comparison: pidgin/gtkimhtmltoolbar.c
pidgin/gtkimhtmltoolbar.c
- changeset 21342
- 6d1d2ebd9277
- parent 21217
- c5dfa570daff
- parent 21214
- db28e29a4990
- child 21345
- 0ae8ed7bbf35
equal
deleted
inserted
replaced
| 21219:cb5369141774 | 21342:6d1d2ebd9277 |
|---|---|
| 182 g_signal_connect(G_OBJECT(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog)->cancel_button), "clicked", | 182 g_signal_connect(G_OBJECT(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog)->cancel_button), "clicked", |
| 183 G_CALLBACK(cancel_toolbar_font), toolbar); | 183 G_CALLBACK(cancel_toolbar_font), toolbar); |
| 184 g_signal_connect_after(G_OBJECT(toolbar->font_dialog), "realize", | 184 g_signal_connect_after(G_OBJECT(toolbar->font_dialog), "realize", |
| 185 G_CALLBACK(realize_toolbar_font), toolbar); | 185 G_CALLBACK(realize_toolbar_font), toolbar); |
| 186 } | 186 } |
| 187 gtk_window_set_transient_for(GTK_WINDOW(toolbar->font_dialog), | |
| 188 GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(toolbar)))); | |
| 189 gtk_window_present(GTK_WINDOW(toolbar->font_dialog)); | 187 gtk_window_present(GTK_WINDOW(toolbar->font_dialog)); |
| 190 } else { | 188 } else { |
| 191 cancel_toolbar_font(font, toolbar); | 189 cancel_toolbar_font(font, toolbar); |
| 192 } | 190 } |
| 193 gtk_widget_grab_focus(toolbar->imhtml); | 191 gtk_widget_grab_focus(toolbar->imhtml); |
| 709 PIDGIN_DIALOG(dialog); | 707 PIDGIN_DIALOG(dialog); |
| 710 | 708 |
| 711 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); | 709 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); |
| 712 gtk_window_set_role(GTK_WINDOW(dialog), "smiley_dialog"); | 710 gtk_window_set_role(GTK_WINDOW(dialog), "smiley_dialog"); |
| 713 gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE); | 711 gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE); |
| 714 gtk_window_set_transient_for(GTK_WINDOW(dialog), | |
| 715 GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(toolbar)))); | |
| 716 | 712 |
| 717 if (unique_smileys != NULL) { | 713 if (unique_smileys != NULL) { |
| 718 struct smiley_button_list *ls, *it, *it_tmp; | 714 struct smiley_button_list *ls, *it, *it_tmp; |
| 719 GtkWidget *line; | 715 GtkWidget *line; |
| 720 int line_width = 0; | 716 int line_width = 0; |
