? P
? depcomp
? goption.diff
? gtk-doc.make
? libgnomeui-zip
? p1
? stamp-h1
? file-chooser/testfilechooser
? libgnomeui/stamp-gnome-marshal.h
? libgnomeui/stamp-gnometypebuiltins.h
? test-gnome/test-gnome-popt
Index: configure.in
===================================================================
RCS file: /cvs/gnome/libgnomeui/configure.in,v
retrieving revision 1.217
diff -p -u -u -p -r1.217 configure.in
--- configure.in	21 Sep 2005 15:55:36 -0000	1.217
+++ configure.in	29 Sep 2005 13:49:09 -0000
@@ -19,11 +19,12 @@ m4_define([libgnomeui_extraversion], [])
 dnl Required versions of other packages
 m4_define([esound_required_version],         [0.2.26])
 m4_define([audiofile_required_version],      [0.2.3])
-m4_define([libgnome_required_version],       [2.0.0])
+m4_define([libgnome_required_version],       [2.13.0])
 m4_define([libgnomecanvas_required_version], [2.0.0])
-m4_define([libbonoboui_required_version],    [2.0.0])
+m4_define([libbonoboui_required_version],    [2.13.0])
 m4_define([gconf_required_version],          [1.1.11])
 m4_define([pango_required_version],          [1.1.2])
+m4_define([glib_required_version],           [2.8.0])
 m4_define([gtk_required_version],            [2.6.0])
 m4_define([gnomevfs_required_version],       [2.7.3])
 m4_define([libglade_required_version],       [2.0.0])
@@ -165,6 +166,7 @@ GNOMEUI_MODULES="dnl
   libbonoboui-2.0 >= libbonoboui_required_version dnl
   gconf-2.0 >= gconf_required_version dnl
   pango >= pango_required_version dnl
+  glib-2.0 >= glib_required_version
   gnome-vfs-2.0 >= gnomevfs_required_version dnl
   $gnome_keyring_requirement"
 PKG_CHECK_MODULES(LIBGNOMEUI, [$GNOMEUI_MODULES])
Index: libgnomeui/gnome-client.c
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-client.c,v
retrieving revision 1.137
diff -p -u -u -p -r1.137 gnome-client.c
--- libgnomeui/gnome-client.c	13 May 2005 14:33:56 -0000	1.137
+++ libgnomeui/gnome-client.c	29 Sep 2005 13:49:10 -0000
@@ -846,6 +846,22 @@ static void client_parse_func (poptConte
 			       enum poptCallbackReason reason,
 			       const struct poptOption *opt,
 			       const char *arg, void *data);
+
+static gboolean gnome_client_goption_sm_client_id (const gchar *option_name,
+						   const gchar *value,
+						   gpointer data,
+						   GError **error);
+
+static gboolean gnome_client_goption_sm_config_prefix (const gchar *option_name,
+						       const gchar *value,
+						       gpointer data,
+						       GError **error);
+
+static gboolean gnome_client_goption_sm_disable (const gchar *option_name,
+						 const gchar *value,
+						 gpointer data,
+						 GError **error);
+
 static void gnome_client_pre_args_parse(GnomeProgram *app, GnomeModuleInfo *mod_info);
 static void gnome_client_post_args_parse(GnomeProgram *app, GnomeModuleInfo *mod_info);
 
@@ -869,6 +885,22 @@ static const struct poptOption options[]
   {NULL, '\0', 0, NULL, 0}
 };
 
+static const GOptionEntry session_goptions[] = {
+  { "sm-client-id", '\0', 0, G_OPTION_ARG_CALLBACK,
+    gnome_client_goption_sm_client_id, 
+    N_("Specify session management ID"), N_("ID")},
+
+  { "sm-config-prefix", '\0', 0, G_OPTION_ARG_CALLBACK,
+    gnome_client_goption_sm_config_prefix, 
+    N_("Specify prefix of saved configuration"), N_("PREFIX")},
+
+  { "sm-disable", '\0', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
+    gnome_client_goption_sm_disable, 
+    N_("Disable connection to session manager"), NULL},
+
+  { NULL }
+};
+
 typedef struct {
 	guint sm_connect_id;
 } GnomeProgramClass_gnome_client;
@@ -978,6 +1010,16 @@ gnome_client_module_info_get (void)
 		NULL, NULL
 	};
 
+	GOptionGroup * option_group;
+	option_group = g_option_group_new ("gnome-session",
+					   N_("Session management"),
+					   N_("Show session management options"),
+					   NULL, NULL);
+	g_option_group_set_translation_domain (option_group, GETTEXT_PACKAGE);
+	g_option_group_add_entries(option_group, session_goptions);
+
+	module_info.expansion1 = (gpointer) option_group;
+
 	if (module_info.requirements == NULL) {
 		static GnomeModuleRequirement req[3];
 
@@ -1028,6 +1070,41 @@ client_parse_func (poptContext ctx,
   }
 }
 
