Changeset 728a981 for protocols/oscar/oscar.c

Timestamp:

2006-03-24T15:16:38Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

f32d557

Parents:

96ace1b (diff), 9b8a38b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

[merge] Wilmer

File:

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

protocols/oscar/oscar.c

@@ -356 +356 @@
         if (isdigit(*user->username)) {
                 odata->icq = TRUE;
-                /* this is odd but it's necessary for a proper do_import and do_export */
+                /* This is odd but it's necessary for a proper do_import and do_export.
+                   We don't do those anymore, but let's stick with it, just in case
+                   it accidentally fixes something else too... */
                 gc->password[8] = 0;
         } else {
@@ -1148 +1150 @@
                 reason = msg + 6;
         
-        dialog_msg = g_strdup_printf("The user %u wants to add you to their buddy list for the following reason:\n\n%s", uin, reason ? reason : "No reason given.");
+        dialog_msg = g_strdup_printf("The user %u wants to add you to their buddy list for the following reason: %s", uin, reason ? reason : "No reason given.");
         data->gc = gc;
         data->uin = uin;
@@ -1737 +1739 @@
         odata->rights.maxdenies = (guint)maxdenies;
 
-//      serv_finish_login(gc);
-
-        if (bud_list_cache_exists(gc))
-                do_import(gc, NULL);
-
         aim_clientready(sess, fr->conn);
 
@@ -2096 +2093 @@
         } /* End of for loop */
 
-        if (tmp)
-                do_export(gc);
         aim_ssi_enable(sess, fr->conn);