diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2009-10-08 15:38:04 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2009-10-08 15:38:04 -0400 |
| commit | 62da5967b5e4c8308f436a31a7af0388a1d9d225 (patch) | |
| tree | 23206c79d63b9202138901d0f953cfac5590df89 /src | |
| parent | dc5266b42298495c316ef5186c2cd01f27f55064 (diff) | |
| parent | 80d2f2afcf2adca78e93986733be23359e504ce6 (diff) | |
| download | ayatana-indicator-messages-62da5967b5e4c8308f436a31a7af0388a1d9d225.tar.gz ayatana-indicator-messages-62da5967b5e4c8308f436a31a7af0388a1d9d225.tar.bz2 ayatana-indicator-messages-62da5967b5e4c8308f436a31a7af0388a1d9d225.zip | |
* Upstream release 0.2.6 (LP: #446629)
* Building the menu after checking the blacklist so that the
separators are all correct.
* Small fix for a perspective memory leak.
Diffstat (limited to 'src')
| -rw-r--r-- | src/indicator-messages.c | 4 | ||||
| -rw-r--r-- | src/messages-service.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/indicator-messages.c b/src/indicator-messages.c index 0d0e294..e7d6207 100644 --- a/src/indicator-messages.c +++ b/src/indicator-messages.c @@ -202,12 +202,12 @@ indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, gchar * value, in static gboolean new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client) { - indicator_item_t * mi_data = g_new0(indicator_item_t, 1); - g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE); g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE); /* Note: not checking parent, it's reasonable for it to be NULL */ + indicator_item_t * mi_data = g_new0(indicator_item_t, 1); + GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new()); GtkWidget * hbox = gtk_hbox_new(FALSE, 4); diff --git a/src/messages-service.c b/src/messages-service.c index 754d7ee..f5681b7 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -1147,7 +1147,6 @@ build_launcher (gpointer data) /* Add it to the menu */ dbusmenu_menuitem_child_append(root_menuitem, DBUSMENU_MENUITEM(ll->menuitem)); dbusmenu_menuitem_child_append(root_menuitem, DBUSMENU_MENUITEM(ll->separator)); - resort_menu(root_menuitem); /* If we're in the black list or we've gotten eclipsed by something else, hide the item and the separator. */ @@ -1157,6 +1156,7 @@ build_launcher (gpointer data) dbusmenu_menuitem_property_set(ll->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "false"); } + resort_menu(root_menuitem); check_hidden(); } else { /* If so add ourselves */ |