ayatana-commits team mailing list archive

[Cody Russell <crussell@xxxxxxxxxxxxx>]

Cody Russell has proposed merging lp:~bratsche/indicator-session/clear-menu into lp:indicator-session.

    Requested reviews:
    Indicator Applet Developers (indicator-applet-developers)

-- 
https://code.launchpad.net/~bratsche/indicator-session/clear-menu/+merge/12387
Your team ayatana-commits is subscribed to branch lp:indicator-session.

=== modified file 'src/users-service-dbus.c'
--- src/users-service-dbus.c	2009-09-24 06:21:50 +0000
+++ src/users-service-dbus.c	2009-09-24 21:50:19 +0000
@@ -46,10 +46,10 @@
 static void     users_loaded                           (DBusGProxy        *proxy,
                                                         gpointer           user_data);
 static void     user_added                             (DBusGProxy        *proxy,
-                                                        guint              uid,
+                                                        gint64             uid,
                                                         gpointer           user_data);
 static void     user_removed                           (DBusGProxy        *proxy,
-                                                        guint              uid,
+                                                        gint64             uid,
                                                         gpointer           user_data);
 static void     user_updated                           (DBusGProxy        *proxy,
                                                         guint              uid,
@@ -916,7 +916,7 @@
 
 static void
 user_added (DBusGProxy *proxy,
-            guint       uid,
+            gint64      uid,
             gpointer    user_data)
 {
   UsersServiceDbus *service = (UsersServiceDbus *)user_data;
@@ -972,7 +972,7 @@
 
 static void
 user_removed (DBusGProxy *proxy,
-              guint       uid,
+              gint64      uid,
               gpointer    user_data)
 {
   UsersServiceDbus *service = (UsersServiceDbus *)user_data;

=== modified file 'src/users-service.c'
--- src/users-service.c	2009-09-24 17:13:26 +0000
+++ src/users-service.c	2009-09-24 21:50:19 +0000
@@ -251,14 +251,6 @@
   users_service_dbus_activate_user_session (service, user);
 }
 
-static void
-remove_menu_item (DbusmenuMenuitem *root, gpointer user_data)
-{
-  DbusmenuMenuitem *child = (DbusmenuMenuitem *)user_data;
-
-  dbusmenu_menuitem_child_delete (root, child);
-}
-
 static gint
 compare_users_by_username (const gchar *a,
                            const gchar *b)
@@ -277,10 +269,13 @@
   GList *u;
   UserData *user;
   gboolean can_activate;
+  GList *children;
 
   can_activate = users_service_dbus_can_activate_session (service);
 
-  dbusmenu_menuitem_foreach (root, remove_menu_item, NULL);
+  children = dbusmenu_menuitem_take_children (root);
+  g_list_foreach (children, (GFunc)g_object_unref, NULL);
+  g_list_free (children);
 
   mi = dbusmenu_menuitem_new();
   dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Lock Screen"));