diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-17 15:15:19 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-17 15:15:19 +0000 |
| commit | e8c8d00ea43c204ee276bde7fb663a0f0249790f (patch) | |
| tree | a98fdef3c5885eb2eac2ba047e244b3fd3c0f800 /protocols/msn/msn.h | |
| parent | 1c3008ac0b2b29f7e14ec9b874af3277c511c7a4 (diff) | |
| parent | f9928cb319c2879a56b7280f09723b26035982d0 (diff) | |
Merging mainline.
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 e2badbf9..50f273ad 100644 --- a/protocols/msn/msn.h +++ b/protocols/msn/msn.h @@ -97,7 +97,6 @@ struct msn_switchboard struct msn_away_state { - int number; char code[4]; char name[16]; }; @@ -136,7 +135,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[]; @@ -145,8 +144,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 ); |