totem r6190 - in trunk: . src

[chpe svn gnome org]

Author: chpe
Date: Tue Mar 24 22:06:07 2009
New Revision: 6190
URL: http://svn.gnome.org/viewvc/totem?rev=6190&view=rev

Log:
	* src/eggdesktopfile.c: (egg_set_desktop_file):
	* src/eggsmclient-1.patch:
	* src/eggsmclient.c: (egg_sm_client_get_option_group): Update smclient
	to latest libegg copy. Bug #560328 continued.

Modified:
   trunk/ChangeLog
   trunk/src/eggdesktopfile.c
   trunk/src/eggsmclient-1.patch
   trunk/src/eggsmclient.c

Modified: trunk/src/eggdesktopfile.c
==============================================================================
--- trunk/src/eggdesktopfile.c	(original)
+++ trunk/src/eggdesktopfile.c	Tue Mar 24 22:06:07 2009
@@ -1440,16 +1440,18 @@
       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);
-    }
+  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);
+      }
+  }
 
   G_UNLOCK (egg_desktop_file);
 }

Modified: trunk/src/eggsmclient-1.patch
==============================================================================
--- trunk/src/eggsmclient-1.patch	(original)
+++ trunk/src/eggsmclient-1.patch	Tue Mar 24 22:06:07 2009
@@ -1,4 +1,4 @@
-From 2b5284a034b47858eee43c0e8067d8c6d9d2a867 Mon Sep 17 00:00:00 2001
+From b134b02356a5811b504106c09e437f189c807f1f Mon Sep 17 00:00:00 2001
 From: Christian Persch <chpe gnome org>
 Date: Wed, 24 Sep 2008 13:33:57 +0200
 Subject: [PATCH] Add egg_sm_client_set_discard_command() to set the discard command when using egg_sm_client_set_restart_command(), to ease porting from GnomeClient without needing to support a new session file format.
@@ -132,10 +132,10 @@
    return cmd;
  }
 diff --git a/libegg/smclient/eggsmclient.c b/libegg/smclient/eggsmclient.c
-index 8e2254f..6bec6ed 100644
+index efa901d..85aaee4 100644
 --- a/libegg/smclient/eggsmclient.c
 +++ b/libegg/smclient/eggsmclient.c
-@@ -437,6 +437,27 @@ egg_sm_client_set_restart_command (EggSMClient  *client,
+@@ -445,6 +445,27 @@ egg_sm_client_set_restart_command (EggSMClient  *client,
  }
  
  /**

Modified: trunk/src/eggsmclient.c
==============================================================================
--- trunk/src/eggsmclient.c	(original)
+++ trunk/src/eggsmclient.c	Tue Mar 24 22:06:07 2009
@@ -178,6 +178,7 @@
 static gboolean sm_client_disable = FALSE;
 static char *sm_client_state_file = NULL;
 static char *sm_client_id = NULL;
+static char *sm_config_prefix = NULL;
 
 static gboolean
 sm_client_post_parse_func (GOptionContext  *context,
@@ -228,10 +229,17 @@
     { "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 },
     { NULL }
   };
   GOptionGroup *group;