diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-08-24 00:12:24 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-08-24 00:12:24 +0100 |
| commit | be999a5385ff4e9ac7416de4cca3288f18cee85c (patch) | |
| tree | ddd6a6e256719c378e9748e0d96791e11844f659 /protocols/oscar | |
| parent | 237eadd361a7ed1d2a49180056d12b57f6f3cc0a (diff) | |
| parent | eb6df6a280c458546ebc57126e63a828674b4cd8 (diff) | |
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).
Diffstat (limited to 'protocols/oscar')
| -rw-r--r-- | protocols/oscar/oscar.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c index db6a28f4..aba08c1f 100644 --- a/protocols/oscar/oscar.c +++ b/protocols/oscar/oscar.c @@ -2603,6 +2603,7 @@ void oscar_initmodule() { 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; ret->login = oscar_login; |