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

List:       kde-commits
Subject:    groupwise_in_anger: kdenetwork/kopete/protocols/groupwise
From:       Will Stephenson <lists () stevello ! free-online ! co ! uk>
Date:       2004-09-08 15:03:44
Message-ID: 20040908150344.B23E11CC2 () office ! kde ! org
[Download RAW message or body]

CVS commit by wstephens: 

Various safety checks and an error message if the server or port are wrong.


  M +24 -12    gwaccount.cpp   1.1.1.1.2.47


--- kdenetwork/kopete/protocols/groupwise/gwaccount.cpp  #1.1.1.1.2.46:1.1.1.1.2.47
@@ -423,8 +423,14 @@ void GroupWiseAccount::slotKopeteGroupRe
         if ( isConnected() )
         {
+                QString objectIdString = renamedGroup->pluginData( protocol(), \
accountId() + " objectId" ); +                // if this group exists on the server
+                if ( !objectIdString.isEmpty() )
+                {
                 kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl;
                 
                 GroupWise::FolderItem fi;
-                fi.id = renamedGroup->pluginData( protocol(), accountId() + " \
objectId" ).toInt(); +                        fi.id = objectIdString.toInt();
+                        if ( fi.id != 0 )
+                        {
                 fi.sequence = renamedGroup->pluginData( protocol(), accountId() + " \
                sequence" ).toInt();
                 fi.name = renamedGroup->pluginData( protocol(), accountId() + " \
serverDisplayName" ); @@ -437,4 +443,6 @@ void GroupWiseAccount::slotKopeteGroupRe
                 renamedGroup->displayName() );
         }
+                }
+        }
         //else
         // errornotconnected
@@ -471,4 +479,8 @@ void GroupWiseAccount::slotConnError()
 {
         kdDebug ( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl;
+        KMessageBox::queuedMessageBox( Kopete::UI::Global::mainWidget(), \
KMessageBox::Sorry, +                                i18n( "Error shown when \
connecting failed", "Kopete was not able to connect to the GroupWise Messenger server \
for account '%1'.\nPlease check your server and port settings and try again." ).arg( \
accountId() ) , i18n ("Unable to connect '%1'").arg( accountId() ) ); +        
+        disconnect ( KopeteAccount::Manual );
 }
 


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