rev 9031 - in branches/kde4/packages/kdelibs/debian: . patches

[Adeodato Simó]

Author: adeodato
Date: 2008-01-19 09:52:42 +0000 (Sat, 19 Jan 2008)
New Revision: 9031

Added:
   branches/kde4/packages/kdelibs/debian/patches/r759579_kaboutapplicationdialog_crash.diff
   branches/kde4/packages/kdelibs/debian/patches/r763245_ktreewidgetsearchlinewidget_delayed_createWidgets.diff
Modified:
   branches/kde4/packages/kdelibs/debian/changelog
   branches/kde4/packages/kdelibs/debian/patches/series
Log:
Cherry pick a couple patches from /branches/KDE/4.0.

Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog	2008-01-19 09:17:31 UTC (rev 9030)
+++ branches/kde4/packages/kdelibs/debian/changelog	2008-01-19 09:52:42 UTC (rev 9031)
@@ -1,3 +1,18 @@
+kde4libs (4:4.0.0-3) UNRELEASED; urgency=low
+
+  +++ Changes by Adeodato Simó:
+
+  * Cherry pick a couple patches from /branches/KDE/4.0:
+
+    + r759579_kaboutapplicationdialog_crash: do not crash when aboutData is
+      NULL in the constructor.
+
+    + r763245_ktreewidgetsearchlinewidget_delayed_createWidgets: do not create
+      the widgets directly in the constructor, but invoke them with a delay,
+      because other way calls to virtual functions does not work correctly.
+
+ -- Adeodato Simó <dato at net.com.org.es>  Sat, 19 Jan 2008 10:45:02 +0100
+
 kde4libs (4:4.0.0-2) unstable; urgency=low
 
   +++ Changes by Fathi Boudra:

Added: branches/kde4/packages/kdelibs/debian/patches/r759579_kaboutapplicationdialog_crash.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/r759579_kaboutapplicationdialog_crash.diff	                        (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/r759579_kaboutapplicationdialog_crash.diff	2008-01-19 09:52:42 UTC (rev 9031)
@@ -0,0 +1,26 @@
+--- a/kdeui/dialogs/kaboutapplicationdialog.cpp
++++ b/kdeui/dialogs/kaboutapplicationdialog.cpp
+@@ -55,11 +55,6 @@
+   : KDialog(parent),
+     d(new Private(this))
+ {
+-    setPlainCaption(i18n("About %1", aboutData->programName()));
+-    setButtons(KDialog::Close);
+-    setDefaultButton(KDialog::Close);
+-    setModal(false);
+-
+     if (aboutData == 0)
+         aboutData = KGlobal::mainComponent().aboutData();
+ 
+@@ -72,6 +67,11 @@
+         return;
+     }
+ 
++    setPlainCaption(i18n("About %1", aboutData->programName()));
++    setButtons(KDialog::Close);
++    setDefaultButton(KDialog::Close);
++    setModal(false);
++
+     KTitleWidget *titleWidget = new KTitleWidget(this);
+ 
+     titleWidget->setPixmap(qApp->windowIcon().pixmap(64, 64), KTitleWidget::ImageLeft);

Added: branches/kde4/packages/kdelibs/debian/patches/r763245_ktreewidgetsearchlinewidget_delayed_createWidgets.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/r763245_ktreewidgetsearchlinewidget_delayed_createWidgets.diff	                        (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/r763245_ktreewidgetsearchlinewidget_delayed_createWidgets.diff	2008-01-19 09:52:42 UTC (rev 9031)
@@ -0,0 +1,14 @@
+--- a/kdeui/itemviews/ktreewidgetsearchline.cpp
++++ b/kdeui/itemviews/ktreewidgetsearchline.cpp
+@@ -585,8 +585,9 @@
+ {
+   d->treeWidget = treeWidget;
+ 
+-  createWidgets();
+-
++  // can't call createWidgets directly because it calls virtual functions
++  // that might not work if called directly from here due to how inheritance works
++  QMetaObject::invokeMethod(this, SLOT(createWidgets()), Qt::QueuedConnection);
+ }
+ 
+ KTreeWidgetSearchLineWidget::~KTreeWidgetSearchLineWidget()

Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series	2008-01-19 09:17:31 UTC (rev 9030)
+++ branches/kde4/packages/kdelibs/debian/patches/series	2008-01-19 09:52:42 UTC (rev 9031)
@@ -7,3 +7,5 @@
 14_hardcode_ptm_device.diff
 15_kfreebsd_support.diff
 16_arm_fixes.diff
+r759579_kaboutapplicationdialog_crash.diff
+r763245_ktreewidgetsearchlinewidget_delayed_createWidgets.diff