rpms/gnome-power-manager/devel gnome-power-manager-2.18.2-statistics-crash.patch, NONE, 1.1 gnome-power-manager.spec, 1.84, 1.85

Matthias Clasen (mclasen) fedora-extras-commits at redhat.com
Mon May 7 02:40:31 UTC 2007


Author: mclasen

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

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-2.18.2-statistics-crash.patch 
Log Message:
avoid a crash in gnome-power-statistics


gnome-power-manager-2.18.2-statistics-crash.patch:

--- NEW FILE gnome-power-manager-2.18.2-statistics-crash.patch ---
--- gnome-power-manager-2.18.2/src/gpm-graph-widget.c.statistics-crash	2007-05-06 22:33:28.000000000 -0400
+++ gnome-power-manager-2.18.2/src/gpm-graph-widget.c	2007-05-06 22:33:34.000000000 -0400
@@ -991,6 +991,8 @@ gpm_graph_widget_draw_line (GpmGraphWidg
 	for (i=0; i<graph->priv->data_list->len; i++) {
 		gpm_debug ("drawing line %i", i);
 		l = (GList *) g_ptr_array_index (graph->priv->data_list, i);
+		if (l == NULL)
+			continue;
 		new = (GpmInfoDataPoint *) l->data;
 		oldx = 0;
 		oldy = 0;


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- gnome-power-manager.spec	27 Apr 2007 07:17:18 -0000	1.84
+++ gnome-power-manager.spec	7 May 2007 02:39:56 -0000	1.85
@@ -5,11 +5,12 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.18.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/System
 Source: http://ftp.gnome.org/pub/gnome/sources/gnome-power-manager/2.18/gnome-power-manager-%{version}.tar.bz2
 Patch0: gnome-power-manager-2.17.92-dpms-query-less.patch
+Patch1: gnome-power-manager-2.18.2-statistics-crash.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome-power.sourceforge.net/
 BuildPrereq: libgnomeui-devel
@@ -45,6 +46,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .dpms-query
+%patch1 -p1 -b .statistics-crash
 
 %build
 %configure \
@@ -121,6 +123,10 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Sun May  6 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.2-3
+- Avoid a crash in gnome-power-statistics if the daemon
+  is not running (#239228)
+
 * Fri Apr 27 2007 David Zeuthen <davidz at redhat.com> - 2.18.2-2
 - Remove broken nodefaultbeep patch as it was wrongly applied to disable
   battery recall warnings - gotta love patch(1) (#238087)




More information about the fedora-extras-commits mailing list