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

List:       kde-commits
Subject:    branches/work/kopete/dev-0.12/kopete/protocols/msn
From:       Johann Ollivier Lapeyre <johann.ollivierlapeyre () gmail ! com>
Date:       2006-01-29 16:27:30
Message-ID: 1138552050.859454.22450.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 503579 by johann_ol:

- fixing missing Kaction in msncontact.cpp and msncontact.h
- Add webcam icon for MSN in toolbar and menu


 M  +3 -0      msnchatsession.cpp  
 M  +9 -0      msncontact.cpp  
 M  +2 -0      msncontact.h  


--- branches/work/kopete/dev-0.12/kopete/protocols/msn/msnchatsession.cpp \
#503578:503579 @@ -86,8 +86,11 @@
 	m_actionNudge=new KAction( i18n( "Send Nudge" ), "bell", 0, this, \
SLOT(slotSendNudge() ), actionCollection(), "msnSendNudge" ) ;  \
m_actionNudge->setEnabled(true);  #if MSN_WEBCAM
+	// Invite to receive webcam action
 	m_actionWebcamReceive=new KAction( i18n( "View Contact's Webcam" ), \
"webcamreceive",  0, this, SLOT(slotWebcamReceive() ), actionCollection(), \
"msnWebcamReceive" ) ;  m_actionWebcamReceive->setEnabled(true);
+	
+	//Send webcam action
 	m_actionWebcamSend=new KAction( i18n( "Send Webcam" ), "webcamsend",  0, this, \
SLOT(slotWebcamSend() ), actionCollection(), "msnWebcamSend" ) ;  \
m_actionWebcamSend->setEnabled(true);  
--- branches/work/kopete/dev-0.12/kopete/protocols/msn/msncontact.cpp #503578:503579
@@ -142,6 +142,12 @@
 		// Send mail (only available if it is an hotmail account)
 		actionSendMail = new KAction( i18n("Send Email...") , "mail_generic",0, this, \
SLOT( slotSendMail() ),  this, "actionSendMail" );
+
+		// Invite to receive webcam
+		actionWebcamReceive = new KAction( i18n( "View Contact's Webcam" ), \
"webcamreceive",  0, this, SLOT(slotWebcamReceive() ), this, "msnWebcamReceive" ) ; +
+		//Send webcam action
+		actionWebcamSend = new KAction( i18n( "Send Webcam" ), "webcamsend",  0, this, \
SLOT(slotWebcamSend() ), this, "msnWebcamSend" ) ;  }
 	else
 		actionBlock->setText( label );
@@ -151,7 +157,10 @@
 	m_actionCollection->append( actionBlock );
 	m_actionCollection->append( actionShowProfile );
 	m_actionCollection->append( actionSendMail );
+	m_actionCollection->append( actionWebcamReceive );
+	m_actionCollection->append( actionWebcamSend );
 
+
 	return m_actionCollection;
 }
 
--- branches/work/kopete/dev-0.12/kopete/protocols/msn/msncontact.h #503578:503579
@@ -178,6 +178,8 @@
 	KAction *actionBlock;
 	KAction *actionShowProfile;
 	KAction *actionSendMail;
+	KAction *actionWebcamReceive;
+	KAction *actionWebcamSend;
 
 	QString m_obj; //the MSNObject
 


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