diff options
| author | Ted Gould <ted@canonical.com> | 2009-10-04 15:33:16 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-10-04 15:33:16 -0500 |
| commit | 6b7b7a7ec38ca43ee1ba92dbc479c0abc3a5f786 (patch) | |
| tree | 7e91e4b88a4a9877a9ebc0ddf72b5af45c382258 | |
| parent | 85a2a2321591f82582236d65ff2198a510520ed4 (diff) | |
| parent | 735d17b40b609584d9a99c113c5848c0e5f759e4 (diff) | |
| download | ayatana-indicator-messages-6b7b7a7ec38ca43ee1ba92dbc479c0abc3a5f786.tar.gz ayatana-indicator-messages-6b7b7a7ec38ca43ee1ba92dbc479c0abc3a5f786.tar.bz2 ayatana-indicator-messages-6b7b7a7ec38ca43ee1ba92dbc479c0abc3a5f786.zip | |
Resorting after checking blacklist
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | src/indicator-messages.c | 4 | ||||
| -rw-r--r-- | src/messages-service.c | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 5104621..2e7f179 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-messages (0.2.5-0ubuntu1~ppa2~finalsep1) UNRELEASED; urgency=low + + * Resorting after checking blacklist + + -- Ted Gould <ted@ubuntu.com> Sun, 04 Oct 2009 15:32:55 -0500 + indicator-messages (0.2.5-0ubuntu1~ppa1) karmic; urgency=low * Upstream release 0.2.5 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 */ |