[banshee] HardwareManager: fix some consistency nitpicks from previous change
- From: Andrés Aragoneses <aaragoneses src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] HardwareManager: fix some consistency nitpicks from previous change
- Date: Sun, 22 Jun 2014 10:31:39 +0000 (UTC)
commit 5389a92f5f56fddbb1391b02741831568f9635ac
Author: Andrés G. Aragoneses <knocte gmail com>
Date: Sun Jun 22 12:29:17 2014 +0200
HardwareManager: fix some consistency nitpicks from previous change
Previous commit [1] had some consistency nitpicks that I only
noticed now.
[1] https://git.gnome.org/browse/banshee/commit/?id=5a5cb82394519779c4ba641b7e993f4015714417
.../Banshee.Hardware.Gio/HardwareManager.cs | 8 +++++---
.../Banshee.Hardware.Gio/LowLevel/Manager.cs | 6 +++---
.../Banshee.Hardware/HardwareManager.cs | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/HardwareManager.cs
b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/HardwareManager.cs
index 10c506c..453059c 100644
--- a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/HardwareManager.cs
+++ b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/HardwareManager.cs
@@ -25,11 +25,9 @@
// THE SOFTWARE.
#if ENABLE_GIO_HARDWARE
-using System;
using System.Collections.Generic;
using Banshee.Hardware;
-using Hyena;
namespace Banshee.Hardware.Gio
{
@@ -79,8 +77,12 @@ namespace Banshee.Hardware.Gio
private void HandleManagerDeviceChanged (IDevice device)
{
+ if (device == null) {
+ return;
+ }
+
var handler = DeviceChanged;
- if (null != handler) {
+ if (handler != null) {
handler (this, new DeviceChangedEventArgs (device));
}
}
diff --git a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/Manager.cs
b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/Manager.cs
index be2e78b..3768805 100644
--- a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/Manager.cs
+++ b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/Manager.cs
@@ -86,19 +86,19 @@ namespace Banshee.Hardware.Gio
void HandleMonitorMountAdded (object o, MountAddedArgs args)
{
- Hyena.Log.Debug ("Gio.Manager: Received MountAdded Signal");
+ Hyena.Log.Debug ("Gio.Manager: received MountAdded signal");
VolumeChanged (args.Mount.Volume);
}
void HandleMonitorMountRemoved (object o, MountRemovedArgs args)
{
- Hyena.Log.Debug ("Gio.Manager: received MountRemoved Signal");
+ Hyena.Log.Debug ("Gio.Manager: received MountRemoved signal");
VolumeChanged (args.Mount.Volume);
}
private void HandleMonitorVolumeAdded (object o, VolumeAddedArgs args)
{
- Hyena.Log.Debug ("Gio.Manager: Received VolumeAdded Signal");
+ Hyena.Log.Debug ("Gio.Manager: received VolumeAdded signal");
var volume = GLib.VolumeAdapter.GetObject ((GLib.Object) args.Args [0]);
if (volume == null) {
Hyena.Log.Error ("Gio.Manager: ignoring VolumeAdded signal with no volume");
diff --git a/src/Core/Banshee.Services/Banshee.Hardware/HardwareManager.cs
b/src/Core/Banshee.Services/Banshee.Hardware/HardwareManager.cs
index 082ade0..9574f58 100644
--- a/src/Core/Banshee.Services/Banshee.Hardware/HardwareManager.cs
+++ b/src/Core/Banshee.Services/Banshee.Hardware/HardwareManager.cs
@@ -193,7 +193,7 @@ namespace Banshee.Hardware
{
lock (this) {
var handler = DeviceChanged;
- if (null != handler) {
+ if (handler != null) {
handler (this, args);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]