--- gst.c.org	Mon Mar 31 16:45:26 2003
+++ gst.c	Mon Mar 31 16:54:57 2003
@@ -267,22 +267,23 @@
   context = poptGetContext ("GStreamer", *argc, (const char**)*argv,
                             options, 0);
 
-  while ((nextopt = poptGetNextOpt (context)) > 0)
+  while ((nextopt = poptGetNextOpt (context)) != -1)
   {
     /* we only check for failures here, actual work is done in callbacks */
-    if (_gst_initialization_failure) return FALSE;
+    if (nextopt < -1) {
+      /* FIXME: Do we want to use GError? */
+      g_warning ("Error on option %s: %s.\nRun '%s --help' "
+                 "to see a full list of available command line options.\n",
+                 poptBadOption (context, 0),
+                 poptStrerror (nextopt),
+                 (*argv)[0]);
+    }
+    if (_gst_initialization_failure) {
+      poptFreeContext (context);
+      return FALSE;
+    }
   }
 
-  if (nextopt != -1) {
-    g_print ("Error on option %s: %s.\nRun '%s --help' "
-             "to see a full list of available command line options.\n",
-             poptBadOption (context, 0),
-             poptStrerror (nextopt),
-             (*argv)[0]);
-
-    poptFreeContext (context);
-    return FALSE;
-  }
   poptFreeContext (context);
 
   /* let's do this once there are 1.6.3 popt debs out
