[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=76ef102

The following commit has been merged in the master branch:
commit 76ef102ab937fe2580dd774dcf88338ecb2ecd07
Merge: 4e9e3918f59762a4895cd10270906e03e74bfaae 3730b4eabd0018737fbd0ab87b44a1237179fcf9
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Sun Jan 27 18:47:33 2013 +0100

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	filters/formatting/ktptextui_message_filter_formatting.desktop
    	filters/images/ktptextui_message_filter_images.desktop
    	plasmoid/org.kde.ktp-chatplasmoid/metadata.desktop

 .../ktptextui_message_filter_formatting.desktop    | 10 +++++++---
 .../images/ktptextui_message_filter_images.desktop |  2 +-
 lib/logmanager.cpp                                 | 23 +++++++++++++++-------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --cc filters/formatting/ktptextui_message_filter_formatting.desktop
index 92aba49,66e8589..1f67140
--- a/filters/formatting/ktptextui_message_filter_formatting.desktop
+++ b/filters/formatting/ktptextui_message_filter_formatting.desktop
@@@ -1,11 -1,13 +1,11 @@@
  [Desktop Entry]
  Encoding=UTF-8
  Name=Google Talk Style Formatting
 -Name[bs]=Formatiranje stila za Google Talk
 -Name[ca]=Formatació seguint l'estil de Google Talk
  Name[cs]=Formátovat stylem Google Talk
- Name[da]=Google Talk-stilformatering
+ Name[da]=Google Talk-agtig formatering
  Name[de]=„Google Talk“-Stilformatierung
- Name[el]=Διαμόρφωση του στιλ στο Google Talk
- Name[es]=Formato de estilo de Google Talk
+ Name[el]=Στιλ διαμόρφωσης Google Talk
+ Name[es]=Formato de estilo Google Talk
  Name[et]=Google Talki stiilis vormindamine
  Name[fi]=Google Talkin tapainen muotoilu
  Name[gl]=Formato de estilo de Google Talk
@@@ -29,11 -30,13 +29,15 @@@ Name[x-test]=xxGoogle Talk Style Format
  Name[zh_CN]=Google Talk 样式的格式
  Name[zh_TW]=Google Talk 樣式的格式
  Comment=Use _, * and - to make text italic, bold or strikeout respectively
 -Comment[bs]=Koristite _, * i - da napravite tekst kurzivnim, podebljanim ili precrtanim
 -Comment[ca]=Usa _, * and - per convertir el text a itàlic, negreta o tatxat respectivament
  Comment[cs]=Použít _, * a - pro kurzívu, tučný a přeškrtnutý text
++<<<<<<< HEAD
 +Comment[da]=Brug _, * og - til at lave hhv. kursiv, fed eller overstreget
++=======
+ Comment[da]=Brug _, * og - til at gøre tekst hhv. kursiv, fed eller gennemstreget
++>>>>>>> kde-telepathy-0.5
  Comment[de]=Mit „_“, “*“ und „-“ wird Text geneigt, fett oder durchgestrichen dargestellt
  Comment[el]=Χρησιμοποιήστε _, * και - για πλάγιους, έντονους ή με επιγράμμιση χαρακτήρες αντίστοιχα
 -Comment[es]=Utilizar _, * y - para poner el texto en cursiva, negrita o tachado respectivamente
 +Comment[es]=Utilice _, * y - para poner el texto en cursiva, negrita o tachado respectivamente
  Comment[et]=_, * ja - kasutamine teksti muutmiseks kaldkirja, rasvaseks või läbikriipsutatuks
  Comment[gl]=Usar _,* e - para por o texto e cursiva, negra e tachado, respectivamente
  Comment[hu]=Az _, * és - használatával teheti a szöveget döntötté, félkövérré vagy áthúzottá
diff --cc lib/logmanager.cpp
index cc664bb,9ac5103..e4ae2b2
--- a/lib/logmanager.cpp
+++ b/lib/logmanager.cpp
@@@ -147,11 -160,11 +147,11 @@@ void LogManager::onEventsFinished(Tpl::
      QList<Tpl::EventPtr> allEvents = pe->events();
      QList<Tpl::TextEventPtr> events;
      QList<Tpl::EventPtr>::iterator i = allEvents.end();
 -    while (i-- != allEvents.begin() && (events.count() <= m_fetchAmount)) {
 +    while (i-- != allEvents.begin() && (events.count() < m_fetchAmount)) {
          Tpl::TextEventPtr textEvent = (*i).dynamicCast<Tpl::TextEvent>();
-         if(!textEvent.isNull()) {
-             if(!queuedMessageTokens.contains(textEvent->messageToken())) {
-                 events.prepend( textEvent );
+         if (!textEvent.isNull()) {
+             if (!queuedMessageTokens.contains(textEvent->messageToken())) {
+                 events.prepend(textEvent);
              }
          }
      }
@@@ -170,13 -183,23 +170,22 @@@
              type = AdiumThemeMessageInfo::HistoryRemoteToLocal;
              contact = m_textChannel->targetContact();
          }
+ 
+         /* When connection is dropped (account goes offline), we get an invalid
+          * contact, so we can't correctly create the message. There's no point
+          * emitting fetched() with only partial list of messages, so let's
+          * just terminate here. */
+         if (!contact) {
+             return;
+         }
+ 
          AdiumThemeContentInfo message(type);
  
 -        if (type == AdiumThemeMessageInfo::HistoryLocalToRemote) {
 -            message.setMessage(MessageProcessor::instance()->processOutgoingMessage(event).finalizedMessage());
 -        } else {
 -            message.setMessage(MessageProcessor::instance()->processIncomingMessage(event).finalizedMessage());
 -        }
 +        KTp::Message processedEvent(type == AdiumThemeMessageInfo::HistoryLocalToRemote ? KTp::MessageProcessor::instance()->processOutgoingMessage(event)
 +                                                                                        : KTp::MessageProcessor::instance()->processIncomingMessage(event));
  
 +        message.setMessage(processedEvent.finalizedMessage());
 +        message.setScript(processedEvent.finalizedScript());
          message.setService(m_account->serviceName());
          message.setSenderDisplayName(event->sender()->alias());
          message.setSenderScreenName(event->sender()->alias());

-- 
ktp-text-ui packaging