Merge branch 'master' of gitorious@git.sugarlabs.org:sugar/mainline

2 files changed, 15 insertions, 4 deletions

diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 9535edf..a32b8df 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -472,12 +472,16 @@ class ActivityIcon(CanvasIcon):
 
     def create_palette(self):
         palette = FavoritePalette(self._activity_info, self._journal_entries)
+        palette.connect('activate', self.__palette_activate_cb)
         palette.connect('erase-activated', self.__erase_activated_cb)
         return palette
 
     def __erase_activated_cb(self, palette):
         self.emit('erase-activated', self._activity_info.get_bundle_id())
 
+    def __palette_activate_cb(self, palette):
+        self._activate()
+
     def __hovering_changed_event_cb(self, icon, hovering):
         self._hovering = hovering
 
@@ -530,6 +534,9 @@ class ActivityIcon(CanvasIcon):
         return width, width
 
     def __button_release_event_cb(self, icon, event):
+        self._activate()
+
+    def _activate(self):
         self.palette.popdown(immediate=True)
         if get_settings().resume_mode and self._journal_entries:
             entry = self._journal_entries[0]
diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py
index 99cf57f..35a8301 100644
--- a/src/jarabe/view/buddymenu.py
+++ b/src/jarabe/view/buddymenu.py
@@ -18,6 +18,7 @@ import logging
 from gettext import gettext as _
 
 import gtk
+import gconf
 
 from sugar.graphics.palette import Palette
 from sugar.graphics.menuitem import MenuItem
@@ -83,10 +84,13 @@ class BuddyMenu(Palette):
         self.menu.append(item)
         item.show()
 
-        item = MenuItem(_('Logout'), 'system-logout')
-        item.connect('activate', self.__logout_activate_cb)
-        self.menu.append(item)
-        item.show()
+        client = gconf.client_get_default()
+        
+        if client.get_bool('/desktop/sugar/show_logout'):
+            item = MenuItem(_('Logout'), 'system-logout')
+            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)