From fb964a82fd2244d91b6303853d3a49ec338b94cc Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sat, 18 Dec 2004 21:51:48 +0000 Subject: Make sure we don't have any app-modal dialogues. Fixes bug #110479. 2004-12-18 Christian Persch * 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. --- src/bookmarks/ephy-bookmarks-editor.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) (limited to 'src/bookmarks/ephy-bookmarks-editor.c') diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c index 556984c5a..514e51280 100644 --- a/src/bookmarks/ephy-bookmarks-editor.c +++ b/src/bookmarks/ephy-bookmarks-editor.c @@ -454,10 +454,10 @@ cmd_open_bookmarks_in_browser (GtkAction *action, } static GtkWidget* -delete_topic_dialog_construct (GtkWindow *parent, const char *topic) +delete_topic_dialog_construct (GtkWindow *parent, + const char *topic) { GtkWidget *dialog; - GtkWindowGroup *group; char *str; str = g_strdup_printf (_("Delete topic %s?"), topic); @@ -478,16 +478,7 @@ delete_topic_dialog_construct (GtkWindow *parent, const char *topic) gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Delete Topic"), GTK_RESPONSE_ACCEPT); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); - group = GTK_WINDOW (parent)->group; - - if (group == NULL) - { - group = gtk_window_group_new (); - gtk_window_group_add_window (group, GTK_WINDOW (parent)); - g_object_unref (group); - } - - gtk_window_group_add_window (group, GTK_WINDOW (dialog)); + gtk_window_group_add_window (GTK_WINDOW (parent)->group, GTK_WINDOW (dialog)); return dialog; } @@ -1542,17 +1533,9 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor) EphyNode *node; GtkUIManager *ui_merge; GtkActionGroup *action_group; - GtkWindowGroup *group; int col_id, details_value; - /* ensure window group */ - group = GTK_WINDOW (editor)->group; - if (group == NULL) - { - group = gtk_window_group_new (); - gtk_window_group_add_window (group, GTK_WINDOW (editor)); - g_object_unref (group); - } + ephy_gui_ensure_window_group (GTK_WINDOW (editor)); gtk_window_set_title (GTK_WINDOW (editor), _("Bookmarks")); gtk_window_set_icon_name (GTK_WINDOW (editor), EPHY_STOCK_BOOKMARKS); -- cgit v1.2.3