Merge branch 'elmdnd'

Conflicts:
	trunk/TMP/st/elementary/.gitignore

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@51935 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/ecore_x/xlib/ecore_x_drawable.c b/src/lib/ecore_x/xlib/ecore_x_drawable.c
index 00a53aa..90bda18 100644 (file)
--- a/src/lib/ecore_x/xlib/ecore_x_drawable.c
+++ b/src/lib/ecore_x/xlib/ecore_x_drawable.c
@@ -12,7 +12,7 @@
 
 /**
  * Retrieves the geometry of the given drawable.
- * @param d The given drawable.
+* @param d The given drawable.
  * @param x Pointer to an integer into which the X position is to be stored.
  * @param y Pointer to an integer into which the Y position is to be stored.
  * @param w Pointer to an integer into which the width is to be stored.

diff --git a/src/lib/ecore_x/xlib/ecore_x_selection.c b/src/lib/ecore_x/xlib/ecore_x_selection.c
index 807ef9a..da9a6d6 100644 (file)
--- a/src/lib/ecore_x/xlib/ecore_x_selection.c
+++ b/src/lib/ecore_x/xlib/ecore_x_selection.c
@@ -719,7 +719,7 @@ _ecore_x_selection_parse(const char *target, void *data, int size, int format)
         if (!strcmp(prs->target, target))
           {
              sel = prs->parse(target, data, size, format);
-             return sel;
+            if (sel) return sel;
           }
      }
 
@@ -851,6 +851,7 @@ _ecore_x_selection_parser_text(const char *target __UNUSED__,
    sel->text = (char *)data;
    ECORE_X_SELECTION_DATA(sel)->length = size;
    ECORE_X_SELECTION_DATA(sel)->content = ECORE_X_SELECTION_CONTENT_TEXT;
+   ECORE_X_SELECTION_DATA(sel)->data = data;
    ECORE_X_SELECTION_DATA(sel)->free = _ecore_x_selection_data_text_free;
    return sel;
 } /* _ecore_x_selection_parser_text */

diff --git a/src/lib/ecore_x/xlib/ecore_x_window.c b/src/lib/ecore_x/xlib/ecore_x_window.c
index 1628564..8308c3f 100644 (file)
--- a/src/lib/ecore_x/xlib/ecore_x_window.c
+++ b/src/lib/ecore_x/xlib/ecore_x_window.c
@@ -657,6 +657,13 @@ ecore_x_window_size_get(Ecore_X_Window win, int *w, int *h)
 
 /**
  * Retrieves the geometry of the given window.
+ *
+ * Note that the x & y coordingates are relative to your parent.  In
+ * particular for reparenting window managers - relative to you window border.
+ * If you want screen coordinates either walk the window tree to the root,
+ * else for ecore_evas applications see ecore_evas_geometry_get().  Elementary
+ * applications can use elm_win_screen_position_get().
+ *
  * @param   win The given window.
  * @param   x   Pointer to an integer in which the X position is to be stored.
  * @param   y   Pointer to an integer in which the Y position is to be stored.