[Goodies-commits] r1459 - xfce4-battery-plugin/branches/XERVERIUS/panel-plugin

[Nick Schermer]

Author: nick
Date: 2006-06-26 13:37:55 +0000 (Mon, 26 Jun 2006)
New Revision: 1459

Modified:
   xfce4-battery-plugin/branches/XERVERIUS/panel-plugin/battery-overview.c
   xfce4-battery-plugin/branches/XERVERIUS/panel-plugin/battery.c
Log:
* Typos
* Use convenience function for loading status icon


Modified: xfce4-battery-plugin/branches/XERVERIUS/panel-plugin/battery-overview.c
===================================================================
--- xfce4-battery-plugin/branches/XERVERIUS/panel-plugin/battery-overview.c	2006-06-21 19:26:53 UTC (rev 1458)
+++ xfce4-battery-plugin/branches/XERVERIUS/panel-plugin/battery-overview.c	2006-06-26 13:37:55 UTC (rev 1459)
@@ -138,7 +138,7 @@
     
     /* Technology */
     value = battery_hal_get_string (bat->udi, "battery.technology");
-    battery_add_overview_item (vbox, sg, _("Technology:"), value);
+    battery_add_overview_item (vbox, sg, _("Technology"), value);
     
     /* Capacity */
     if (battery_hal_get_int (bat->udi, "battery.reporting.design") &&
@@ -147,11 +147,11 @@
         value = g_strdup_printf ("%d %s",
                                  battery_hal_get_int    (bat->udi, "battery.reporting.design"),
                                  battery_hal_get_string (bat->udi, "battery.reporting.unit"));
-        battery_add_overview_item (vbox, sg, _("Design Capacity:"), value);
+        battery_add_overview_item (vbox, sg, _("Design Capacity"), value);
     }
     
     value = battery_hal_get_string (bat->udi, "linux.acpi_path");
-    battery_add_overview_item (vbox, sg, _("ACPI Path:"), value);
+    battery_add_overview_item (vbox, sg, _("ACPI Path"), value);
 }
 
 static void

Modified: xfce4-battery-plugin/branches/XERVERIUS/panel-plugin/battery.c
===================================================================
--- xfce4-battery-plugin/branches/XERVERIUS/panel-plugin/battery.c	2006-06-21 19:26:53 UTC (rev 1458)
+++ xfce4-battery-plugin/branches/XERVERIUS/panel-plugin/battery.c	2006-06-26 13:37:55 UTC (rev 1459)
@@ -183,8 +183,10 @@
 	isize = psize - (2 * BORDER) - (2 * (psize > 26 ? 2 : 0)) - (2 * MAX (battery->frame->style->xthickness,
                                                                               battery->frame->style->ythickness));
 
-	/* Load the new icon */
-        pixbuf = xfce_themed_icon_load (name, isize);
+	/* Note: gtk_icon_theme_load_icon is a convenience
+		 function to maintain sharpness */
+        pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
+	                                   name, isize , 0, NULL);
 
         if (pixbuf)
         {