From ebe9e0aeccc89ababd40632e38bf9b82990710dd Mon Sep 17 00:00:00 2001
From: Daniel Francis <francis@sugarlabs.org>
Date: Tue, 9 Dec 2014 16:40:52 -0200
Subject: [PATCH] Fix palette creation for all frame

Signed-off-by: Daniel Francis <francis@sugarlabs.org>
---
 extensions/deviceicon/audio.py   | 1 -
 extensions/deviceicon/network.py | 1 -
 extensions/deviceicon/speech.py  | 1 -
 src/jarabe/frame/frame.py        | 3 ++-
 src/jarabe/frame/friendstray.py  | 1 -
 src/jarabe/frame/navigable.py    | 7 ++++---
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/extensions/deviceicon/audio.py b/extensions/deviceicon/audio.py
index 8fb5c2d314..de7e0ec6ff 100644
--- a/extensions/deviceicon/audio.py
+++ b/extensions/deviceicon/audio.py
@@ -73,7 +73,6 @@ def create_palette(self):
         palette = AudioPalette(device_label, output_label, input_label,
                                output_model=self._audio_output_model,
                                input_model=self._audio_input_model)
-        self.set_palette(palette)
         palette.set_group_id('frame')
         return palette
 
diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py
index b4e29075df..61d1fad04c 100644
--- a/extensions/deviceicon/network.py
+++ b/extensions/deviceicon/network.py
@@ -774,7 +774,6 @@ def create_palette(self):
         palette.connect('gsm-connect', self.__gsm_connect_cb)
         palette.connect('gsm-disconnect', self.__gsm_disconnect_cb)
 
-        self.set_palette(palette)
         self._palette = palette
 
         props = dbus.Interface(self._device, dbus.PROPERTIES_IFACE)
diff --git a/extensions/deviceicon/speech.py b/extensions/deviceicon/speech.py
index 956e4d8315..f0843dd04d 100644
--- a/extensions/deviceicon/speech.py
+++ b/extensions/deviceicon/speech.py
@@ -50,7 +50,6 @@ def create_palette(self):
         label = GLib.markup_escape_text(_('Speech'))
         palette = SpeechPalette(label, manager=self._manager)
         palette.set_group_id('frame')
-        self.set_palette(palette)
         return palette
 
 
diff --git a/src/jarabe/frame/frame.py b/src/jarabe/frame/frame.py
index 43c7285763..10a6762548 100644
--- a/src/jarabe/frame/frame.py
+++ b/src/jarabe/frame/frame.py
@@ -243,7 +243,8 @@ def notify_right_press(self):
 
     def notify_left_press(self):
         if self.visible:
-            logging.debug("Frame: %d %d" % (self.nav_action, self.navigation_position))
+            logging.debug("Frame: %d %d" %
+                          (self.nav_action, self.navigation_position))
             if self.nav_action == -1 or self.nav_action == 2 \
                     or self.nav_action == -2:
                 self.navigation_position -= 1
diff --git a/src/jarabe/frame/friendstray.py b/src/jarabe/frame/friendstray.py
index 13e45a5f2d..d98564d31c 100644
--- a/src/jarabe/frame/friendstray.py
+++ b/src/jarabe/frame/friendstray.py
@@ -40,7 +40,6 @@ def create_palette(self):
         palette = BuddyMenu(self._buddy)
         palette.props.icon_visible = False
         palette.set_group_id('frame')
-        self.set_palette(palette)
         return palette
 
 
diff --git a/src/jarabe/frame/navigable.py b/src/jarabe/frame/navigable.py
index d33c44f78d..35a9ffd444 100644
--- a/src/jarabe/frame/navigable.py
+++ b/src/jarabe/frame/navigable.py
@@ -16,9 +16,10 @@ def navigate(self):
         if size == -1:
             return -2
         button = self.nav_queue[self.nav_pos]
-        if button.get_palette() is None:
-            button.create_palette()
-        button.get_palette().popup()
+        # if button.get_palette() is None:
+        #     button.create_palette()
+        button.palette_invoker.notify_mouse_enter()
+        # button.get_palette().popup()
         if size == 0:
             return 2
         if self.nav_pos == 0: