aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/e-shell.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index df9895e1e2..b38b6eae07 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,11 @@
2003-03-06 Ettore Perazzoli <ettore@ximian.com>
+ * e-shell.c (impl_Shell_selectUserFolder): At least for now,
+ disable the nasty XWMHints trick to fool WMs; it is not needed now
+ that everything is in-proc.
+
+2003-03-06 Ettore Perazzoli <ettore@ximian.com>
+
* e-shell-utils.c (e_shell_folder_name_is_valid): Do not allow
names with a "#" in them either.
diff --git a/shell/e-shell.c b/shell/e-shell.c
index a542dda597..0535821d4d 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -560,6 +560,7 @@ impl_Shell_selectUserFolder (PortableServer_Servant servant,
g_signal_connect (folder_selection_dialog, "cancelled",
G_CALLBACK (folder_selection_dialog_cancelled_cb), shell);
+#if NASTY_HACK_FOR_OUT_OF_PROC_COMPONENTS
if (parent_xid == 0) {
gtk_widget_show (folder_selection_dialog);
} else {
@@ -570,8 +571,6 @@ impl_Shell_selectUserFolder (PortableServer_Servant servant,
the foreign parent window's. This way smartass window
managers like Sawfish don't get confused. */
- /* e_set_dialog_parent_from_xid (GTK_WINDOW (folder_selection_dialog), parent_xid); */
-
if (XGetClassHint (GDK_DISPLAY (), (Window) parent_xid, &class_hints)) {
gtk_window_set_wmclass (GTK_WINDOW (folder_selection_dialog),
class_hints.res_name, class_hints.res_class);
@@ -597,6 +596,9 @@ impl_Shell_selectUserFolder (PortableServer_Servant servant,
XFree (parent_wm_hints);
}
}
+#else
+ gtk_widget_show (folder_selection_dialog);
+#endif
}
static GNOME_Evolution_Storage