diff options
| author | Ted Gould <ted@gould.cx> | 2010-02-22 15:57:41 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-02-22 15:57:41 -0600 |
| commit | 094035738564575b2fd3086676d3633906625e34 (patch) | |
| tree | 4373f27f37a9252ed21531c2c3fc528cf4ac1093 | |
| parent | 3676f118f50dde2571fd72c4db7cae5bca7c983a (diff) | |
| parent | 1d6eba2448b2753cb3cc38e05d763a576d40b978 (diff) | |
| download | libayatana-appindicator-094035738564575b2fd3086676d3633906625e34.tar.gz libayatana-appindicator-094035738564575b2fd3086676d3633906625e34.tar.bz2 libayatana-appindicator-094035738564575b2fd3086676d3633906625e34.zip | |
* Upstream Merge
* Using foreach instead of forall
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/libappindicator/app-indicator.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index b98997d..22eadad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.0.13-0ubuntu3~ppa3~menu2) UNRELEASED; urgency=low + + * Upstream Merge + * Using foreach instead of forall + + -- Ted Gould <ted@ubuntu.com> Mon, 22 Feb 2010 15:57:23 -0600 + indicator-application (0.0.13-0ubuntu3~ppa3~menu1) lucid; urgency=low * Upstream merge diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index 361875d..0490031 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -1240,7 +1240,7 @@ container_iterate (GtkWidget *widget, submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (widget)); if (submenu != NULL) { - gtk_container_forall (GTK_CONTAINER (submenu), + gtk_container_foreach (GTK_CONTAINER (submenu), container_iterate, child); g_signal_connect_object (submenu, @@ -1285,7 +1285,7 @@ submenu_changed (GtkWidget *widget, dbusmenu_menuitem_child_delete (root, c); } - gtk_container_forall (GTK_CONTAINER (widget), + gtk_container_foreach (GTK_CONTAINER (widget), container_iterate, root); } @@ -1301,7 +1301,7 @@ setup_dbusmenu (AppIndicator *self) if (priv->menu) { - gtk_container_forall (GTK_CONTAINER (priv->menu), + gtk_container_foreach (GTK_CONTAINER (priv->menu), container_iterate, root); } |