discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=946390c62acadc09006efc1a61e9b7ba8334808a
commit 946390c62acadc09006efc1a61e9b7ba8334808a Author: Stefan Schmidt <[email protected]> Date: Tue Nov 11 16:45:55 2014 +0100 modules/geolocation: Fix naming for the whole module to be geolocation It still ahd some bits from the original name (geoclue2). I tried squeeze as much renaming as possible in the earlier commits but these done here would have broken the code so I do the rest all in one go here. --- configure.ac | 2 +- src/modules/Makefile.mk | 2 +- src/modules/Makefile_geoclue2.mk | 28 --------------- src/modules/Makefile_geolocation.mk | 28 +++++++++++++++ .../e-module-geolocation.edj} | Bin src/modules/{geoclue2 => geolocation}/e_mod_main.c | 38 ++++++++++----------- .../gen/eldbus_geo_clue2_client.c | 0 .../gen/eldbus_geo_clue2_client.h | 0 .../gen/eldbus_geo_clue2_location.c | 0 .../gen/eldbus_geo_clue2_location.h | 0 .../gen/eldbus_geo_clue2_manager.c | 0 .../gen/eldbus_geo_clue2_manager.h | 0 .../{geoclue2 => geolocation}/gen/eldbus_utils.h | 0 .../{geoclue2 => geolocation}/module.desktop.in | 0 14 files changed, 49 insertions(+), 49 deletions(-) diff --git a/configure.ac b/configure.ac index ed63119..89e6755 100644 --- a/configure.ac +++ b/configure.ac @@ -1088,7 +1088,7 @@ src/modules/quickaccess/module.desktop src/modules/teamwork/module.desktop src/modules/shot/module.desktop src/modules/backlight/module.desktop -src/modules/geoclue2/module.desktop +src/modules/geolocation/module.desktop src/modules/tasks/module.desktop src/modules/xkbswitch/module.desktop src/modules/tiling/module.desktop diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk index a1969ee..62a1afe 100644 --- a/src/modules/Makefile.mk +++ b/src/modules/Makefile.mk @@ -122,4 +122,4 @@ include src/modules/Makefile_wl_fb.mk include src/modules/Makefile_policy_mobile.mk -include src/modules/Makefile_geoclue2.mk +include src/modules/Makefile_geolocation.mk diff --git a/src/modules/Makefile_geoclue2.mk b/src/modules/Makefile_geoclue2.mk deleted file mode 100644 index 33cd963..0000000 --- a/src/modules/Makefile_geoclue2.mk +++ /dev/null @@ -1,28 +0,0 @@ -EXTRA_DIST += src/modules/geoclue2/module.desktop.in \ -src/modules/geoclue2/e-module-geoclue2.edj -if USE_MODULE_GEOLOCATION -geolocationdir = $(MDIR)/geoclue2 -geolocation_DATA = src/modules/geoclue2/e-module-geoclue2.edj \ - src/modules/geoclue2/module.desktop - - -geolocationpkgdir = $(MDIR)/geoclue2/$(MODULE_ARCH) -geolocationpkg_LTLIBRARIES = src/modules/geoclue2/module.la - -src_modules_geoclue2_module_la_LIBADD = $(MOD_LIBS) -src_modules_geoclue2_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -src_modules_geoclue2_module_la_LDFLAGS = $(MOD_LDFLAGS) -src_modules_geoclue2_module_la_SOURCES = \ -src/modules/geoclue2/e_mod_main.c \ -src/modules/geoclue2/gen/eldbus_geo_clue2_client.c \ -src/modules/geoclue2/gen/eldbus_geo_clue2_client.h \ -src/modules/geoclue2/gen/eldbus_geo_clue2_location.c \ -src/modules/geoclue2/gen/eldbus_geo_clue2_location.h \ -src/modules/geoclue2/gen/eldbus_geo_clue2_manager.c \ -src/modules/geoclue2/gen/eldbus_geo_clue2_manager.h \ -src/modules/geoclue2/gen/eldbus_utils.h - -PHONIES += geolocation install-geolocation -geolocation: $(geolocationpkg_LTLIBRARIES) $(geolocation_DATA) -install-geolocation: install-geolocationDATA install-geolocationpkgLTLIBRARIES -endif diff --git a/src/modules/Makefile_geolocation.mk b/src/modules/Makefile_geolocation.mk new file mode 100644 index 0000000..450d613 --- /dev/null +++ b/src/modules/Makefile_geolocation.mk @@ -0,0 +1,28 @@ +EXTRA_DIST += src/modules/geolocation/module.desktop.in \ +src/modules/geolocation/e-module-geolocation.edj +if USE_MODULE_GEOLOCATION +geolocationdir = $(MDIR)/geolocation +geolocation_DATA = src/modules/geolocation/e-module-geolocation.edj \ + src/modules/geolocation/module.desktop + + +geolocationpkgdir = $(MDIR)/geolocation/$(MODULE_ARCH) +geolocationpkg_LTLIBRARIES = src/modules/geolocation/module.la + +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 + +PHONIES += geolocation install-geolocation +geolocation: $(geolocationpkg_LTLIBRARIES) $(geolocation_DATA) +install-geolocation: install-geolocationDATA install-geolocationpkgLTLIBRARIES +endif diff --git a/src/modules/geoclue2/e-module-geoclue2.edj b/src/modules/geolocation/e-module-geolocation.edj similarity index 100% rename from src/modules/geoclue2/e-module-geoclue2.edj rename to src/modules/geolocation/e-module-geolocation.edj diff --git a/src/modules/geoclue2/e_mod_main.c b/src/modules/geolocation/e_mod_main.c similarity index 92% rename from src/modules/geoclue2/e_mod_main.c rename to src/modules/geolocation/e_mod_main.c index a53a13c..7debcaa 100644 --- a/src/modules/geoclue2/e_mod_main.c +++ b/src/modules/geolocation/e_mod_main.c @@ -29,7 +29,7 @@ typedef struct _Instance Instance; struct _Instance { E_Gadcon_Client *gcc; - Evas_Object *o_geoclue2; + Evas_Object *icon; E_Gadcon_Popup *popup; Evas_Object *popup_label; Evas_Object *popup_latitude; @@ -50,8 +50,8 @@ struct _Instance const char *description; }; -static Eina_List *geoclue2_instances = NULL; -static E_Module *geoclue2_module = NULL; +static Eina_List *geolocation_instances = NULL; +static E_Module *geolocation_module = NULL; void popup_update(Instance *inst) @@ -143,7 +143,7 @@ cb_client_start(Eldbus_Proxy *proxy EINA_UNUSED, void *data, Eldbus_Pending *pen DBG("Client proxy start callback received"); - edje_object_signal_emit(inst->o_geoclue2, "e,state,location_on", "e"); + edje_object_signal_emit(inst->icon, "e,state,location_on", "e"); } void @@ -154,11 +154,11 @@ cb_client_stop(Eldbus_Proxy *proxy EINA_UNUSED, void *data, Eldbus_Pending *pend DBG("Client proxy stop callback received"); - edje_object_signal_emit(inst->o_geoclue2, "e,state,location_off", "e"); + edje_object_signal_emit(inst->icon, "e,state,location_off", "e"); } static void -_geoclue2_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event) +_geolocation_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event) { Instance *inst = data; Evas_Event_Mouse_Down *ev = event; @@ -332,7 +332,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style) gcc->data = inst; inst->gcc = gcc; - inst->o_geoclue2 = o; + inst->icon = o; inst->latitude = 0.0; inst->longitude = 0.0; @@ -340,14 +340,14 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style) inst->altitude= 0.0 ; inst->description = NULL; inst->in_use = EINA_FALSE; - edje_object_signal_emit(inst->o_geoclue2, "e,state,location_off", "e"); + edje_object_signal_emit(inst->icon, "e,state,location_off", "e"); - evas_object_event_callback_add(inst->o_geoclue2, + evas_object_event_callback_add(inst->icon, EVAS_CALLBACK_MOUSE_DOWN, - _geoclue2_cb_mouse_down, + _geolocation_cb_mouse_down, inst); - geoclue2_instances = eina_list_append(geoclue2_instances, inst); + geolocation_instances = eina_list_append(geolocation_instances, inst); inst->conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM); if (!inst->conn) @@ -374,8 +374,8 @@ _gc_shutdown(E_Gadcon_Client *gcc) Instance *inst; inst = gcc->data; - geoclue2_instances = eina_list_remove(geoclue2_instances, inst); - evas_object_del(inst->o_geoclue2); + geolocation_instances = eina_list_remove(geolocation_instances, inst); + evas_object_del(inst->icon); geo_clue2_manager_proxy_unref(inst->location); geo_clue2_manager_proxy_unref(inst->client); geo_clue2_manager_proxy_unref(inst->manager); @@ -392,9 +392,9 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__) inst = gcc->data; mw = 0, mh = 0; - edje_object_size_min_get(inst->o_geoclue2, &mw, &mh); + edje_object_size_min_get(inst->icon, &mw, &mh); if ((mw < 1) || (mh < 1)) - edje_object_size_min_calc(inst->o_geoclue2, &mw, &mh); + edje_object_size_min_calc(inst->icon, &mw, &mh); if (mw < 4) mw = 4; if (mh < 4) mh = 4; e_gadcon_client_aspect_set(gcc, mw, mh); @@ -414,8 +414,8 @@ _gc_icon(const E_Gadcon_Client_Class *client_class __UNUSED__, Evas *evas) char buf[4096]; o = edje_object_add(evas); - snprintf(buf, sizeof(buf), "%s/e-module-geoclue2.edj", - e_module_dir_get(geoclue2_module)); + snprintf(buf, sizeof(buf), "%s/e-module-geolocation.edj", + e_module_dir_get(geolocation_module)); edje_object_file_set(o, buf, "icon"); return o; } @@ -426,7 +426,7 @@ _gc_id_new(const E_Gadcon_Client_Class *client_class) static char buf[4096]; snprintf(buf, sizeof(buf), "%s.%d", client_class->name, - eina_list_count(geoclue2_instances) + 1); + eina_list_count(geolocation_instances) + 1); return buf; } @@ -440,7 +440,7 @@ EAPI E_Module_Api e_modapi = EAPI void * e_modapi_init(E_Module *m) { - geoclue2_module = m; + geolocation_module = m; e_gadcon_provider_register(&_gadcon_class); return m; } diff --git a/src/modules/geoclue2/gen/eldbus_geo_clue2_client.c b/src/modules/geolocation/gen/eldbus_geo_clue2_client.c similarity index 100% rename from src/modules/geoclue2/gen/eldbus_geo_clue2_client.c rename to src/modules/geolocation/gen/eldbus_geo_clue2_client.c diff --git a/src/modules/geoclue2/gen/eldbus_geo_clue2_client.h b/src/modules/geolocation/gen/eldbus_geo_clue2_client.h similarity index 100% rename from src/modules/geoclue2/gen/eldbus_geo_clue2_client.h rename to src/modules/geolocation/gen/eldbus_geo_clue2_client.h diff --git a/src/modules/geoclue2/gen/eldbus_geo_clue2_location.c b/src/modules/geolocation/gen/eldbus_geo_clue2_location.c similarity index 100% rename from src/modules/geoclue2/gen/eldbus_geo_clue2_location.c rename to src/modules/geolocation/gen/eldbus_geo_clue2_location.c diff --git a/src/modules/geoclue2/gen/eldbus_geo_clue2_location.h b/src/modules/geolocation/gen/eldbus_geo_clue2_location.h similarity index 100% rename from src/modules/geoclue2/gen/eldbus_geo_clue2_location.h rename to src/modules/geolocation/gen/eldbus_geo_clue2_location.h diff --git a/src/modules/geoclue2/gen/eldbus_geo_clue2_manager.c b/src/modules/geolocation/gen/eldbus_geo_clue2_manager.c similarity index 100% rename from src/modules/geoclue2/gen/eldbus_geo_clue2_manager.c rename to src/modules/geolocation/gen/eldbus_geo_clue2_manager.c diff --git a/src/modules/geoclue2/gen/eldbus_geo_clue2_manager.h b/src/modules/geolocation/gen/eldbus_geo_clue2_manager.h similarity index 100% rename from src/modules/geoclue2/gen/eldbus_geo_clue2_manager.h rename to src/modules/geolocation/gen/eldbus_geo_clue2_manager.h diff --git a/src/modules/geoclue2/gen/eldbus_utils.h b/src/modules/geolocation/gen/eldbus_utils.h similarity index 100% rename from src/modules/geoclue2/gen/eldbus_utils.h rename to src/modules/geolocation/gen/eldbus_utils.h diff --git a/src/modules/geoclue2/module.desktop.in b/src/modules/geolocation/module.desktop.in similarity index 100% rename from src/modules/geoclue2/module.desktop.in rename to src/modules/geolocation/module.desktop.in --
