[Pkg-xfce-commits] r3533 - in desktop/trunk/xfce4-terminal/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2009-10-06 14:40:41 +0000 (Tue, 06 Oct 2009)
New Revision: 3533

Added:
   desktop/trunk/xfce4-terminal/debian/patches/01_fix-background-image.patch
Modified:
   desktop/trunk/xfce4-terminal/debian/changelog
   desktop/trunk/xfce4-terminal/debian/rules
Log:
* debian/rules:
  - correct the sed expression when correcting the help path    (LP: #442021)
* debian/patches:
  - 01_fix-background-image.patch added.                      closes: #539646

Modified: desktop/trunk/xfce4-terminal/debian/changelog
===================================================================
--- desktop/trunk/xfce4-terminal/debian/changelog	2009-10-06 06:29:33 UTC (rev 3532)
+++ desktop/trunk/xfce4-terminal/debian/changelog	2009-10-06 14:40:41 UTC (rev 3533)
@@ -1,3 +1,12 @@
+xfce4-terminal (0.4.1-2) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - correct the sed expression when correcting the help path    (LP: #442021)
+  * debian/patches:
+    - 01_fix-background-image.patch added.                      closes: #539646
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 06 Oct 2009 16:38:20 +0200
+
 xfce4-terminal (0.4.1-1) unstable; urgency=low
 
   * New upstream release.

Added: desktop/trunk/xfce4-terminal/debian/patches/01_fix-background-image.patch
===================================================================
--- desktop/trunk/xfce4-terminal/debian/patches/01_fix-background-image.patch	                        (rev 0)
+++ desktop/trunk/xfce4-terminal/debian/patches/01_fix-background-image.patch	2009-10-06 14:40:41 UTC (rev 3533)
@@ -0,0 +1,78 @@
+commit e8244292fa3d24314f54883fa1b97c3e2e85cd43
+Author: Nick Schermer <nick at xfce.org>
+Date:   Tue Oct 6 15:48:41 2009 +0200
+
+    Fix broken background image when compositing is disabled (bug #5645).
+
+diff --git a/Terminal.glade b/Terminal.glade
+index 8704b8a..0091a0c 100644
+--- a/Terminal.glade
++++ b/Terminal.glade
+@@ -1978,10 +1978,10 @@ when double clicking:</property>
+     </data>
+   </object>
+   <object class="GtkAdjustment" id="background-darkness">
+-    <property name="lower">0.050000000000000003</property>
++    <property name="lower">0</property>
+     <property name="upper">1</property>
+     <property name="step_increment">0.01</property>
+-    <property name="page_increment">0.10000000000000001</property>
++    <property name="page_increment">0.1</property>
+   </object>
+   <object class="GtkSizeGroup" id="sizegroup1">
+     <widgets>
+diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
+index 1a07c0e..446b44f 100644
+--- a/terminal/terminal-screen.c
++++ b/terminal/terminal-screen.c
+@@ -994,7 +994,8 @@ terminal_screen_timer_background (gpointer user_data)
+   TerminalBackground   background_mode;
+   GdkPixbuf           *image;
+   gdouble              background_darkness;
+-  gboolean             transparent = FALSE;
++  gdouble              saturation = 1.0;
++  guint16              opacity = 0xffff;
+ 
+   terminal_return_val_if_fail (TERMINAL_IS_SCREEN (screen), FALSE);
+   terminal_return_val_if_fail (VTE_IS_TERMINAL (screen->terminal), FALSE);
+@@ -1003,7 +1004,6 @@ terminal_screen_timer_background (gpointer user_data)
+ 
+   g_object_get (G_OBJECT (screen->preferences), "background-mode", &background_mode, NULL);
+ 
+-
+   if (G_UNLIKELY (background_mode == TERMINAL_BACKGROUND_IMAGE))
+     {
+       loader = terminal_image_loader_get ();
+@@ -1026,25 +1026,15 @@ terminal_screen_timer_background (gpointer user_data)
+     {
+       g_object_get (G_OBJECT (screen->preferences), "background-darkness", &background_darkness, NULL);
+ 
+-      if (gtk_widget_is_composited (GTK_WIDGET (screen)))
+-        {
+-          vte_terminal_set_opacity (VTE_TERMINAL (screen->terminal), 0xffff * background_darkness);
+-          vte_terminal_set_background_saturation (VTE_TERMINAL (screen->terminal), 1.0);
+-        }
+-      else
+-        {
+-          vte_terminal_set_background_saturation (VTE_TERMINAL (screen->terminal), 1.0 - background_darkness);
+-          vte_terminal_set_opacity (VTE_TERMINAL (screen->terminal), 0xffff);
+-          transparent = TRUE;
+-        }
+-    }
+-  else
+-    {
+-      vte_terminal_set_background_saturation (VTE_TERMINAL (screen->terminal), 1.0);
+-      vte_terminal_set_opacity (VTE_TERMINAL (screen->terminal), 0xffff);
++      saturation = 1.0 - background_darkness;
++      opacity = 0xffff * background_darkness;
+     }
+ 
+-  vte_terminal_set_background_transparent (VTE_TERMINAL (screen->terminal), transparent);
++  vte_terminal_set_background_saturation (VTE_TERMINAL (screen->terminal), saturation);
++  vte_terminal_set_opacity (VTE_TERMINAL (screen->terminal), opacity);
++  vte_terminal_set_background_transparent (VTE_TERMINAL (screen->terminal),
++                                           background_mode == TERMINAL_BACKGROUND_TRANSPARENT
++                                           && !gtk_widget_is_composited (GTK_WIDGET (screen)));
+ 
+   screen->last_size_change = time (NULL);
+ 

Modified: desktop/trunk/xfce4-terminal/debian/rules
===================================================================
--- desktop/trunk/xfce4-terminal/debian/rules	2009-10-06 06:29:33 UTC (rev 3532)
+++ desktop/trunk/xfce4-terminal/debian/rules	2009-10-06 14:40:41 UTC (rev 3533)
@@ -18,6 +18,6 @@
 	install -m 0644 debian/terminal.xpm debian/xfce4-terminal/usr/share/pixmaps/
 	mv debian/xfce4-terminal/usr/lib/xfce4-terminal/xfce4-terminalHelp \
 		debian/xfce4-terminal/usr/lib/xfce4-terminal/TerminalHelp
-	sed -i 's#doc/Terminal/#doc/xfce4-terminal/html#' debian/xfce4-terminal/usr/lib/xfce4-terminal/TerminalHelp
+	sed -i 's#doc/Terminal#doc/xfce4-terminal/html#' debian/xfce4-terminal/usr/lib/xfce4-terminal/TerminalHelp
 	chrpath -d -k debian/xfce4-terminal/usr/bin/xfce4-terminal