← Back to branch summary

~ubuntu-branches/debian/experimental/kopete/experimental

« back to all changes in this revision

Viewing changes to plugins/history2/history2import.cpp

  • Committer: Package Import Robot
  • Author(s): Maximiliano Curia
  • Date: 2015-02-24 11:32:57 UTC
  • mfrom: (1.1.41 vivid)
  • Revision ID: package-import@ubuntu.com-20150224113257-gnupg4v7lzz18ij0
Tags: 4:14.12.2-1
* New upstream release (14.12.2).
* Bump Standards-Version to 3.9.6, no changes needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/history2/history2import.cpp
168
168
                amount++; // for QProgressDialog in save()
169
169
 
170
170
                strings[0] = log->other->protocol()->pluginId() + " (" + log->other->account()->accountId() + ')';
171
 
                strings[1] = log->other->nickName();
 
171
                strings[1] = log->other->displayName();
172
172
                strings[2] = message.timestamp.toString("yyyy-MM-dd");
173
173
 
174
174
                bool update = false;
222
222
                                continue;
223
223
                        cursor.insertHtml(message.timestamp.toString("hh:mm:ss "));
224
224
                        if (message.incoming)
225
 
                                cursor.insertHtml("<font color=\"blue\">" + log->other->nickName().append(": </font>"));
 
225
                                cursor.insertHtml("<font color=\"blue\">" + log->other->displayName().append(": </font>"));
226
226
                        else
227
 
                                cursor.insertHtml("<font color=\"green\">" + log->me->nickName().append(": </font>"));
 
227
                                cursor.insertHtml("<font color=\"green\">" + log->me->displayName().append(": </font>"));
228
228
                        cursor.insertHtml(message.text);
229
229
                        cursor.insertBlock();
230
230
                }
518
518
                        nick = line.mid(endTime+1, nickEnd - endTime - 2); // -2 to delete the colon
519
519
 
520
520
                        // detect if the message is in- or outbound
521
 
                        if (nick == log->me->nickName())
 
521
                        if (nick == log->me->displayName())
522
522
                                message.incoming = false;
523
 
                        else if (nick == log->other->nickName())
 
523
                        else if (nick == log->other->displayName())
524
524
                                message.incoming = true;
525
525
                        else if (knownNicks.contains(nick))
526
526
                                message.incoming = knownNicks.value(nick);