Don't put the prefs/pdm dialogue over all windows. Make the add-language

2005-11-15  Christian Persch  <chpe@cvs.gnome.org>

	* data/glade/epiphany.glade:
	* data/glade/prefs-dialog.glade:
	* data/glade/print.glade:
	* src/pdm-dialog.c: (pdm_dialog_response_cb), (pdm_dialog_init):
	* src/prefs-dialog.c: (setup_add_language_dialog),
	(prefs_dialog_init):

	Don't put the prefs/pdm dialogue over all windows. Make the
	add-language dialogue modal to the prefs dialogue.

6 files changed, 32 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 4f0916dca..d1c9e26a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-11-15  Christian Persch  <chpe@cvs.gnome.org>
+
+	* data/glade/epiphany.glade:
+	* data/glade/prefs-dialog.glade:
+	* data/glade/print.glade:
+	* src/pdm-dialog.c: (pdm_dialog_response_cb), (pdm_dialog_init):
+	* src/prefs-dialog.c: (setup_add_language_dialog),
+	(prefs_dialog_init):
+
+	Don't put the prefs/pdm dialogue over all windows. Make the
+	add-language dialogue modal to the prefs dialogue.
+
 2005-11-07  Christian Persch  <chpe@cvs.gnome.org>
 
 	* configure.ac:
diff --git a/data/glade/epiphany.glade b/data/glade/epiphany.glade
index 58a3126a0..8c9697283 100644
--- a/data/glade/epiphany.glade
+++ b/data/glade/epiphany.glade
@@ -15,7 +15,7 @@
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">False</property>
 
diff --git a/data/glade/prefs-dialog.glade b/data/glade/prefs-dialog.glade
index 80e9322eb..58e556e1f 100644
--- a/data/glade/prefs-dialog.glade
+++ b/data/glade/prefs-dialog.glade
@@ -15,7 +15,7 @@
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="has_separator">False</property>
   <signal name="response" handler="prefs_dialog_response_cb" last_modification_time="Sat, 10 May 2003 09:37:44 GMT"/>
diff --git a/data/glade/print.glade b/data/glade/print.glade
index 801921abd..9a1caf507 100644
--- a/data/glade/print.glade
+++ b/data/glade/print.glade
@@ -15,7 +15,7 @@
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
   <property name="has_separator">False</property>
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index c7b3efc56..fe1748136 100755
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -816,6 +816,9 @@ pdm_dialog_init (PdmDialog *dialog)
 				  properties[PROP_NOTEBOOK].id, &notebook,
 				  NULL);
 
+	ephy_gui_ensure_window_group (GTK_WINDOW (window));
+
+	gtk_window_set_role (GTK_WINDOW (window), "epiphany-cookie-manager");
 	gtk_window_set_icon_name (GTK_WINDOW (window), "web-browser");
 
 	/**
@@ -1038,15 +1041,11 @@ pdm_dialog_response_cb (GtkDialog *widget,
 			gint response,
 			PdmDialog *dialog)
 {
-	switch (response)
+	if (response == GTK_RESPONSE_HELP)
 	{
-		case GTK_RESPONSE_CLOSE:
-			g_object_unref (dialog);
-			break;
-		case GTK_RESPONSE_HELP:
-			pdm_dialog_show_help (dialog);
-			break;
-		default:
-			break;
+		pdm_dialog_show_help (dialog);
+		return;
 	}
+
+	g_object_unref (dialog);
 }
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index c8e7187b0..db73f1b0c 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -816,7 +816,7 @@ static EphyDialog *
 setup_add_language_dialog (PrefsDialog *pd)
 {
 	EphyDialog *dialog;
-	GtkWidget *window;
+	GtkWidget *window, *parent;
 	GtkListStore *store;
 	GtkTreeModel *sortmodel;
 	GtkTreeView *treeview;
@@ -826,10 +826,10 @@ setup_add_language_dialog (PrefsDialog *pd)
 	GtkTreeIter iter;
 	int i;
 
-	window = ephy_dialog_get_control (EPHY_DIALOG (pd), properties[WINDOW_PROP].id);
+	parent = ephy_dialog_get_control (EPHY_DIALOG (pd), properties[WINDOW_PROP].id);
 
 	dialog =  EPHY_DIALOG (g_object_new (EPHY_TYPE_DIALOG,
-					     "parent-window", window,
+					     "parent-window", parent,
 					     "default-width", 260,
 					     "default-height", 230,
 					     NULL));
@@ -868,6 +868,9 @@ setup_add_language_dialog (PrefsDialog *pd)
 				  add_lang_props[LANGUAGE_DIALOG].id, &window,
 				  NULL);
 
+	gtk_window_group_add_window (GTK_WINDOW (parent)->group, GTK_WINDOW (window));
+	gtk_window_set_modal (GTK_WINDOW (window), TRUE);
+
 	gtk_tree_view_set_reorderable (GTK_TREE_VIEW (treeview), FALSE);
 
 	gtk_tree_view_set_model (treeview, sortmodel);
@@ -1216,6 +1219,9 @@ prefs_dialog_init (PrefsDialog *pd)
 		 properties[MONOSPACE_PROP].id, &monospace_combo,
 		 NULL);
 
+	ephy_gui_ensure_window_group (GTK_WINDOW (window));
+
+	gtk_window_set_role (GTK_WINDOW (window), "epiphany-preferences");
 	gtk_window_set_icon_name (GTK_WINDOW (window), GTK_STOCK_PREFERENCES);
 
 	/* set homepage button sensitivity */