+static gboolean
+gnome_client_goption_sm_client_id (const gchar *option_name,
+				   const gchar *value,
+				   gpointer data,
+				   GError **error)
+{
+	gnome_client_set_id (master_client, value);
+
+	return TRUE;
+}
+
+static gboolean
+gnome_client_goption_sm_disable (const gchar *option_name,
+				 const gchar *value,
+				 gpointer data,
+				 GError **error)
+{
+	g_object_set (G_OBJECT (gnome_program_get()),
+		      GNOME_CLIENT_PARAM_SM_CONNECT, FALSE, NULL);
+
+	return TRUE;
+}
+
+static gboolean
+gnome_client_goption_sm_config_prefix (const gchar *option_name,
+				       const gchar *value,
+				       gpointer data,
+				       GError **error)
+{
+	g_free (master_client->config_prefix);
+	master_client->config_prefix = g_strdup (value);
+	master_client_restored = TRUE;
+ 
+	return TRUE;
+}
 
 static void
 gnome_client_pre_args_parse(GnomeProgram *app, GnomeModuleInfo *mod_info)
Index: libgnomeui/gnome-ui-init.c
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-ui-init.c,v
retrieving revision 1.196
diff -p -u -u -p -r1.196 gnome-ui-init.c
--- libgnomeui/gnome-ui-init.c	16 May 2005 11:14:23 -0000	1.196
+++ libgnomeui/gnome-ui-init.c	29 Sep 2005 13:49:11 -0000
@@ -80,6 +80,14 @@ static void libgnomeui_arg_callback 	(po
 					 const struct poptOption * opt,
 					 const char * arg,
 					 void * data);
+static gboolean libgnomeui_goption_disable_crash_dialog (const gchar *option_name,
+							 const gchar *value,
+							 gpointer data,
+							 GError **error);
+static gboolean libgnomeui_goption_display (const gchar *option_name,
+					    const gchar *value,
+					    gpointer data,
+					    GError **error);
 static void libgnomeui_init_pass	(const GnomeModuleInfo *mod_info);
 static void libgnomeui_class_init	(GnomeProgramClass *klass,
 					 const GnomeModuleInfo *mod_info);
@@ -124,6 +132,13 @@ static struct poptOption libgnomeui_opti
 	{NULL, '\0', 0, NULL, 0, NULL, NULL}
 };
 
+static GOptionEntry libgnomeui_goptions[] = {
+	{ "disable-crash-dialog", '\0', G_OPTION_FLAG_NO_ARG,
+	  G_OPTION_ARG_CALLBACK, libgnomeui_goption_disable_crash_dialog,
+	  N_("Disable Crash Dialog"), NULL },
+	{ NULL }
+};
+
 const GnomeModuleInfo *
 libgnomeui_module_info_get (void)
 {
@@ -136,6 +151,16 @@ libgnomeui_module_info_get (void)
 		NULL, NULL
 	};
 
+	GOptionGroup * option_group;
+	option_group = g_option_group_new ("gnome-ui",
+					   N_("GNOME GUI Library"),
+					   N_("Show GNOME GUI options"),
+					   NULL, NULL);
+	g_option_group_set_translation_domain (option_group, GETTEXT_PACKAGE);
+	g_option_group_add_entries(option_group, libgnomeui_goptions);
+
+	module_info.expansion1 = (gpointer) option_group;
+
 	if (module_info.requirements == NULL) {
 		static GnomeModuleRequirement req[6];
 
@@ -591,6 +616,18 @@ libgnomeui_arg_callback(poptContext con,
         default:
                 break;
         }
+}
+
+static gboolean
+libgnomeui_goption_disable_crash_dialog (const gchar *option_name,
+					 const gchar *value,
+					 gpointer data,
+					 GError **error)
+{ 
+	g_object_set (G_OBJECT (gnome_program_get ()),
+		      LIBGNOMEUI_PARAM_CRASH_DIALOG, FALSE, NULL);
+
+	return TRUE;
 }
 
 /* automagically parse all the gtkrc files for us.
Index: test-gnome/testgnome.c
===================================================================
RCS file: /cvs/gnome/libgnomeui/test-gnome/testgnome.c,v
retrieving revision 1.32
diff -p -u -u -p -r1.32 testgnome.c
--- test-gnome/testgnome.c	18 Apr 2005 01:49:16 -0000	1.32
+++ test-gnome/testgnome.c	29 Sep 2005 13:49:15 -0000
@@ -1,7 +1,7 @@
 /* testGNOME - program similar to testgtk which shows gnome lib functions.
  *
  * Authors : Richard Hestilow <hestgray@ionet.net> (GNOME 1.x version)
- * 	     Carlos Perelló Marín <carlos@gnome-db.org> (Ported to GNOME 2.0)
+ * 	     Carlos Perellï¿½Marï¿½ <carlos@gnome-db.org> (Ported to GNOME 2.0)
  *
  * Copyright (C) 1998-2001 Free Software Foundation
  *
@@ -1500,7 +1500,7 @@ create_about_box (void)
 						NULL /* logo pixbuf */);
 	gtk_widget_show (about_box);
 }
-
+				
 int
 main (int argc, char **argv)
 {
@@ -1534,12 +1534,15 @@ main (int argc, char **argv)
 	GtkWidget *box2;
 	GtkWidget *button;
 	GtkWidget *scrolled_window;
+	GOptionContext *context;
 	int i;
 
-	
+	context = g_option_context_new ("test-gnome");
 	gnome_program_init ("testGNOME", VERSION,
 			    LIBGNOMEUI_MODULE,
-			    argc, argv, NULL);
+			    argc, argv,
+			    GNOME_PARAM_GOPTION_CONTEXT, context,
+			    NULL);
 
 	app = create_newwin (FALSE, "testGNOME", "testGNOME");
 	gtk_window_set_default_size (GTK_WINDOW (app->app), 200, 300);
