Changes in protocols/oscar/oscar.c [11e090b:b8ef1b1]

File:

• protocols/oscar/oscar.c (modified) (4 diffs)

protocols/oscar/oscar.c

@@ -1088 +1088 @@
                 int *exch = g_new0(int, 1);
                 GList *m = NULL;
-                char txt[1024];
-                struct aim_chat_invitation * inv = g_new0(struct aim_chat_invitation, 1);
-
                 m = g_list_append(m, g_strdup(name ? name : args->info.chat.roominfo.name));
                 *exch = args->info.chat.roominfo.exchange;
                 m = g_list_append(m, exch);
 
+                char txt[1024];
+
                 g_snprintf( txt, 1024, "Got an invitation to chatroom %s from %s: %s", name, userinfo->sn, args->msg );
+
+                struct aim_chat_invitation * inv = g_new0(struct aim_chat_invitation, 1);
 
                 inv->gc = gc;
@@ -2450 +2451 @@
         type2 = va_arg(ap, int);
         va_end(ap);
-    
-        if(type2 == 0x0002) {
-                /* User is typing */
-                serv_got_typing(gc, sn, 0, 1);
-        } 
-        else if (type2 == 0x0001) {
-                /* User has typed something, but is not actively typing (stale) */
-                serv_got_typing(gc, sn, 0, 2);
-        }
-        else {
-                /* User has stopped typing */
-                serv_got_typing(gc, sn, 0, 0);
-        }        
-        
+
+        if(type2 == 0x0001 || type2 == 0x0002)
+                serv_got_typing(gc, sn, 0);
+
         return 1;
 }
@@ -2505 +2496 @@
         struct oscar_data * od = (struct oscar_data*)gc->proto_data;
         struct chat_connection * ccon;
+        
+        if(!(ccon = find_oscar_chat(gc, id)))
+                return -1;
+        
         int ret;
         guint8 len = strlen(message);
         char *s;
-        
-        if(!(ccon = find_oscar_chat(gc, id)))
-                return -1;
                 
         for (s = message; *s; s++)
@@ -2605 +2597 @@
 {
         struct oscar_data * od = (struct oscar_data *)gc->proto_data;
-        int ret;
+
         static int chat_id = 0;
         char * chatname = g_new0(char, strlen(gc->username)+4);
-        
         g_snprintf(chatname, strlen(gc->username) + 4, "%s%d", gc->username, chat_id++);
   
-        ret = oscar_chat_join(gc, chatname);
+        int ret = oscar_chat_join(gc, chatname);
 
         aim_chat_invite(od->sess, od->conn, who, "", 4, chatname, 0x0);