ayatana-commits team mailing list archive

[David Barth <david.barth@xxxxxxxxxxxxx>]

David Barth has proposed merging lp:~dbarth/indicator-session/separator-n-order into lp:indicator-session.

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


step by step...
-- 
https://code.launchpad.net/~dbarth/indicator-session/separator-n-order/+merge/19475
Your team ayatana-commits is subscribed to branch lp:indicator-session.

=== modified file 'src/session-service.c'
--- src/session-service.c	2010-02-08 22:46:35 +0000
+++ src/session-service.c	2010-02-17 11:42:19 +0000
@@ -437,6 +437,10 @@
 
   if (can_activate == TRUE)
     {
+	  DbusmenuMenuitem * separator1 = dbusmenu_menuitem_new();
+	  dbusmenu_menuitem_property_set(separator1, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
+	  dbusmenu_menuitem_child_append(root, separator1);
+
       if (check_guest_session ())
         {
           mi = dbusmenu_menuitem_new ();
@@ -445,6 +449,25 @@
           g_signal_connect (G_OBJECT (mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_guest_session), NULL);
         }
 
+      if (check_new_session ())
+        {
+          ensure_gconf_client ();
+
+          switch_menuitem = dbusmenu_menuitem_new ();
+          dbusmenu_menuitem_property_set (switch_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch User..."));
+          dbusmenu_menuitem_child_append (root, switch_menuitem);
+          g_signal_connect (G_OBJECT (switch_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_new_session), NULL);
+
+          if (gconf_client_get_bool (gconf_client, LOCKDOWN_KEY, NULL))
+            {
+              dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
+            }
+          else
+            {
+              dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
+            }
+        }
+
       if (count > MINIMUM_USERS && count < MAXIMUM_USERS)
         {
           if (users != NULL)
@@ -476,24 +499,6 @@
             }
         }
 
-      if (check_new_session ())
-        {
-          ensure_gconf_client ();
-
-          switch_menuitem = dbusmenu_menuitem_new ();
-          dbusmenu_menuitem_property_set (switch_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch User..."));
-          dbusmenu_menuitem_child_append (root, switch_menuitem);
-          g_signal_connect (G_OBJECT (switch_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_new_session), NULL);
-
-          if (gconf_client_get_bool (gconf_client, LOCKDOWN_KEY, NULL))
-            {
-              dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
-            }
-          else
-            {
-              dbusmenu_menuitem_property_set_bool (switch_menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
-            }
-        }
     }
 
 	DbusmenuMenuitem * separator = dbusmenu_menuitem_new();