gnome-terminal r3408 - branches/gnome-2-26/src

[chpe svn gnome org]

Author: chpe
Date: Mon Mar 30 17:18:47 2009
New Revision: 3408
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3408&view=rev

Log:
Update from libegg. Fixes bug #577025.

Modified:
   branches/gnome-2-26/src/eggdesktopfile.c
   branches/gnome-2-26/src/eggsmclient.c

Modified: branches/gnome-2-26/src/eggdesktopfile.c
==============================================================================
--- branches/gnome-2-26/src/eggdesktopfile.c	(original)
+++ branches/gnome-2-26/src/eggdesktopfile.c	Mon Mar 30 17:18:47 2009
@@ -987,7 +987,7 @@
 					     NULL);
 }
 
-#define EGG_DESKTOP_FILE_SN_TIMEOUT_LENGTH (30 /* seconds */ * 1000)
+#define EGG_DESKTOP_FILE_SN_TIMEOUT_LENGTH (30 /* seconds */)
 
 typedef struct {
   GdkDisplay *display;
@@ -1017,8 +1017,8 @@
   sn_data->display = g_object_ref (display);
   sn_data->startup_id = g_strdup (startup_id);
 
-  g_timeout_add (EGG_DESKTOP_FILE_SN_TIMEOUT_LENGTH,
-		 startup_notification_timeout, sn_data);
+  g_timeout_add_seconds (EGG_DESKTOP_FILE_SN_TIMEOUT_LENGTH,
+			 startup_notification_timeout, sn_data);
 }
 #endif /* GTK 2.12 */
 
@@ -1072,7 +1072,7 @@
 			  GError **error)
 {
   EggDesktopFileLaunchOption option;
-  GSList *translated_documents, *docs;
+  GSList *translated_documents = NULL, *docs = NULL;
   char *command, **argv;
   int argc, i, screen_num;
   gboolean success, current_success;
@@ -1440,6 +1440,21 @@
       g_error_free (error);
     }
 
+#if 0
+  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);
+      }
+  }
+#endif
+
   G_UNLOCK (egg_desktop_file);
 }
 

Modified: branches/gnome-2-26/src/eggsmclient.c
==============================================================================
--- branches/gnome-2-26/src/eggsmclient.c	(original)
+++ branches/gnome-2-26/src/eggsmclient.c	Mon Mar 30 17:18:47 2009
@@ -229,10 +229,14 @@
     { "sm-client-id", 0, 0,
       G_OPTION_ARG_STRING, &sm_client_id,
       N_("Specify session management ID"), N_("ID") },
-    /* Compatibility options */
+    /* GnomeClient compatibility option */
     { "sm-disable", 0, G_OPTION_FLAG_HIDDEN,
       G_OPTION_ARG_NONE, &sm_client_disable,
       NULL, NULL },
+    /* GnomeClient compatibility option. This is a dummy option that only
+     * exists so that sessions saved by apps with GnomeClient can be restored
+     * later when they've switched to EggSMClient. See bug #575308.
+     */
     { "sm-config-prefix", 0, G_OPTION_FLAG_HIDDEN,
       G_OPTION_ARG_STRING, &sm_config_prefix,
       NULL, NULL },