[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete
From:       Lamarque Souza <lamarque () gmail ! com>
Date:       2011-03-20 20:29:14
Message-ID: 20110320202915.0A07AAC8C9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1225418 by lvsouza:

Changing "Ignore" to "Close" to prevent missinterpretation.

BUG: 217243
FIXED-IN 4.7.0


 M  +1 -1      libkopete/private/kopeteviewmanager.cpp  
 M  +1 -1      plugins/otr/authenticationwizard.cpp  
 M  +2 -2      protocols/wlm/wlmaccount.cpp  
 M  +3 -3      protocols/yahoo/yahooaccount.cpp  


--- trunk/KDE/kdenetwork/kopete/libkopete/private/kopeteviewmanager.cpp \
#1225417:1225418 @@ -407,7 +407,7 @@
 	                                                               : \
KNotification::Persistent);  notify->setPixmap( QPixmap::fromImage( \
msg.from()->metaContact()->picture().image() ) );  notify->setActions( QStringList() \
                << i18nc( "@action", "View" )
-	                                  << i18nc( "@action", "Ignore" ) );
+	                                  << i18nc( "@action", "Close" ) );
 
 	if ( d->balloonGroupMessageNotificationsPerSender )
 	{
--- trunk/KDE/kdenetwork/kopete/plugins/otr/authenticationwizard.cpp #1225417:1225418
@@ -75,7 +75,7 @@
 		notification->setText( i18n( "Incoming authentication request from %1", \
OtrlChatInterface::self()->formatContact( session->members().first()->contactId() ) ) \
);  notification->setPixmap( SmallIcon( "kopete" ) );
 		notification->setWidget( this );
-		notification->setActions( QStringList() << i18n( "View" ) << i18n( "Ignore" ) );
+		notification->setActions( QStringList() << i18n( "View" ) << i18n( "Close" ) );
 		connect( notification, SIGNAL( activated( unsigned int ) ), SLOT( \
notificationActivated( unsigned int ) ) );  notification->sendEvent();
 	}
--- trunk/KDE/kdenetwork/kopete/protocols/wlm/wlmaccount.cpp #1225417:1225418
@@ -1156,7 +1156,7 @@
 
     notification->setText(i18np( "You have one unread message in your Hotmail \
                inbox.",
                                  "You have %1 unread messages in your Hotmail \
                inbox.", unread_inbox));
-    notification->setActions(( QStringList() << i18nc("@action", "Open Inbox" ) << \
i18nc("@action", "Ignore" )) ); +    notification->setActions(( QStringList() << \
i18nc("@action", "Open Inbox" ) << i18nc("@action", "Close" )) );  \
                notification->setFlags(KNotification::Persistent);
     QObject::connect(notification,SIGNAL(activated()), this , SLOT(slotOpenInbox()) \
                );
     QObject::connect(notification,SIGNAL(action1Activated()), this, \
SLOT(slotOpenInbox()) ); @@ -1171,7 +1171,7 @@
     KNotification *notification= new KNotification ("msn_mail");
 
     notification->setText(i18n( "New message from %1 in your Hotmail \
                inbox.<p>Subject: %2", from, subject));
-    notification->setActions(( QStringList() << i18nc("@action", "Open Inbox" ) << \
i18nc("@action", "Ignore" )) ); +    notification->setActions(( QStringList() << \
i18nc("@action", "Open Inbox" ) << i18nc("@action", "Close" )) );  \
                notification->setFlags(KNotification::Persistent);
     QObject::connect(notification,SIGNAL(activated()), this , SLOT(slotOpenInbox()) \
                );
     QObject::connect(notification,SIGNAL(action1Activated()), this, \
                SLOT(slotOpenInbox()) );
--- trunk/KDE/kdenetwork/kopete/protocols/yahoo/yahooaccount.cpp #1225417:1225418
@@ -1167,7 +1167,7 @@
 	}
 	if( KMessageBox::Yes == KMessageBox::questionYesNo( \
Kopete::UI::Global::mainWidget(),  i18n("%1 has invited you to join a conference with \
                %2.\n\nHis/her message: %3\n\nAccept?",
-				who, m, msg), QString(), KGuiItem( i18nc("@action","Accept") ), KGuiItem( \
i18nc("@action","Ignore") ) ) ) +				who, m, msg), QString(), KGuiItem( \
i18nc("@action","Accept") ), KGuiItem( i18nc("@action","Close") ) ) )  {
 		m_session->joinConference( room, myMembers );
 		if( !m_conferences[room] )
@@ -1610,7 +1610,7 @@
 	m_pendingWebcamInvites.append( who );
 
 	if( KMessageBox::Yes == KMessageBox::questionYesNo( \
Kopete::UI::Global::mainWidget(), i18n("%1 has invited you to view his/her webcam. \
                Accept?", who),
-                            QString(), KGuiItem( i18nc("@action","Accept") ), \
KGuiItem( i18nc("@action","Ignore") ) ) ) +                            QString(), \
KGuiItem( i18nc("@action","Accept") ), KGuiItem( i18nc("@action","Close") ) ) )  {
 		m_pendingWebcamInvites.removeAll( who );
 		m_session->requestWebcam( who );
@@ -1821,7 +1821,7 @@
 void YahooAccount::slotWebcamViewerRequest( const QString &viewer )
 {
 	if( KMessageBox::Yes == KMessageBox::questionYesNo( \
                Kopete::UI::Global::mainWidget(), i18n("%1 wants to view your webcam. \
                Grant access?",
-		viewer), QString(), KGuiItem( i18nc("@action","Accept") ), KGuiItem( \
i18nc("@action","Ignore") ) ) ) +		viewer), QString(), KGuiItem( \
i18nc("@action","Accept") ), KGuiItem( i18nc("@action","Close") ) ) )  \
m_session->grantWebcamAccess( viewer );  }
 


[prev in list] [next in list] [prev in thread] [next in thread]