From f6e8305309f0733fff39a49945d5b818e828507e Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 2 Apr 2015 12:23:55 -0400 Subject: [PATCH] geolocation module build: now with fewer generated files! also fix distcheck of geolocation edj file by not compiling it --- src/modules/Makefile_geolocation.mk | 32 +- src/modules/geolocation/.gitignore | 8 +- .../geolocation/e-module-geolocation.edj | Bin 0 -> 13492 bytes src/modules/geolocation/e_mod_main.c | 6 +- .../geolocation/gen/eldbus_geo_clue2_client.c | 442 ------------------ .../geolocation/gen/eldbus_geo_clue2_client.h | 32 -- .../gen/eldbus_geo_clue2_location.c | 242 ---------- .../gen/eldbus_geo_clue2_location.h | 18 - .../gen/eldbus_geo_clue2_manager.c | 203 -------- .../gen/eldbus_geo_clue2_manager.h | 19 - src/modules/geolocation/gen/eldbus_utils.h | 24 - .../geolocation/org.freedesktop.GeoClue2.xml | 199 ++++++++ 12 files changed, 226 insertions(+), 999 deletions(-) create mode 100644 src/modules/geolocation/e-module-geolocation.edj delete mode 100644 src/modules/geolocation/gen/eldbus_geo_clue2_client.c delete mode 100644 src/modules/geolocation/gen/eldbus_geo_clue2_client.h delete mode 100644 src/modules/geolocation/gen/eldbus_geo_clue2_location.c delete mode 100644 src/modules/geolocation/gen/eldbus_geo_clue2_location.h delete mode 100644 src/modules/geolocation/gen/eldbus_geo_clue2_manager.c delete mode 100644 src/modules/geolocation/gen/eldbus_geo_clue2_manager.h delete mode 100644 src/modules/geolocation/gen/eldbus_utils.h create mode 100644 src/modules/geolocation/org.freedesktop.GeoClue2.xml diff --git a/src/modules/Makefile_geolocation.mk b/src/modules/Makefile_geolocation.mk index 1eebb16e4..b9a1596e9 100644 --- a/src/modules/Makefile_geolocation.mk +++ b/src/modules/Makefile_geolocation.mk @@ -1,34 +1,36 @@ EXTRA_DIST += src/modules/geolocation/module.desktop.in \ -src/modules/geolocation/e-module-geolocation.edc \ -src/modules/tiling/images/location_on.png \ -src/modules/tiling/images/location_off.png +src/modules/geolocation/e-module-geolocation.edj \ +src/modules/geolocation/org.freedesktop.GeoClue2.xml + if USE_MODULE_GEOLOCATION geolocationdir = $(MDIR)/geolocation geolocation_DATA = src/modules/geolocation/e-module-geolocation.edj \ src/modules/geolocation/module.desktop -CLEANFILES += src/modules/geolocation/e-module-geolocation.edj - geolocationpkgdir = $(MDIR)/geolocation/$(MODULE_ARCH) geolocationpkg_LTLIBRARIES = src/modules/geolocation/module.la -GEOLOCATION_EDJE_FLAGS = $(EDJE_FLAGS) -id $(top_srcdir)/src/modules/geolocation/images +GEO_GEN = \ +src/modules/geolocation/eldbus_geo_clue2_client.c \ +src/modules/geolocation/eldbus_geo_clue2_client.h \ +src/modules/geolocation/eldbus_geo_clue2_location.c \ +src/modules/geolocation/eldbus_geo_clue2_location.h \ +src/modules/geolocation/eldbus_geo_clue2_manager.c \ +src/modules/geolocation/eldbus_geo_clue2_manager.h \ +src/modules/geolocation/eldbus_utils.h -src/modules/geolocation/%.edj: src/modules/geolocation/%.edc Makefile - $(EDJE_CC) $(GEOLOCATION_EDJE_FLAGS) $< $@ +MAINTAINERCLEANFILES += $(GEO_GEN) + +$(GEO_GEN): src/modules/geolocation/org.freedesktop.GeoClue2.xml + @cd $(top_builddir)/src/modules/geolocation && \ + eldbus-codegen $(abs_top_srcdir)/src/modules/geolocation/org.freedesktop.GeoClue2.xml src_modules_geolocation_module_la_LIBADD = $(MOD_LIBS) src_modules_geolocation_module_la_CPPFLAGS = $(MOD_CPPFLAGS) src_modules_geolocation_module_la_LDFLAGS = $(MOD_LDFLAGS) src_modules_geolocation_module_la_SOURCES = \ src/modules/geolocation/e_mod_main.c \ -src/modules/geolocation/gen/eldbus_geo_clue2_client.c \ -src/modules/geoclocation/gen/eldbus_geo_clue2_client.h \ -src/modules/geolocation/gen/eldbus_geo_clue2_location.c \ -src/modules/geolocation/gen/eldbus_geo_clue2_location.h \ -src/modules/geolocation/gen/eldbus_geo_clue2_manager.c \ -src/modules/geolocation/gen/eldbus_geo_clue2_manager.h \ -src/modules/geolocation/gen/eldbus_utils.h +$(GEO_GEN) PHONIES += geolocation install-geolocation geolocation: $(geolocationpkg_LTLIBRARIES) $(geolocation_DATA) diff --git a/src/modules/geolocation/.gitignore b/src/modules/geolocation/.gitignore index a004fcc09..1ffb2d448 100644 --- a/src/modules/geolocation/.gitignore +++ b/src/modules/geolocation/.gitignore @@ -1 +1,7 @@ -/e-module-geolocation.edj +/eldbus_geo_clue2_client.c +/eldbus_geo_clue2_client.h +/eldbus_geo_clue2_location.c +/eldbus_geo_clue2_location.h +/eldbus_geo_clue2_manager.c +/eldbus_geo_clue2_manager.h +/eldbus_utils.h diff --git a/src/modules/geolocation/e-module-geolocation.edj b/src/modules/geolocation/e-module-geolocation.edj new file mode 100644 index 0000000000000000000000000000000000000000..93f6ce427e70187274542f475e7ac1aa2954352a GIT binary patch literal 13492 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 literal 0 HcmV?d00001 diff --git a/src/modules/geolocation/e_mod_main.c b/src/modules/geolocation/e_mod_main.c index 5c82084ef..dad2b02ba 100644 --- a/src/modules/geolocation/e_mod_main.c +++ b/src/modules/geolocation/e_mod_main.c @@ -1,8 +1,8 @@ #include "e.h" -#include "gen/eldbus_geo_clue2_manager.h" -#include "gen/eldbus_geo_clue2_client.h" -#include "gen/eldbus_geo_clue2_location.h" +#include "eldbus_geo_clue2_manager.h" +#include "eldbus_geo_clue2_client.h" +#include "eldbus_geo_clue2_location.h" /* gadcon requirements */ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); diff --git a/src/modules/geolocation/gen/eldbus_geo_clue2_client.c b/src/modules/geolocation/gen/eldbus_geo_clue2_client.c deleted file mode 100644 index 73fed906a..000000000 --- a/src/modules/geolocation/gen/eldbus_geo_clue2_client.c +++ /dev/null @@ -1,442 +0,0 @@ -#include "eldbus_geo_clue2_client.h" - -static int _log_main = -1; -#undef ERR -#define ERR(...) EINA_LOG_DOM_ERR(_log_main, __VA_ARGS__); -int GEO_CLUE2_CLIENT_LOCATION_UPDATED_EVENT = 0; - -static void -cb_geo_clue2_client_start(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - Geo_Clue2_Client_Start_Cb cb = data; - const char *error, *error_msg; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(proxy, user_data, pending, &error_info); - return; - } - if (!eldbus_message_arguments_get(msg, "")) - { - Eldbus_Error_Info error_info = {"", ""}; - ERR("Error: Getting arguments from message."); - cb(proxy, user_data, pending, &error_info); - return; - } - cb(proxy, user_data, pending, NULL); - return; -} - -Eldbus_Pending * -geo_clue2_client_start_call(Eldbus_Proxy *proxy, Geo_Clue2_Client_Start_Cb cb, const void *data) -{ - Eldbus_Message *msg; - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - msg = eldbus_proxy_method_call_new(proxy, "Start"); - if (!eldbus_message_arguments_append(msg, "")) - { - ERR("Error: Filling message."); - return NULL; - } - p = eldbus_proxy_send(proxy, msg, cb_geo_clue2_client_start, cb, -1); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_geo_clue2_client_stop(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - Geo_Clue2_Client_Stop_Cb cb = data; - const char *error, *error_msg; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(proxy, user_data, pending, &error_info); - return; - } - if (!eldbus_message_arguments_get(msg, "")) - { - Eldbus_Error_Info error_info = {"", ""}; - ERR("Error: Getting arguments from message."); - cb(proxy, user_data, pending, &error_info); - return; - } - cb(proxy, user_data, pending, NULL); - return; -} - -Eldbus_Pending * -geo_clue2_client_stop_call(Eldbus_Proxy *proxy, Geo_Clue2_Client_Stop_Cb cb, const void *data) -{ - Eldbus_Message *msg; - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - msg = eldbus_proxy_method_call_new(proxy, "Stop"); - if (!eldbus_message_arguments_append(msg, "")) - { - ERR("Error: Filling message."); - return NULL; - } - p = eldbus_proxy_send(proxy, msg, cb_geo_clue2_client_stop, cb, -1); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -geo_clue2_client_location_updated_data_free(void *user_data EINA_UNUSED, void *func_data) -{ - Geo_Clue2_Client_LocationUpdated_Data *s_data = func_data; - free(s_data->old); - free(s_data->new); - free(s_data); -} - -static void -on_geo_clue2_client_location_updated(void *data, const Eldbus_Message *msg) -{ - Eldbus_Proxy *proxy = data; - Geo_Clue2_Client_LocationUpdated_Data *s_data = calloc(1, sizeof(Geo_Clue2_Client_LocationUpdated_Data)); - s_data->proxy = proxy; - if (!eldbus_message_arguments_get(msg, "oo", &s_data->old, &s_data->new)) - { - ERR("Error: Getting arguments from message."); - free(s_data); - return; - } - s_data->old = strdup(s_data->old); - s_data->new = strdup(s_data->new); - ecore_event_add(GEO_CLUE2_CLIENT_LOCATION_UPDATED_EVENT, s_data, geo_clue2_client_location_updated_data_free, NULL); -} - -static void -cb_geo_clue2_client_location(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_String_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - const char *v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "Location", proxy, &error_info, NULL); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Location", proxy, &error_info, NULL); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "o", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Location", proxy, &error_info, NULL); - return; - } - cb(user_data, pending, "Location", proxy, NULL, v); -} - -Eldbus_Pending * -geo_clue2_client_location_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_String_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "Location", cb_geo_clue2_client_location, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_geo_clue2_client_distance_threshold(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Uint32_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - unsigned int v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "DistanceThreshold", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "DistanceThreshold", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "u", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "DistanceThreshold", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "DistanceThreshold", proxy, NULL, v); -} - -Eldbus_Pending * -geo_clue2_client_distance_threshold_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Uint32_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "DistanceThreshold", cb_geo_clue2_client_distance_threshold, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_geo_clue2_client_distance_threshold_set(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - const char *error, *error_msg; - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Codegen_Property_Set_Cb cb = data; - if (eldbus_message_error_get(msg, &error, &error_msg)) { - Eldbus_Error_Info error_info = {error, error_msg}; - - cb(user_data, "DistanceThreshold", proxy, pending, &error_info); - return; - } - cb(user_data, "DistanceThreshold", proxy, pending, NULL); -} - -Eldbus_Pending * -geo_clue2_client_distance_threshold_propset(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Set_Cb cb, const void *data, const void *value) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(value, NULL); - p = eldbus_proxy_property_set(proxy, "DistanceThreshold", "u", value, cb_geo_clue2_client_distance_threshold_set, data); - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_geo_clue2_client_desktop_id(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_String_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - const char *v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "DesktopId", proxy, &error_info, NULL); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "DesktopId", proxy, &error_info, NULL); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "s", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "DesktopId", proxy, &error_info, NULL); - return; - } - cb(user_data, pending, "DesktopId", proxy, NULL, v); -} - -Eldbus_Pending * -geo_clue2_client_desktop_id_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_String_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "DesktopId", cb_geo_clue2_client_desktop_id, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_geo_clue2_client_desktop_id_set(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - const char *error, *error_msg; - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Codegen_Property_Set_Cb cb = data; - if (eldbus_message_error_get(msg, &error, &error_msg)) { - Eldbus_Error_Info error_info = {error, error_msg}; - - cb(user_data, "DesktopId", proxy, pending, &error_info); - return; - } - cb(user_data, "DesktopId", proxy, pending, NULL); -} - -Eldbus_Pending * -geo_clue2_client_desktop_id_propset(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Set_Cb cb, const void *data, const void *value) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(value, NULL); - p = eldbus_proxy_property_set(proxy, "DesktopId", "s", value, cb_geo_clue2_client_desktop_id_set, data); - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_geo_clue2_client_requested_accuracy_level(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Uint32_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - unsigned int v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "RequestedAccuracyLevel", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "RequestedAccuracyLevel", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "u", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "RequestedAccuracyLevel", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "RequestedAccuracyLevel", proxy, NULL, v); -} - -Eldbus_Pending * -geo_clue2_client_requested_accuracy_level_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Uint32_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "RequestedAccuracyLevel", cb_geo_clue2_client_requested_accuracy_level, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_geo_clue2_client_requested_accuracy_level_set(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - const char *error, *error_msg; - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Codegen_Property_Set_Cb cb = data; - if (eldbus_message_error_get(msg, &error, &error_msg)) { - Eldbus_Error_Info error_info = {error, error_msg}; - - cb(user_data, "RequestedAccuracyLevel", proxy, pending, &error_info); - return; - } - cb(user_data, "RequestedAccuracyLevel", proxy, pending, NULL); -} - -Eldbus_Pending * -geo_clue2_client_requested_accuracy_level_propset(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Set_Cb cb, const void *data, const void *value) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(value, NULL); - p = eldbus_proxy_property_set(proxy, "RequestedAccuracyLevel", "u", value, cb_geo_clue2_client_requested_accuracy_level_set, data); - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_geo_clue2_client_active(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Bool_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - Eina_Bool v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "Active", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Active", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "b", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Active", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "Active", proxy, NULL, v); -} - -Eldbus_Pending * -geo_clue2_client_active_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "Active", cb_geo_clue2_client_active, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -void -geo_clue2_client_log_domain_set(int id) -{ - _log_main = id; -} - -void -geo_clue2_client_proxy_unref(Eldbus_Proxy *proxy) -{ - Eldbus_Object *obj = eldbus_proxy_object_get(proxy); - eldbus_proxy_unref(proxy); - eldbus_object_unref(obj); -} - -Eldbus_Proxy * -geo_clue2_client_proxy_get(Eldbus_Connection *conn, const char *bus, const char *path) -{ - Eldbus_Object *obj; - Eldbus_Proxy *proxy; - EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(bus, NULL); - if (!path) path = "/"; - obj = eldbus_object_get(conn, bus, path); - proxy = eldbus_proxy_get(obj, "org.freedesktop.GeoClue2.Client"); - eldbus_proxy_signal_handler_add(proxy, "LocationUpdated", on_geo_clue2_client_location_updated, proxy); - if (!GEO_CLUE2_CLIENT_LOCATION_UPDATED_EVENT) - GEO_CLUE2_CLIENT_LOCATION_UPDATED_EVENT = ecore_event_type_new(); - return proxy; -} diff --git a/src/modules/geolocation/gen/eldbus_geo_clue2_client.h b/src/modules/geolocation/gen/eldbus_geo_clue2_client.h deleted file mode 100644 index 5f73069bb..000000000 --- a/src/modules/geolocation/gen/eldbus_geo_clue2_client.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef ELDBUS_GEO_CLUE2_CLIENT_H -#define ELDBUS_GEO_CLUE2_CLIENT_H - -#include -#include -#include -#include "eldbus_utils.h" - -Eldbus_Proxy *geo_clue2_client_proxy_get(Eldbus_Connection *conn, const char *bus, const char *path); -void geo_clue2_client_proxy_unref(Eldbus_Proxy *proxy); -void geo_clue2_client_log_domain_set(int id); -typedef void (*Geo_Clue2_Client_Start_Cb)(Eldbus_Proxy *proxy, void *data, Eldbus_Pending *pending, Eldbus_Error_Info *error); -Eldbus_Pending *geo_clue2_client_start_call(Eldbus_Proxy *proxy, Geo_Clue2_Client_Start_Cb cb, const void *data); -typedef void (*Geo_Clue2_Client_Stop_Cb)(Eldbus_Proxy *proxy, void *data, Eldbus_Pending *pending, Eldbus_Error_Info *error); -Eldbus_Pending *geo_clue2_client_stop_call(Eldbus_Proxy *proxy, Geo_Clue2_Client_Stop_Cb cb, const void *data); -extern int GEO_CLUE2_CLIENT_LOCATION_UPDATED_EVENT; -typedef struct _Geo_Clue2_Client_LocationUpdated_Data -{ - Eldbus_Proxy *proxy; - char *old; - char *new; -} Geo_Clue2_Client_LocationUpdated_Data; -Eldbus_Pending *geo_clue2_client_location_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_String_Get_Cb cb, const void *data); -Eldbus_Pending *geo_clue2_client_distance_threshold_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Uint32_Get_Cb cb, const void *data); -Eldbus_Pending *geo_clue2_client_distance_threshold_propset(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Set_Cb cb, const void *data, const void *value); -Eldbus_Pending *geo_clue2_client_desktop_id_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_String_Get_Cb cb, const void *data); -Eldbus_Pending *geo_clue2_client_desktop_id_propset(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Set_Cb cb, const void *data, const void *value); -Eldbus_Pending *geo_clue2_client_requested_accuracy_level_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Uint32_Get_Cb cb, const void *data); -Eldbus_Pending *geo_clue2_client_requested_accuracy_level_propset(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Set_Cb cb, const void *data, const void *value); -Eldbus_Pending *geo_clue2_client_active_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data); - -#endif diff --git a/src/modules/geolocation/gen/eldbus_geo_clue2_location.c b/src/modules/geolocation/gen/eldbus_geo_clue2_location.c deleted file mode 100644 index 53dbf3c3f..000000000 --- a/src/modules/geolocation/gen/eldbus_geo_clue2_location.c +++ /dev/null @@ -1,242 +0,0 @@ -#include "eldbus_geo_clue2_location.h" - -static int _log_main = -1; -#undef ERR -#define ERR(...) EINA_LOG_DOM_ERR(_log_main, __VA_ARGS__); - -static void -cb_geo_clue2_location_latitude(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Double_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - double v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "Latitude", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Latitude", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "d", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Latitude", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "Latitude", proxy, NULL, v); -} - -Eldbus_Pending * -geo_clue2_location_latitude_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Double_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "Latitude", cb_geo_clue2_location_latitude, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_geo_clue2_location_longitude(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Double_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - double v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "Longitude", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Longitude", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "d", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Longitude", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "Longitude", proxy, NULL, v); -} - -Eldbus_Pending * -geo_clue2_location_longitude_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Double_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "Longitude", cb_geo_clue2_location_longitude, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_geo_clue2_location_accuracy(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Double_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - double v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "Accuracy", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Accuracy", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "d", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Accuracy", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "Accuracy", proxy, NULL, v); -} - -Eldbus_Pending * -geo_clue2_location_accuracy_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Double_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "Accuracy", cb_geo_clue2_location_accuracy, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_geo_clue2_location_altitude(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Double_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - double v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "Altitude", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Altitude", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "d", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Altitude", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "Altitude", proxy, NULL, v); -} - -Eldbus_Pending * -geo_clue2_location_altitude_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Double_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "Altitude", cb_geo_clue2_location_altitude, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_geo_clue2_location_description(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_String_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - const char *v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "Description", proxy, &error_info, NULL); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Description", proxy, &error_info, NULL); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "s", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "Description", proxy, &error_info, NULL); - return; - } - cb(user_data, pending, "Description", proxy, NULL, v); -} - -Eldbus_Pending * -geo_clue2_location_description_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_String_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "Description", cb_geo_clue2_location_description, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -void -geo_clue2_location_log_domain_set(int id) -{ - _log_main = id; -} - -void -geo_clue2_location_proxy_unref(Eldbus_Proxy *proxy) -{ - Eldbus_Object *obj = eldbus_proxy_object_get(proxy); - eldbus_proxy_unref(proxy); - eldbus_object_unref(obj); -} - -Eldbus_Proxy * -geo_clue2_location_proxy_get(Eldbus_Connection *conn, const char *bus, const char *path) -{ - Eldbus_Object *obj; - Eldbus_Proxy *proxy; - EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(bus, NULL); - if (!path) path = "/"; - obj = eldbus_object_get(conn, bus, path); - proxy = eldbus_proxy_get(obj, "org.freedesktop.GeoClue2.Location"); - return proxy; -} diff --git a/src/modules/geolocation/gen/eldbus_geo_clue2_location.h b/src/modules/geolocation/gen/eldbus_geo_clue2_location.h deleted file mode 100644 index 38793a158..000000000 --- a/src/modules/geolocation/gen/eldbus_geo_clue2_location.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef ELDBUS_GEO_CLUE2_LOCATION_H -#define ELDBUS_GEO_CLUE2_LOCATION_H - -#include -#include -#include -#include "eldbus_utils.h" - -Eldbus_Proxy *geo_clue2_location_proxy_get(Eldbus_Connection *conn, const char *bus, const char *path); -void geo_clue2_location_proxy_unref(Eldbus_Proxy *proxy); -void geo_clue2_location_log_domain_set(int id); -Eldbus_Pending *geo_clue2_location_latitude_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Double_Get_Cb cb, const void *data); -Eldbus_Pending *geo_clue2_location_longitude_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Double_Get_Cb cb, const void *data); -Eldbus_Pending *geo_clue2_location_accuracy_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Double_Get_Cb cb, const void *data); -Eldbus_Pending *geo_clue2_location_altitude_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Double_Get_Cb cb, const void *data); -Eldbus_Pending *geo_clue2_location_description_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_String_Get_Cb cb, const void *data); - -#endif \ No newline at end of file diff --git a/src/modules/geolocation/gen/eldbus_geo_clue2_manager.c b/src/modules/geolocation/gen/eldbus_geo_clue2_manager.c deleted file mode 100644 index 1fea88947..000000000 --- a/src/modules/geolocation/gen/eldbus_geo_clue2_manager.c +++ /dev/null @@ -1,203 +0,0 @@ -#include "eldbus_geo_clue2_manager.h" - -static int _log_main = -1; -#undef ERR -#define ERR(...) EINA_LOG_DOM_ERR(_log_main, __VA_ARGS__); - -static void -cb_geo_clue2_manager_get_client(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - Geo_Clue2_Manager_Get_Client_Cb cb = data; - const char *error, *error_msg; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - const char *client = NULL; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(proxy, user_data, pending, &error_info, client); - return; - } - if (!eldbus_message_arguments_get(msg, "o", &client)) - { - Eldbus_Error_Info error_info = {"", ""}; - ERR("Error: Getting arguments from message."); - cb(proxy, user_data, pending, &error_info, client); - return; - } - cb(proxy, user_data, pending, NULL, client); - return; -} - -Eldbus_Pending * -geo_clue2_manager_get_client_call(Eldbus_Proxy *proxy, Geo_Clue2_Manager_Get_Client_Cb cb, const void *data) -{ - Eldbus_Message *msg; - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - msg = eldbus_proxy_method_call_new(proxy, "GetClient"); - if (!eldbus_message_arguments_append(msg, "")) - { - ERR("Error: Filling message."); - return NULL; - } - p = eldbus_proxy_send(proxy, msg, cb_geo_clue2_manager_get_client, cb, -1); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_geo_clue2_manager_add_agent(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - Geo_Clue2_Manager_Add_Agent_Cb cb = data; - const char *error, *error_msg; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(proxy, user_data, pending, &error_info); - return; - } - if (!eldbus_message_arguments_get(msg, "")) - { - Eldbus_Error_Info error_info = {"", ""}; - ERR("Error: Getting arguments from message."); - cb(proxy, user_data, pending, &error_info); - return; - } - cb(proxy, user_data, pending, NULL); - return; -} - -Eldbus_Pending * -geo_clue2_manager_add_agent_call(Eldbus_Proxy *proxy, Geo_Clue2_Manager_Add_Agent_Cb cb, const void *data, const char *id) -{ - Eldbus_Message *msg; - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - msg = eldbus_proxy_method_call_new(proxy, "AddAgent"); - if (!eldbus_message_arguments_append(msg, "s", id)) - { - ERR("Error: Filling message."); - return NULL; - } - p = eldbus_proxy_send(proxy, msg, cb_geo_clue2_manager_add_agent, cb, -1); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_geo_clue2_manager_in_use(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Bool_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - Eina_Bool v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "InUse", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "InUse", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "b", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "InUse", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "InUse", proxy, NULL, v); -} - -Eldbus_Pending * -geo_clue2_manager_in_use_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "InUse", cb_geo_clue2_manager_in_use, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -static void -cb_geo_clue2_manager_available_accuracy_level(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending) -{ - void *user_data = eldbus_pending_data_del(pending, "__user_data"); - const char *error, *error_msg; - Eldbus_Codegen_Property_Uint32_Get_Cb cb = data; - Eldbus_Proxy *proxy = eldbus_pending_data_del(pending, "__proxy"); - Eldbus_Message_Iter *variant; - unsigned int v; - if (eldbus_message_error_get(msg, &error, &error_msg)) - { - Eldbus_Error_Info error_info = {error, error_msg}; - cb(user_data, pending, "AvailableAccuracyLevel", proxy, &error_info, 0); - return; - } - if (!eldbus_message_arguments_get(msg, "v", &variant)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "AvailableAccuracyLevel", proxy, &error_info, 0); - return; - } - if (!eldbus_message_iter_arguments_get(variant, "u", &v)) - { - Eldbus_Error_Info error_info = {"", ""}; - cb(user_data, pending, "AvailableAccuracyLevel", proxy, &error_info, 0); - return; - } - cb(user_data, pending, "AvailableAccuracyLevel", proxy, NULL, v); -} - -Eldbus_Pending * -geo_clue2_manager_available_accuracy_level_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Uint32_Get_Cb cb, const void *data) -{ - Eldbus_Pending *p; - EINA_SAFETY_ON_NULL_RETURN_VAL(proxy, NULL); - p = eldbus_proxy_property_get(proxy, "AvailableAccuracyLevel", cb_geo_clue2_manager_available_accuracy_level, cb); - if (data) - eldbus_pending_data_set(p, "__user_data", data); - eldbus_pending_data_set(p, "__proxy", proxy); - return p; -} - -void -geo_clue2_manager_log_domain_set(int id) -{ - _log_main = id; -} - -void -geo_clue2_manager_proxy_unref(Eldbus_Proxy *proxy) -{ - Eldbus_Object *obj = eldbus_proxy_object_get(proxy); - eldbus_proxy_unref(proxy); - eldbus_object_unref(obj); -} - -Eldbus_Proxy * -geo_clue2_manager_proxy_get(Eldbus_Connection *conn, const char *bus, const char *path) -{ - Eldbus_Object *obj; - Eldbus_Proxy *proxy; - EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(bus, NULL); - if (!path) path = "/"; - obj = eldbus_object_get(conn, bus, path); - proxy = eldbus_proxy_get(obj, "org.freedesktop.GeoClue2.Manager"); - return proxy; -} diff --git a/src/modules/geolocation/gen/eldbus_geo_clue2_manager.h b/src/modules/geolocation/gen/eldbus_geo_clue2_manager.h deleted file mode 100644 index b96323a46..000000000 --- a/src/modules/geolocation/gen/eldbus_geo_clue2_manager.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef ELDBUS_GEO_CLUE2_MANAGER_H -#define ELDBUS_GEO_CLUE2_MANAGER_H - -#include -#include -#include -#include "eldbus_utils.h" - -Eldbus_Proxy *geo_clue2_manager_proxy_get(Eldbus_Connection *conn, const char *bus, const char *path); -void geo_clue2_manager_proxy_unref(Eldbus_Proxy *proxy); -void geo_clue2_manager_log_domain_set(int id); -typedef void (*Geo_Clue2_Manager_Get_Client_Cb)(Eldbus_Proxy *proxy, void *data, Eldbus_Pending *pending, Eldbus_Error_Info *error, const char *client); -Eldbus_Pending *geo_clue2_manager_get_client_call(Eldbus_Proxy *proxy, Geo_Clue2_Manager_Get_Client_Cb cb, const void *data); -typedef void (*Geo_Clue2_Manager_Add_Agent_Cb)(Eldbus_Proxy *proxy, void *data, Eldbus_Pending *pending, Eldbus_Error_Info *error); -Eldbus_Pending *geo_clue2_manager_add_agent_call(Eldbus_Proxy *proxy, Geo_Clue2_Manager_Add_Agent_Cb cb, const void *data, const char *id); -Eldbus_Pending *geo_clue2_manager_in_use_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Bool_Get_Cb cb, const void *data); -Eldbus_Pending *geo_clue2_manager_available_accuracy_level_propget(Eldbus_Proxy *proxy, Eldbus_Codegen_Property_Uint32_Get_Cb cb, const void *data); - -#endif \ No newline at end of file diff --git a/src/modules/geolocation/gen/eldbus_utils.h b/src/modules/geolocation/gen/eldbus_utils.h deleted file mode 100644 index db4f9ae39..000000000 --- a/src/modules/geolocation/gen/eldbus_utils.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef ELDBUS_UTILS_H -#define ELDBUS_UTILS_H 1 - -typedef struct _Eldbus_Error_Info -{ - const char *error; - const char *message; -} Eldbus_Error_Info; - -typedef void (*Eldbus_Codegen_Property_Set_Cb)(void *data, const char *propname, Eldbus_Proxy *proxy, Eldbus_Pending *p, Eldbus_Error_Info *error_info); - -typedef void (*Eldbus_Codegen_Property_String_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, const char *value); -typedef void (*Eldbus_Codegen_Property_Int32_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, int value); -typedef void (*Eldbus_Codegen_Property_Byte_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, unsigned char value); -typedef void (*Eldbus_Codegen_Property_Bool_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, Eina_Bool value); -typedef void (*Eldbus_Codegen_Property_Int16_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, short int value); -typedef void (*Eldbus_Codegen_Property_Uint16_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, unsigned short int value); -typedef void (*Eldbus_Codegen_Property_Uint32_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, unsigned int value); -typedef void (*Eldbus_Codegen_Property_Double_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, double value); -typedef void (*Eldbus_Codegen_Property_Int64_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, int64_t value); -typedef void (*Eldbus_Codegen_Property_Uint64_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, uint64_t value); -typedef void (*Eldbus_Codegen_Property_Complex_Get_Cb)(void *data, Eldbus_Pending *p, const char *propname, Eldbus_Proxy *proxy, Eldbus_Error_Info *error_info, Eina_Value *value); - -#endif \ No newline at end of file diff --git a/src/modules/geolocation/org.freedesktop.GeoClue2.xml b/src/modules/geolocation/org.freedesktop.GeoClue2.xml new file mode 100644 index 000000000..ab1456543 --- /dev/null +++ b/src/modules/geolocation/org.freedesktop.GeoClue2.xml @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +