diff options
| author | Christian Persch <chpe@src.gnome.org> | 2009-04-09 05:28:07 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2009-04-09 05:28:07 +0800 |
| commit | 98a77d35bedf5beff0f0dfef29674430f74c0102 (patch) | |
| tree | 0915def203adcd2f3fb548e4d3592af99bdaba82 /lib/egg/eggsmclient-xsmp.c | |
| parent | 7f0ac8bada128d5b6c51952613d2786a951f1e75 (diff) | |
| download | gsoc2013-epiphany-98a77d35bedf5beff0f0dfef29674430f74c0102.tar gsoc2013-epiphany-98a77d35bedf5beff0f0dfef29674430f74c0102.tar.gz gsoc2013-epiphany-98a77d35bedf5beff0f0dfef29674430f74c0102.tar.bz2 gsoc2013-epiphany-98a77d35bedf5beff0f0dfef29674430f74c0102.tar.lz gsoc2013-epiphany-98a77d35bedf5beff0f0dfef29674430f74c0102.tar.xz gsoc2013-epiphany-98a77d35bedf5beff0f0dfef29674430f74c0102.tar.zst gsoc2013-epiphany-98a77d35bedf5beff0f0dfef29674430f74c0102.zip | |
Update smclient from libegg master
svn path=/trunk/; revision=8952
Diffstat (limited to 'lib/egg/eggsmclient-xsmp.c')
| -rw-r--r-- | lib/egg/eggsmclient-xsmp.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/egg/eggsmclient-xsmp.c b/lib/egg/eggsmclient-xsmp.c index dcaf36b98..81af7d2b6 100644 --- a/lib/egg/eggsmclient-xsmp.c +++ b/lib/egg/eggsmclient-xsmp.c @@ -830,10 +830,14 @@ save_state (EggSMClientXSMP *xsmp) if (desktop_file) { GKeyFile *merged_file; + char *desktop_file_path; merged_file = g_key_file_new (); - if (g_key_file_load_from_file (merged_file, - egg_desktop_file_get_source (desktop_file), + desktop_file_path = + g_filename_from_uri (egg_desktop_file_get_source (desktop_file), + NULL, NULL); + if (desktop_file_path && + g_key_file_load_from_file (merged_file, desktop_file_path, G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS, NULL)) { @@ -876,8 +880,11 @@ save_state (EggSMClientXSMP *xsmp) EGG_DESKTOP_FILE_KEY_EXEC, exec); g_free (exec); - } + else + desktop_file = NULL; + + g_free (desktop_file_path); } /* Now write state_file to disk. (We can't use mktemp(), because |