? depcomp
? goption.diff
? gtk-doc.make
? libbonoboui-zip
? t
? po/stamp-it
Index: configure.in
===================================================================
RCS file: /cvs/gnome/libbonoboui/configure.in,v
retrieving revision 1.173
diff -p -u -u -p -r1.173 configure.in
--- configure.in	10 Sep 2005 14:32:53 -0000	1.173
+++ configure.in	29 Sep 2005 13:36:31 -0000
@@ -1,7 +1,7 @@
 AC_INIT(bonobo/bonobo-ui-engine.h)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libbonoboui, 2.10.1)
+AM_INIT_AUTOMAKE(libbonoboui, 2.13.0)
 
 AM_MAINTAINER_MODE
 
@@ -97,11 +97,12 @@ dnl
 dnl Start of pkg-config checks
 dnl
 BONOBOUI_MODULES="libgnomecanvas-2.0 >= 1.116.0 \
-		  libbonobo-2.0 >= 2.3.3 \
-		  libgnome-2.0 >= 1.116.0 \
-		  bonobo-activation-2.0 >= 1.0.0 \
+		  libbonobo-2.0 >= 2.13.0 \
+		  libgnome-2.0 >= 2.13.0 \
+		  bonobo-activation-2.0 >= 2.13.0 \
 		  libxml-2.0 >= 2.4.20 \
 		  gconf-2.0 >= 1.1.9 \
+		  glib-2.0 >= 2.8.0 \
 		  gtk+-2.0 >= 2.6.0 \
 		  gobject-2.0 >= 2.6.0"
 PKG_CHECK_MODULES(BONOBOUI, $BONOBOUI_MODULES)
Index: bonobo/bonobo-ui-init-gtk.c
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-ui-init-gtk.c,v
retrieving revision 1.6
diff -p -u -u -p -r1.6 bonobo-ui-init-gtk.c
--- bonobo/bonobo-ui-init-gtk.c	22 Jan 2004 00:10:50 -0000	1.6
+++ bonobo/bonobo-ui-init-gtk.c	29 Sep 2005 13:36:31 -0000
@@ -12,8 +12,14 @@ static void
 bonobo_ui_gtk_pre_args_parse (GnomeProgram    *program,
 			      GnomeModuleInfo *mod_info)
 {
-	bonobo_ui_gtk_init_info_t *init_info = g_new0 (bonobo_ui_gtk_init_info_t, 1);
+	GOptionContext *context;
+	bonobo_ui_gtk_init_info_t *init_info;
 
+	g_object_get (G_OBJECT (program), GNOME_PARAM_GOPTION_CONTEXT,
+		      &context, NULL);
+	if (context) return;
+	
+	init_info = g_new0 (bonobo_ui_gtk_init_info_t, 1);
 	init_info->gtk_args = g_ptr_array_new ();
 
 	g_object_set_data (G_OBJECT (program),
@@ -25,11 +31,16 @@ static void
 bonobo_ui_gtk_post_args_parse (GnomeProgram    *program,
 			       GnomeModuleInfo *mod_info)
 {
+	GOptionContext *context;
 	bonobo_ui_gtk_init_info_t *init_info;
 	int final_argc;
 	char **final_argv;
 	int i;
 
+	g_object_get (G_OBJECT (program), GNOME_PARAM_GOPTION_CONTEXT,
+		      &context, NULL);
+	if (context) return;
+
 	init_info = g_object_get_data (G_OBJECT (program),
 				       "Libbonoboui-Gtk-Module-init-info");
 
@@ -165,6 +176,10 @@ bonobo_ui_gtk_module_info_get (void)
 		NULL,
 		NULL, NULL, NULL
 	};
+	
+	/* FIXME: TRUE or FALSE (open default display)? */
+	module_info.expansion1 = (gpointer) gtk_get_option_group (TRUE);
+
 	if (module_info.version == NULL) {
 		module_info.version = g_strdup_printf ("%d.%d.%d",
 						       GTK_MAJOR_VERSION,
