← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/kdenetwork/oneiric-updates

« back to all changes in this revision

Viewing changes to kopete/protocols/wlm/wlmaccount.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac, Philip Muškovac
  • Date: 2011-07-10 12:36:35 UTC
  • mfrom: (1.1.59 upstream)
  • Revision ID: package-import@ubuntu.com-20110710123635-3db9oyxdswp4sp1e
Tags: 4:4.6.90-0ubuntu1
* New upstream release
 - Bump on kde-sc-dev-latest
 - s/kdebase-runtime-dev/kde-runtime-dev
* Dropped kubuntu_05_samba_sharing.diff <- went upstream
* Added kubuntu_05_make_old_symbols_reappear_and_fix_building.diff
* Refreshed *.install
* Refreshed symbols

[ Philip Muškovac ]
* fix debug package depends on kdebase-runtime-dbg -> kde-runtime-dbg 
  and recommends on kde-workspace-dbg

Show diffs side-by-side

added added

removed removed

Lines of Context:
kopete/protocols/wlm/wlmaccount.cpp
1156
1156
 
1157
1157
    notification->setText(i18np( "You have one unread message in your Hotmail inbox.",
1158
1158
                                 "You have %1 unread messages in your Hotmail inbox.", unread_inbox));
1159
 
    notification->setActions(( QStringList() << i18nc("@action", "Open Inbox" ) << i18nc("@action", "Ignore" )) );
 
1159
    notification->setActions(( QStringList() << i18nc("@action", "Open Inbox" ) << i18nc("@action", "Close" )) );
1160
1160
    notification->setFlags(KNotification::Persistent);
 
1161
    notification->setPixmap(accountIcon(KIconLoader::SizeMedium));
1161
1162
    QObject::connect(notification,SIGNAL(activated()), this , SLOT(slotOpenInbox()) );
1162
1163
    QObject::connect(notification,SIGNAL(action1Activated()), this, SLOT(slotOpenInbox()) );
1163
1164
    QObject::connect(notification,SIGNAL(action2Activated()), notification, SLOT(close()) );
1171
1172
    KNotification *notification= new KNotification ("msn_mail", Kopete::UI::Global::mainWidget());
1172
1173
 
1173
1174
    notification->setText(i18n( "New message from %1 in your Hotmail inbox.<p>Subject: %2", from, subject));
1174
 
    notification->setActions(( QStringList() << i18nc("@action", "Open Inbox" ) << i18nc("@action", "Ignore" )) );
 
1175
    notification->setActions(( QStringList() << i18nc("@action", "Open Inbox" ) << i18nc("@action", "Close" )) );
1175
1176
    notification->setFlags(KNotification::Persistent);
 
1177
    notification->setPixmap(accountIcon(KIconLoader::SizeMedium));
1176
1178
    QObject::connect(notification,SIGNAL(activated()), this , SLOT(slotOpenInbox()) );
1177
1179
    QObject::connect(notification,SIGNAL(action1Activated()), this, SLOT(slotOpenInbox()) );
1178
1180
    QObject::connect(notification,SIGNAL(action2Activated()), notification, SLOT(close()) );
1387
1389
        c->setOnlineStatus (WlmProtocol::protocol ()->wlmOffline);
1388
1390
    }
1389
1391
 
1390
 
    if (m_transferManager)
1391
 
    {
1392
 
        delete m_transferManager;
1393
 
        m_transferManager = NULL;
1394
 
    }
1395
 
    if (m_chatManager)
1396
 
    {
1397
 
        delete m_chatManager;
1398
 
        m_chatManager = NULL;
1399
 
    }
 
1392
    delete m_transferManager;
 
1393
    m_transferManager = NULL;
 
1394
    delete m_chatManager;
 
1395
    m_chatManager = NULL;
1400
1396
    if (m_server)
1401
1397
    {
1402
1398
        QObject::disconnect (&m_server->cb, 0, 0, 0);