← Back to branch summary

~ubuntu-branches/ubuntu/edgy/kopete/edgy-updates

« back to all changes in this revision

Viewing changes to kopete/kopete/chatwindow/kopetechatwindow.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Sarah Hobbs
  • Date: 2006-07-14 23:45:58 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20060714234558-gq6jzmy117r2pj4r
Tags: 4:3.5.4+kopete0.12.1-0ubuntu1
* New upstream version
* Reverted patch 01_kopete_kdesktop_freeze.diff (fixed upstream)
* Reverted patch 02_icq_version_too_old.diff (fixed upstream)
* Bumped Version so that this gets installed, instead of the kopete in kdenetwork

Show diffs side-by-side

added added

removed removed

Lines of Context:
kopete/kopete/chatwindow/kopetechatwindow.cpp
1
1
/*
2
2
    kopetechatwindow.cpp - Chat Window
3
3
 
4
 
    Copyright (c) 2002-2005 by Olivier Goffart       <ogoffart@ kde.org>
 
4
    Copyright (c) 2002-2006 by Olivier Goffart       <ogoffart@ kde.org>
5
5
    Copyright (c) 2003-2004 by Richard Smith         <kde@metafoo.co.uk>
6
6
    Copyright (C) 2002      by James Grant
7
7
    Copyright (c) 2002      by Stefan Gehn           <metz AT gehn.net>
311
311
 
312
312
        createStandardStatusBarAction();
313
313
 
314
 
        chatSend = new KAction( i18n( "&Send Message" ), QString::fromLatin1( "mail_send" ), 0,
 
314
        chatSend = new KAction( i18n( "&Send Message" ), QString::fromLatin1( "mail_send" ), QKeySequence(Key_Return) ,
315
315
                this, SLOT( slotSendMessage() ), coll, "chat_send" );
316
 
        //Default to 'Return' for sending messages
317
 
        chatSend->setShortcut( QKeySequence(Key_Return) );
318
316
        chatSend->setEnabled( false );
319
317
 
320
318
        KStdAction::save ( this, SLOT(slotChatSave()), coll );