rpms/gnome-applets/devel gnome-applets-2.21.4-cpufreq.patch, NONE, 1.1 gnome-applets.spec, 1.260, 1.261 gnome-applets-2.16.0.1-fix-null-applet.patch, 1.1, NONE

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20102

Modified Files:
	gnome-applets.spec 
Added Files:
	gnome-applets-2.21.4-cpufreq.patch 
Removed Files:
	gnome-applets-2.16.0.1-fix-null-applet.patch 
Log Message:
fix patch


gnome-applets-2.21.4-cpufreq.patch:

--- NEW FILE gnome-applets-2.21.4-cpufreq.patch ---
diff -up gnome-applets-2.21.4/cpufreq/src/cpufreq-utils.c.cpufreq gnome-applets-2.21.4/cpufreq/src/cpufreq-utils.c
--- gnome-applets-2.21.4/cpufreq/src/cpufreq-utils.c.cpufreq	2008-01-03 15:36:29.000000000 -0500
+++ gnome-applets-2.21.4/cpufreq/src/cpufreq-utils.c	2008-01-16 01:28:07.000000000 -0500
@@ -109,6 +109,9 @@ cpufreq_utils_selector_is_available (voi
 	if (!path)
 		return FALSE;
 
+	g_free (path);
+	return TRUE;
+
 	if (geteuid () == 0) {
 		g_free (path);
 		return TRUE;
diff -up gnome-applets-2.21.4/cpufreq/src/cpufreq-popup.c.cpufreq gnome-applets-2.21.4/cpufreq/src/cpufreq-popup.c
--- gnome-applets-2.21.4/cpufreq/src/cpufreq-popup.c.cpufreq	2008-01-03 15:36:29.000000000 -0500
+++ gnome-applets-2.21.4/cpufreq/src/cpufreq-popup.c	2008-01-16 01:27:14.000000000 -0500
@@ -176,20 +176,13 @@ static void
 cpufreq_popup_run_selector (CPUFreqPopup *popup,
 			    const gchar  *params)
 {
-	gchar  *path;
 	guint   cpu;
 	gchar  *command;
 	GError *error = NULL;
 
-	path = g_find_program_in_path ("cpufreq-selector");
-
-	if (!path)
-		return;
-
 	cpu = cpufreq_monitor_get_cpu (popup->priv->monitor);
 
-	command = g_strdup_printf ("%s -c %d %s", path, cpu, params);
-	g_free (path);
+	command = g_strdup_printf ("/usr/bin/cpufreq-selector -c %d %s", cpu, params);
 
 	g_spawn_command_line_async (command, &error);
 	g_free (command);


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- gnome-applets.spec	16 Jan 2008 05:48:15 -0000	1.260
+++ gnome-applets.spec	16 Jan 2008 06:34:05 -0000	1.261
@@ -49,12 +49,9 @@
 Patch0:		gnome-applets-2.15.2-use-old-modemlights.patch
 Patch2:		gnome-applets-2.10.1-use-builtin-apm.patch
 Patch3:		gnome-applets-2.3.6-ppp-command.patch
-Patch4:		gnome-applets-2.17.1-cpufreq.patch
+Patch4:		gnome-applets-2.21.4-cpufreq.patch
 Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=395035
-Patch30:	gnome-applets-2.16.0.1-fix-null-applet.patch
-
 # http://bugzilla.gnome.org/show_bug.cgi?id=424639
 Patch31:        gnome-applets-2.18.0-fix-find.patch
 
@@ -172,7 +169,6 @@
 %patch4 -p1 -b .cpufreq
 %patch11 -p1 -b .dont-require-display
 
-%patch30 -p1 -b .fix-null-applet
 %patch31 -p1 -b .fix-find
 %patch33 -p1 -b .node-leak
 %patch35 -p1 -b .mixer-sync


--- gnome-applets-2.16.0.1-fix-null-applet.patch DELETED ---