Changeset 133

Timestamp:

26/10/08 19:19:54 (3 months ago)

Author:

smoku

Message:

Minor fixes in session handling

Location:

jggtrans/src

Files:

• sessions.c (modified) (4 diffs)
• users.c (modified) (5 diffs)

jggtrans/src/sessions.c

@@ -295 +295 @@
 }
 
+void session_broken(Session *s){
+
+        if (s->req_id){
+                jabber_iq_send_error(s->s,s->jid,NULL,s->req_id,502,_("Remote Server Error"));
+        }
+        else{
+                GList *it;
+                presence_send(s->s,NULL,s->user->jid,0,NULL,"Connection broken",0);
+                for(it=s->user->contacts;it;it=it->next){
+                        Contact *c=(Contact *)it->data;
+
+                        if (!GG_S_NA(c->status) && c->status!=-1){
+                                char *ujid;
+                                ujid=jid_build_full(c->uin);
+                                presence_send(s->s,ujid,s->user->jid,0,NULL,"Transport disconnected",0);
+                                g_free(ujid);
+                        }
+                }
+        }
+        s->connected=0;
+        session_schedule_reconnect(s);
+        session_remove(s);
+}
+
 gboolean session_error(Session *s){
 GgServer *serv;
@@ -327 +351 @@
                         return FALSE;
 
-        s->timeout_func=0;
-        g_warning(N_("Session timeout for %s"),s->jid);
-
         session_broken(s);
         return FALSE;
@@ -342 +363 @@
         serv=(GgServer*)s->current_server->data;
         user_load_locale(s->user);
+
+        s->timeout_func=0;
+        g_warning(N_("Session timeout for %s"),s->jid);
 
         if(serv->port!=1){
@@ -354 +378 @@
         return session_error(s);
 }
-
-void session_broken(Session *s){
-
-        if (s->req_id){
-                jabber_iq_send_error(s->s,s->jid,NULL,s->req_id,502,_("Remote Server Error"));
-        }
-        else{
-                GList *it;
-                presence_send(s->s,NULL,s->user->jid,0,NULL,"Connection broken",0);
-                for(it=s->user->contacts;it;it=it->next){
-                        Contact *c=(Contact *)it->data;
-
-                        if (!GG_S_NA(c->status) && c->status!=-1){
-                                char *ujid;
-                                ujid=jid_build_full(c->uin);
-                                presence_send(s->s,ujid,s->user->jid,0,NULL,"Transport disconnected",0);
-                                g_free(ujid);
-                        }
-                }
-        }
-        s->connected=0;
-        session_schedule_reconnect(s);
-        session_remove(s);
-}
-
 
 gboolean session_ping(gpointer data){

jggtrans/src/users.c

@@ -214 +214 @@
 
                 userlist=xmlnode_insert_tag(xml,"userlist");
-                for(it=g_list_first(u->contacts);it;it=it->next){
+                for(it=g_list_first(u->contacts);it;it=g_list_next(it)){
                         c=(Contact *)it->data;
                         ctag=xmlnode_insert_tag(userlist,"contact");
@@ -536 +536 @@
 
         g_assert(u!=NULL);
-        for(it=g_list_first(u->contacts);it;it=it->next){
+        for(it=g_list_first(u->contacts);it;it=g_list_next(it)){
                 c=(Contact *)it->data;
                 if (c->uin==uin) return c;
@@ -640 +640 @@
                         u=user_get_by_jid(de->d_name);
                         if(u){
-                                if(u->subscribe==SUB_FROM || u->subscribe==SUB_BOTH)
+                                if(u->subscribe==SUB_FROM || u->subscribe==SUB_BOTH){
                                         presence_send_probe(s,NULL,de->d_name);
+                                }
                                 user_free(u);
                         }
@@ -647 +648 @@
         }
         closedir(dir);
-
-        g_message(L_("Done probing all registered users"));
 
         return 0;
@@ -723 +722 @@
         g_message(L_("%sConfirmed: %i"),space,u->confirmed);
         g_message(L_("%sContacts:"),space);
-        for(it=g_list_first(u->contacts);it;it=it->next){
+        for(it=g_list_first(u->contacts);it;it=g_list_next(it)){
                 c=(Contact *)it->data;
                 g_message(L_("%sContact: %p"),space1,c);