gnome-games r8176 - trunk/libgames-support

[chpe svn gnome org]

Author: chpe
Date: Tue Oct 21 21:50:14 2008
New Revision: 8176
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8176&view=rev

Log:
Update from libegg.

Modified:
   trunk/libgames-support/eggdesktopfile.c
   trunk/libgames-support/eggsmclient-xsmp.c
   trunk/libgames-support/eggsmclient.patch

Modified: trunk/libgames-support/eggdesktopfile.c
==============================================================================
--- trunk/libgames-support/eggdesktopfile.c	(original)
+++ trunk/libgames-support/eggdesktopfile.c	Tue Oct 21 21:50:14 2008
@@ -1025,7 +1025,7 @@
 static GPtrArray *
 array_putenv (GPtrArray *env, char *variable)
 {
-  int i, keylen;
+  guint i, keylen;
 
   if (!env)
     {

Modified: trunk/libgames-support/eggsmclient-xsmp.c
==============================================================================
--- trunk/libgames-support/eggsmclient-xsmp.c	(original)
+++ trunk/libgames-support/eggsmclient-xsmp.c	Tue Oct 21 21:50:14 2008
@@ -837,7 +837,7 @@
 				     G_KEY_FILE_KEEP_COMMENTS |
 				     G_KEY_FILE_KEEP_TRANSLATIONS, NULL))
 	{
-	  int g, k, i;
+	  guint g, k, i;
 	  char **groups, **keys, *value, *exec;
 
 	  groups = g_key_file_get_groups (state_file, NULL);
@@ -1106,7 +1106,7 @@
   GPtrArray *props;
   SmProp *prop;
   va_list ap;
-  int i;
+  guint i;
 
   props = g_ptr_array_new ();
 
@@ -1199,7 +1199,7 @@
   SmProp *prop;
   SmPropValue pv;
   GArray *vals;
-  int i;
+  guint i;
 
   prop = g_new (SmProp, 1);
   prop->name = (char *)name;

Modified: trunk/libgames-support/eggsmclient.patch
==============================================================================
--- trunk/libgames-support/eggsmclient.patch	(original)
+++ trunk/libgames-support/eggsmclient.patch	Tue Oct 21 21:50:14 2008
@@ -1,5 +1,5 @@
 diff --git a/libegg/smclient/eggsmclient-xsmp.c b/libegg/smclient/eggsmclient-xsmp.c
-index 86dfdb7..71b0180 100644
+index e4b11f6..dcaf36b 100644
 --- a/libegg/smclient/eggsmclient-xsmp.c
 +++ b/libegg/smclient/eggsmclient-xsmp.c
 @@ -88,6 +88,8 @@ struct _EggSMClientXSMP
@@ -121,77 +121,10 @@
    return cmd;
  }
 diff --git a/libegg/smclient/eggsmclient.c b/libegg/smclient/eggsmclient.c
-index b24968d..6bec6ed 100644
+index 8e2254f..6bec6ed 100644
 --- a/libegg/smclient/eggsmclient.c
 +++ b/libegg/smclient/eggsmclient.c
-@@ -38,7 +38,7 @@ enum {
-   LAST_SIGNAL
- };
- 
--static guint signals[LAST_SIGNAL] = { 0 };
-+static guint signals[LAST_SIGNAL];
- 
- struct _EggSMClientPrivate {
-   GKeyFile *state_file;
-@@ -179,23 +179,6 @@ static gboolean sm_client_disable = FALSE;
- static char *sm_client_state_file = NULL;
- static char *sm_client_id = NULL;
- 
--static GOptionEntry entries[] = {
--  { "sm-client-disable", 0, 0,
--    G_OPTION_ARG_NONE, &sm_client_disable,
--    N_("Disable connection to session manager"), NULL },
--  { "sm-client-state-file", 0, 0,
--    G_OPTION_ARG_STRING, &sm_client_state_file,
--    N_("Specify file containing saved configuration"), N_("FILE") },
--  { "sm-client-id", 0, 0,
--    G_OPTION_ARG_STRING, &sm_client_id,
--    N_("Specify session management ID"), N_("ID") },
--  /* Compatibility options */
--  { "sm-disable", 0, G_OPTION_FLAG_HIDDEN,
--    G_OPTION_ARG_NONE, &sm_client_disable,
--    NULL, NULL },
--  { NULL }
--};
--
- static gboolean
- sm_client_post_parse_func (GOptionContext  *context,
- 			   GOptionGroup    *group,
-@@ -235,6 +218,22 @@ sm_client_post_parse_func (GOptionContext  *context,
- GOptionGroup *
- egg_sm_client_get_option_group (void)
- {
-+  const GOptionEntry entries[] = {
-+    { "sm-client-disable", 0, 0,
-+      G_OPTION_ARG_NONE, &sm_client_disable,
-+      N_("Disable connection to session manager"), NULL },
-+    { "sm-client-state-file", 0, 0,
-+      G_OPTION_ARG_FILENAME, &sm_client_state_file,
-+      N_("Specify file containing saved configuration"), N_("FILE") },
-+    { "sm-client-id", 0, 0,
-+      G_OPTION_ARG_STRING, &sm_client_id,
-+      N_("Specify session management ID"), N_("ID") },
-+    /* Compatibility options */
-+    { "sm-disable", 0, G_OPTION_FLAG_HIDDEN,
-+      G_OPTION_ARG_NONE, &sm_client_disable,
-+      NULL, NULL },
-+    { NULL }
-+  };
-   GOptionGroup *group;
- 
-   /* Use our own debug handler for the "EggSMClient" domain. */
-@@ -242,8 +241,8 @@ egg_sm_client_get_option_group (void)
- 		     egg_sm_client_debug_handler, NULL);
- 
-   group = g_option_group_new ("sm-client",
--			      _("Session Management Options"),
--			      _("Show Session Management options"),
-+			      _("Session management options:"),
-+			      _("Show session management options"),
- 			      NULL, NULL);
-   g_option_group_add_entries (group, entries);
-   g_option_group_set_parse_hooks (group, NULL, sm_client_post_parse_func);
-@@ -438,6 +437,27 @@ egg_sm_client_set_restart_command (EggSMClient  *client,
+@@ -437,6 +437,27 @@ egg_sm_client_set_restart_command (EggSMClient  *client,
  }
  
  /**