[Pkg-xfce-commits] r5661 - in desktop/trunk/xfce4-panel/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-21 15:20:35 +0000 (Thu, 21 Apr 2011)
New Revision: 5661

Added:
   desktop/trunk/xfce4-panel/debian/patches/01_fix-transparency-migration.patch
   desktop/trunk/xfce4-panel/debian/patches/series
Modified:
   desktop/trunk/xfce4-panel/debian/changelog
Log:
* debian/patches:
  - 01_fix-transparency-migration added, fix inversion when migrating
    transparency settings.

Modified: desktop/trunk/xfce4-panel/debian/changelog
===================================================================
--- desktop/trunk/xfce4-panel/debian/changelog	2011-04-21 15:19:35 UTC (rev 5660)
+++ desktop/trunk/xfce4-panel/debian/changelog	2011-04-21 15:20:35 UTC (rev 5661)
@@ -1,3 +1,11 @@
+xfce4-panel (4.8.3-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 01_fix-transparency-migration added, fix inversion when migrating
+      transparency settings.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 21 Apr 2011 17:19:57 +0200
+
 xfce4-panel (4.8.3-1) unstable; urgency=low
 
   * New upstream bugfix release.

Added: desktop/trunk/xfce4-panel/debian/patches/01_fix-transparency-migration.patch
===================================================================
--- desktop/trunk/xfce4-panel/debian/patches/01_fix-transparency-migration.patch	                        (rev 0)
+++ desktop/trunk/xfce4-panel/debian/patches/01_fix-transparency-migration.patch	2011-04-21 15:20:35 UTC (rev 5661)
@@ -0,0 +1,24 @@
+commit 3603b4f159e3b2ef8f9c31efd8eb5bd3e895991f
+Author: Yves-Alexis Perez <corsac at debian.org>
+Date:   Thu Apr 21 16:50:16 2011 +0200
+
+    Migrate: Fix 4.6 transparency migration (bug #7523).
+
+diff --git a/migrate/migrate-46.c b/migrate/migrate-46.c
+index 2f9ebcc..467b554 100644
+--- a/migrate/migrate-46.c
++++ b/migrate/migrate-46.c
+@@ -844,11 +844,11 @@ migrate_46_end_element_handler (GMarkupParseContext  *context,
+ 
+           /* set transparency */
+           g_snprintf (prop, sizeof (prop), "/panels/panel-%u/leave-opacity", parser->panel_id_counter);
+-          xfconf_channel_set_uint (parser->channel, prop,  parser->panel_transparency);
++          xfconf_channel_set_uint (parser->channel, prop, 100 - parser->panel_transparency);
+ 
+           g_snprintf (prop, sizeof (prop), "/panels/panel-%u/enter-opacity", parser->panel_id_counter);
+           xfconf_channel_set_uint (parser->channel, prop,  parser->panel_activetrans ?
+-                                   parser->panel_transparency : 100);
++                                   100 - parser->panel_transparency : 100);
+ 
+           /* prepare for the next panel */
+           parser->panel_id_counter++;

Added: desktop/trunk/xfce4-panel/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-panel/debian/patches/series	                        (rev 0)
+++ desktop/trunk/xfce4-panel/debian/patches/series	2011-04-21 15:20:35 UTC (rev 5661)
@@ -0,0 +1 @@
+01_fix-transparency-migration.patch