[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=df55ff4

The following commit has been merged in the master branch:
commit df55ff4b1a4fd4dd26e67258d588fca8f9073539
Author: Lasath Fernando <kde at lasath.org>
Date:   Sat Nov 12 03:44:38 2011 +1100

    Idk why, but changing the order of inheritance seemes to have fixed those issues.
---
 lib/conversation-watcher.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/conversation-watcher.h b/lib/conversation-watcher.h
index 927441a..40a7be2 100644
--- a/lib/conversation-watcher.h
+++ b/lib/conversation-watcher.h
@@ -25,7 +25,7 @@
 
 class Conversation;
 
-class ConversationWatcher : public Tp::AbstractClientObserver , public QObject
+class ConversationWatcher : public QObject, public Tp::AbstractClientObserver 
 {
 Q_OBJECT
 

-- 
ktp-text-ui packaging