Mercurial > pidgin.yaz
comparison pidgin/gtkroomlist.c @ 32827:4a34689eeb33 default tip
merged from im.pidgin.pidgin
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Sat, 19 Nov 2011 14:42:54 +0900 |
parents | 2ec94166be43 |
children |
comparison
equal
deleted
inserted
replaced
32692:0f94ec89f0bc | 32827:4a34689eeb33 |
---|---|
231 PurpleAccount *account = purple_roomlist_get_account(info->list); | 231 PurpleAccount *account = purple_roomlist_get_account(info->list); |
232 PurpleConnection *gc = purple_account_get_connection(account); | 232 PurpleConnection *gc = purple_account_get_connection(account); |
233 PurplePluginProtocolInfo *prpl_info = NULL; | 233 PurplePluginProtocolInfo *prpl_info = NULL; |
234 | 234 |
235 if(gc != NULL) | 235 if(gc != NULL) |
236 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); | 236 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc)); |
237 | 237 |
238 if(prpl_info != NULL && prpl_info->roomlist_room_serialize) | 238 if(prpl_info != NULL && prpl_info->roomlist_room_serialize) |
239 name = prpl_info->roomlist_room_serialize(info->room); | 239 name = prpl_info->roomlist_room_serialize(info->room); |
240 else | 240 else |
241 name = g_strdup(purple_roomlist_room_get_name(info->room)); | 241 name = g_strdup(purple_roomlist_room_get_name(info->room)); |
500 { | 500 { |
501 PurpleConnection *conn = purple_account_get_connection(account); | 501 PurpleConnection *conn = purple_account_get_connection(account); |
502 PurplePluginProtocolInfo *prpl_info = NULL; | 502 PurplePluginProtocolInfo *prpl_info = NULL; |
503 | 503 |
504 if (conn && PURPLE_CONNECTION_IS_CONNECTED(conn)) | 504 if (conn && PURPLE_CONNECTION_IS_CONNECTED(conn)) |
505 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(conn->prpl); | 505 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(conn)); |
506 | 506 |
507 return (prpl_info && prpl_info->roomlist_get_list != NULL); | 507 return (prpl_info && prpl_info->roomlist_get_list != NULL); |
508 } | 508 } |
509 | 509 |
510 gboolean | 510 gboolean |