diff options
author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-14 17:55:27 +0000 |
---|---|---|
committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-14 17:55:27 +0000 |
commit | fb009891bb60921401ffeb47b33cf35a246cbe34 (patch) | |
tree | 64802b4ef62334559815ca4a5b6d1e04fa6a49ae /protocols/msn/msn.h | |
parent | 8fb1263325c6839b792c352283abac3f63142fa2 (diff) | |
parent | c6ca3ee33e27feefb8cae0dc1d55a7239baf43cb (diff) |
Adding a few consts and other misc fixes from bug #431. Doing this via a
merge because bzr can probably deal with the conflicts better than patch.
Diffstat (limited to 'protocols/msn/msn.h')
-rw-r--r-- | protocols/msn/msn.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/protocols/msn/msn.h b/protocols/msn/msn.h index 333ae7f0..84914bc3 100644 --- a/protocols/msn/msn.h +++ b/protocols/msn/msn.h @@ -134,7 +134,7 @@ struct msn_handler_data #define STATUS_SB_IM_SPARE 4 /* Make one-to-one conversation switchboard available again, invite failed. */ #define STATUS_SB_CHAT_SPARE 8 /* Same, but also for groupchats (not used yet). */ -int msn_chat_id; +extern int msn_chat_id; extern const struct msn_away_state msn_away_state_list[]; extern const struct msn_status_code msn_status_code_list[]; @@ -143,8 +143,8 @@ extern const struct msn_status_code msn_status_code_list[]; is down already (for example, when an impatient user disabled the connection), the callback should check whether it's still listed here before doing *anything* else. */ -GSList *msn_connections; -GSList *msn_switchboards; +extern GSList *msn_connections; +extern GSList *msn_switchboards; /* ns.c */ gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond ); |