rpms/gnome-power-manager/devel gnome-power-manager.spec, 1.100, 1.101 no-background.patch, 1.1, 1.2

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-power-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16283

Modified Files:
	gnome-power-manager.spec no-background.patch 
Log Message:
Fix the 100% cpu use



Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- gnome-power-manager.spec	5 Oct 2007 18:46:33 -0000	1.100
+++ gnome-power-manager.spec	7 Oct 2007 01:36:08 -0000	1.101
@@ -5,7 +5,7 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.20.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and GFDL+
 Group: Applications/System
 Source: http://download.gnome.org/sources/gnome-power-manager/2.20/gnome-power-manager-%{version}.tar.bz2
@@ -126,6 +126,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog 
+* Sat Oct  6 2007 Matthias Clasen <mclasen at redhat.com> - 2.20.0-5
+- Fix a thinko in the previous patch (#321671)
+
 * Fri Oct  5 2007 David Zeuthen <davidz at redhat.com> - 2.20.0-4
 - Rebuild
 

no-background.patch:

Index: no-background.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/no-background.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- no-background.patch	5 Oct 2007 18:02:59 -0000	1.1
+++ no-background.patch	7 Oct 2007 01:36:08 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up gnome-power-manager-2.20.0/applets/inhibit/inhibit-applet.c.no-background gnome-power-manager-2.20.0/applets/inhibit/inhibit-applet.c
 --- gnome-power-manager-2.20.0/applets/inhibit/inhibit-applet.c.no-background	2007-08-14 16:29:10.000000000 -0400
-+++ gnome-power-manager-2.20.0/applets/inhibit/inhibit-applet.c	2007-10-05 14:00:54.000000000 -0400
++++ gnome-power-manager-2.20.0/applets/inhibit/inhibit-applet.c	2007-10-06 21:34:32.000000000 -0400
 @@ -48,6 +48,7 @@ typedef struct{
  	PanelApplet parent;
  	/* applet state */
@@ -18,17 +18,23 @@
  }
  
  /**
-@@ -278,6 +281,9 @@ gpm_applet_draw_cb (GpmInhibitApplet *ap
- 		return FALSE;
+@@ -272,12 +275,11 @@ gpm_applet_draw_cb (GpmInhibitApplet *ap
  	}
  
+ 	/* retrieve applet size */
+-	gpm_applet_get_icon (applet);
+ 	gpm_applet_check_size (applet);
+-	if (applet->size <= 2) {
+-		return FALSE;
+-	}
+ 
 +	return FALSE;
 +
 +#if 0
  	/* if no icon, then don't try to display */
  	if (applet->icon == NULL) {
  		return FALSE;
-@@ -309,6 +315,7 @@ gpm_applet_draw_cb (GpmInhibitApplet *ap
+@@ -309,6 +311,7 @@ gpm_applet_draw_cb (GpmInhibitApplet *ap
  			 GDK_RGB_DITHER_NONE, 0, 0);
  
  	return TRUE;
@@ -36,7 +42,7 @@
  }
  
  /**
-@@ -318,10 +325,34 @@ gpm_applet_draw_cb (GpmInhibitApplet *ap
+@@ -318,10 +321,34 @@ gpm_applet_draw_cb (GpmInhibitApplet *ap
   **/
  static void
  gpm_applet_change_background_cb (GpmInhibitApplet *applet,
@@ -74,7 +80,7 @@
  }
  
  /**
-@@ -591,6 +622,9 @@ gpm_inhibit_applet_init (GpmInhibitApple
+@@ -591,6 +618,9 @@ gpm_inhibit_applet_init (GpmInhibitApple
  	applet->connection = NULL;
  	applet->proxy = NULL;
  
@@ -84,7 +90,7 @@
  	/* Add application specific icons to search path */
  	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
                                             GPM_DATA G_DIR_SEPARATOR_S "icons");
-@@ -617,17 +651,21 @@ gpm_inhibit_applet_init (GpmInhibitApple
+@@ -617,17 +647,21 @@ gpm_inhibit_applet_init (GpmInhibitApple
  	g_signal_connect (G_OBJECT(applet), "expose-event",
  			  G_CALLBACK(gpm_applet_draw_cb), NULL);