diff options
| author | Conor Curran <conor.curran@canonical.com> | 2011-02-01 14:40:51 -0600 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2011-02-01 14:40:51 -0600 |
| commit | 2b6453d1a988eb4a82df18401b3ba9b3867a2f40 (patch) | |
| tree | 84c9f7a1a05638f81f513c353d50549a55a14a58 /src | |
| parent | ebf8fb61bea8de7d6d2df81015b538638207f2cf (diff) | |
| download | ayatana-indicator-sound-2b6453d1a988eb4a82df18401b3ba9b3867a2f40.tar.gz ayatana-indicator-sound-2b6453d1a988eb4a82df18401b3ba9b3867a2f40.tar.bz2 ayatana-indicator-sound-2b6453d1a988eb4a82df18401b3ba9b3867a2f40.zip | |
fixes for the last two merge requests
Diffstat (limited to 'src')
| -rw-r--r-- | src/sound-service-dbus.c | 6 | ||||
| -rw-r--r-- | src/title-menu-item.vala | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/sound-service-dbus.c b/src/sound-service-dbus.c index 7f5afdc..637bee4 100644 --- a/src/sound-service-dbus.c +++ b/src/sound-service-dbus.c @@ -452,7 +452,7 @@ static gboolean sound_service_dbus_blacklist_player (SoundServiceDbus* self, g_debug ("we have this already blacklisted, no need to do anything"); g_variant_builder_clear (&builder); g_object_unref (our_settings); - g_object_unref (the_black_list); + g_variant_unref (the_black_list); return result; } } @@ -475,7 +475,7 @@ static gboolean sound_service_dbus_blacklist_player (SoundServiceDbus* self, g_debug ("it was not blacklisted ?, no need to do anything"); g_variant_builder_clear (&builder); g_object_unref (our_settings); - g_object_unref (the_black_list); + g_variant_unref (the_black_list); return result; } @@ -497,7 +497,7 @@ static gboolean sound_service_dbus_blacklist_player (SoundServiceDbus* self, value); g_object_unref (our_settings); - g_object_unref (the_black_list); + g_variant_unref (the_black_list); return result; } diff --git a/src/title-menu-item.vala b/src/title-menu-item.vala index fd81f65..ac93b89 100644 --- a/src/title-menu-item.vala +++ b/src/title-menu-item.vala @@ -48,7 +48,7 @@ public class TitleMenuitem : PlayerItem public void alter_label (string new_title) { - if (new_title != null) return; + if (new_title == null) return; this.property_set(MENUITEM_NAME, new_title); } |