Fix palette creation for all frame

Signed-off-by: Daniel Francis <[email protected]>
trinidadg · Dec 9, 2014 · ebe9e0a · ebe9e0a
1 parent a8f8f4f
commit ebe9e0a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: