Attachment #157536 for bug #199166

View | Details | Raw Unified | Return to bug 199166
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-2 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= xfce4-power-manager	4	PORTNAME= xfce4-power-manager
5	PORTVERSION= 1.5.0	5	PORTVERSION= 1.5.1
6	CATEGORIES= sysutils xfce	6	CATEGORIES= sysutils xfce
7	MASTER_SITES= XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}/	7	MASTER_SITES= XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R}/
8	DIST_SUBDIR= xfce4	8	DIST_SUBDIR= xfce4
Lines 25-31 Link Here
25	USE_XORG= xrandr x11 xext xtst xscrnsaver	25	USE_XORG= xrandr x11 xext xtst xscrnsaver
26	CONFIGURE_ARGS= --disable-network-manager \	26	CONFIGURE_ARGS= --disable-network-manager \
27	--enable-polkit \	27	--enable-polkit \
28	--enable-xfce4panel	28	--enable-xfce4panel \
		29	--enable-debug=yes
29	INSTALL_TARGET= install-strip	30	INSTALL_TARGET= install-strip
30		31
31	.include <bsd.port.mk>	32	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (xfce4/xfce4-power-manager-1.5.0.tar.bz2) = 62bc832d9474094fd7481c4658c0dd67e1b41fe89fdaa75b2803d3d2096f9fb7	1	SHA256 (xfce4/xfce4-power-manager-1.5.1.tar.bz2) = 91c5dca87523a1683f9f69260b2b7291d5c06b34a49ccf79ef8e37bba35e0500
2	SIZE (xfce4/xfce4-power-manager-1.5.0.tar.bz2) = 1108153	2	SIZE (xfce4/xfce4-power-manager-1.5.1.tar.bz2) = 1110627




--- panel-plugins/power-manager-plugin/power-manager-button.c.orig	2015-06-05 08:14:04 UTC
+++ panel-plugins/power-manager-plugin/power-manager-button.c
@@ -285,7 +285,7 @@ static void
 power_manager_button_set_label (PowerManagerButton *button, gdouble percentage,
                                 guint64 time_to_empty_or_full)
 {
-    gchar *label_string;
+    gchar *label_string = NULL;
     gint   hours;
     gint   minutes;
     gchar *remaining_time = NULL;
@@ -407,7 +407,13 @@ power_manager_button_update_device_icon_
         DBG("this is the display device, updating");
         /* it is! update the panel button */
         g_free (button->priv->panel_icon_name);
-
+#ifdef XFCE_PLUGIN
+        g_object_get (device,
+                      "icon-name", &icon_name,
+                      NULL);
+        if (icon_name == NULL || g_strcmp0 (icon_name, "") == 0)
+            icon_name = g_strdup (PANEL_DEFAULT_ICON);
+#endif
         button->priv->panel_icon_name = g_strdup (icon_name);
         power_manager_button_set_icon (button);
         /* update tooltip */

Return to bug 199166

Lines 1-26 Link Here

(-)files/patch-panel-plugins_power-manager-plugin_power-manager-button.c (-25 / +10 lines)
1	--- panel-plugins/power-manager-plugin/power-manager-button.c.orig 2015-05-25 16:10:37 UTC	1	--- panel-plugins/power-manager-plugin/power-manager-button.c.orig 2015-06-05 08:14:04 UTC
2	+++ panel-plugins/power-manager-plugin/power-manager-button.c	2	+++ panel-plugins/power-manager-plugin/power-manager-button.c
3	@@ -382,7 +382,7 @@ power_manager_button_update_device_icon_	3	@@ -285,7 +285,7 @@ static void
4	details = get_device_description (button->priv->upower, device);	4	power_manager_button_set_label (PowerManagerButton *button, gdouble percentage,
5		5	guint64 time_to_empty_or_full)
6	/* If UPower doesn't give us an icon, just use the default */	6	{
7	- if (icon_name == NULL)	7	- gchar *label_string;
8	+ if (icon_name == NULL \|\| g_strcmp0 (icon_name, "") == 0)	8	+ gchar *label_string = NULL;
9	icon_name = g_strdup (PANEL_DEFAULT_ICON);	9	gint hours;
10		10	gint minutes;
11	pix = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),	11	gchar *remaining_time = NULL;
12	@@ -407,7 +407,13 @@ power_manager_button_update_device_icon_
13	DBG("this is the display device, updating");
14	/* it is! update the panel button */
15	g_free (button->priv->panel_icon_name);
16	-
17	+#ifdef XFCE_PLUGIN
18	+ g_object_get (device,
19	+ "icon-name", &icon_name,
20	+ NULL);
21	+ if (icon_name == NULL \|\| g_strcmp0 (icon_name, "") == 0)
22	+ icon_name = g_strdup (PANEL_DEFAULT_ICON);
23	+#endif
24	button->priv->panel_icon_name = g_strdup (icon_name);
25	power_manager_button_set_icon (button);
26	/* update tooltip */