mozilla-firefox/patches/mozilla-firefox-1.0.7-embed-prompt-modal.patch

Index: embedding/browser/gtk/src/EmbedPrompter.cpp
===================================================================
RCS file: /cvsroot/mozilla/embedding/browser/gtk/src/EmbedPrompter.cpp,v
retrieving revision 1.14
diff -p -u -u -p -U10 -r1.14 EmbedPrompter.cpp
--- embedding/browser/gtk/src/EmbedPrompter.cpp	15 Jan 2005 19:25:25 -0000	1.14
+++ embedding/browser/gtk/src/EmbedPrompter.cpp	25 Jan 2005 13:43:19 -0000
@@ -97,20 +97,26 @@ EmbedPrompter::~EmbedPrompter(void)
         delete[] mItemList;
 }
 
 nsresult
 EmbedPrompter::Create(PromptType aType, GtkWindow* aParentWindow)
 {
     mWindow = gtk_dialog_new_with_buttons(mTitle.get(), aParentWindow,
                                           GTK_DIALOG_DESTROY_WITH_PARENT,
                                           NULL);
 
+    // only add the dialog to the window group if the parent already has a window group,
+    // so as not to break app's expectations about modal dialogs.
+    if (aParentWindow && GTK_WINDOW (aParentWindow)->group) {
+        gtk_window_group_add_window (GTK_WINDOW (aParentWindow)->group, GTK_WINDOW (mWindow));
+    }
+
     // gtk will resize this for us as necessary
     gtk_window_set_default_size(GTK_WINDOW(mWindow), 100, 50);
 
     // this HBox will contain the icon, and a vbox which contains the
     // dialog text and other widgets.
     GtkWidget* dialogHBox = gtk_hbox_new(FALSE, 12);
 
 
     // Set up dialog properties according to the GNOME HIG
     // (http://developer.gnome.org/projects/gup/hig/1.0/windows.html#alert-windows)
1	niro	153	Index: embedding/browser/gtk/src/EmbedPrompter.cpp
2			===================================================================
3			RCS file: /cvsroot/mozilla/embedding/browser/gtk/src/EmbedPrompter.cpp,v
4			retrieving revision 1.14
5			diff -p -u -u -p -U10 -r1.14 EmbedPrompter.cpp
6			--- embedding/browser/gtk/src/EmbedPrompter.cpp 15 Jan 2005 19:25:25 -0000 1.14
7			+++ embedding/browser/gtk/src/EmbedPrompter.cpp 25 Jan 2005 13:43:19 -0000
8			@@ -97,20 +97,26 @@ EmbedPrompter::~EmbedPrompter(void)
9			delete[] mItemList;
10			}
11
12			nsresult
13			EmbedPrompter::Create(PromptType aType, GtkWindow* aParentWindow)
14			{
15			mWindow = gtk_dialog_new_with_buttons(mTitle.get(), aParentWindow,
16			GTK_DIALOG_DESTROY_WITH_PARENT,
17			NULL);
18
19			+ // only add the dialog to the window group if the parent already has a window group,
20			+ // so as not to break app's expectations about modal dialogs.
21			+ if (aParentWindow && GTK_WINDOW (aParentWindow)->group) {
22			+ gtk_window_group_add_window (GTK_WINDOW (aParentWindow)->group, GTK_WINDOW (mWindow));
23			+ }
24			+
25			// gtk will resize this for us as necessary
26			gtk_window_set_default_size(GTK_WINDOW(mWindow), 100, 50);
27
28			// this HBox will contain the icon, and a vbox which contains the
29			// dialog text and other widgets.
30			GtkWidget* dialogHBox = gtk_hbox_new(FALSE, 12);
31
32
33			// Set up dialog properties according to the GNOME HIG
34			// (http://developer.gnome.org/projects/gup/hig/1.0/windows.html#alert-windows)