From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Tue, 16 Feb 2010 11:24:33 +0000 (+0000)
Subject: Revert "tools: Move gst_tools_print_version call to avoid warning from new GLib."
X-Git-Tag: RELEASE-0.10.27~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47601cb91108655c08e3938696abe036c80f9919;p=platform%2Fupstream%2Fgstreamer.git

Revert "tools: Move gst_tools_print_version call to avoid warning from new GLib."

This reverts commit 93dd95f02ef3fa530f54ce81e8ffba96f3b679cb.

This commit made --version not work any longer. The g_setprgname()
warning is fixed in recent GLib versions.
---

diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c
index 743e621..13d76da 100644
--- a/tools/gst-inspect.c
+++ b/tools/gst-inspect.c
@@ -1491,8 +1491,6 @@ main (int argc, char *argv[])
 
   g_thread_init (NULL);
 
-  gst_tools_print_version ("gst-inspect");
-
 #ifndef GST_DISABLE_OPTION_PARSING
   ctx = g_option_context_new ("[ELEMENT-NAME | PLUGIN-NAME]");
   g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE);
@@ -1506,6 +1504,8 @@ main (int argc, char *argv[])
   gst_init (&argc, &argv);
 #endif
 
+  gst_tools_print_version ("gst-inspect");
+
   if (print_all && argc > 1) {
     g_print ("-a requires no extra arguments\n");
     return 1;
diff --git a/tools/gst-launch.c b/tools/gst-launch.c
index caca18b..591d631 100644
--- a/tools/gst-launch.c
+++ b/tools/gst-launch.c
@@ -715,8 +715,6 @@ main (int argc, char *argv[])
 
   g_thread_init (NULL);
 
-  gst_tools_print_version ("gst-launch");
-
 #ifndef GST_DISABLE_OPTION_PARSING
   ctx = g_option_context_new ("PIPELINE-DESCRIPTION");
   g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE);
@@ -733,6 +731,8 @@ main (int argc, char *argv[])
   gst_init (&argc, &argv);
 #endif
 
+  gst_tools_print_version ("gst-launch");
+
 #ifndef DISABLE_FAULT_HANDLER
   if (!no_fault)
     fault_setup ();