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

List:       kde-commits
Subject:    branches/work/kopete/dev-0.12/kopete/protocols/jabber
From:       Duncan Mac-Vicar Prett <duncan () kde ! org>
Date:       2006-01-29 20:48:40
Message-ID: 1138567720.529057.21726.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 503666 by dmacvicar:

dont tell the user 100 times we cannot bind the port. One time is enough

 M  +3 -2      jabberaccount.cpp  
 M  +3 -0      jabberaccount.h  


--- branches/work/kopete/dev-0.12/kopete/protocols/jabber/jabberaccount.cpp \
#503665:503666 @@ -103,7 +103,7 @@
 #endif
 	m_bookmarks = new JabberBookmarks(this);
 	m_removing=false;
-
+	m_notifiedUserCannotBindTransferPort = false;
 	// add our own contact to the pool
 	JabberContact *myContact = contactPool()->addContact ( XMPP::RosterItem ( accountId \
), Kopete::ContactList::self()->myself(), false );  setMyself( myContact );
@@ -159,11 +159,12 @@
 		return;
 	}
 
-	if ( !m_jabberClient->setS5BServerPort ( port ) )
+	if ( !m_jabberClient->setS5BServerPort ( port ) && \
!m_notifiedUserCannotBindTransferPort)  {
 		KMessageBox::queuedMessageBox ( Kopete::UI::Global::mainWidget (), \
KMessageBox::Sorry,  i18n ( "Could not bind Jabber file transfer manager to local \
port. Please check if the file transfer port is already in use or choose another port \
in the account settings." ),  i18n ( "Failed to start Jabber File Transfer Manager" ) \
); +		m_notifiedUserCannotBindTransferPort = true;
 	}
 
 }
--- branches/work/kopete/dev-0.12/kopete/protocols/jabber/jabberaccount.h \
#503665:503666 @@ -214,6 +214,9 @@
 	
 	/* used in removeAccount() */
 	bool m_removing;
+	/* keep track if we told the user we were not able to bind the
+	   jabber transfer port, to avoid popup insanity */
+	bool m_notifiedUserCannotBindTransferPort;
 private slots:
 	/* Connects to the server. */
 	void slotConnect ();


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