comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- changeset 39913
- ce96d4639dc7
- parent 39897
- 16b440d4ab36
- child 39918
- 1c8e11f9274f
equal
deleted
inserted
replaced
| 39912:94c809048a88 | 39913:ce96d4639dc7 |
|---|---|
| 1313 | 1313 |
| 1314 button = pidgin_new_menu_item(menu, _("Send File"), | 1314 button = pidgin_new_menu_item(menu, _("Send File"), |
| 1315 PIDGIN_STOCK_TOOLBAR_SEND_FILE, G_CALLBACK(menu_chat_send_file_cb), | 1315 PIDGIN_STOCK_TOOLBAR_SEND_FILE, G_CALLBACK(menu_chat_send_file_cb), |
| 1316 PIDGIN_CONVERSATION(conv)); | 1316 PIDGIN_CONVERSATION(conv)); |
| 1317 | 1317 |
| 1318 if (gc == NULL || protocol == NULL) | 1318 if (gc == NULL) { |
| 1319 can_receive_file = FALSE; | 1319 can_receive_file = FALSE; |
| 1320 else { | 1320 } else { |
| 1321 gchar *real_who = NULL; | 1321 gchar *real_who = NULL; |
| 1322 real_who = purple_protocol_chat_iface_get_user_real_name(protocol, gc, | 1322 real_who = purple_protocol_chat_iface_get_user_real_name(protocol, gc, |
| 1323 purple_chat_conversation_get_id(chat), who); | 1323 purple_chat_conversation_get_id(chat), who); |
| 1324 | 1324 |
| 1325 if (!purple_protocol_xfer_can_receive( | 1325 if (!purple_protocol_xfer_can_receive( |
| 2450 PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv); | 2450 PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv); |
| 2451 | 2451 |
| 2452 if(gtkconv == NULL || gtkconv->active_conv != conv) | 2452 if(gtkconv == NULL || gtkconv->active_conv != conv) |
| 2453 continue; | 2453 continue; |
| 2454 | 2454 |
| 2455 if (gtkconv->unseen_state >= min_state | 2455 if (gtkconv->unseen_state >= min_state && |
| 2456 && (!hidden_only || | 2456 (!hidden_only || gtkconv->win == hidden_convwin)) { |
| 2457 (hidden_only && gtkconv->win == hidden_convwin))) { | |
| 2458 | 2457 |
| 2459 r = g_list_prepend(r, conv); | 2458 r = g_list_prepend(r, conv); |
| 2460 c++; | 2459 c++; |
| 2461 } | 2460 } |
| 2462 } | 2461 } |
| 2787 | 2786 |
| 2788 /* | 2787 /* |
| 2789 * Check if account support voice and/or calls, and | 2788 * Check if account support voice and/or calls, and |
| 2790 * if the current buddy supports it. | 2789 * if the current buddy supports it. |
| 2791 */ | 2790 */ |
| 2792 if (account != NULL && PURPLE_IS_IM_CONVERSATION(conv)) { | 2791 if (PURPLE_IS_IM_CONVERSATION(conv)) { |
| 2793 PurpleMediaCaps caps = | 2792 PurpleMediaCaps caps = |
| 2794 purple_protocol_get_media_caps(account, | 2793 purple_protocol_get_media_caps(account, |
| 2795 purple_conversation_get_name(conv)); | 2794 purple_conversation_get_name(conv)); |
| 2796 | 2795 |
| 2797 gtk_action_set_sensitive(win->menu->audio_call, | 2796 gtk_action_set_sensitive(win->menu->audio_call, |
| 5131 gtk_list_store_remove(GTK_LIST_STORE(model), &iter); | 5130 gtk_list_store_remove(GTK_LIST_STORE(model), &iter); |
| 5132 gtk_tree_row_reference_free(ref); | 5131 gtk_tree_row_reference_free(ref); |
| 5133 purple_chat_user_set_ui_data(chatuser, NULL); | 5132 purple_chat_user_set_ui_data(chatuser, NULL); |
| 5134 } | 5133 } |
| 5135 | 5134 |
| 5136 if (chatuser) | 5135 add_chat_user_common(chat, chatuser, NULL); |
| 5137 add_chat_user_common(chat, chatuser, NULL); | |
| 5138 } | 5136 } |
| 5139 | 5137 |
| 5140 gboolean | 5138 gboolean |
| 5141 pidgin_conv_has_focus(PurpleConversation *conv) | 5139 pidgin_conv_has_focus(PurpleConversation *conv) |
| 5142 { | 5140 { |
