Mercurial > pidgin
comparison libpurple/buddyicon.c @ 24350:8282911d5e17
Build everything with the *_DISABLE_DEPRECATED flags set. This allows us
to detect when we're still using deprecated functions internally (and by
extension, when we've deprecated something we shouldn't have). In the
course of developing this changeset, I fixed a few such cases.
Given that the plan is to switch from PURPLE_HIDE_STRUCTS to
PURPLE_DISABLE_DEPRECATED as each struct is fully dealt with, this will
also ensure we have no regressions on the struct hiding work.
Deprecated functions are still available to the respective .c file, to
avoid missing prototype errors. Also, Perl and DBus undef the
*_DISABLE_DEPRECATED defines as appropriate so that deprecated functions
will still be exported to Perl plugins and via DBus. (Otherwise, we'd
be breaking backwards compatibility.)
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Thu, 30 Oct 2008 22:40:49 +0000 |
parents | 2ecdd0403dc1 |
children | 9c0337d4b878 5ebfa814b9e8 |
comparison
equal
deleted
inserted
replaced
24349:f52b94f3b6ca | 24350:8282911d5e17 |
---|---|
21 * | 21 * |
22 * You should have received a copy of the GNU General Public License | 22 * You should have received a copy of the GNU General Public License |
23 * along with this program; if not, write to the Free Software | 23 * along with this program; if not, write to the Free Software |
24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA | 24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
25 */ | 25 */ |
26 #define _PURPLE_BUDDYICON_C_ | |
27 | |
26 #include "internal.h" | 28 #include "internal.h" |
27 #include "buddyicon.h" | 29 #include "buddyicon.h" |
28 #include "conversation.h" | 30 #include "conversation.h" |
29 #include "dbus-maybe.h" | 31 #include "dbus-maybe.h" |
30 #include "debug.h" | 32 #include "debug.h" |
952 } | 954 } |
953 | 955 |
954 return purple_buddy_icons_node_set_custom_icon(node, data, len); | 956 return purple_buddy_icons_node_set_custom_icon(node, data, len); |
955 } | 957 } |
956 | 958 |
957 #ifndef PURPLE_DISABLE_DEPRECATED | |
958 gboolean | 959 gboolean |
959 purple_buddy_icons_has_custom_icon(PurpleContact *contact) | 960 purple_buddy_icons_has_custom_icon(PurpleContact *contact) |
960 { | 961 { |
961 return purple_buddy_icons_node_has_custom_icon((PurpleBlistNode*)contact); | 962 return purple_buddy_icons_node_has_custom_icon((PurpleBlistNode*)contact); |
962 } | 963 } |
971 purple_buddy_icons_set_custom_icon(PurpleContact *contact, guchar *icon_data, | 972 purple_buddy_icons_set_custom_icon(PurpleContact *contact, guchar *icon_data, |
972 size_t icon_len) | 973 size_t icon_len) |
973 { | 974 { |
974 return purple_buddy_icons_node_set_custom_icon((PurpleBlistNode*)contact, icon_data, icon_len); | 975 return purple_buddy_icons_node_set_custom_icon((PurpleBlistNode*)contact, icon_data, icon_len); |
975 } | 976 } |
976 #endif | |
977 | 977 |
978 void | 978 void |
979 _purple_buddy_icon_set_old_icons_dir(const char *dirname) | 979 _purple_buddy_icon_set_old_icons_dir(const char *dirname) |
980 { | 980 { |
981 old_icons_dir = g_strdup(dirname); | 981 old_icons_dir = g_strdup(dirname); |