evince r3250 - in trunk: . shell

[carlosgc svn gnome org]

Author: carlosgc
Date: Sun Nov  2 10:24:58 2008
New Revision: 3250
URL: http://svn.gnome.org/viewvc/evince?rev=3250&view=rev

Log:
2008-11-02  Carlos Garcia Campos  <carlosgc gnome org>

	* 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()

Modified:
   trunk/ChangeLog
   trunk/shell/ev-application.c
   trunk/shell/main.c

Modified: trunk/shell/ev-application.c
==============================================================================
--- trunk/shell/ev-application.c	(original)
+++ trunk/shell/ev-application.c	Sun Nov  2 10:24:58 2008
@@ -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 @@
 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),

Modified: trunk/shell/main.c
==============================================================================
--- trunk/shell/main.c	(original)
+++ trunk/shell/main.c	Sun Nov  2 10:24:58 2008
@@ -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 @@
 
 	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);