← Back to branch summary

~ubuntu-branches/ubuntu/utopic/psi/utopic

« back to all changes in this revision

Viewing changes to src/chatdlg.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jan Niehusmann
  • Date: 2009-09-25 17:49:51 UTC
  • mfrom: (6.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20090925174951-lvm7kdap82o8xhn3
Tags: 0.13-1
* Updated to upstream version 0.13
* Set Standards-Version to 3.8.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/chatdlg.cpp
130
130
        QTimer::singleShot(10, this, SLOT(initComposing()));
131
131
        connect(this, SIGNAL(composing(bool)), SLOT(updateIsComposing(bool)));
132
132
 
133
 
        setAcceptDrops(TRUE);
 
133
        setAcceptDrops(true);
134
134
        updateContact(jid(), true);
135
135
 
136
136
        X11WM_CLASS("chat");
271
271
        // Reset 'contact is composing' & cancel own composing event
272
272
        resetComposing();
273
273
        setChatState(StateGone);
274
 
        if (contactChatState_ == StateComposing || contactChatState_ == StateInactive) {
 
274
        if (contactChatState_ == XMPP::StateComposing || contactChatState_ == XMPP::StateInactive) {
275
275
                setContactChatState(StatePaused);
276
276
        }
277
277
 
642
642
        if (chatEdit()->text() == "/clear") {
643
643
                chatEdit()->clear();
644
644
                doClear();
 
645
                QString line1,line2;
 
646
                MiniCommand_Depreciation_Message("/clear", "clear", line1, line2);
 
647
                appendSysMsg(line1);
 
648
                appendSysMsg(line2);
645
649
                return;
646
650
        }
647
651
 
974
978
        if (!isActiveTab())
975
979
                return;
976
980
 
977
 
        chatEdit()->insert(text + " ");
 
981
        chatEdit()->insert(text + ' ');
978
982
}
979
983
 
980
984
/**