devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f5e35519b302c503c02d3b9827ce6fc0f9f0c279
commit f5e35519b302c503c02d3b9827ce6fc0f9f0c279
Author: Chris Michael <cp.mich...@samsung.com>
Date: Thu Aug 20 10:57:07 2015 -0400
ecore-wl2: Group connect and disconnect functions together
Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
src/lib/ecore_wl2/Ecore_Wl2.h | 26 +++++++++++++-------------
src/lib/ecore_wl2/ecore_wl2_display.c | 28 ++++++++++++++--------------
2 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/lib/ecore_wl2/Ecore_Wl2.h b/src/lib/ecore_wl2/Ecore_Wl2.h
index 13e8e6b..e60a651 100644
--- a/src/lib/ecore_wl2/Ecore_Wl2.h
+++ b/src/lib/ecore_wl2/Ecore_Wl2.h
@@ -154,6 +154,19 @@ EAPI Ecore_Wl2_Display *ecore_wl2_display_connect(const
char *name);
EAPI void ecore_wl2_display_disconnect(Ecore_Wl2_Display *display);
/**
+ * Terminate a Wayland display's main loop
+ *
+ * @brief This function is typically used by servers to terminate the
+ * Wayland display main loop. This is usually only called when a server
+ * encounters an error.
+ *
+ * @param display The Ecore_Wl2_Display to terminate
+ *
+ * @ingroup Ecore_Wl2_Display_Group
+ */
+EAPI void ecore_wl2_display_terminate(Ecore_Wl2_Display *display);
+
+/**
* Retrieve the existing Wayland display
*
* @param display The Ecore_Wl2_Display for which to retrieve the existing
@@ -177,19 +190,6 @@ EAPI struct wl_display
*ecore_wl2_display_get(Ecore_Wl2_Display *display);
*/
EAPI struct wl_shm *ecore_wl2_display_shm_get(Ecore_Wl2_Display *display);
-/**
- * Terminate a Wayland display's main loop
- *
- * @brief This function is typically used by servers to terminate the
- * Wayland display main loop. This is usually only called when a server
- * encounters an error.
- *
- * @param display The Ecore_Wl2_Display to terminate
- *
- * @ingroup Ecore_Wl2_Display_Group
- */
-EAPI void ecore_wl2_display_terminate(Ecore_Wl2_Display *display);
-
/* # ifdef __cplusplus */
/* } */
/* # endif */
diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c
b/src/lib/ecore_wl2/ecore_wl2_display.c
index 89baebe..0c16c6d 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -293,20 +293,6 @@ connect_err:
return NULL;
}
-EAPI struct wl_display *
-ecore_wl2_display_get(Ecore_Wl2_Display *display)
-{
- EINA_SAFETY_ON_NULL_RETURN_VAL(display, NULL);
- return display->wl.display;
-}
-
-EAPI struct wl_shm *
-ecore_wl2_display_shm_get(Ecore_Wl2_Display *display)
-{
- EINA_SAFETY_ON_NULL_RETURN_VAL(display, NULL);
- return display->wl.shm;
-}
-
EAPI void
ecore_wl2_display_disconnect(Ecore_Wl2_Display *display)
{
@@ -329,3 +315,17 @@ ecore_wl2_display_terminate(Ecore_Wl2_Display *display)
EINA_SAFETY_ON_NULL_RETURN(display);
wl_display_terminate(display->wl.display);
}
+
+EAPI struct wl_display *
+ecore_wl2_display_get(Ecore_Wl2_Display *display)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(display, NULL);
+ return display->wl.display;
+}
+
+EAPI struct wl_shm *
+ecore_wl2_display_shm_get(Ecore_Wl2_Display *display)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(display, NULL);
+ return display->wl.shm;
+}
--
