seahorse r2969 - in trunk: . libegg

[sadam svn gnome org]

Author: sadam
Date: Wed Apr  8 23:57:38 2009
New Revision: 2969
URL: http://svn.gnome.org/viewvc/seahorse?rev=2969&view=rev

Log:
2009-04-08  Adam Schreiber <sadam gnome org>

    * libegg/eggsmclient.c: Update to latest version.


Modified:
   trunk/ChangeLog
   trunk/libegg/eggsmclient.c

Modified: trunk/libegg/eggsmclient.c
==============================================================================
--- trunk/libegg/eggsmclient.c	(original)
+++ trunk/libegg/eggsmclient.c	Wed Apr  8 23:57:38 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;