comparison: pidgin/gtkimhtmltoolbar.c
pidgin/gtkimhtmltoolbar.c
- changeset 19445
- cf52131657e8
- parent 19444
- c896521b3732
- child 19446
- d1d2655887ae
equal
deleted
inserted
replaced
| 19444:c896521b3732 | 19445:cf52131657e8 |
|---|---|
| 172 g_signal_connect(G_OBJECT(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog)->cancel_button), "clicked", | 172 g_signal_connect(G_OBJECT(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog)->cancel_button), "clicked", |
| 173 G_CALLBACK(cancel_toolbar_font), toolbar); | 173 G_CALLBACK(cancel_toolbar_font), toolbar); |
| 174 g_signal_connect_after(G_OBJECT(toolbar->font_dialog), "realize", | 174 g_signal_connect_after(G_OBJECT(toolbar->font_dialog), "realize", |
| 175 G_CALLBACK(realize_toolbar_font), toolbar); | 175 G_CALLBACK(realize_toolbar_font), toolbar); |
| 176 } | 176 } |
| 177 gtk_window_set_transient_for(GTK_WINDOW(toolbar->fontdialog), gtk_widget_get_toplevel(toolbar)); | 177 gtk_window_set_transient_for(GTK_WINDOW(toolbar->font_dialog), gtk_widget_get_toplevel(GTK_WIDGET(toolbar))); |
| 178 gtk_window_present(GTK_WINDOW(toolbar->font_dialog)); | 178 gtk_window_present(GTK_WINDOW(toolbar->font_dialog)); |
| 179 } else { | 179 } else { |
| 180 cancel_toolbar_font(font, toolbar); | 180 cancel_toolbar_font(font, toolbar); |
| 181 } | 181 } |
| 182 gtk_widget_grab_focus(toolbar->imhtml); | 182 gtk_widget_grab_focus(toolbar->imhtml); |
| 687 PIDGIN_DIALOG(dialog); | 687 PIDGIN_DIALOG(dialog); |
| 688 | 688 |
| 689 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); | 689 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); |
| 690 gtk_window_set_role(GTK_WINDOW(dialog), "smiley_dialog"); | 690 gtk_window_set_role(GTK_WINDOW(dialog), "smiley_dialog"); |
| 691 gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE); | 691 gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE); |
| 692 gtk_window_set_transient_for(GTK_WINDOW(dialog), gtk_widget_get_toplevel(toolbar)); | 692 gtk_window_set_transient_for(GTK_WINDOW(dialog), gtk_widget_get_toplevel(GTK_WIDGET(toolbar))); |
| 693 | 693 |
| 694 if (unique_smileys != NULL) { | 694 if (unique_smileys != NULL) { |
| 695 struct smiley_button_list *ls, *it, *it_tmp; | 695 struct smiley_button_list *ls, *it, *it_tmp; |
| 696 GtkWidget *line; | 696 GtkWidget *line; |
| 697 int line_width = 0; | 697 int line_width = 0; |
