rpms/gnome-utils/F-12 0001-gsearchtool-Backport-the-version-fix.patch, NONE, 1.1 gnome-utils.spec, 1.206, 1.207

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3187

Modified Files:
	gnome-utils.spec 
Added Files:
	0001-gsearchtool-Backport-the-version-fix.patch 
Log Message:
Fix --version


0001-gsearchtool-Backport-the-version-fix.patch:
 ChangeLog               |    7 +++++++
 gsearchtool-callbacks.c |   11 +++++++++++
 gsearchtool-callbacks.h |    5 +++++
 gsearchtool-support.c   |    2 +-
 gsearchtool.c           |    4 ++--
 5 files changed, 26 insertions(+), 3 deletions(-)

--- NEW FILE 0001-gsearchtool-Backport-the-version-fix.patch ---
>From d300c1a0d6c53f46b96363068713c1a14aaa77ab Mon Sep 17 00:00:00 2001
From: Dennis Cranston <dennis_cranston at yahoo.com>
Date: Wed, 21 Oct 2009 14:43:43 -0700
Subject: [PATCH 1/3] [gsearchtool]  Backport the "--version" fix

Backport the "--version" command line fix without introducting
a new string.  Also, fix a compiler warning.
---
 gsearchtool/ChangeLog               |    7 +++++++
 gsearchtool/gsearchtool-callbacks.c |   11 +++++++++++
 gsearchtool/gsearchtool-callbacks.h |    5 +++++
 gsearchtool/gsearchtool-support.c   |    2 +-
 gsearchtool/gsearchtool.c           |    3 ++-
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/gsearchtool/ChangeLog b/gsearchtool/ChangeLog
index ff2f4af..7397146 100644
--- a/gsearchtool/ChangeLog
+++ b/gsearchtool/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-21 Dennis Cranston <dennis_cranston at yahoo.com>
+
+	* gsearchtool.c, gsearchtool-callbacks.[ch]: Backport the
+	  "--version" command line argument fix without introducing
+	  a new string.  
+	* gsearchtool-support.c: Fix compiler warning.
+ 
 2009-09-30  Dennis Cranston  <dennis_cranston at yahoo.com>
 
 	*  gsearchtool.c:  Remove new string from previous commit.
diff --git a/gsearchtool/gsearchtool-callbacks.c b/gsearchtool/gsearchtool-callbacks.c
index 1496b8d..62cb86a 100644
--- a/gsearchtool/gsearchtool-callbacks.c
+++ b/gsearchtool/gsearchtool-callbacks.c
@@ -31,6 +31,7 @@
 
 #include <string.h>
 #include <signal.h>
+#include <stdlib.h>
 #include <sys/wait.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -94,6 +95,16 @@ quit_application (GSearchWindow * gsearch)
 }
 
 void
+version_cb (const gchar * option_name,
+            const gchar * value,
+            gpointer data,
+            GError ** error)
+{
+        g_print ("%s %s\n", g_get_application_name (), VERSION);
+        exit (0);
+}
+
+void
 quit_session_cb (EggSMClient * client,
                  gpointer data)
 {
diff --git a/gsearchtool/gsearchtool-callbacks.h b/gsearchtool/gsearchtool-callbacks.h
index 604eed6..191cc94 100644
--- a/gsearchtool/gsearchtool-callbacks.h
+++ b/gsearchtool/gsearchtool-callbacks.h
@@ -36,6 +36,11 @@ extern "C" {
 #include "eggsmclient.h"
 
 void
+version_cb (const gchar * option_name,
+            const gchar * value,
+            gpointer data,
+            GError ** error);
+void
 quit_session_cb (EggSMClient * client,
                  gpointer data);
 void
diff --git a/gsearchtool/gsearchtool-support.c b/gsearchtool/gsearchtool-support.c
index 0e1bc46..3852178 100644
--- a/gsearchtool/gsearchtool-support.c
+++ b/gsearchtool/gsearchtool-support.c
@@ -1195,7 +1195,7 @@ open_file_with_filemanager (GtkWidget * window,
 {
 	GDesktopAppInfo * d_app_info;
 	GKeyFile * key_file;
-	GdkAppLaunchContext *ctx;
+	GdkAppLaunchContext * ctx = NULL;
 	GList * list = NULL;
 	GAppInfo * g_app_info;
 	GFile * g_file;
diff --git a/gsearchtool/gsearchtool.c b/gsearchtool/gsearchtool.c
index 37c5a88..0afc8b0 100644
--- a/gsearchtool/gsearchtool.c
+++ b/gsearchtool/gsearchtool.c
@@ -154,6 +154,7 @@ struct _GSearchGOptionArguments {
 } GSearchGOptionArguments;
 
 static GOptionEntry GSearchGOptionEntries[] = {
+	{ "version", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, version_cb, NULL, NULL},
 	{ "named", 0, 0, G_OPTION_ARG_STRING, &GSearchGOptionArguments.name, NULL, N_("STRING") },
 	{ "path", 0, 0, G_OPTION_ARG_STRING, &GSearchGOptionArguments.path, NULL, N_("PATH") },
 	{ "sortby", 0, 0, G_OPTION_ARG_STRING, &GSearchGOptionArguments.sortby, NULL, N_("VALUE") },
@@ -1281,7 +1282,7 @@ add_atk_relation (GtkWidget * obj1,
 static void
 gsearch_setup_goption_descriptions (void)
 {
-	gint i = 0;
+	gint i = 1;
 	gint j;
 
 	GSearchGOptionEntries[i++].description = g_strdup (_("Set the text of \"Name contains\" search option"));
-- 
1.6.5.1



Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/F-12/gnome-utils.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- gnome-utils.spec	24 Oct 2009 03:21:30 -0000	1.206
+++ gnome-utils.spec	25 Oct 2009 23:44:48 -0000	1.207
@@ -9,7 +9,7 @@
 
 Name:           gnome-utils
 Version:        2.28.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch: 		1
 Summary:        GNOME utility programs
 
@@ -17,6 +17,10 @@ Group:          Applications/System
 License:        GPLv2+
 URL: 	        http://www.gnome.org
 Source0:        http://download.gnome.org/sources/gnome-utils/2.28/gnome-utils-%{version}.tar.bz2
+
+Patch0:		spinner.patch
+Patch1:		0001-gsearchtool-Backport-the-version-fix.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-doc-utils >= %{gnome_doc_utils_version}
@@ -84,6 +88,8 @@ view various system log files.
 
 %prep
 %setup -q
+%patch0 -p1 -b .spinner
+%patch1 -p1 -b .version
 
 # Hide from menus
 pushd gsearchtool
@@ -312,6 +318,9 @@ fi
 %{_mandir}/man1/gnome-system-log.1.gz
 
 %changelog
+* Sun Oct 25 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.1-3
+- Fxi the --version command (#516491)
+
 * Fri Oct 23 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.28.1-2
 - Fix the gsearchtool spinner