brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome-shell-jhbuild.in: Fix restore_gnome.

Browse Source 
The gconf keys used to restore GNOME aren't in a proper GNOME3 environment.
To mimic what GNOME3 gnome-session does would be extremely complicated, so
just launch the system gnome-shell.

https://bugzilla.gnome.org/show_bug.cgi?id=654527
This commit is contained in:
Jasper St. Pierre 2011-07-13 13:08:43 -04:00
parent 5819dd3a5a
commit 297eab738f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gnome-shell-jhbuild.in
View File

@ -532,7 +532,7 @@ def restore_gnome():
component = client.get_string(gconf_path) component = client.get_string(gconf_path)
if component == None or component == "": if component == None or component == "":
return return False
# See gnome-session/gsm-util.c:gsm_util_find_desktop_file_for_app_name() # See gnome-session/gsm-util.c:gsm_util_find_desktop_file_for_app_name()
# The one difference is that we don't search the autostart directories, # The one difference is that we don't search the autostart directories,
@ -549,9 +549,15 @@ def restore_gnome():
if appinfo: if appinfo:
appinfo.launch() appinfo.launch()
return True
return False
launch_component("/desktop/gnome/session/required_components/windowmanager") # GNOME2 fallback
launch_component("/desktop/gnome/session/required_components/panel") wm = launch_component("/desktop/gnome/session/required_components/windowmanager")
panel = launch_component("/desktop/gnome/session/required_components/panel")
if not wm and not panel: # Probably GNOME3
subprocess.Popen(['gnome-shell'])
# Main program # Main program