diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-17 13:56:52 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-17 13:56:52 +0000 |
| commit | 75554d0a484d21f95fcf24394f89c541a650acaf (patch) | |
| tree | 51d9dc322baeb2e542fc13d9ba69e74f70a87636 /protocols/msn/msn.h | |
| parent | e5e795dae28c7871a47040436454a456fb338820 (diff) | |
| parent | f9928cb319c2879a56b7280f09723b26035982d0 (diff) | |
Merging in 1.2.5.
Diffstat (limited to 'protocols/msn/msn.h')
| -rw-r--r-- | protocols/msn/msn.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/protocols/msn/msn.h b/protocols/msn/msn.h index 7c849acf..84914bc3 100644 --- a/protocols/msn/msn.h +++ b/protocols/msn/msn.h @@ -96,7 +96,6 @@ struct msn_switchboard struct msn_away_state { - int number; char code[4]; char name[16]; }; @@ -135,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[]; @@ -144,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 ); |