diff options
| author | Marcus Lundblad <malu@pidgin.im> | 2008-11-13 19:49:58 +0000 |
|---|---|---|
| committer | Marcus Lundblad <malu@pidgin.im> | 2008-11-13 19:49:58 +0000 |
| commit | 331e5abbc736dab7fd2bfdb0a562a8f2685d7f98 (patch) | |
| tree | 6ece3941d85aa4e2f102e2b408800b050ab44e8c /libpurple/connection.h | |
| parent | e11446a26441d4747ac12056c15917b639b28611 (diff) | |
| parent | 1b903fef80704da5122624023ffc5ec5c4b74514 (diff) | |
| download | pidgin-331e5abbc736dab7fd2bfdb0a562a8f2685d7f98.tar.gz | |
propagate from branch 'im.pidgin.pidgin' (head 21f65a6c30b67dd34167f59b104c39bf2ca4441e)
to branch 'im.pidgin.cpw.attention_ui' (head 51024e4724b6d3101e504f222b5d7685917bee1e)
Diffstat (limited to 'libpurple/connection.h')
| -rw-r--r-- | libpurple/connection.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpurple/connection.h b/libpurple/connection.h index 71e5bd58a6..3441179901 100644 --- a/libpurple/connection.h +++ b/libpurple/connection.h @@ -268,7 +268,7 @@ extern "C" { /**************************************************************************/ /*@{*/ -#ifndef PURPLE_DISABLE_DEPRECATED +#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_CONNECTION_C_) /** * This function should only be called by purple_account_connect() * in account.c. If you're trying to sign on an account, use that @@ -292,7 +292,7 @@ void purple_connection_new(PurpleAccount *account, gboolean regist, const char *password); #endif -#ifndef PURPLE_DISABLE_DEPRECATED +#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_CONNECTION_C_) /** * This function should only be called by purple_account_unregister() * in account.c. @@ -310,7 +310,7 @@ void purple_connection_new(PurpleAccount *account, gboolean regist, void purple_connection_new_unregister(PurpleAccount *account, const char *password, PurpleAccountUnregistrationCb cb, void *user_data); #endif -#ifndef PURPLE_DISABLE_DEPRECATED +#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_CONNECTION_C_) /** * Disconnects and destroys a PurpleConnection. * |