diff options
| author | Lars Uebernickel <lars.uebernickel@canonical.com> | 2012-08-20 23:32:23 +0200 |
|---|---|---|
| committer | Lars Uebernickel <lars.uebernickel@canonical.com> | 2012-08-20 23:32:23 +0200 |
| commit | 6e38f791c64476215ae68a7a5beabe44dde20131 (patch) | |
| tree | 8f8e0d7bc26f3f9d11db9c631748e2e663e67786 /src/indicator-messages.c | |
| parent | 234c3cb933fcd422d9185b4bb01bed3223f0e791 (diff) | |
| parent | d34fb7000e9b508b05c653b47bb60f35989c34f9 (diff) | |
| download | ayatana-indicator-messages-6e38f791c64476215ae68a7a5beabe44dde20131.tar.gz ayatana-indicator-messages-6e38f791c64476215ae68a7a5beabe44dde20131.tar.bz2 ayatana-indicator-messages-6e38f791c64476215ae68a7a5beabe44dde20131.zip | |
Merge Charles' branch: fixes a memory and a signal leak; various neat cleanups
The "add sanity check" commit is not included, as app-section is not public.
This merge also removes the remaining sanity checks in app-section.
Diffstat (limited to 'src/indicator-messages.c')
| -rw-r--r-- | src/indicator-messages.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/indicator-messages.c b/src/indicator-messages.c index 67a28e9..4e8701a 100644 --- a/src/indicator-messages.c +++ b/src/indicator-messages.c @@ -155,11 +155,7 @@ indicator_messages_dispose (GObject *object) IndicatorMessages * self = INDICATOR_MESSAGES(object); g_return_if_fail(self != NULL); - if (self->service != NULL) { - g_object_unref(self->service); - self->service = NULL; - } - + g_clear_object (&self->service); g_clear_object (&self->menu_wrapper); g_clear_object (&self->actions); g_clear_object (&self->menu); @@ -227,6 +223,8 @@ indicator_messages_accessible_desc_updated (IndicatorMessages *self) g_return_if_fail (entries != NULL); g_signal_emit_by_name (self, INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, entries->data); + + g_list_free (entries); } static void |