Merge lp:~agateau/plasma-widget-message-indicator/fix-text-overlap-in-systemtray into lp:~kubuntu-packagers/kubuntu-packaging/plasma-widget-message-indicator

[Aurélien Gâteau]

Work around for LP #632419. The real fix is in lp:libindicate-qt/trunk, but I'd rather not get new versions of libraries out that close to Maverick release.

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-08 18:49:55 +0000
+++ debian/changelog	2010-09-30 08:03:44 +0000
@@ -1,3 +1,10 @@
+plasma-widget-message-indicator (0.5.6-0ubuntu3) maverick; urgency=low
+
+  * Add kubuntu_02_fix_text_overlap_in_systemtray.diff to work around text
+    overlap in system tray LP: #632419
+
+ -- Aurélien Gâteau <[e-mail]>  Thu, 30 Sep 2010 09:47:14 +0200
+
 plasma-widget-message-indicator (0.5.6-0ubuntu2) maverick; urgency=low
 
   * Add kubuntu_01_fix_translation_domain.diff to create the correct

=== added file 'debian/patches/kubuntu_02_fix_text_overlap_in_systemtray.diff'
--- debian/patches/kubuntu_02_fix_text_overlap_in_systemtray.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/kubuntu_02_fix_text_overlap_in_systemtray.diff	2010-09-30 08:03:44 +0000
@@ -0,0 +1,19 @@
+This patch should be removed when libindicate-qt 0.2.6 is out. But since we are
+very close to Maverick release I prefer to patch the applet than the library.
+Index: plasma-widget-message-indicator-0.5.6/src/message-indicator.cpp
+===================================================================
+--- plasma-widget-message-indicator-0.5.6.orig/src/message-indicator.cpp	2010-09-30 09:45:36.000000000 +0200
++++ plasma-widget-message-indicator-0.5.6/src/message-indicator.cpp	2010-09-30 09:46:09.000000000 +0200
+@@ -127,10 +127,10 @@
+     // from "messaging" to "message.<something>"
+     mSourceModel = new ListenerModel(mListener, QRegExp("^messag(e|ing)"));
+     connect(mSourceModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)),
+-            SLOT(slotRowsChanged(const QModelIndex&))
++            SLOT(slotRowsChanged(const QModelIndex&)), Qt::QueuedConnection
+             );
+     connect(mSourceModel, SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
+-            SLOT(slotRowsChanged(const QModelIndex&))
++            SLOT(slotRowsChanged(const QModelIndex&)), Qt::QueuedConnection
+             );
+     connect(mSourceModel, SIGNAL(drawAttentionChanged(const QModelIndex&)),
+             SLOT(slotDrawAttentionChanged())

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-09-08 18:49:55 +0000
+++ debian/patches/series	2010-09-30 08:03:44 +0000
@@ -1,1 +1,2 @@
 kubuntu_01_fix_translation_domain.diff
+kubuntu_02_fix_text_overlap_in_systemtray.diff