=== modified file 'debian/changelog'
--- debian/changelog	2010-05-21 02:59:50 +0000
+++ debian/changelog	2010-06-11 21:41:33 +0000
@@ -1,3 +1,10 @@
+indicator-application (0.0.21-0ubuntu1~ppa2) lucid; urgency=low
+
+  * Upstream Merge
+    * Fixing signal names to get submenu updates.
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 11 Jun 2010 16:41:31 -0500
+
 indicator-application (0.0.21-0ubuntu1~ppa1) lucid; urgency=low
 
   * New upstream release.

=== modified file 'src/libappindicator/app-indicator.c'
--- src/libappindicator/app-indicator.c	2010-05-21 02:38:31 +0000
+++ src/libappindicator/app-indicator.c	2010-06-11 21:40:52 +0000
@@ -1364,12 +1364,12 @@
                                 container_iterate,
                                 child);
           g_signal_connect_object (submenu,
-                                   "add",
+                                   "child-added",
                                    G_CALLBACK (submenu_changed),
                                    child,
                                    0);
           g_signal_connect_object (submenu,
-                                   "remove",
+                                   "child-removed",
                                    G_CALLBACK (submenu_changed),
                                    child,
                                    0);
@@ -1506,11 +1506,11 @@
   check_connect (self);
 
   g_signal_connect (menu,
-                    "add",
+                    "child-added",
                     G_CALLBACK (client_menu_changed),
                     self);
   g_signal_connect (menu,
-                    "remove",
+                    "child-removed",
                     G_CALLBACK (client_menu_changed),
                     self);
 }