diff -Nru gtk2-engines-oxygen-1.2.2/debian/changelog gtk2-engines-oxygen-1.2.2/debian/changelog --- gtk2-engines-oxygen-1.2.2/debian/changelog 2012-03-17 23:12:41.000000000 +0000 +++ gtk2-engines-oxygen-1.2.2/debian/changelog 2012-05-11 17:01:51.000000000 +0000 @@ -1,3 +1,16 @@ +gtk2-engines-oxygen (1.2.2-0ubuntu1.1~gspr1) precise; urgency=low + + * Until this arrives in precise-updates. + + -- Gard Spreemann Fri, 11 May 2012 19:01:19 +0200 + +gtk2-engines-oxygen (1.2.2-0ubuntu1.1) precise-proposed; urgency=low + + * Fix crash in Filezilla when connecting to a remote site. (LP: #992133) + - Add fix-filezilla-crash.patch, cerry-picked from upstream. + + -- Felix Geyer Sun, 06 May 2012 11:47:50 +0200 + gtk2-engines-oxygen (1.2.2-0ubuntu1) precise; urgency=low * New upstream release. diff -Nru gtk2-engines-oxygen-1.2.2/debian/patches/fix-filezilla-crash.patch gtk2-engines-oxygen-1.2.2/debian/patches/fix-filezilla-crash.patch --- gtk2-engines-oxygen-1.2.2/debian/patches/fix-filezilla-crash.patch 1970-01-01 00:00:00.000000000 +0000 +++ gtk2-engines-oxygen-1.2.2/debian/patches/fix-filezilla-crash.patch 2012-05-11 16:57:31.000000000 +0000 @@ -0,0 +1,23 @@ +From: Ruslan Kabatsayev +Date: Wed, 14 Mar 2012 11:04:35 +0000 +Subject: Check if GdkWindow is destroyed before restoring composited state +X-Git-Tag: v1.2.2-1 +X-Git-Url: http://quickgit.kde.org/?p=oxygen-gtk.git&a=commitdiff&h=d6c4de90902a005fc14e55c1789bec276dbfcdf0 +--- +Check if GdkWindow is destroyed before restoring composited state +CCBUG: 295875 +--- + + +--- a/src/animations/oxygeninnershadowdata.cpp ++++ b/src/animations/oxygeninnershadowdata.cpp +@@ -164,7 +164,7 @@ namespace Oxygen + + // remove compositing flag + GdkWindow* window( gtk_widget_get_window( widget ) ); +- if( GDK_IS_WINDOW( window ) && G_OBJECT_TYPE_NAME( widget ) != std::string("GtkPizza") ) ++ if( GDK_IS_WINDOW( window ) && !gdk_window_is_destroyed(window) && G_OBJECT_TYPE_NAME( widget ) != std::string("GtkPizza") ) + { gdk_window_set_composited( window, _initiallyComposited ); } + } + + diff -Nru gtk2-engines-oxygen-1.2.2/debian/patches/series gtk2-engines-oxygen-1.2.2/debian/patches/series --- gtk2-engines-oxygen-1.2.2/debian/patches/series 2012-01-23 21:44:06.000000000 +0000 +++ gtk2-engines-oxygen-1.2.2/debian/patches/series 2012-05-11 16:57:31.000000000 +0000 @@ -1 +1,2 @@ dont-build-demos.patch +fix-filezilla-crash.patch