diff options
| author | Christian Persch <chpe@src.gnome.org> | 2009-03-24 22:06:07 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2009-03-24 22:06:07 +0000 |
| commit | 8f64567e41fd803d7df610a7fe7ff093bad9c8cd (patch) | |
| tree | 5f20cf5424a44447afd23c71bf9846a2c2b631ac /src/eggdesktopfile.c | |
| parent | 0a58af582aa2714a662f5f4d105c4f26b83b55dc (diff) | |
| download | totem-8f64567e41fd803d7df610a7fe7ff093bad9c8cd.tar.gz | |
Update smclient to latest libegg copy. Bug #560328 continued.
* src/eggdesktopfile.c: (egg_set_desktop_file):
* src/eggsmclient-1.patch:
* src/eggsmclient.c: (egg_sm_client_get_option_group): Update smclient
to latest libegg copy. Bug #560328 continued.
svn path=/trunk/; revision=6190
Diffstat (limited to 'src/eggdesktopfile.c')
| -rw-r--r-- | src/eggdesktopfile.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/eggdesktopfile.c b/src/eggdesktopfile.c index 9e9376e45..357e548f5 100644 --- a/src/eggdesktopfile.c +++ b/src/eggdesktopfile.c @@ -1440,16 +1440,18 @@ egg_set_desktop_file (const char *desktop_file_path) g_error_free (error); } - /* Set localized application name and default window icon */ - if (egg_desktop_file->name) - g_set_application_name (egg_desktop_file->name); - if (egg_desktop_file->icon) - { - if (g_path_is_absolute (egg_desktop_file->icon)) - gtk_window_set_default_icon_from_file (egg_desktop_file->icon, NULL); - else - gtk_window_set_default_icon_name (egg_desktop_file->icon); - } + if (egg_desktop_file) { + /* Set localized application name and default window icon */ + if (egg_desktop_file->name) + g_set_application_name (egg_desktop_file->name); + if (egg_desktop_file->icon) + { + if (g_path_is_absolute (egg_desktop_file->icon)) + gtk_window_set_default_icon_from_file (egg_desktop_file->icon, NULL); + else + gtk_window_set_default_icon_name (egg_desktop_file->icon); + } + } G_UNLOCK (egg_desktop_file); } |