Mercurial > pidgin.yaz

comparison pidgin/gtkimhtmltoolbar.c @ 21344:80af064d311c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '2511e448b3af6dfc5daebf1f6d4b485ef647c245' and '471ae1ec0ae96bb44471811c3a0d6b905743a400'
author Richard Laager <rlaager@wiktel.com>
date Fri, 16 Nov 2007 22:59:44 +0000
parents 0b67d509a305 6c4de0d24eff
children 200afe30b7af
comparison
equal deleted inserted replaced
21231:002c2495cae3 21344:80af064d311c
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;