Changeset 110

Timestamp:

21/10/08 14:02:45 (3 months ago)

Author:

smoku

Message:

Presence handling improvements.

Location:

jggtrans/src

Files:

• sessions.c (modified) (3 diffs)
• users.h (modified) (2 diffs)

jggtrans/src/sessions.c

@@ -1005 +1005 @@
 
         if (c->blocked) return GG_USER_BLOCKED;
-        if (c->got_online || c->subscribe==SUB_FROM || c->subscribe==SUB_BOTH) notify_type|=GG_USER_NORMAL;
-        if (c->got_probe || c->subscribe==SUB_TO || c->subscribe==SUB_BOTH) notify_type|=GG_USER_OFFLINE;
+        if (c->got_online || c->subscribe==SUB_FROM || c->subscribe==SUB_BOTH) return GG_USER_NORMAL;
+        if (c->got_probe || c->subscribe==SUB_TO || c->subscribe==SUB_BOTH) return GG_USER_OFFLINE;
 
         return notify_type;
@@ -1022 +1022 @@
         add=new_notify_type&(~c->gg_notify_type);
         
-        if (del) gg_remove_notify_ex(s->ggs,c->uin,del);
-        if (add) gg_add_notify_ex(s->ggs,c->uin,add);
+        if (del) gg_remove_notify_ex(s->ggs,c->uin,new_notify_type);
+        if (add) gg_add_notify_ex(s->ggs,c->uin,new_notify_type);
 
         c->gg_notify_type=new_notify_type;
@@ -1045 +1045 @@
         for(it=g_list_first(s->user->contacts);it;it=it->next){
                 Contact *c=(Contact *)it->data;
-                userlist[i]=c->uin;
                 c->gg_notify_type=compute_notify_type(c);
-                types[i]=c->gg_notify_type;
-                i++;    
+                if(c->gg_notify_type){
+                        userlist[i]=c->uin;
+                        types[i]=c->gg_notify_type;
+                        i++;
+                }
         }
 

jggtrans/src/users.h

@@ -37 +37 @@
         gboolean ignored;
         gboolean blocked;
-        SubscriptionType subscribe;
+        SubscriptionType subscribe;     /* copy of item s10n state from user roster */
 
-        gboolean got_online;
-        gboolean got_probe;
+        gboolean got_online;            /* user sent direct available presence to this user */
+        gboolean got_probe;                     /* user server sent presence probe to this user */
 
         int gg_notify_type;
@@ -62 +62 @@
         char *locale;
         char * status;
-        SubscriptionType subscribe;
+        SubscriptionType subscribe;     /* copy of transport item s10n state from user roster */
 
         int confirmed;