[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-19 17:10:34
[Download RAW message or body]

CVS commit by gerken: 

Make connect animation start at the right point (still not working though)


  M +5 -5      jabberaccount.cpp   1.58
  M +2 -2      jabberaccount.h   1.27


--- kdenonbeta/kopete/protocols/jabber/jabberaccount.cpp  #1.57:1.58
@@ -290,4 +290,6 @@ void JabberAccount::connect ()
         kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Connecting to Jabber server \
" << server() << ":" << port() << " with jidDomain " << jidDomain << endl;  
+        setPresence(protocol()->JabberConnecting, "");
+
         jabberClient->connectToHost (server(), port(), jidDomain);
 
@@ -320,6 +322,4 @@ void JabberAccount::slotHandshaken ()
         }
 
-        setPresence(protocol()->JabberConnecting, "");
-
 }
 
@@ -501,5 +501,5 @@ void JabberAccount::setPresence (const K
                 // if we are already connected and changing our presence or if we \
                are connecting
                 // and set our initial presence, send new presence packet to the \
                server
-                if (isConnected () || (myContact->onlineStatus() == \
protocol()->JabberConnecting)) +                if (isConnected ())
                 {
                         kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Sending new \
presence to the server." << endl; @@ -511,5 +511,5 @@ void JabberAccount::setPresence \
(const K  presence.setIsAvailable (true);
 
-                        if ((status == protocol()->JabberOnline) || (status == \
protocol()->JabberConnecting)) +                        if (status == \
protocol()->JabberOnline)  presence.setShow ("");
                         else if (status == protocol()->JabberChatty)
@@ -529,5 +529,5 @@ void JabberAccount::setPresence (const K
                         }
 
-                        kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Updating \
presence to \"" << presence.status () << "\" with reason \"" << reason << endl; +     \
kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Updating presence to show(" << \
presence.show () << "), status(" << presence.status () << "), with reason \"" << \
reason << endl;  
                         myContact->slotUpdatePresence (status, reason);

--- kdenonbeta/kopete/protocols/jabber/jabberaccount.h  #1.26:1.27
@@ -72,6 +72,4 @@ public slots:
         void disconnect ();
 
-        void setPresence (const KopeteOnlineStatus & status, const QString & reason \
                = 0, int priority = 5);
-
         /* Sends a presence packet to a node. */
         void sendPresenceToNode (const KopeteOnlineStatus & status, const QString & \
reason); @@ -113,4 +111,6 @@ private:
         /* Psi backend for this account. */
         Jabber::Client *jabberClient;
+
+        void setPresence (const KopeteOnlineStatus & status, const QString & reason \
= 0, int priority = 5);  
         /* Asks the specified JID for authorization. */


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