rpms/gnome-power-manager/devel gnome-power-manager-2.18.2-bubble-markup.patch, NONE, 1.1 gnome-power-manager.spec, 1.85, 1.86

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	gnome-power-manager.spec 
Added Files:
	gnome-power-manager-2.18.2-bubble-markup.patch 
Log Message:
fix markup in battery bubbles


gnome-power-manager-2.18.2-bubble-markup.patch:

--- NEW FILE gnome-power-manager-2.18.2-bubble-markup.patch ---
Index: src/gpm-power.c
===================================================================
--- src/gpm-power.c	(revision 2210)
+++ src/gpm-power.c	(working copy)
@@ -736,26 +736,8 @@
 	g_return_val_if_fail (device != NULL, NULL);
 
 	status = &device->battery_status;
-	details = g_string_new ("");
+	details = g_string_new ("Device Information");
 
-	if (device->product) {
-		g_string_append_printf (details, _("<b>Product:</b> %s\n"), device->product);
-	}
-	if (status->is_present == FALSE) {
-		g_string_append (details, _("<b>Status:</b> Missing\n"));
-	} else if (gpm_power_battery_is_charged (status)) {
-		g_string_append (details, _("<b>Status:</b> Charged\n"));
-	} else if (status->is_charging) {
-		g_string_append (details, _("<b>Status:</b> Charging\n"));
-	} else if (status->is_discharging) {
-		g_string_append (details, _("<b>Status:</b> Discharging\n"));
-	}
-	if (status->percentage_charge >= 0) {
-		g_string_append_printf (details, _("<b>Percentage charge:</b> %i%%\n"),
-					status->percentage_charge);
-	}
-	/* remove the last \n */
-	g_string_truncate (details, details->len-1);
 	return details;
 }
 
@@ -778,6 +760,22 @@
 	status = &device->battery_status;
 	details = g_string_new ("");
 
+	if (device->product) {
+		g_string_append_printf (details, _("<b>Product:</b> %s\n"), device->product);
+	}
+	if (status->is_present == FALSE) {
+		g_string_append (details, _("<b>Status:</b> Missing\n"));
+	} else if (gpm_power_battery_is_charged (status)) {
+		g_string_append (details, _("<b>Status:</b> Charged\n"));
+	} else if (status->is_charging) {
+		g_string_append (details, _("<b>Status:</b> Charging\n"));
+	} else if (status->is_discharging) {
+		g_string_append (details, _("<b>Status:</b> Discharging\n"));
+	}
+	if (status->percentage_charge >= 0) {
+		g_string_append_printf (details, _("<b>Percentage charge:</b> %i%%\n"),
+					status->percentage_charge);
+	}
 	if (device->vendor) {
 		g_string_append_printf (details, "<b>%s</b> %s\n",
 					_("Vendor:"), device->vendor);


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- gnome-power-manager.spec	7 May 2007 02:39:56 -0000	1.85
+++ gnome-power-manager.spec	16 May 2007 15:37:28 -0000	1.86
@@ -5,12 +5,13 @@
 Summary: GNOME Power Manager
 Name: gnome-power-manager
 Version: 2.18.2
-Release: 3%{?dist}
+Release: 4%{?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
+Patch2: gnome-power-manager-2.18.2-bubble-markup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://gnome-power.sourceforge.net/
 BuildPrereq: libgnomeui-devel
@@ -47,6 +48,7 @@
 %setup -q
 %patch0 -p1 -b .dpms-query
 %patch1 -p1 -b .statistics-crash
+%patch2 -p0 -b .bubble-markup
 
 %build
 %configure \
@@ -123,6 +125,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_InhibitApplet.xml
 
 %changelog
+* Wed May 16 2007 Matthias Clasen <mclasen at redhat.com> - 2.18.2-4
+- Don't put markup in notification summaries (#240258)
+
 * 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)