[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=c36e1b8

The following commit has been merged in the master branch:
commit c36e1b82e00e76a7f259174f991dda1170408c0f
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Mar 12 12:53:19 2012 +0000

    Fix a bug that stops messages not appearing in group chats if the logger is enabled.
    
    The bug was that code would wait for the logger to finish, but the logger wasn't doing anything.
---
 lib/logmanager.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/logmanager.cpp b/lib/logmanager.cpp
index e0a92aa..8075664 100644
--- a/lib/logmanager.cpp
+++ b/lib/logmanager.cpp
@@ -102,12 +102,10 @@ void LogManager::fetchLast()
         connect(dates, SIGNAL(finished(Tpl::PendingOperation*)), SLOT(onDatesFinished(Tpl::PendingOperation*)));
         return;
     }
+#endif
     //in all other cases finish immediately.
-#else
     QList<AdiumThemeContentInfo> messages;
     Q_EMIT fetched(messages);
-#endif
-
 }
 
 #ifdef TELEPATHY_LOGGER_QT4_FOUND

-- 
ktp-text-ui packaging