rpms/sabayon/devel sabayon-2.25.0-gconf-crashes.patch,NONE,1.1

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10142

Added Files:
	sabayon-2.25.0-gconf-crashes.patch 
Log Message:
Forgot to 'cvs add' a patch
(didn't I spew some nasty words about missing commit hook last time?)


sabayon-2.25.0-gconf-crashes.patch:

--- NEW FILE sabayon-2.25.0-gconf-crashes.patch ---
diff -up sabayon-2.25.0/lib/sources/paneldelegate.py.gconf sabayon-2.25.0/lib/sources/paneldelegate.py
--- sabayon-2.25.0/lib/sources/paneldelegate.py.gconf	2009-01-12 19:38:22.000000000 +0100
+++ sabayon-2.25.0/lib/sources/paneldelegate.py	2009-04-03 17:46:08.000000000 +0200
@@ -191,10 +191,19 @@ class PanelDelegate (userprofile.SourceD
     class PanelObject (PanelThing):
         def __init__ (self, id, added = False, removed = False):
             PanelDelegate.PanelThing.__init__ (self, id, added, removed)
-  
+            
             self.toplevel_id = self.client.get_string (PANEL_KEY_BASE + "/objects/" + id + "/toplevel_id")
             self.object_type = self.client.get_string (PANEL_KEY_BASE + "/objects/" + id + "/object_type")
 
+            home = util.get_home_dir()
+            (cl, xaddress) = gconfsource.get_client_and_address_for_path (os.path.join (home, ".gconf"))
+            
+            # FIXME: not sure why this is happening, looks like the change is pushed to wrong gconf repository
+            if self.toplevel_id == None:
+                self.toplevel_id = cl.get_string (PANEL_KEY_BASE + "/objects/" + id + "/toplevel_id")
+            if self.object_type == None:
+                self.object_type = cl.get_string (PANEL_KEY_BASE + "/objects/" + id + "/object_type")
+
             if self.object_type == "drawer-object":
                 # Translators: This is a drawer in gnome-panel (where you can put applets)
                 self.name = _("Drawer")
@@ -202,6 +211,10 @@ class PanelDelegate (userprofile.SourceD
                 self.name = _("Main Menu")
             elif self.object_type == "launcher-object":
                 launcher_location = self.client.get_string (PANEL_KEY_BASE + "/objects/" + id + "/launcher_location")
+                # FIXME: not sure why this is happening, looks like the change is pushed to wrong gconf repository 
+                if launcher_location == None:
+                    launcher_location = cl.get_string (PANEL_KEY_BASE + "/objects/" + id + "/launcher_location")
+
                 if launcher_location[0] == '/':
                     desktop_file = launcher_location
                 elif launcher_location[0:7] == "file://": # See what happens when you drag and drop from the menu
@@ -212,6 +225,10 @@ class PanelDelegate (userprofile.SourceD
                 self.name = _("%s launcher") % launcher.getName()
             elif self.object_type == "action-applet":
                 action_type = self.client.get_string (PANEL_KEY_BASE + "/objects/" + id + "/action_type")
+                # FIXME: not sure why this is happening, looks like the change is pushed to wrong gconf repository 
+                if action_type == None:
+                    action_type = cl.get_string (PANEL_KEY_BASE + "/objects/" + id + "/action_type")
+
                 if action_type == "lock":
                     self.name = _("Lock Screen button")
                 elif action_type == "logout":