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

List:       kde-commits
Subject:    kdenonbeta/kopete/protocols/jabber
From:       Till Gerken <till () tantalo ! net>
Date:       2003-07-28 19:09:30
[Download RAW message or body]

CVS commit by gerken: 

Fix bounce bug in case of error. Needs dialog after 0.7.


  M +1 -1      TODO   1.67
  M +8 -0      jabbercontact.cpp   1.149


--- kdenonbeta/kopete/protocols/jabber/TODO  #1.66:1.67
@@ -23,5 +23,5 @@
 - vCard doesn't save address and gender (is gender supported?)
 - remove ugly cyclic includes/forward declarations in jabberawaydialog.h and \
                jabberaccount.h
-- received message 404 type error to a non-existing contact bounces the message
+- display error messages in JabberContact::slotReceivedMessage()
 - make awaydialog autodelete itself
 - remove KOS from all classes, make them contact specific for Greg's enhancements,

--- kdenonbeta/kopete/protocols/jabber/jabbercontact.cpp  #1.148:1.149
@@ -406,4 +406,12 @@ void JabberContact::slotReceivedMessage 
         kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Received Message Type:" << \
message.type () << endl;  
+        // check for errors first
+        if (message.type () == "error")
+        {
+                // FIXME: unable to add i18n string here before release,
+                // add warning dialog after 0.7
+                return;
+        }
+
         // determine message type
         if (message.type () == "chat")


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