Mercurial > pidgin.yaz
diff pidgin/gtkimhtmltoolbar.c @ 20597:591267f6f1d5
propagate from branch 'im.pidgin.pidgin' (head 025faf23aaac403798451974c320c4de6df470d5)
to branch 'org.maemo.garage.pidgin.pidgin.dialog-transience' (head bab8f4f115d13e3eb53165748f147eae91ee250d)
| author | Gabriel Schulhof <nix@go-nix.ca> |
|---|---|
| date | Sat, 22 Sep 2007 09:48:07 +0000 |
| parents | b6517519d719 b1bd2e8b01ef |
| children | 285bb637a2b7 |
line wrap: on
line diff
--- a/pidgin/gtkimhtmltoolbar.c Fri Sep 21 16:09:12 2007 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Sat Sep 22 09:48:07 2007 +0000 @@ -184,6 +184,8 @@ g_signal_connect_after(G_OBJECT(toolbar->font_dialog), "realize", G_CALLBACK(realize_toolbar_font), toolbar); } + gtk_window_set_transient_for(GTK_WINDOW(toolbar->font_dialog), + GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(toolbar)))); gtk_window_present(GTK_WINDOW(toolbar->font_dialog)); } else { cancel_toolbar_font(font, toolbar); @@ -434,7 +436,7 @@ _("_Insert"), G_CALLBACK(do_insert_link_cb), _("Cancel"), G_CALLBACK(cancel_link_cb), NULL, NULL, NULL, - toolbar); + "conversation", toolbar); g_free(msg); g_free(desc); } else { @@ -709,6 +711,8 @@ gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); gtk_window_set_role(GTK_WINDOW(dialog), "smiley_dialog"); gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE); + gtk_window_set_transient_for(GTK_WINDOW(dialog), + GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(toolbar)))); if (unique_smileys != NULL) { struct smiley_button_list *ls, *it, *it_tmp;