Typedef change: dbus_pending_cb -> device_dbus_pending_cb

Change-Id: I1308144009a355d9c4580391ed6c1ac126255bce
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>

diff --git a/include/display-internal.h b/include/display-internal.h
index fb1920b46254d4090249997b6b61315a430c6a60..a50b87b1130f99fac669352ad8af8b5c6252d44e 100644 (file)
--- a/include/display-internal.h
+++ b/include/display-internal.h
@@ -97,7 +97,7 @@ int device_display_get_max_brightness_state(int display_index, display_state_e s
  */
 int device_display_set_brightness_state(int display_index, display_state_e state, int brightness);
 
-typedef void (*dbus_pending_cb)(void *data, GVariant *result, GError *err);
+typedef void (*device_dbus_pending_cb)(void *data, GVariant *result, GError *err);
 
 /**
  * @brief Change display state by a specific reason
@@ -118,7 +118,7 @@ typedef void (*dbus_pending_cb)(void *data, GVariant *result, GError *err);
  * @retval #DEVICE_ERROR_OPERATION_FAILED Operation failed
  * @see device_display_change_state_by_reason()
  */
-int device_display_change_state_by_reason(display_state_e type, const char *reason, int timeout, dbus_pending_cb cb);
+int device_display_change_state_by_reason(display_state_e type, const char *reason, int timeout, device_dbus_pending_cb cb);
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/touchscreen-internal.h b/include/touchscreen-internal.h
index d85de688901211841821242de4cb94c02da8eaf3..657118e05dd8268e1b4f0ff5e1b65e91bed13ab5 100644 (file)
--- a/include/touchscreen-internal.h
+++ b/include/touchscreen-internal.h
@@ -2,10 +2,9 @@
 #define __TIZEN_SYSTEM_TOUCHSCREEN_INTERNAL_H__
 
 #include <gio/gio.h>
+typedef void (*device_dbus_pending_cb)(void *data, GVariant *result, GError *err);
 
-typedef void (*dbus_pending_cb)(void *data, GVariant *result, GError *err);
+int device_touchscreen_enable(device_dbus_pending_cb cb);
+int device_touchscreen_disable(device_dbus_pending_cb cb);
 
-int device_touchscreen_enable(dbus_pending_cb cb);
-int device_touchscreen_disable(dbus_pending_cb cb);
-
-#endif __TIZEN_SYSTEM_TOUCHSCREEN_INTERNAL_H__
+#endif

diff --git a/src/dbus.c b/src/dbus.c
index 14891bf29ba165085dd3290c42855facef2a1e56..6290e79de67001919e2da9c460d2daf0998d7696 100644 (file)
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -31,7 +31,7 @@
 #define DBUS_MAXIMUM_NAME_LENGTH 255
 
 struct pending_call_data {
-       dbus_pending_cb func;
+       device_dbus_pending_cb func;
        void *data;
 };
 
@@ -405,7 +405,7 @@ static void cb_pending(GDBusProxy *proxy,
 int dbus_method_async_with_reply_var(const char *dest, const char *path,
                const char *interface, const char *method,
                GVariant *param,
-               dbus_pending_cb cb, int timeout, void *data)
+               device_dbus_pending_cb cb, int timeout, void *data)
 {
        GDBusProxy *proxy;
        GError *err = NULL;
@@ -456,7 +456,7 @@ int dbus_method_async_with_reply_var(const char *dest, const char *path,
 int dbus_method_async_with_reply(const char *dest, const char *path,
                const char *interface, const char *method,
                const char *sig, const char *param[],
-               dbus_pending_cb cb, int timeout, void *data)
+               device_dbus_pending_cb cb, int timeout, void *data)
 {
        return dbus_method_async_with_reply_var(dest,
                                path,

diff --git a/src/dbus.h b/src/dbus.h
index c721d3b936e22477df588d6978f4185749c46032..8d1ed9bc4881ab1387f407c9d797925fc346ab5d 100644 (file)
--- a/src/dbus.h
+++ b/src/dbus.h
@@ -88,15 +88,15 @@ int dbus_method_sync_with_reply(const char *dest,
  * If result is NULL, err is set.
  * Do not invoke g_variant_unref() with result.
  */
-typedef void (*dbus_pending_cb)(void *data, GVariant *result, GError *err);
+typedef void (*device_dbus_pending_cb)(void *data, GVariant *result, GError *err);
 
 int dbus_method_async_with_reply_var(const char *dest, const char *path,
                const char *interface, const char *method,
                GVariant *param,
-               dbus_pending_cb cb, int timeout, void *data);
+               device_dbus_pending_cb cb, int timeout, void *data);
 int dbus_method_async_with_reply(const char *dest, const char *path,
                const char *interface, const char *method,
-               const char *sig, const char *param[], dbus_pending_cb cb, int timeout, void *data);
+               const char *sig, const char *param[], device_dbus_pending_cb cb, int timeout, void *data);
 
 void restart_callback(void);
 

diff --git a/src/display.c b/src/display.c
index 6be39bbdc5bb3b23bef8faf95c22cd645f5a95a7..850e159b56a5aea241e570ffddbc108633fbed5f 100644 (file)
--- a/src/display.c
+++ b/src/display.c
@@ -410,7 +410,7 @@ int device_display_set_brightness_state(int display_index, display_state_e state
        return DEVICE_ERROR_NONE;
 }
 
-int device_display_change_state_by_reason(display_state_e type, const char *reason, int timeout, dbus_pending_cb cb)
+int device_display_change_state_by_reason(display_state_e type, const char *reason, int timeout, device_dbus_pending_cb cb)
 {
        int ret;
 

diff --git a/src/touchscreen-internal.c b/src/touchscreen-internal.c
index 081b4ad341ccc99e65940cd4b3a63f909feba28c..622027398e894ecaa345ac2c075e20902c2d953c 100644 (file)
--- a/src/touchscreen-internal.c
+++ b/src/touchscreen-internal.c
@@ -5,7 +5,7 @@
 #define METHOD_TOUCHSCREEN_ENABLE  "Enable"
 #define METHOD_TOUCHSCREEN_DISABLE "Disable"
 
-int device_touchscreen_enable(dbus_pending_cb cb)
+int device_touchscreen_enable(device_dbus_pending_cb cb)
 {
        int ret;
        ret = dbus_method_async_with_reply(DEVICED_BUS_NAME,
@@ -15,7 +15,7 @@ int device_touchscreen_enable(dbus_pending_cb cb)
        return errno_to_device_error(ret);
 }
 
-int device_touchscreen_disable(dbus_pending_cb cb)
+int device_touchscreen_disable(device_dbus_pending_cb cb)
 {
        int ret;
        ret = dbus_method_async_with_reply(DEVICED_BUS_NAME,