Changeset be999a5 for protocols/oscar

Timestamp:

2010-08-23T23:12:24Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ad2d8bc

Parents:

237eadd (diff), eb6df6a (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:

First step in this merge. Mostly a bzr merge and then a cleanup of conflicts
and parts I want to/have to redo (because of ui-fix).

File:

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

protocols/oscar/oscar.c

@@ -2604 +2604 @@
         struct prpl *ret = g_new0(struct prpl, 1);
         ret->name = "oscar";
+    ret->mms = 2343;       /* this guess taken from libotr UPGRADING file */
         ret->away_states = oscar_away_states;
         ret->init = oscar_init;