From 41d936f5cbf3d5686ab6e6c2f8e8fd928a3c86f6 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Sun, 2 Nov 2008 10:24:58 +0000 Subject: [PATCH] Move the egg_set_desktop_file() call to main and remove 2008-11-02 Carlos Garcia Campos * shell/ev-application.c: (ev_application_init_session): * shell/main.c: (main): Move the egg_set_desktop_file() call to main and remove gtk_window_set_default_icon_name() since it's already called by egg_set_desktop_file() svn path=/trunk/; revision=3250 --- ChangeLog | 9 +++++++++ shell/ev-application.c | 3 --- shell/main.c | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb7fb075..9d4cb7ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-11-02 Carlos Garcia Campos + + * shell/ev-application.c: (ev_application_init_session): + * shell/main.c: (main): + + Move the egg_set_desktop_file() call to main and remove + gtk_window_set_default_icon_name() since it's already called by + egg_set_desktop_file() + 2008-11-01 Carlos Garcia Campos * libdocument/ev-file-helpers.c: (ev_xfer_uri_simple): diff --git a/shell/ev-application.c b/shell/ev-application.c index 49d10f4b..9637940e 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -31,7 +31,6 @@ #include "totem-scrsaver.h" #include "eggsmclient.h" -#include "eggdesktopfile.h" #include "ev-application.h" #include "ev-document-factory.h" @@ -227,8 +226,6 @@ smclient_quit_cb (EggSMClient *client, static void ev_application_init_session (EvApplication *application) { - egg_set_desktop_file (GNOMEDATADIR "/applications/evince.desktop"); - application->smclient = egg_sm_client_get (); g_signal_connect (application->smclient, "save_state", G_CALLBACK (smclient_save_state_cb), diff --git a/shell/main.c b/shell/main.c index ff8eafa2..bb1e1c8f 100644 --- a/shell/main.c +++ b/shell/main.c @@ -37,6 +37,7 @@ #include "ev-metadata-manager.h" #include "ev-stock-icons.h" #include "eggsmclient.h" +#include "eggdesktopfile.h" static gchar *ev_page_label; static gchar *ev_find_string; @@ -372,7 +373,8 @@ main (int argc, char *argv[]) ev_file_helpers_init (); ev_stock_icons_init (); - gtk_window_set_default_icon_name ("evince"); + + egg_set_desktop_file (GNOMEDATADIR "/applications/evince.desktop"); if (!ev_application_load_session (EV_APP)) load_files (file_arguments, args); -- 2.43.5