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

[Felix Geyer]

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

The following commit has been merged in the master branch:
commit ce2c4ab6aafaee352424576f00d8b8b7d4f15a15
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sat Oct 25 11:04:18 2014 +0200

    Drop fix-innershadow-crash.patch, applied upstream.
---
 debian/changelog                           |  1 +
 debian/patches/fix-innershadow-crash.patch | 34 ------------------------------
 debian/patches/series                      |  1 -
 3 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4e78281..e46fed9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gtk2-engines-oxygen (1.4.6-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop fix-innershadow-crash.patch, applied upstream.
 
  -- Felix Geyer <fgeyer at debian.org>  Sat, 25 Oct 2014 11:03:09 +0200
 
diff --git a/debian/patches/fix-innershadow-crash.patch b/debian/patches/fix-innershadow-crash.patch
deleted file mode 100644
index ec0bbd0..0000000
--- a/debian/patches/fix-innershadow-crash.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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 584d729..625ddbd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 dont-build-demos.patch
-fix-innershadow-crash.patch

-- 
gtk2-engines-oxygen packaging