diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2004-12-19 05:51:48 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2004-12-19 05:51:48 +0800 |
| commit | fb964a82fd2244d91b6303853d3a49ec338b94cc (patch) | |
| tree | 529320e1e933bc2a41945c51f6374818158a4898 /embed/mozilla/GtkNSSKeyPairDialogs.cpp | |
| parent | 419bf3af0979b9d9c0bc04e0e8c02ad68bcd4dd6 (diff) | |
| download | gsoc2013-epiphany-fb964a82fd2244d91b6303853d3a49ec338b94cc.tar.gz gsoc2013-epiphany-fb964a82fd2244d91b6303853d3a49ec338b94cc.tar.zst gsoc2013-epiphany-fb964a82fd2244d91b6303853d3a49ec338b94cc.zip | |
Make sure we don't have any app-modal dialogues. Fixes bug #110479.
2004-12-18 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/ContentHandler.cpp:
* embed/mozilla/FilePicker.cpp:
* embed/mozilla/GtkNSSClientAuthDialogs.cpp:
* embed/mozilla/GtkNSSDialogs.cpp:
* embed/mozilla/GtkNSSKeyPairDialogs.cpp:
* lib/ephy-file-chooser.c: (ephy_file_chooser_new):
* lib/ephy-gui.c: (ephy_gui_ensure_window_group),
(ephy_gui_confirm_overwrite_file):
* lib/ephy-gui.h:
* src/bookmarks/ephy-bookmarks-editor.c:
(delete_topic_dialog_construct), (ephy_bookmarks_editor_construct):
* src/ephy-window.c: (ephy_window_init):
* src/pdm-dialog.c: (show_cookies_properties):
Make sure we don't have any app-modal dialogues. Fixes bug #110479.
Diffstat (limited to 'embed/mozilla/GtkNSSKeyPairDialogs.cpp')
| -rw-r--r-- | embed/mozilla/GtkNSSKeyPairDialogs.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp index 066cd44f5..ed987b105 100644 --- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp +++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp @@ -66,6 +66,7 @@ #include <glib/gi18n.h> #include "GtkNSSKeyPairDialogs.h" +#include "ephy-gui.h" #include "ephy-debug.h" GtkNSSKeyPairDialogs::GtkNSSKeyPairDialogs () @@ -198,13 +199,20 @@ GtkNSSKeyPairDialogs::DisplayGeneratingKeypairInfo (nsIInterfaceRequestor *ctx, nsCOMPtr<nsIDOMWindow> parent = do_GetInterface (ctx); - GtkWidget *gparent = EphyUtils::FindGtkParent (parent); + GtkWindow *gparent = GTK_WINDOW (EphyUtils::FindGtkParent (parent)); - dialog = gtk_dialog_new_with_buttons ("", GTK_WINDOW (gparent), - GTK_DIALOG_NO_SEPARATOR, NULL); + dialog = gtk_dialog_new_with_buttons ("", gparent, + GTK_DIALOG_DESTROY_WITH_PARENT, NULL); + + if (gparent) + { + gtk_window_group_add_window (ephy_gui_ensure_window_group (gparent), + GTK_WINDOW (dialog)); + } gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser"); + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); |