comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- changeset 39685
- d0af5235a720
- parent 39684
- 763e71cb2ad7
- child 39687
- 8358d4cc1480
equal
deleted
inserted
replaced
| 39684:763e71cb2ad7 | 39685:d0af5235a720 |
|---|---|
| 5368 "send-message", | 5368 "send-message", |
| 5369 G_CALLBACK(send_cb), | 5369 G_CALLBACK(send_cb), |
| 5370 gtkconv | 5370 gtkconv |
| 5371 ); | 5371 ); |
| 5372 | 5372 |
| 5373 frame = pidgin_create_webview(TRUE, >kconv->entry, NULL); | |
| 5374 | |
| 5375 if (!chat) { | 5373 if (!chat) { |
| 5376 /* For sending typing notifications for IMs */ | 5374 /* For sending typing notifications for IMs */ |
| 5377 gtkconv->u.im->typing_timer = 0; | 5375 gtkconv->u.im->typing_timer = 0; |
| 5378 gtkconv->u.im->animate = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/animate_buddy_icons"); | 5376 gtkconv->u.im->animate = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/animate_buddy_icons"); |
| 5379 gtkconv->u.im->show_icon = TRUE; | 5377 gtkconv->u.im->show_icon = TRUE; |
| 5720 talkatu_editor_show_toolbar(TALKATU_EDITOR(gtkconv->editor)); | 5718 talkatu_editor_show_toolbar(TALKATU_EDITOR(gtkconv->editor)); |
| 5721 } else { | 5719 } else { |
| 5722 talkatu_editor_hide_toolbar(TALKATU_EDITOR(gtkconv->editor)); | 5720 talkatu_editor_hide_toolbar(TALKATU_EDITOR(gtkconv->editor)); |
| 5723 } | 5721 } |
| 5724 | 5722 |
| 5725 pidgin_webview_switch_active_conversation( | |
| 5726 PIDGIN_WEBVIEW(gtkconv->entry), conv); | |
| 5727 pidgin_webview_switch_active_conversation( | 5723 pidgin_webview_switch_active_conversation( |
| 5728 PIDGIN_WEBVIEW(gtkconv->webview), conv); | 5724 PIDGIN_WEBVIEW(gtkconv->webview), conv); |
| 5729 | 5725 |
| 5730 if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons")) | 5726 if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons")) |
| 5731 gtk_widget_show(gtkconv->infopane_hbox); | 5727 gtk_widget_show(gtkconv->infopane_hbox); |
| 9244 | 9240 |
| 9245 pidgin_conv_window_show(dest_win); | 9241 pidgin_conv_window_show(dest_win); |
| 9246 } | 9242 } |
| 9247 } | 9243 } |
| 9248 | 9244 |
| 9249 gtk_widget_grab_focus(active_gtkconv->entry); | 9245 gtk_widget_grab_focus(active_gtkconv->editor); |
| 9250 | 9246 |
| 9251 return TRUE; | 9247 return TRUE; |
| 9252 } | 9248 } |
| 9253 | 9249 |
| 9254 | 9250 |
| 9447 remove_edit_entry(PidginConversation *gtkconv, GtkWidget *entry) | 9443 remove_edit_entry(PidginConversation *gtkconv, GtkWidget *entry) |
| 9448 { | 9444 { |
| 9449 g_signal_handlers_disconnect_matched(G_OBJECT(entry), G_SIGNAL_MATCH_DATA, | 9445 g_signal_handlers_disconnect_matched(G_OBJECT(entry), G_SIGNAL_MATCH_DATA, |
| 9450 0, 0, NULL, NULL, gtkconv); | 9446 0, 0, NULL, NULL, gtkconv); |
| 9451 gtk_widget_show(gtkconv->infopane); | 9447 gtk_widget_show(gtkconv->infopane); |
| 9452 gtk_widget_grab_focus(gtkconv->entry); | 9448 gtk_widget_grab_focus(gtkconv->editor); |
| 9453 gtk_widget_destroy(entry); | 9449 gtk_widget_destroy(entry); |
| 9454 } | 9450 } |
| 9455 | 9451 |
| 9456 static gboolean | 9452 static gboolean |
| 9457 alias_focus_cb(GtkWidget *widget, GdkEventFocus *event, gpointer user_data) | 9453 alias_focus_cb(GtkWidget *widget, GdkEventFocus *event, gpointer user_data) |
| 10071 gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook), TRUE); | 10067 gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook), TRUE); |
| 10072 } | 10068 } |
| 10073 | 10069 |
| 10074 focus_gtkconv = g_list_nth_data(pidgin_conv_window_get_gtkconvs(win), | 10070 focus_gtkconv = g_list_nth_data(pidgin_conv_window_get_gtkconvs(win), |
| 10075 gtk_notebook_get_current_page(GTK_NOTEBOOK(win->notebook))); | 10071 gtk_notebook_get_current_page(GTK_NOTEBOOK(win->notebook))); |
| 10076 gtk_widget_grab_focus(focus_gtkconv->entry); | 10072 gtk_widget_grab_focus(focus_gtkconv->editor); |
| 10077 | 10073 |
| 10078 if (pidgin_conv_window_get_gtkconv_count(win) == 1) | 10074 if (pidgin_conv_window_get_gtkconv_count(win) == 1) |
| 10079 update_send_to_selection(win); | 10075 update_send_to_selection(win); |
| 10080 } | 10076 } |
| 10081 | 10077 |
