comparison: pidgin/gtkimhtmltoolbar.c
pidgin/gtkimhtmltoolbar.c
- changeset 21653
- 621c47778132
- parent 21233
- e75de8db4f2b
- child 21764
- 773b66076151
equal
deleted
inserted
replaced
| 21491:73ae9aeda3c5 | 21653:621c47778132 |
|---|---|
| 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); |
| 427 msg = g_strdup(_("Please enter the URL of the " | 425 msg = g_strdup(_("Please enter the URL of the " |
| 428 "link that you want to insert.")); | 426 "link that you want to insert.")); |
| 429 } | 427 } |
| 430 | 428 |
| 431 toolbar->link_dialog = | 429 toolbar->link_dialog = |
| 432 purple_request_fields_with_hint(toolbar, _("Insert Link"), | 430 purple_request_fields(toolbar, _("Insert Link"), |
| 433 NULL, | 431 NULL, |
| 434 msg, | 432 msg, |
| 435 fields, | 433 fields, |
| 436 _("_Insert"), G_CALLBACK(do_insert_link_cb), | 434 _("_Insert"), G_CALLBACK(do_insert_link_cb), |
| 437 _("Cancel"), G_CALLBACK(cancel_link_cb), | 435 _("Cancel"), G_CALLBACK(cancel_link_cb), |
| 438 NULL, NULL, NULL, | 436 NULL, NULL, NULL, |
| 439 PURPLE_REQUEST_UI_HINT_CONV, toolbar); | 437 toolbar); |
| 440 g_free(msg); | 438 g_free(msg); |
| 441 g_free(desc); | 439 g_free(desc); |
| 442 } else { | 440 } else { |
| 443 close_link_dialog(toolbar); | 441 close_link_dialog(toolbar); |
| 444 } | 442 } |
| 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; |
