From: <the...@us...> - 2006-11-16 22:47:59
|
Revision: 17760 http://svn.sourceforge.net/gaim/?rev=17760&view=rev Author: thekingant Date: 2006-11-16 14:47:45 -0800 (Thu, 16 Nov 2006) Log Message: ----------- Get rid of serv_set_buddyicon(). Moved the code directly into gaim_account_set_buddy_icon(). Modified Paths: -------------- trunk/libgaim/account.c trunk/libgaim/plugins/perl/common/Server.xs trunk/libgaim/server.c trunk/libgaim/server.h Modified: trunk/libgaim/account.c =================================================================== --- trunk/libgaim/account.c 2006-11-16 20:07:19 UTC (rev 17759) +++ trunk/libgaim/account.c 2006-11-16 22:47:45 UTC (rev 17760) @@ -1270,9 +1270,18 @@ account->buddy_icon = g_strdup(icon); if (gaim_account_is_connected(account)) { - char *filename = gaim_buddy_icons_get_full_path(icon); - serv_set_buddyicon(gaim_account_get_connection(account), filename); - g_free(filename); + GaimConnection *gc; + GaimPluginProtocolInfo *prpl_info; + + gc = gaim_account_get_connection(account); + prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); + + if (prpl_info && prpl_info->set_buddy_icon) + { + char *filename = gaim_buddy_icons_get_full_path(icon); + prpl_info->set_buddy_icon(gc, filename); + g_free(filename); + } } schedule_accounts_save(); Modified: trunk/libgaim/plugins/perl/common/Server.xs =================================================================== --- trunk/libgaim/plugins/perl/common/Server.xs 2006-11-16 20:07:19 UTC (rev 17759) +++ trunk/libgaim/plugins/perl/common/Server.xs 2006-11-16 22:47:45 UTC (rev 17760) @@ -206,11 +206,6 @@ Gaim::TypingState state void -serv_set_buddyicon(gc, filename) - Gaim::Connection gc - const char *filename - -void serv_set_info(con, a) Gaim::Connection con const char * a Modified: trunk/libgaim/server.c =================================================================== --- trunk/libgaim/server.c 2006-11-16 20:07:19 UTC (rev 17759) +++ trunk/libgaim/server.c 2006-11-16 22:47:45 UTC (rev 17760) @@ -414,18 +414,6 @@ return val; } -void serv_set_buddyicon(GaimConnection *gc, const char *filename) -{ - GaimPluginProtocolInfo *prpl_info = NULL; - - if (gc->prpl != NULL) - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); - - if (prpl_info && prpl_info->set_buddy_icon) - prpl_info->set_buddy_icon(gc, filename); - -} - /* * woo. i'm actually going to comment this function. isn't that fun. make * sure to follow along, kids Modified: trunk/libgaim/server.h =================================================================== --- trunk/libgaim/server.h 2006-11-16 20:07:19 UTC (rev 17759) +++ trunk/libgaim/server.h 2006-11-16 22:47:45 UTC (rev 17760) @@ -91,7 +91,6 @@ void serv_got_im(GaimConnection *gc, const char *who, const char *msg, GaimMessageFlags flags, time_t mtime); -void serv_set_buddyicon(GaimConnection *gc, const char *filename); void serv_got_chat_invite(GaimConnection *gc, const char *name, const char *who, const char *message, GHashTable *data); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |