aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-10-23 06:50:37 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-10-23 06:50:37 +0800
commit2808a2dce47c1c934aaa655c9fb46fe1d33dcb10 (patch)
treecf336299c6059131100c78fd5120310b5d919ec8 /shell
parent83d1650e487c3751760c5fc00bda2274bc3e5515 (diff)
downloadgsoc2013-evolution-2808a2dce47c1c934aaa655c9fb46fe1d33dcb10.tar
gsoc2013-evolution-2808a2dce47c1c934aaa655c9fb46fe1d33dcb10.tar.gz
gsoc2013-evolution-2808a2dce47c1c934aaa655c9fb46fe1d33dcb10.tar.bz2
gsoc2013-evolution-2808a2dce47c1c934aaa655c9fb46fe1d33dcb10.tar.lz
gsoc2013-evolution-2808a2dce47c1c934aaa655c9fb46fe1d33dcb10.tar.xz
gsoc2013-evolution-2808a2dce47c1c934aaa655c9fb46fe1d33dcb10.tar.zst
gsoc2013-evolution-2808a2dce47c1c934aaa655c9fb46fe1d33dcb10.zip
Don't die if the parent window has no WMHints.
* e-shell.c (impl_Shell_selectUserFolder): Don't die if the parent window has no WMHints. svn path=/trunk/; revision=13905
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-shell.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 91ca171de2..3d10b3e511 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,10 @@
2001-10-22 Ettore Perazzoli <ettore@ximian.com>
+ * e-shell.c (impl_Shell_selectUserFolder): Don't die if the parent
+ window has no WMHints.
+
+2001-10-22 Ettore Perazzoli <ettore@ximian.com>
+
* e-shell-view.c (show_existing_view): If the view is dead, just
return FALSE. Prevents crash #12483.
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 2962824126..6de1b38912 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -497,7 +497,7 @@ impl_Shell_selectUserFolder (PortableServer_Servant servant,
parent_wm_hints = XGetWMHints (GDK_DISPLAY (), (Window) parent_xid);
- if (parent_wm_hints->flags & WindowGroupHint) {
+ if (parent_wm_hints != NULL && (parent_wm_hints->flags & WindowGroupHint)) {
XWMHints *wm_hints;
wm_hints = XAllocWMHints ();
@@ -505,9 +505,8 @@ impl_Shell_selectUserFolder (PortableServer_Servant servant,
wm_hints->window_group = parent_wm_hints->window_group;
XSetWMHints (GDK_DISPLAY (), GDK_WINDOW_XWINDOW (folder_selection_dialog->window), wm_hints);
XFree (wm_hints);
+ XFree (parent_wm_hints);
}
-
- XFree (parent_wm_hints);
}
}