[Pkg-xfce-commits] r7047 - in goodies/trunk/xfce4-battery-plugin/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2012-05-28 13:24:25 +0000 (Mon, 28 May 2012)
New Revision: 7047

Added:
   goodies/trunk/xfce4-battery-plugin/debian/patches/
   goodies/trunk/xfce4-battery-plugin/debian/patches/01_dont-reset-label-orientation.patch
   goodies/trunk/xfce4-battery-plugin/debian/patches/series
Modified:
   goodies/trunk/xfce4-battery-plugin/debian/changelog
Log:
* debian/patches:
  - 01_dont-reset-label-orientation added backported from upstream. Keep the
    old behavior on 4.8 panel where there's no deskbar mode.  closes: #674864

Modified: goodies/trunk/xfce4-battery-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/changelog	2012-05-23 19:29:02 UTC (rev 7046)
+++ goodies/trunk/xfce4-battery-plugin/debian/changelog	2012-05-28 13:24:25 UTC (rev 7047)
@@ -1,3 +1,11 @@
+xfce4-battery-plugin (1.0.4-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 01_dont-reset-label-orientation added backported from upstream. Keep the
+      old behavior on 4.8 panel where there's no deskbar mode.  closes: #674864
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 28 May 2012 15:05:41 +0200
+
 xfce4-battery-plugin (1.0.4-1) unstable; urgency=low
 
   * New upstream release.

Added: goodies/trunk/xfce4-battery-plugin/debian/patches/01_dont-reset-label-orientation.patch
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/patches/01_dont-reset-label-orientation.patch	                        (rev 0)
+++ goodies/trunk/xfce4-battery-plugin/debian/patches/01_dont-reset-label-orientation.patch	2012-05-28 13:24:25 UTC (rev 7047)
@@ -0,0 +1,18 @@
+commit 7a5c18a7616944c38bd971c6a76dd93ad343ce07
+Author: Landry Breuil <landry at xfce.org>
+Date:   Mon May 28 14:58:44 2012 +0200
+
+    Don't set labels orientation on 4.8 panels (Bug #8961)
+
+diff --git a/panel-plugin/battery.c b/panel-plugin/battery.c
+index 4168f26..49fd16b 100644
+--- a/panel-plugin/battery.c
++++ b/panel-plugin/battery.c
+@@ -800,7 +800,6 @@ battmon_set_orientation (XfcePanelPlugin *plugin, GtkOrientation orientation,
+     xfce_hvbox_set_orientation(XFCE_HVBOX(battmon->actempbox), !orientation);
+     gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(battmon->battstatus),
+                (orientation == GTK_ORIENTATION_HORIZONTAL ? GTK_PROGRESS_BOTTOM_TO_TOP : GTK_PROGRESS_LEFT_TO_RIGHT));
+-    battmon_set_labels_orientation(battmon, orientation);
+     battmon_set_size(plugin, xfce_panel_plugin_get_size (plugin), battmon);
+     update_apm_status( battmon );
+     battmon->timeoutid = g_timeout_add(1 * 1024, (GSourceFunc) update_apm_status, battmon);

Added: goodies/trunk/xfce4-battery-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/patches/series	                        (rev 0)
+++ goodies/trunk/xfce4-battery-plugin/debian/patches/series	2012-05-28 13:24:25 UTC (rev 7047)
@@ -0,0 +1 @@
+01_dont-reset-label-orientation.patch