aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2012-03-01 17:02:04 +0000
committerConor Curran <conor.curran@canonical.com>2012-03-01 17:02:04 +0000
commitffc2f69f9405ecdb19713bbeda8ff6ae0ee99e6f (patch)
tree83865c9b1b198c4cd2472a6b141e93945997261f
parent062aadf6d9ab7f1cecfab74159507047d52dc6d8 (diff)
parente884478843aaf00a05c325da5766f44cdf67c26a (diff)
downloadayatana-indicator-sound-ffc2f69f9405ecdb19713bbeda8ff6ae0ee99e6f.tar.gz
ayatana-indicator-sound-ffc2f69f9405ecdb19713bbeda8ff6ae0ee99e6f.tar.bz2
ayatana-indicator-sound-ffc2f69f9405ecdb19713bbeda8ff6ae0ee99e6f.zip
fix charles coverity fixes
-rw-r--r--src/sound-service-dbus.c34
1 files changed, 22 insertions, 12 deletions
diff --git a/src/sound-service-dbus.c b/src/sound-service-dbus.c
index 5650002..07d3d6f 100644
--- a/src/sound-service-dbus.c
+++ b/src/sound-service-dbus.c
@@ -58,6 +58,7 @@ struct _SoundServiceDbusPrivate {
DbusmenuMenuitem* root_menuitem;
Device* device;
gboolean greeter_mode;
+ guint registration_id;
};
enum {
@@ -155,18 +156,18 @@ sound_service_dbus_init (SoundServiceDbus *self)
return;
}
/* register the service on it */
- g_dbus_connection_register_object (priv->connection,
- INDICATOR_SOUND_SERVICE_DBUS_OBJECT_PATH,
- interface_info,
- &interface_table,
- self,
- NULL,
- &error);
- if (error != NULL) {
- g_error("Unable to register the object to DBus: %s", error->message);
- g_error_free(error);
- return;
- }
+ priv->registration_id = g_dbus_connection_register_object (priv->connection,
+ INDICATOR_SOUND_SERVICE_DBUS_OBJECT_PATH,
+ interface_info,
+ &interface_table,
+ self,
+ NULL,
+ &error);
+ if (error != NULL) {
+ g_error("Unable to register the object to DBus: %s", error->message);
+ g_error_free(error);
+ return;
+ }
}
DbusmenuMenuitem*
@@ -239,6 +240,15 @@ show_sound_settings_dialog (DbusmenuMenuitem *mi,
static void
sound_service_dbus_dispose (GObject *object)
{
+ SoundServiceDbusPrivate *priv = SOUND_SERVICE_DBUS_GET_PRIVATE (object);
+
+ if (priv->connection && priv->registration_id) {
+ g_dbus_connection_unregister_object (priv->connection, priv->registration_id);
+ priv->registration_id = 0;
+ }
+
+ g_clear_object(&priv->connection);
+
G_OBJECT_CLASS (sound_service_dbus_parent_class)->dispose (object);
//TODO dispose of the active sink instance !
return;