? goption.diff
? libbonobo-zip
? doc/api/tmpl/libbonobo-unused.sgml
? po/stamp-it
Index: configure.in
===================================================================
RCS file: /cvs/gnome/libbonobo/configure.in,v
retrieving revision 1.166
diff -p -u -u -p -r1.166 configure.in
--- configure.in	19 Aug 2005 17:30:01 -0000	1.166
+++ configure.in	29 Sep 2005 13:09:13 -0000
@@ -3,8 +3,8 @@ AC_INIT(bonobo/bonobo-moniker.h)
 AM_CONFIG_HEADER(config.h)
 
 BONOBO_MAJOR_VERSION=2
-BONOBO_MINOR_VERSION=10
-BONOBO_MICRO_VERSION=1
+BONOBO_MINOR_VERSION=13
+BONOBO_MICRO_VERSION=0
 BONOBO_VERSION="$BONOBO_MAJOR_VERSION.$BONOBO_MINOR_VERSION.$BONOBO_MICRO_VERSION"
 
 AM_INIT_AUTOMAKE(libbonobo, $BONOBO_VERSION)
@@ -118,7 +118,7 @@ AC_CHECK_HEADERS(sys/wait.h syslog.h)
 # Start of pkg-config checks
 #
 ORBIT_VERSION=2.9.2
-GLIB_VERSION=2.6.0
+GLIB_VERSION=2.8.0
 
 PKG_CHECK_MODULES(LIBBONOBO, \
 	ORBit-2.0 >= $ORBIT_VERSION \
Index: bonobo-activation/bonobo-activation-init.c
===================================================================
RCS file: /cvs/gnome/libbonobo/bonobo-activation/bonobo-activation-init.c,v
retrieving revision 1.64
diff -p -u -u -p -r1.64 bonobo-activation-init.c
--- bonobo-activation/bonobo-activation-init.c	22 Aug 2005 00:13:32 -0000	1.64
+++ bonobo-activation/bonobo-activation-init.c	29 Sep 2005 13:09:14 -0000
@@ -356,6 +356,31 @@ struct poptOption bonobo_activation_popt
         { NULL }
 };
 
+static const GOptionEntry bonobo_activation_goption_options[] = {
+        { "oaf-ior-fd", '\0', 0,  G_OPTION_ARG_INT, &bonobo_activation_ior_fd, 
+          N_("File descriptor to print IOR on"), N_("FD") },
+        { "oaf-activate-iid", '\0', 0, G_OPTION_ARG_STRING, &bonobo_activation_activate_iid, 
+          N_("IID to activate"), "IID" },
+        { "oaf-private", '\0', 0, G_OPTION_ARG_NONE, &bonobo_activation_private, 
+          N_("Prevent registering of server with OAF"), NULL },
+        { NULL }
+};
+
+GOptionGroup *
+bonobo_activation_get_goption_group (void)
+{
+	GOptionGroup *group;
+
+	group = g_option_group_new ("bonbo-activation",
+				    N_("Bonobo Activation"),
+				    N_("Show Bonobo Activation options"),
+				    NULL, NULL);
+	g_option_group_set_translation_domain (group, GETTEXT_PACKAGE);
+	g_option_group_add_entries (group, bonobo_activation_goption_options);
+
+	return group;
+}
+
 /**
  * bonobo_activation_activation_iid_get:
  *
Index: bonobo-activation/bonobo-activation-init.h
===================================================================
RCS file: /cvs/gnome/libbonobo/bonobo-activation/bonobo-activation-init.h,v
retrieving revision 1.9
diff -p -u -u -p -r1.9 bonobo-activation-init.h
--- bonobo-activation/bonobo-activation-init.h	25 Feb 2005 02:40:14 -0000	1.9
+++ bonobo-activation/bonobo-activation-init.h	29 Sep 2005 13:09:14 -0000
@@ -26,6 +26,7 @@
 
 #include <orbit/orbit.h>
 #include <popt.h>
+#include <glib/goption.h>
 
 G_BEGIN_DECLS
 
@@ -54,6 +55,8 @@ char          *bonobo_activation_get_pop
 gboolean       bonobo_activation_debug_shutdown      (void);
 
 extern struct poptOption bonobo_activation_popt_options[];
+
+GOptionGroup  *bonobo_activation_get_goption_group   (void);
 
 G_END_DECLS
 
