diff options
| author | Carlos Garcia Campos <carlosgc@gnome.org> | 2009-02-05 09:44:50 (GMT) |
|---|---|---|
| committer | Carlos Garcia Campos <carlosgc@src.gnome.org> | 2009-02-05 09:44:50 (GMT) |
| commit | 841369ba5c77e58a6fa19723b33d04720a7d4fec (patch) | |
| tree | 1c50e5522fdb8994fe3a203c3fe29d5c6843bc2b /shell | |
| parent | ee88daeea5519ca669244684877effbcea42fb56 (diff) | |
Make session manager code compile for w32. These changes have been taken
2009-02-05 Carlos Garcia Campos <carlosgc@gnome.org>
* configure.ac:
* cut-n-paste/smclient/Makefile.am:
* cut-n-paste/smclient/eggdesktopfile.c:
* cut-n-paste/smclient/eggsmclient-win32.c:
* shell/main.c:
Make session manager code compile for w32. These changes have been
taken from upstream libegg. Based on patch by Hib Eris. See bug
#339172.
svn path=/trunk/; revision=3416
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/main.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/shell/main.c b/shell/main.c index 5348469..17e0f64 100644 --- a/shell/main.c +++ b/shell/main.c @@ -37,7 +37,9 @@ #include "ev-file-helpers.h" #include "ev-stock-icons.h" #include "eggsmclient.h" +#ifndef G_OS_WIN32 #include "eggdesktopfile.h" +#endif static gchar *ev_page_label; static gchar *ev_find_string; @@ -374,8 +376,14 @@ main (int argc, char *argv[]) return 1; ev_stock_icons_init (); - + +#ifdef G_OS_WIN32 + /* Manually set name and icon in win32 */ + g_set_application_name (_("Evince")); + gtk_window_set_default_icon_name ("evince"); +#else egg_set_desktop_file (GNOMEDATADIR "/applications/evince.desktop"); +#endif /* G_OS_WIN32 */ if (!ev_application_load_session (EV_APP)) load_files (file_arguments, args); |