Don't show the special G_OPTION_REMAINING entry. (#161934, Matthew F.

2004-12-21  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (print_entry): Don't show
	the special G_OPTION_REMAINING entry.  (#161934,
	Matthew F. Barnes)

diff --git a/ChangeLog b/ChangeLog
index 960acfa..3515a4e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-21  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/goption.c (print_entry): Don't show
+       the special G_OPTION_REMAINING entry.  (#161934,
+       Matthew F. Barnes)
+
 2004-12-20  Tor Lillqvist  <tml@iki.fi>
 
        * glib/gconvert.c (g_locale_to_utf8, g_filename_to_uri): Improve

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 960acfa..3515a4e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-12-21  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/goption.c (print_entry): Don't show
+       the special G_OPTION_REMAINING entry.  (#161934,
+       Matthew F. Barnes)
+
 2004-12-20  Tor Lillqvist  <tml@iki.fi>
 
        * glib/gconvert.c (g_locale_to_utf8, g_filename_to_uri): Improve

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 960acfa..3515a4e 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2004-12-21  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/goption.c (print_entry): Don't show
+       the special G_OPTION_REMAINING entry.  (#161934,
+       Matthew F. Barnes)
+
 2004-12-20  Tor Lillqvist  <tml@iki.fi>
 
        * glib/gconvert.c (g_locale_to_utf8, g_filename_to_uri): Improve

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 960acfa..3515a4e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-12-21  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/goption.c (print_entry): Don't show
+       the special G_OPTION_REMAINING entry.  (#161934,
+       Matthew F. Barnes)
+
 2004-12-20  Tor Lillqvist  <tml@iki.fi>
 
        * glib/gconvert.c (g_locale_to_utf8, g_filename_to_uri): Improve

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 960acfa..3515a4e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-12-21  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/goption.c (print_entry): Don't show
+       the special G_OPTION_REMAINING entry.  (#161934,
+       Matthew F. Barnes)
+
 2004-12-20  Tor Lillqvist  <tml@iki.fi>
 
        * glib/gconvert.c (g_locale_to_utf8, g_filename_to_uri): Improve

diff --git a/glib/goption.c b/glib/goption.c
index 781d8d5..a8a124e 100644 (file)
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -372,6 +372,9 @@ print_entry (GOptionGroup       *group,
   if (entry->flags & G_OPTION_FLAG_HIDDEN)
     return;
 
+  if (entry->long_name[0] == 0)
+    return;
+
   str = g_string_new (NULL);
   
   if (entry->short_name)