From c1618e59fc37d1e9afdc49940634aa2a3d66df6b Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Wed, 24 Nov 2004 07:27:58 +0000
Subject: [PATCH] i can't believe that didnt segv! fixed.

SVN revision: 12243
---
 legacy/ecore/src/lib/ecore_x/Ecore_X.h       |  5 +++--
 legacy/ecore/src/lib/ecore_x/ecore_x.c       |  3 +++
 legacy/ecore/src/lib/ecore_x/ecore_x_icccm.c | 12 ++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/legacy/ecore/src/lib/ecore_x/Ecore_X.h b/legacy/ecore/src/lib/ecore_x/Ecore_X.h
index 660bc1f9b5..4d86a4d978 100644
--- a/legacy/ecore/src/lib/ecore_x/Ecore_X.h
+++ b/legacy/ecore/src/lib/ecore_x/Ecore_X.h
@@ -1021,11 +1021,12 @@ int              ecore_x_client_message8_send(Ecore_X_Window win, Ecore_X_Atom t
 	   Ecore_X_Event_Mask all;
 	   Ecore_X_Event_Mask no_propagate;
 	} event_mask;
+	Ecore_X_Gravity    window_gravity;
+	Ecore_X_Gravity    pixel_gravity;
+	Ecore_X_Colormap   colormap;
 	/* FIXME: missing
 	 * Colormap comormap;
 	 * int map_installed;
-	 * int bit_gravity;
-	 * int win_gravity;
 	 * Screen *screen;
 	 * Visual *visual;
 	 */
diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x.c b/legacy/ecore/src/lib/ecore_x/ecore_x.c
index 8c7a9d6722..72ad11c1a2 100644
--- a/legacy/ecore/src/lib/ecore_x/ecore_x.c
+++ b/legacy/ecore/src/lib/ecore_x/ecore_x.c
@@ -921,6 +921,9 @@ ecore_x_window_attributes_get(Ecore_X_Window win, Ecore_X_Window_Attributes *att
    att_ret->event_mask.mine = att.your_event_mask;
    att_ret->event_mask.all = att.your_event_mask;
    att_ret->event_mask.no_propagate = att.do_not_propagate_mask;
+   att_ret->window_gravity = att.win_gravity;
+   att_ret->pixel_gravity = att.win_gravity;
+   att_ret->colormap = att.colormap;
    return 1;
 }
 
diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_icccm.c b/legacy/ecore/src/lib/ecore_x/ecore_x_icccm.c
index bd10ecb1fa..6104cf8d02 100644
--- a/legacy/ecore/src/lib/ecore_x/ecore_x_icccm.c
+++ b/legacy/ecore/src/lib/ecore_x/ecore_x_icccm.c
@@ -261,22 +261,22 @@ ecore_x_icccm_size_pos_hints_get(Ecore_X_Window win,
    int stepx = 1, stepy = 1;
    double mina = 0.0, maxa = 0.0;
    
-   if (!XGetWMNormalHints(_ecore_x_disp, win, &hint, &mask)) return 0;
+   if (XGetWMNormalHints(_ecore_x_disp, win, &hint, &mask) < Success) return 0;
    if ((hint.flags & USPosition) || ((hint.flags & PPosition)))
      {
-	if (*request_pos) *request_pos = 1;
+	if (request_pos) *request_pos = 1;
      }
    else
      {
-	if (*request_pos) *request_pos = 0;
+	if (request_pos) *request_pos = 0;
      }
    if (hint.flags & PWinGravity)
      {
-	if (*gravity) *gravity = hint.win_gravity;
+	if (gravity) *gravity = hint.win_gravity;
      }
    else
      {
-	if (*gravity) *gravity = ECORE_X_GRAVITY_NW;
+	if (gravity) *gravity = ECORE_X_GRAVITY_NW;
      }
    if (hint.flags & PMinSize)
      {
@@ -359,7 +359,7 @@ ecore_x_icccm_title_get(Ecore_X_Window win)
 {
    XTextProperty xprop;   
    
-   if (XGetWMName(_ecore_x_disp, win, &xprop))
+   if (XGetWMName(_ecore_x_disp, win, &xprop) >= Success)
      {
 	if (xprop.value)
 	  {