Mercurial > pidgin.yaz

comparison pidgin/gtkimhtmltoolbar.c @ 21229:0b67d509a305

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '1bcf84e26d11f259b3c5ec663e3fecc2f01aed33' and 'ce13b5ca4994abbd4934b3bc568c8b115335c426'
author Richard Laager <rlaager@wiktel.com>
date Sun, 14 Oct 2007 02:41:00 +0000
parents 84b9b98070e5
children fba1f6c3df0b 80af064d311c
comparison
equal deleted inserted replaced
21098:7e200a629109 21229:0b67d509a305
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))));
187 gtk_window_present(GTK_WINDOW(toolbar->font_dialog)); 189 gtk_window_present(GTK_WINDOW(toolbar->font_dialog));
188 } else { 190 } else {
189 cancel_toolbar_font(font, toolbar); 191 cancel_toolbar_font(font, toolbar);
190 } 192 }
191 gtk_widget_grab_focus(toolbar->imhtml); 193 gtk_widget_grab_focus(toolbar->imhtml);
707 PIDGIN_DIALOG(dialog); 709 PIDGIN_DIALOG(dialog);
708 710
709 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); 711 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
710 gtk_window_set_role(GTK_WINDOW(dialog), "smiley_dialog"); 712 gtk_window_set_role(GTK_WINDOW(dialog), "smiley_dialog");
711 gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE); 713 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))));
712 716
713 if (unique_smileys != NULL) { 717 if (unique_smileys != NULL) {
714 struct smiley_button_list *ls, *it, *it_tmp; 718 struct smiley_button_list *ls, *it, *it_tmp;
715 GtkWidget *line; 719 GtkWidget *line;
716 int line_width = 0; 720 int line_width = 0;