Changeset 4346c3f4 for protocols/oscar

Timestamp:

2010-07-16T23:31:55Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e437366

Parents:

3709301 (diff), ef14a83 (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:

Merging mainline.

File:

• protocols/oscar/oscar.c (modified) (1 diff)

protocols/oscar/oscar.c

@@ -2531 +2531 @@
         struct groupchat *c;
         
-        chatname = g_strdup_printf("%s%s_%d", isdigit(*ic->acc->user) ? "icq_" : "",
+        chatname = g_strdup_printf("%s%s%d", isdigit(*ic->acc->user) ? "icq" : "",
                                    ic->acc->user, chat_id++);