Hello community,

here is the log from the commit of package qtcurve-kde4 for openSUSE:Factory 
checked in at 2012-08-22 12:16:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qtcurve-kde4 (Old)
 and      /work/SRC/openSUSE:Factory/.qtcurve-kde4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "qtcurve-kde4", Maintainer is "kde-maintain...@suse.de"

Changes:
--------
--- /work/SRC/openSUSE:Factory/qtcurve-kde4/qtcurve-kde4.changes        
2012-07-30 17:13:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qtcurve-kde4.new/qtcurve-kde4.changes   
2012-08-22 12:16:45.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 10 06:42:42 UTC 2012 - m...@suse.com
+
+- Update to version 1.8.14
+  * Fix loading of kwin decoration/config under KDE4.9
+
+-------------------------------------------------------------------

Old:
----
  QtCurve-KDE4-1.8.13.tar.bz2

New:
----
  QtCurve-KDE4-1.8.14.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ qtcurve-kde4.spec ++++++
--- /var/tmp/diff_new_pack.yCC5fr/_old  2012-08-22 12:16:47.000000000 +0200
+++ /var/tmp/diff_new_pack.yCC5fr/_new  2012-08-22 12:16:47.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           qtcurve-kde4
-Version:        1.8.13
+Version:        1.8.14
 Release:        0
 Summary:        QtCurve style for KDE 4
 License:        GPL-2.0+

++++++ QtCurve-KDE4-1.8.13.tar.bz2 -> QtCurve-KDE4-1.8.14.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.13/CMakeLists.txt 
new/QtCurve-KDE4-1.8.14/CMakeLists.txt
--- old/QtCurve-KDE4-1.8.13/CMakeLists.txt      2012-07-24 18:06:39.000000000 
+0200
+++ new/QtCurve-KDE4-1.8.14/CMakeLists.txt      2012-08-09 21:35:22.000000000 
+0200
@@ -8,7 +8,7 @@
 set(CPACK_SOURCE_GENERATOR "TBZ2")
 set(CPACK_PACKAGE_VERSION_MAJOR "1")
 set(CPACK_PACKAGE_VERSION_MINOR "8")
-set(CPACK_PACKAGE_VERSION_PATCH "13")
+set(CPACK_PACKAGE_VERSION_PATCH "14")
 set(CPACK_PACKAGE_CONTACT "Craig Drummond <craig.p.drumm...@gmail.com>")
 set(QTCURVE_VERSION 
"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
 set(QTCURVE_VERSION_FULL "${QTCURVE_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.13/ChangeLog 
new/QtCurve-KDE4-1.8.14/ChangeLog
--- old/QtCurve-KDE4-1.8.13/ChangeLog   2012-07-24 18:06:39.000000000 +0200
+++ new/QtCurve-KDE4-1.8.14/ChangeLog   2012-08-09 21:35:22.000000000 +0200
@@ -1,3 +1,7 @@
+1.8.14
+------
+1. Fix loading of kwin decoration/config under KDE4.9
+
 1.8.13
 ------
 1. Fix KDE4.9 build - window grouping disabled.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.13/kwin/qtcurvehandler.cpp 
new/QtCurve-KDE4-1.8.14/kwin/qtcurvehandler.cpp
--- old/QtCurve-KDE4-1.8.13/kwin/qtcurvehandler.cpp     2012-07-24 
18:06:39.000000000 +0200
+++ new/QtCurve-KDE4-1.8.14/kwin/qtcurvehandler.cpp     2012-08-09 
21:35:22.000000000 +0200
@@ -85,12 +85,21 @@
 namespace KWinQtCurve
 {
 
+    // make the handler accessible to other classes...
+static QtCurveHandler *handler = 0;
+
+QtCurveHandler * Handler()
+{
+    return handler;
+}
+
 QtCurveHandler::QtCurveHandler()
               : itsLastMenuXid(0)
               , itsLastStatusXid(0)
               , itsStyle(NULL)
               , itsDBus(NULL)
 {
+    handler=this;
     setStyle();
     reset(0);
 
@@ -100,6 +109,7 @@
 
 QtCurveHandler::~QtCurveHandler()
 {
+    handler=0;
     delete itsStyle;
 }
 
@@ -477,24 +487,19 @@
     itsClients.removeAll(c);
 }
 
-// make the handler accessible to other classes...
-static QtCurveHandler *handler = 0;
-
-QtCurveHandler * Handler()
-{
-    return handler;
-}
-
 }
 
+#if KDE_IS_VERSION(4, 9, 0)
+KWIN_DECORATION(KWinQtCurve::QtCurveHandler)
+#else
 extern "C"
 {
     KDE_EXPORT KDecorationFactory *create_factory()
     {
-        KWinQtCurve::handler = new KWinQtCurve::QtCurveHandler();
-        return KWinQtCurve::handler;
+        return new KWinQtCurve::QtCurveHandler();
     }
 }
+#endif
 
 #include "qtcurvedbus.moc"
 #include "qtcurvehandler.moc"

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to