Changes in / [bf02a67:547f937]

Files:

• protocols/oscar/oscar.c (modified) (3 diffs)
• storage_text.c (modified) (1 diff)

protocols/oscar/oscar.c

@@ -1086 +1086 @@
                 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;
@@ -2503 +2504 @@
         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++)
@@ -2603 +2605 @@
 {
         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);

storage_text.c

@@ -30 +30 @@
 /* DO NOT USE THIS FUNCTION IN NEW CODE. This 
  * function is here merely because the save/load code still uses 
- * ids rather than names */
+ * ids rather then names */
 static struct prpl *find_protocol_by_id(int id)
 {