? depcomp
? gtk-doc.make
? libgnomeui-zip
? stamp-h1
? libgnomeui/stamp-gnome-marshal.h
? libgnomeui/stamp-gnometypebuiltins.h
Index: libgnomeui/gnome-client.c
===================================================================
RCS file: /cvs/gnome/libgnomeui/libgnomeui/gnome-client.c,v
retrieving revision 1.137
diff -u -r1.137 gnome-client.c
--- libgnomeui/gnome-client.c	13 May 2005 14:33:56 -0000	1.137
+++ libgnomeui/gnome-client.c	19 Jun 2005 18:25:54 -0000
@@ -846,6 +846,22 @@
 			       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,19 @@
   {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 +1007,12 @@
 		NULL, NULL
 	};
 
+	GOptionGroup * session_group;
+	session_group = g_option_group_new("gnome-client",_("Session management"),_("Show Session management Options"), NULL, NULL);
+	g_option_group_add_entries(session_group, session_goptions);
+	g_option_group_set_translation_domain (session_group, GETTEXT_PACKAGE);
+	module_info.expansion1 = (gpointer) session_group;
+
 	if (module_info.requirements == NULL) {
 		static GnomeModuleRequirement req[3];
 
@@ -1028,6 +1063,40 @@
   }
 }
 
+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)
+{
+	if(master_client->config_prefix)
+		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 -u -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	19 Jun 2005 18:25:55 -0000
@@ -80,6 +80,14 @@
 					 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,14 @@
 	{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},
+        {"display", '\0', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
+	libgnomeui_goption_display, N_("X display to use"), N_("DISPLAY")},
+	{ NULL }
+};
+
 const GnomeModuleInfo *
 libgnomeui_module_info_get (void)
 {
@@ -136,6 +152,12 @@
 		NULL, NULL
 	};
 
+	GOptionGroup * libgnomeui_group;
+	libgnomeui_group = g_option_group_new("libgnomeui",_("GNOME GUI Library"),_("Show GNOME GUI Library Options"), NULL, NULL);
+	g_option_group_add_entries(libgnomeui_group, libgnomeui_goptions);
+	g_option_group_set_translation_domain (libgnomeui_group, GETTEXT_PACKAGE);
+	module_info.expansion1 = (gpointer) libgnomeui_group;
+
 	if (module_info.requirements == NULL) {
 		static GnomeModuleRequirement req[6];
 
@@ -593,6 +615,36 @@
         }
 }
 
+static gboolean libgnomeui_goption_disable_crash_dialog (const gchar *option_name,
+						const gchar *value,
+						gpointer data,
+						GError **error)
+{ 
+	GnomeProgram *program = gnome_program_get();
+	g_assert (program != NULL);
+
+	g_object_set (G_OBJECT (program),
+       		LIBGNOMEUI_PARAM_CRASH_DIALOG,
+		FALSE, NULL);
+
+	return TRUE;
+}
+
+static gboolean libgnomeui_goption_display (const gchar *option_name,
+						const gchar *value,
+						gpointer data,
+						GError **error)
+{
+	GnomeProgram *program = gnome_program_get();
+	g_assert (program != NULL);
+                 
+	g_object_set (G_OBJECT (program),
+		LIBGNOMEUI_PARAM_DISPLAY,
+		value, NULL);
+
+	return TRUE;
+}
+
 /* automagically parse all the gtkrc files for us.
  * 
  * Parse:
