Changeset 121

Timestamp:

23/10/08 11:06:09 (3 months ago)

Author:

smoku

Message:

Sending transport presence subscribed only on subscription state change

Files:

• jggtrans/src/presence.c (modified) (2 diffs)

jggtrans/src/presence.c

@@ -234 +234 @@
 
         u=user_get_by_jid(from);
+
         if (jid_is_me(to)){
+
                 debug(L_("Presence subscribe request sent to me"));
+
                 if (!u) {
                         presence_send_unsubscribed(stream,to,from);
                         return 0;
                 }
-                presence_send_subscribed(stream,to,from);
-                if (u->subscribe==SUB_UNDEFINED || u->subscribe==SUB_NONE) u->subscribe=SUB_TO;
-                else if (u->subscribe==SUB_FROM) u->subscribe=SUB_BOTH;
+
+                if (u->subscribe==SUB_UNDEFINED || u->subscribe==SUB_NONE){
+                        u->subscribe=SUB_TO;
+                        presence_send_subscribed(stream,to,from);
+                }
+                else if (u->subscribe==SUB_FROM){
+                        u->subscribe=SUB_BOTH;
+                        presence_send_subscribed(stream,to,from);
+                }
+
                 if (u->subscribe!=SUB_FROM && u->subscribe!=SUB_BOTH){
                         presence_send_subscribe(stream,to,from);
                 }
+
                 user_save(u);
+
                 s=session_get_by_jid(from,NULL,0);
                 if (s){
@@ -259 +271 @@
                         return 0;
                 }
+
                 return 0;
         }