Ticket #207: sl_207.patch

extensions/deviceicon/xomenu.py

@@ -14 +14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+import os
 from gettext import gettext as _
 import gconf
 
@@ -54 +55 @@
         self.menu.append(item)
         item.show()
 
+        if 'GDMSESSION' in os.environ or 'XDM_MANAGED' in os.environ:
+            # We need to ensure that we are logging in to 
+            # Sugar via GDM. GDMSESSION is also present in, 
+            # for example, sugar-jhbuild running from GNOME
+            # We don't need Logout for that
+            if os.environ['GDMSESSION'] == 'sugar' or 'XDM_MANAGED' in \
+                    os.environ:
+                item = MenuItem(_('Logout'), 'go-right')
+                item.connect('activate', self.__logout_activate_cb)
+                self.menu.append(item)
+                item.show()
+
         item = MenuItem(_('Restart'), 'system-restart')
         item.connect('activate', self.__reboot_activate_cb)
         self.menu.append(item)
@@ -64 +77 @@
         self.menu.append(item)
         item.show()
 
+    def __logout_activate_cb(self, menu_item):
+        session_manager = get_session_manager()
+        session_manager.logout()
+
     def __reboot_activate_cb(self, menu_item):
         session_manager = get_session_manager()
         session_manager.reboot()