Warn if there already is a main group. (#170445, Jeff Franks)

2005-03-15  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (g_option_context_set_main_group): Warn
	if there already is a main group.  (#170445, Jeff Franks)

diff --git a/ChangeLog b/ChangeLog
index beb5cf4..729a4aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/goption.c (g_option_context_set_main_group): Warn 
+       if there already is a main group.  (#170445, Jeff Franks)
+
 Sun Mar 13 22:01:17 2005  Manish Singh  <yosh@gimp.org>
 
        * tests/array-test.c: delete a bunch of dead code.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index beb5cf4..729a4aa 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-03-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/goption.c (g_option_context_set_main_group): Warn 
+       if there already is a main group.  (#170445, Jeff Franks)
+
 Sun Mar 13 22:01:17 2005  Manish Singh  <yosh@gimp.org>
 
        * tests/array-test.c: delete a bunch of dead code.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index beb5cf4..729a4aa 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2005-03-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/goption.c (g_option_context_set_main_group): Warn 
+       if there already is a main group.  (#170445, Jeff Franks)
+
 Sun Mar 13 22:01:17 2005  Manish Singh  <yosh@gimp.org>
 
        * tests/array-test.c: delete a bunch of dead code.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index beb5cf4..729a4aa 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-03-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/goption.c (g_option_context_set_main_group): Warn 
+       if there already is a main group.  (#170445, Jeff Franks)
+
 Sun Mar 13 22:01:17 2005  Manish Singh  <yosh@gimp.org>
 
        * tests/array-test.c: delete a bunch of dead code.

diff --git a/glib/goption.c b/glib/goption.c
index 13104f9..a8528de 100644 (file)
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -312,6 +312,13 @@ g_option_context_set_main_group (GOptionContext *context,
   g_return_if_fail (context != NULL);
   g_return_if_fail (group != NULL);
 
+  if (context->main_group)
+    {
+      g_warning ("This GOptionContext already has a main group");
+
+      return;
+    }
+  
   context->main_group = group;
 }