Mercurial > pidgin.yaz
comparison pidgin/gtkutils.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 | 0f94ec89f0bc b6276b10cb10 |
| children |
comparison
equal
deleted
inserted
replaced
| 32692:0f94ec89f0bc | 32827:4a34689eeb33 |
|---|---|
| 1067 if (chat < 0) { | 1067 if (chat < 0) { |
| 1068 pidgin_retrieve_user_info(conn, name); | 1068 pidgin_retrieve_user_info(conn, name); |
| 1069 return; | 1069 return; |
| 1070 } | 1070 } |
| 1071 | 1071 |
| 1072 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(conn->prpl); | 1072 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(conn)); |
| 1073 if (prpl_info != NULL && prpl_info->get_cb_real_name) | 1073 if (prpl_info != NULL && prpl_info->get_cb_real_name) |
| 1074 who = prpl_info->get_cb_real_name(conn, chat, name); | 1074 who = prpl_info->get_cb_real_name(conn, chat, name); |
| 1075 if (prpl_info == NULL || prpl_info->get_cb_info == NULL) { | 1075 if (prpl_info == NULL || prpl_info->get_cb_info == NULL) { |
| 1076 pidgin_retrieve_user_info(conn, who ? who : name); | 1076 pidgin_retrieve_user_info(conn, who ? who : name); |
| 1077 g_free(who); | 1077 g_free(who); |
| 1193 else | 1193 else |
| 1194 { | 1194 { |
| 1195 gc = (PurpleConnection *)l->data; | 1195 gc = (PurpleConnection *)l->data; |
| 1196 account = purple_connection_get_account(gc); | 1196 account = purple_connection_get_account(gc); |
| 1197 | 1197 |
| 1198 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); | 1198 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc)); |
| 1199 } | 1199 } |
| 1200 | 1200 |
| 1201 protoname = prpl_info->list_icon(account, NULL); | 1201 protoname = prpl_info->list_icon(account, NULL); |
| 1202 | 1202 |
| 1203 if (!strcmp(protoname, protocol)) | 1203 if (!strcmp(protoname, protocol)) |
| 1235 else | 1235 else |
| 1236 { | 1236 { |
| 1237 gc = (PurpleConnection *)l->data; | 1237 gc = (PurpleConnection *)l->data; |
| 1238 account = purple_connection_get_account(gc); | 1238 account = purple_connection_get_account(gc); |
| 1239 | 1239 |
| 1240 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); | 1240 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc)); |
| 1241 } | 1241 } |
| 1242 | 1242 |
| 1243 protoname = prpl_info->list_icon(account, NULL); | 1243 protoname = prpl_info->list_icon(account, NULL); |
| 1244 | 1244 |
| 1245 if (!strcmp(protoname, "aim") || !strcmp(protoname, "icq")) | 1245 if (!strcmp(protoname, "aim") || !strcmp(protoname, "icq")) |
| 1647 data->who = g_strdup(who); | 1647 data->who = g_strdup(who); |
| 1648 data->filename = g_strdup(filename); | 1648 data->filename = g_strdup(filename); |
| 1649 data->account = account; | 1649 data->account = account; |
| 1650 | 1650 |
| 1651 if (gc) | 1651 if (gc) |
| 1652 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); | 1652 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc)); |
| 1653 | 1653 |
| 1654 if (prpl_info && prpl_info->options & OPT_PROTO_IM_IMAGE) | 1654 if (prpl_info && prpl_info->options & OPT_PROTO_IM_IMAGE) |
| 1655 im = TRUE; | 1655 im = TRUE; |
| 1656 | 1656 |
| 1657 if (prpl_info && prpl_info->can_receive_file) | 1657 if (prpl_info && prpl_info->can_receive_file) |
| 2132 | 2132 |
| 2133 if (filter_func(&entry, user_data)) { | 2133 if (filter_func(&entry, user_data)) { |
| 2134 add_buddyname_autocomplete_entry(data->store, | 2134 add_buddyname_autocomplete_entry(data->store, |
| 2135 ((PurpleContact *)cnode)->alias, | 2135 ((PurpleContact *)cnode)->alias, |
| 2136 purple_buddy_get_contact_alias(entry.entry.buddy), | 2136 purple_buddy_get_contact_alias(entry.entry.buddy), |
| 2137 entry.entry.buddy->account, | 2137 purple_buddy_get_account(entry.entry.buddy), |
| 2138 entry.entry.buddy->name | 2138 purple_buddy_get_name(entry.entry.buddy) |
| 2139 ); | 2139 ); |
| 2140 } | 2140 } |
| 2141 } | 2141 } |
| 2142 } | 2142 } |
| 2143 } | 2143 } |
| 2225 gboolean | 2225 gboolean |
| 2226 pidgin_screenname_autocomplete_default_filter(const PidginBuddyCompletionEntry *completion_entry, gpointer all_accounts) { | 2226 pidgin_screenname_autocomplete_default_filter(const PidginBuddyCompletionEntry *completion_entry, gpointer all_accounts) { |
| 2227 gboolean all = GPOINTER_TO_INT(all_accounts); | 2227 gboolean all = GPOINTER_TO_INT(all_accounts); |
| 2228 | 2228 |
| 2229 if (completion_entry->is_buddy) { | 2229 if (completion_entry->is_buddy) { |
| 2230 return all || purple_account_is_connected(completion_entry->entry.buddy->account); | 2230 return all || purple_account_is_connected(purple_buddy_get_account(completion_entry->entry.buddy)); |
| 2231 } else { | 2231 } else { |
| 2232 return all || (completion_entry->entry.logged_buddy->account != NULL && purple_account_is_connected(completion_entry->entry.logged_buddy->account)); | 2232 return all || (completion_entry->entry.logged_buddy->account != NULL && purple_account_is_connected(completion_entry->entry.logged_buddy->account)); |
| 2233 } | 2233 } |
| 2234 } | 2234 } |
| 2235 | 2235 |
| 3478 PidginConversation *conv = g_object_get_data(G_OBJECT(item), "gtkconv"); | 3478 PidginConversation *conv = g_object_get_data(G_OBJECT(item), "gtkconv"); |
| 3479 if (!conv) | 3479 if (!conv) |
| 3480 return TRUE; | 3480 return TRUE; |
| 3481 purple_request_file(conv->active_conv, _("Save File"), NULL, TRUE, | 3481 purple_request_file(conv->active_conv, _("Save File"), NULL, TRUE, |
| 3482 G_CALLBACK(savefile_write_cb), NULL, | 3482 G_CALLBACK(savefile_write_cb), NULL, |
| 3483 conv->active_conv->account, NULL, conv->active_conv, | 3483 purple_conversation_get_account(conv->active_conv), NULL, conv->active_conv, |
| 3484 (void *)url); | 3484 (void *)url); |
| 3485 return TRUE; | 3485 return TRUE; |
| 3486 } | 3486 } |
| 3487 | 3487 |
| 3488 static gboolean | 3488 static gboolean |