--- dev/dockbarx/dockbarx.py 2010-04-29 00:00:04.496690000 +0300
+++ /usr/bin/dockbarx.py 2010-04-29 00:16:46.763479957 +0300
@@ -3917,6 +3917,20 @@
}
def __init__(self,applet):
gobject.GObject.__init__(self)
+ if applet is not None:
+ self.pp_menu_xml = """
+
+
+
+
+
+ """
+
+ self.pp_menu_verbs = [("About", self.on_ppm_about),
+ ("Pref", self.on_ppm_pref),
+ ("Reload", self.reload)]
+ applet.setup_menu(self.pp_menu_xml, self.pp_menu_verbs,None)
+
global settings
print "Dockbarx init"
self.applet = applet
@@ -3981,18 +3995,6 @@
self.applet.add(self.container)
self.applet.connect("size-allocate",self.on_applet_size_alloc)
self.applet.connect("change_background", self.on_change_background)
- self.pp_menu_xml = """
-
-
-
-
-
- """
-
- self.pp_menu_verbs = [("About", self.on_ppm_about),
- ("Pref", self.on_ppm_pref),
- ("Reload", self.reload)]
- self.applet.setup_menu(self.pp_menu_xml, self.pp_menu_verbs,None)
self.applet_origin_x = -1000 # off screen. there is no 'window' prop
self.applet_origin_y = -1000 # at this step
self.applet.set_background_widget(applet) # background bug workaround
@@ -4003,8 +4005,8 @@
# Wait until everything is loaded
# before adding groupbuttons
- while gtk.events_pending():
- gtk.main_iteration(False)
+ #while gtk.events_pending():
+ #gtk.main_iteration(False)
self.reload()