[SCM] gtk2-engines-oxygen packaging branch, master, updated. debian/1.4.4-2

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gtk2-engines-oxygen.git;a=commitdiff;h=cb757a6

The following commit has been merged in the master branch:
commit cb757a6617b1cedeefff79d1bcee069de93f02df
Author: Felix Geyer <fgeyer at debian.org>
Date:   Thu Mar 20 20:19:19 2014 +0100

    Fix crash in LibreOffice save dialog. (Closes: #742051)
    
    * Fix crash in LibreOffice save dialog. (Closes: #742051)
      - Cherry-pick upstream commit in fix-innershadow-crash.patch
---
 debian/changelog                           |  8 +++++++
 debian/patches/fix-innershadow-crash.patch | 34 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 43 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0a44200..558d207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gtk2-engines-oxygen (1.4.4-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fix crash in LibreOffice save dialog. (Closes: #742051)
+    - Cherry-pick upstream commit in fix-innershadow-crash.patch
+
+ -- Felix Geyer <fgeyer at debian.org>  Thu, 20 Mar 2014 20:15:45 +0100
+
 gtk2-engines-oxygen (1.4.4-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/fix-innershadow-crash.patch b/debian/patches/fix-innershadow-crash.patch
new file mode 100644
index 0000000..ec0bbd0
--- /dev/null
+++ b/debian/patches/fix-innershadow-crash.patch
@@ -0,0 +1,34 @@
+From: Hugo Pereira Da Costa <hugo.pereira at free.fr>
+Date: Sun, 09 Mar 2014 12:00:33 +0000
+Subject: make sure parent is registered to innerShadowEngine before registering child
+X-Git-Url: http://quickgit.kde.org/?p=oxygen-gtk.git&a=commitdiff&h=b39931fa3ad7a2756bcb1494d5c3559513406ce2
+---
+make sure parent is registered to innerShadowEngine before registering child
+CCBUG: 331879
+---
+
+
+--- a/src/oxygenstylewrapper.cpp
++++ b/src/oxygenstylewrapper.cpp
+@@ -1669,7 +1669,10 @@
+             }
+ 
+             // register to inner shadow engine
+-            if( shadow == GTK_SHADOW_IN && gtk_scrolled_window_get_shadow_type( GTK_SCROLLED_WINDOW( widget ) ) == GTK_SHADOW_IN )
++            if(
++                shadow == GTK_SHADOW_IN &&
++                gtk_scrolled_window_get_shadow_type( GTK_SCROLLED_WINDOW( widget ) ) == GTK_SHADOW_IN &&
++                Style::instance().animations().innerShadowEngine().contains( widget ) )
+             { Style::instance().animations().innerShadowEngine().registerChild( widget, gtk_bin_get_child( GTK_BIN( widget ) ) ); }
+ 
+         } else if(
+@@ -2074,7 +2077,8 @@
+                     if( gtk_scrolled_window_get_shadow_type( scrolledWindow ) != GTK_SHADOW_IN )
+                     {
+                         gtk_scrolled_window_set_shadow_type( scrolledWindow, GTK_SHADOW_IN );
+-                        Style::instance().animations().innerShadowEngine().registerChild( child, gtk_bin_get_child( GTK_BIN( child ) ) );
++                        if( Style::instance().animations().innerShadowEngine().contains( child ) )
++                        { Style::instance().animations().innerShadowEngine().registerChild( child, gtk_bin_get_child( GTK_BIN( child ) ) ); }
+                     }
+ 
+                     return;
diff --git a/debian/patches/series b/debian/patches/series
index 625ddbd..584d729 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 dont-build-demos.patch
+fix-innershadow-crash.patch

-- 
gtk2-engines-oxygen packaging