gnome-terminal r3232 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Sat Nov 29 22:35:34 2008
New Revision: 3232
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3232&view=rev

Log:
Call egg_set_desktop_file() on startup.

Modified:
   trunk/src/eggdesktopfile.c
   trunk/src/terminal.c

Modified: trunk/src/eggdesktopfile.c
==============================================================================
--- trunk/src/eggdesktopfile.c	(original)
+++ trunk/src/eggdesktopfile.c	Sat Nov 29 22:35:34 2008
@@ -1440,17 +1440,6 @@
       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);
-    }
-
   G_UNLOCK (egg_desktop_file);
 }
 

Modified: trunk/src/terminal.c
==============================================================================
--- trunk/src/terminal.c	(original)
+++ trunk/src/terminal.c	Sat Nov 29 22:35:34 2008
@@ -402,7 +402,16 @@
   gtk_about_dialog_set_email_hook (about_email_hook, NULL, NULL);
 
 #ifdef WITH_SMCLIENT
-  //egg_set_desktop_file (TERM_DATADIR G_DIR_SEPARATOR_S  // FIXME)
+  {
+    char *desktop_file;
+
+    desktop_file = g_build_filename (TERM_DATADIR,
+                                     "applications",
+                                     PACKAGE ".desktop",
+                                     NULL);
+    egg_set_desktop_file (desktop_file);
+    g_free (desktop_file);
+  }
 #endif
 
   terminal_app_initialize (options->use_factory);