comparison libpurple/blist.c @ 24292: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 d81104908a4e
children 123c78e48663 da46097b4722
comparison
equal deleted inserted replaced
24291:f52b94f3b6ca 24292:8282911d5e17
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA 20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
21 * 21 *
22 */ 22 */
23 #define PURPLE_BLIST_STRUCTS 23 #define _PURPLE_BLIST_C_
24 24
25 #include "internal.h" 25 #include "internal.h"
26 #include "blist.h" 26 #include "blist.h"
27 #include "conversation.h" 27 #include "conversation.h"
28 #include "dbus-maybe.h" 28 #include "dbus-maybe.h"
445 445
446 purple_blist_add_contact(contact, group, 446 purple_blist_add_contact(contact, group,
447 purple_blist_get_last_child((PurpleBlistNode*)group)); 447 purple_blist_get_last_child((PurpleBlistNode*)group));
448 448
449 if ((alias = xmlnode_get_attrib(cnode, "alias"))) { 449 if ((alias = xmlnode_get_attrib(cnode, "alias"))) {
450 purple_contact_set_alias(contact, alias); 450 purple_blist_alias_contact(contact, alias);
451 } 451 }
452 452
453 for (x = cnode->child; x; x = x->next) { 453 for (x = cnode->child; x; x = x->next) {
454 if (x->type != XMLNODE_TYPE_TAG) 454 if (x->type != XMLNODE_TYPE_TAG)
455 continue; 455 continue;
834 834
835 if (ops && ops->update) 835 if (ops && ops->update)
836 ops->update(purplebuddylist, node); 836 ops->update(purplebuddylist, node);
837 } 837 }
838 838
839 #ifndef PURPLE_DISABLE_DEPRECATED
840 void 839 void
841 purple_blist_update_buddy_icon(PurpleBuddy *buddy) 840 purple_blist_update_buddy_icon(PurpleBuddy *buddy)
842 { 841 {
843 purple_blist_update_node_icon((PurpleBlistNode *)buddy); 842 purple_blist_update_node_icon((PurpleBlistNode *)buddy);
844 } 843 }
845 #endif
846 844
847 /* 845 /*
848 * TODO: Maybe remove the call to this from server.c and call it 846 * TODO: Maybe remove the call to this from server.c and call it
849 * from oscar.c and toc.c instead? 847 * from oscar.c and toc.c instead?
850 */ 848 */