summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-11-12 22:56:05 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-11-12 22:56:05 +0900
commitea51427622db93242f36780ee90b1e02ebc4f666 (patch)
tree87f09ff0f27eb8d18c68b2b29f5bbf9a933f35ff /src/lib
parent4d5c3baaf16b6cad87a72de33828aa054cd447fe (diff)
option build deps that efl guarantees... now just are assumed and not ifdef'd
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Elementary.h.in23
-rw-r--r--src/lib/Makefile.am16
-rw-r--r--src/lib/elc_fileselector.c114
-rw-r--r--src/lib/elc_player.c19
-rw-r--r--src/lib/elm_dbus_menu.c51
-rw-r--r--src/lib/elm_icon.c43
-rw-r--r--src/lib/elm_main.c37
-rw-r--r--src/lib/elm_map.c526
-rw-r--r--src/lib/elm_photo.c8
-rw-r--r--src/lib/elm_prefs_data.c20
-rw-r--r--src/lib/elm_priv.h4
-rw-r--r--src/lib/elm_sys_notify.c25
-rw-r--r--src/lib/elm_systray.c27
-rw-r--r--src/lib/elm_systray_watcher.c15
-rw-r--r--src/lib/elm_thumb.c35
-rw-r--r--src/lib/elm_video.c121
-rw-r--r--src/lib/elm_widget_clock.h4
-rw-r--r--src/lib/elm_widget_fileselector.h2
-rw-r--r--src/lib/elm_widget_fileselector_button.h4
-rw-r--r--src/lib/elm_widget_fileselector_entry.h4
-rw-r--r--src/lib/elm_widget_hoversel.h4
-rw-r--r--src/lib/elm_widget_icon.h4
-rw-r--r--src/lib/elm_widget_label.h4
-rw-r--r--src/lib/elm_widget_photo.h2
-rw-r--r--src/lib/elm_widget_spinner.h4
-rw-r--r--src/lib/elm_widget_thumb.h2
26 files changed, 29 insertions, 1089 deletions
diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 41e5d0057..74f3683fc 100644
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -7,13 +7,14 @@
7#ifndef ELEMENTARY_H 7#ifndef ELEMENTARY_H
8#define ELEMENTARY_H 8#define ELEMENTARY_H
9 9
10#define ELM_ELDBUS
11#define ELM_EFREET
12#define ELM_ETHUMB
13
10@ELM_UNIX_DEF@ ELM_UNIX 14@ELM_UNIX_DEF@ ELM_UNIX
11@ELM_WIN32_DEF@ ELM_WIN32 15@ELM_WIN32_DEF@ ELM_WIN32
12@ELM_WINCE_DEF@ ELM_WINCE 16@ELM_WINCE_DEF@ ELM_WINCE
13@ELM_ELDBUS_DEF@ ELM_ELDBUS
14@ELM_EFREET_DEF@ ELM_EFREET
15@ELM_ELOCATION_DEF@ ELM_ELOCATION 17@ELM_ELOCATION_DEF@ ELM_ELOCATION
16@ELM_ETHUMB_DEF@ ELM_ETHUMB
17@ELM_WEB_DEF@ ELM_WEB 18@ELM_WEB_DEF@ ELM_WEB
18@ELM_EMAP_DEF@ ELM_EMAP 19@ELM_EMAP_DEF@ ELM_EMAP
19@ELM_DEBUG_DEF@ ELM_DEBUG 20@ELM_DEBUG_DEF@ ELM_DEBUG
@@ -73,28 +74,20 @@
73#include <Ecore_Evas.h> 74#include <Ecore_Evas.h>
74#include <Ecore_File.h> 75#include <Ecore_File.h>
75#include <Ecore_Input.h> 76#include <Ecore_Input.h>
76@ELEMENTARY_ECORE_IMF_INC@ 77#include <Ecore_Input.h>
77@ELEMENTARY_ECORE_CON_INC@ 78#include <Ecore_IMF.h>
79#include <Ecore_Con.h>
78#include <Edje.h> 80#include <Edje.h>
79
80#ifdef ELM_ELDBUS
81#include <Eldbus.h> 81#include <Eldbus.h>
82#endif
83
84#ifdef ELM_EFREET
85#include <Efreet.h> 82#include <Efreet.h>
86#include <Efreet_Mime.h> 83#include <Efreet_Mime.h>
87#include <Efreet_Trash.h> 84#include <Efreet_Trash.h>
88#endif 85#include <Ethumb_Client.h>
89 86
90#ifdef ELM_ELOCATION 87#ifdef ELM_ELOCATION
91#include <Elocation.h> 88#include <Elocation.h>
92#endif 89#endif
93 90
94#ifdef ELM_ETHUMB
95#include <Ethumb_Client.h>
96#endif
97
98#ifdef ELM_EMAP 91#ifdef ELM_EMAP
99#include <EMap.h> 92#include <EMap.h>
100#endif 93#endif
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index c6b31d253..46d7a1d90 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -19,19 +19,12 @@ AM_CPPFLAGS = \
19@ELEMENTARY_SDL_CFLAGS@ \ 19@ELEMENTARY_SDL_CFLAGS@ \
20@ELEMENTARY_WIN32_CFLAGS@ \ 20@ELEMENTARY_WIN32_CFLAGS@ \
21@ELEMENTARY_WINCE_CFLAGS@ \ 21@ELEMENTARY_WINCE_CFLAGS@ \
22@ELEMENTARY_ELDBUS_CFLAGS@ \
23@ELEMENTARY_EFREET_CFLAGS@ \
24@ELEMENTARY_ELOCATION_CFLAGS@ \ 22@ELEMENTARY_ELOCATION_CFLAGS@ \
25@ELEMENTARY_EWEATHER_CFLAGS@ \ 23@ELEMENTARY_EWEATHER_CFLAGS@ \
26@ELEMENTARY_ETHUMB_CFLAGS@ \
27@ELEMENTARY_WEB_CFLAGS@ \ 24@ELEMENTARY_WEB_CFLAGS@ \
28@ELEMENTARY_EMAP_CFLAGS@ \ 25@ELEMENTARY_EMAP_CFLAGS@ \
29@ELEMENTARY_ECORE_CON_CFLAGS@ \
30@ELEMENTARY_ECORE_IMF_CFLAGS@ \
31@ELEMENTARY_WAYLAND_CFLAGS@ \ 26@ELEMENTARY_WAYLAND_CFLAGS@ \
32@EVIL_CFLAGS@ \ 27@EVIL_CFLAGS@
33@EIO_CFLAGS@ \
34@EMOTION_CFLAGS@
35 28
36if ELEMENTARY_WINDOWS_BUILD 29if ELEMENTARY_WINDOWS_BUILD
37AM_CPPFLAGS += -DELEMENTARY_BUILD 30AM_CPPFLAGS += -DELEMENTARY_BUILD
@@ -500,18 +493,11 @@ libelementary_la_LIBADD = \
500@ELEMENTARY_SDL_LIBS@ \ 493@ELEMENTARY_SDL_LIBS@ \
501@ELEMENTARY_WIN32_LIBS@ \ 494@ELEMENTARY_WIN32_LIBS@ \
502@ELEMENTARY_WINCE_LIBS@ \ 495@ELEMENTARY_WINCE_LIBS@ \
503@ELEMENTARY_ELDBUS_LIBS@ \
504@ELEMENTARY_EFREET_LIBS@ \
505@ELEMENTARY_ELOCATION_LIBS@ \ 496@ELEMENTARY_ELOCATION_LIBS@ \
506@ELEMENTARY_ETHUMB_LIBS@ \
507@ELEMENTARY_WEB_LIBS@ \ 497@ELEMENTARY_WEB_LIBS@ \
508@ELEMENTARY_EMAP_LIBS@ \ 498@ELEMENTARY_EMAP_LIBS@ \
509@ELEMENTARY_ECORE_IMF_LIBS@ \
510@ELEMENTARY_ECORE_CON_LIBS@ \
511@ELEMENTARY_WAYLAND_LIBS@ \ 499@ELEMENTARY_WAYLAND_LIBS@ \
512@EVIL_LIBS@ \ 500@EVIL_LIBS@ \
513@EIO_LIBS@ \
514@EMOTION_LIBS@ \
515@LTLIBINTL@ 501@LTLIBINTL@
516 502
517libelementary_la_LDFLAGS = \ 503libelementary_la_LDFLAGS = \
diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index d29a266f7..e6a9b8eb9 100644
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -278,9 +278,7 @@ _check_filters(const Elm_Fileselector_Filter *filter, const char *file_name)
278 278
279 if (!filter) return EINA_TRUE; 279 if (!filter) return EINA_TRUE;
280 280
281#ifdef ELM_EFREET
282 mime_type = efreet_mime_type_get(file_name); 281 mime_type = efreet_mime_type_get(file_name);
283#endif
284 282
285 if (!mime_type) return EINA_FALSE; 283 if (!mime_type) return EINA_FALSE;
286 284
@@ -292,7 +290,6 @@ _check_filters(const Elm_Fileselector_Filter *filter, const char *file_name)
292 return EINA_FALSE; 290 return EINA_FALSE;
293} 291}
294 292
295#ifdef HAVE_EIO
296static Eina_Bool 293static Eina_Bool
297_ls_filter_cb(void *data, 294_ls_filter_cb(void *data,
298 Eio_File *handler __UNUSED__, 295 Eio_File *handler __UNUSED__,
@@ -478,8 +475,6 @@ _ls_error_cb(void *data, Eio_File *handler, int error __UNUSED__)
478 _listing_request_cleanup(lreq); 475 _listing_request_cleanup(lreq);
479} 476}
480 477
481#endif
482
483static void 478static void
484_populate(Evas_Object *obj, 479_populate(Evas_Object *obj,
485 const char *path, 480 const char *path,
@@ -489,109 +484,8 @@ _populate(Evas_Object *obj,
489 ELM_FILESELECTOR_DATA_GET(obj, sd); 484 ELM_FILESELECTOR_DATA_GET(obj, sd);
490 if (!path) return; 485 if (!path) return;
491 486
492#ifdef HAVE_EIO
493 Listing_Request *lreq; 487 Listing_Request *lreq;
494#else
495 Eina_List *files = NULL, *dirs = NULL;
496 Eina_File_Direct_Info *file;
497 Eina_Iterator *it;
498 const char *entry;
499#endif
500
501#ifndef HAVE_EIO /* synchronous listing path */
502 if (!ecore_file_is_dir(path)) return;
503
504 it = eina_file_stat_ls(path);
505 if (!it) return;
506
507 if (sd->multi)
508 {
509 char *path;
510 EINA_LIST_FREE(sd->paths, path)
511 free(path);
512 }
513 488
514 evas_object_smart_callback_call(obj, SIG_DIRECTORY_OPEN, (void *)path);
515 if (!parent_it)
516 {
517 if (mode == ELM_FILESELECTOR_LIST)
518 elm_genlist_clear(lreq->sd->files_view);
519 else
520 elm_gengrid_clear(lreq->sd->files_view);
521
522 eina_stringshare_replace(&sd->path, path);
523 _anchors_do(obj, path);
524 elm_object_text_set(sd->name_entry, "");
525 }
526
527 EINA_ITERATOR_FOREACH(it, file)
528 {
529 const char *filename;
530
531 if (!sd->hidden_visible && file->path[file->name_start] == '.') continue;
532
533 filename = eina_stringshare_add(file->path);
534 if (file->type == EINA_FILE_DIR)
535 dirs = eina_list_append(dirs, filename);
536 else if (!sd->only_folder && _check_filters(sd->current_filter, filename))
537 files = eina_list_append(files, filename);
538 }
539 eina_iterator_free(it);
540
541 files = eina_list_sort
542 (files, eina_list_count(files), EINA_COMPARE_CB(strcoll));
543
544 dirs = eina_list_sort
545 (dirs, eina_list_count(dirs), EINA_COMPARE_CB(strcoll));
546 EINA_LIST_FREE(dirs, entry)
547 {
548 if (sd->mode == ELM_FILESELECTOR_LIST)
549 elm_genlist_item_append(sd->files_view, list_itc[ELM_DIRECTORY],
550 entry, /* item data */
551 parent_it,
552 (sd->expand)
553 ? ELM_GENLIST_ITEM_TREE : ELM_GENLIST_ITEM_NONE,
554 NULL, NULL);
555 else if (sd->mode == ELM_FILESELECTOR_GRID)
556 elm_gengrid_item_append(sd->files_view, grid_itc[ELM_DIRECTORY],
557 entry, /* item data */
558 NULL, NULL);
559 }
560
561 EINA_LIST_FREE(files, entry)
562 {
563 Elm_Fileselector_Type type =
564 evas_object_image_extension_can_load_fast_get(entry) ?
565 ELM_FILE_IMAGE : ELM_FILE_UNKNOW;
566
567 if (sd->mode == ELM_FILESELECTOR_LIST)
568 {
569 Elm_Object_Item *item;
570 item = elm_genlist_item_append(sd->files_view, list_itc[type],
571 entry, /* item data */
572 parent_it, ELM_GENLIST_ITEM_NONE,
573 NULL, NULL);
574 if (selected && !strcmp(entry, selected))
575 {
576 elm_genlist_item_selected_set(item, EINA_TRUE);
577 elm_object_text_set(sd->name_entry, ecore_file_file_get(entry));
578 }
579 }
580 else if (sd->mode == ELM_FILESELECTOR_GRID)
581 {
582 Elm_Object_Item *item;
583 item = elm_gengrid_item_append(sd->files_view, grid_itc[type],
584 entry, /* item data */
585 NULL, NULL);
586 if (selected && !strcmp(entry, selected))
587 {
588 elm_gengrid_item_selected_set(item, EINA_TRUE);
589 elm_object_text_set(sd->name_entry, ecore_file_file_get(entry));
590 }
591 }
592 }
593
594#else /* asynchronous listing path */
595 if (sd->expand && sd->current) return; 489 if (sd->expand && sd->current) return;
596 490
597 if (sd->monitor) eio_monitor_del(sd->monitor); 491 if (sd->monitor) eio_monitor_del(sd->monitor);
@@ -619,7 +513,6 @@ _populate(Evas_Object *obj,
619 _ls_done_cb, _ls_error_cb, lreq); 513 _ls_done_cb, _ls_error_cb, lreq);
620 elm_progressbar_pulse(sd->spinner, EINA_TRUE); 514 elm_progressbar_pulse(sd->spinner, EINA_TRUE);
621 elm_layout_signal_emit(lreq->obj, "elm,action,spinner,show", "elm"); 515 elm_layout_signal_emit(lreq->obj, "elm,action,spinner,show", "elm");
622#endif
623} 516}
624 517
625static void 518static void
@@ -1168,7 +1061,6 @@ _files_grid_add(Evas_Object *obj)
1168 return grid; 1061 return grid;
1169} 1062}
1170 1063
1171#ifdef HAVE_EIO
1172static Eina_Bool 1064static Eina_Bool
1173_resource_created(void *data, int type, void *ev) 1065_resource_created(void *data, int type, void *ev)
1174{ 1066{
@@ -1280,7 +1172,6 @@ _resource_deleted(void *data, int type EINA_UNUSED, void *ev)
1280 1172
1281 return ECORE_CALLBACK_PASS_ON; 1173 return ECORE_CALLBACK_PASS_ON;
1282} 1174}
1283#endif
1284 1175
1285static void 1176static void
1286_elm_fileselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) 1177_elm_fileselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
@@ -1372,7 +1263,6 @@ _elm_fileselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1372 elm_fileselector_buttons_ok_cancel_set(obj, EINA_TRUE); 1263 elm_fileselector_buttons_ok_cancel_set(obj, EINA_TRUE);
1373 elm_fileselector_is_save_set(obj, EINA_FALSE); 1264 elm_fileselector_is_save_set(obj, EINA_FALSE);
1374 1265
1375#ifdef HAVE_EIO
1376#define HANDLER_ADD(e, fn) \ 1266#define HANDLER_ADD(e, fn) \
1377 priv->handlers = eina_list_append(priv->handlers, \ 1267 priv->handlers = eina_list_append(priv->handlers, \
1378 ecore_event_handler_add(e, fn, obj)); 1268 ecore_event_handler_add(e, fn, obj));
@@ -1383,7 +1273,6 @@ _elm_fileselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1383 HANDLER_ADD(EIO_MONITOR_FILE_DELETED, _resource_deleted); 1273 HANDLER_ADD(EIO_MONITOR_FILE_DELETED, _resource_deleted);
1384 HANDLER_ADD(EIO_MONITOR_DIRECTORY_DELETED, _resource_deleted); 1274 HANDLER_ADD(EIO_MONITOR_DIRECTORY_DELETED, _resource_deleted);
1385#undef HANDLER_ADD 1275#undef HANDLER_ADD
1386#endif
1387 1276
1388 eo_do(obj, elm_wdg_theme(NULL)); 1277 eo_do(obj, elm_wdg_theme(NULL));
1389} 1278}
@@ -1394,8 +1283,6 @@ _elm_fileselector_smart_del(Eo *obj EINA_UNUSED, void *_pd, va_list *list EINA_U
1394 Elm_Fileselector_Smart_Data *sd = _pd; 1283 Elm_Fileselector_Smart_Data *sd = _pd;
1395 Elm_Fileselector_Filter *filter; 1284 Elm_Fileselector_Filter *filter;
1396 char *path; 1285 char *path;
1397
1398#ifdef HAVE_EIO
1399 Ecore_Event_Handler *h; 1286 Ecore_Event_Handler *h;
1400 1287
1401 if (sd->monitor) eio_monitor_del(sd->monitor); 1288 if (sd->monitor) eio_monitor_del(sd->monitor);
@@ -1405,7 +1292,6 @@ _elm_fileselector_smart_del(Eo *obj EINA_UNUSED, void *_pd, va_list *list EINA_U
1405 { 1292 {
1406 ecore_event_handler_del(h); 1293 ecore_event_handler_del(h);
1407 } 1294 }
1408#endif
1409 1295
1410 EINA_LIST_FREE(sd->filter_list, filter) 1296 EINA_LIST_FREE(sd->filter_list, filter)
1411 { 1297 {
diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
index 6ac0ac468..b5d8ebf8c 100644
--- a/src/lib/elc_player.c
+++ b/src/lib/elc_player.c
@@ -2,9 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#ifdef HAVE_EMOTION 5#include <Emotion.h>
6# include <Emotion.h>
7#endif
8 6
9#include <Elementary.h> 7#include <Elementary.h>
10#include "elm_priv.h" 8#include "elm_priv.h"
@@ -57,7 +55,6 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
57 { NULL, NULL } 55 { NULL, NULL }
58}; 56};
59 57
60#ifdef HAVE_EMOTION
61static void 58static void
62_elm_player_smart_event(Eo *obj, void *_pd, va_list *list) 59_elm_player_smart_event(Eo *obj, void *_pd, va_list *list)
63{ 60{
@@ -699,34 +696,22 @@ _elm_player_smart_del(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
699 eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); 696 eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
700} 697}
701 698
702#endif
703
704EAPI Evas_Object * 699EAPI Evas_Object *
705elm_player_add(Evas_Object *parent) 700elm_player_add(Evas_Object *parent)
706{ 701{
707#ifdef HAVE_EMOTION
708 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 702 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
709 Evas_Object *obj = eo_add(MY_CLASS, parent); 703 Evas_Object *obj = eo_add(MY_CLASS, parent);
710 eo_unref(obj); 704 eo_unref(obj);
711 return obj; 705 return obj;
712#else
713 (void) parent;
714 return NULL;
715#endif
716} 706}
717 707
718static void 708static void
719_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) 709_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
720{ 710{
721#ifdef HAVE_EMOTION
722 eo_do_super(obj, MY_CLASS, eo_constructor()); 711 eo_do_super(obj, MY_CLASS, eo_constructor());
723 eo_do(obj, 712 eo_do(obj,
724 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 713 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
725 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); 714 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
726#else
727 eo_error_set(obj);
728#endif
729
730} 715}
731 716
732static void 717static void
@@ -735,7 +720,6 @@ _class_constructor(Eo_Class *klass)
735 const Eo_Op_Func_Description func_desc[] = { 720 const Eo_Op_Func_Description func_desc[] = {
736 721
737 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor), 722 EO_OP_FUNC(EO_BASE_ID(EO_BASE_SUB_ID_CONSTRUCTOR), _constructor),
738#ifdef HAVE_EMOTION
739 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_player_smart_add), 723 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_ADD), _elm_player_smart_add),
740 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_player_smart_del), 724 EO_OP_FUNC(EVAS_OBJ_SMART_ID(EVAS_OBJ_SMART_SUB_ID_DEL), _elm_player_smart_del),
741 725
@@ -744,7 +728,6 @@ _class_constructor(Eo_Class *klass)
744 728
745 EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_player_smart_content_set), 729 EO_OP_FUNC(ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET), _elm_player_smart_content_set),
746 EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_player_smart_sizing_eval), 730 EO_OP_FUNC(ELM_OBJ_LAYOUT_ID(ELM_OBJ_LAYOUT_SUB_ID_SIZING_EVAL), _elm_player_smart_sizing_eval),
747#endif
748 EO_OP_FUNC_SENTINEL 731 EO_OP_FUNC_SENTINEL
749 }; 732 };
750 eo_class_funcs_set(klass, func_desc); 733 eo_class_funcs_set(klass, func_desc);
diff --git a/src/lib/elm_dbus_menu.c b/src/lib/elm_dbus_menu.c
index 677411401..9c2287bc5 100644
--- a/src/lib/elm_dbus_menu.c
+++ b/src/lib/elm_dbus_menu.c
@@ -8,8 +8,6 @@
8#include "elm_widget_menu.h" 8#include "elm_widget_menu.h"
9#include "elm_widget_icon.h" 9#include "elm_widget_icon.h"
10 10
11#ifdef ELM_ELDBUS
12
13#define DBUS_PATH "/com/canonical/dbusmenu" 11#define DBUS_PATH "/com/canonical/dbusmenu"
14#define DBUS_INTERFACE "com.canonical.dbusmenu" 12#define DBUS_INTERFACE "com.canonical.dbusmenu"
15#define DBUS_MENU_VERSION 3u 13#define DBUS_MENU_VERSION 3u
@@ -19,13 +17,11 @@
19#define REGISTRAR_INTERFACE REGISTRAR_NAME 17#define REGISTRAR_INTERFACE REGISTRAR_NAME
20 18
21#define DBUS_DATA_KEY "_Elm_DBus_Menu" 19#define DBUS_DATA_KEY "_Elm_DBus_Menu"
22#endif
23 20
24typedef struct _Callback_Data Callback_Data; 21typedef struct _Callback_Data Callback_Data;
25 22
26struct _Elm_DBus_Menu 23struct _Elm_DBus_Menu
27{ 24{
28#ifdef ELM_ELDBUS
29 Eo *menu; 25 Eo *menu;
30 Eldbus_Connection *bus; 26 Eldbus_Connection *bus;
31 Eldbus_Service_Interface *iface; 27 Eldbus_Service_Interface *iface;
@@ -33,10 +29,8 @@ struct _Elm_DBus_Menu
33 Eina_Hash *elements; 29 Eina_Hash *elements;
34 Ecore_Idler *signal_idler; 30 Ecore_Idler *signal_idler;
35 Callback_Data *app_menu_data; 31 Callback_Data *app_menu_data;
36#endif
37}; 32};
38 33
39#ifdef ELM_ELDBUS
40static const Eldbus_Service_Interface_Desc _interface; 34static const Eldbus_Service_Interface_Desc _interface;
41static unsigned last_object_path; 35static unsigned last_object_path;
42 36
@@ -178,12 +172,10 @@ _freedesktop_icon_exists(Elm_Menu_Item *item)
178{ 172{
179 if (!item->icon_str) return EINA_FALSE; 173 if (!item->icon_str) return EINA_FALSE;
180 174
181#ifdef ELM_EFREET
182 ELM_ICON_CHECK(item->content) EINA_FALSE; 175 ELM_ICON_CHECK(item->content) EINA_FALSE;
183 176
184 ELM_ICON_DATA_GET(item->content, sd); 177 ELM_ICON_DATA_GET(item->content, sd);
185 if (sd->freedesktop.use) return EINA_TRUE; 178 if (sd->freedesktop.use) return EINA_TRUE;
186#endif
187 179
188 return EINA_FALSE; 180 return EINA_FALSE;
189} 181}
@@ -1042,46 +1034,3 @@ _elm_dbus_menu_update(Elm_DBus_Menu *dbus_menu)
1042{ 1034{
1043 _layout_signal(dbus_menu); 1035 _layout_signal(dbus_menu);
1044} 1036}
1045
1046#else
1047
1048const char *
1049_elm_dbus_menu_register(Eo *obj EINA_UNUSED)
1050{
1051 return NULL;
1052}
1053
1054void
1055_elm_dbus_menu_unregister(Eo *obj EINA_UNUSED)
1056{
1057}
1058
1059void
1060_elm_dbus_menu_app_menu_register(Ecore_X_Window xid EINA_UNUSED, Eo *obj EINA_UNUSED,
1061 void (*result_cb)(Eina_Bool, void *) EINA_UNUSED, void *data EINA_UNUSED)
1062{
1063}
1064
1065void
1066_elm_dbus_menu_app_menu_unregister(Eo *obj EINA_UNUSED)
1067{
1068}
1069
1070int
1071_elm_dbus_menu_item_add(Elm_DBus_Menu *dbus_menu EINA_UNUSED,
1072 Elm_Object_Item *item_obj EINA_UNUSED)
1073{
1074 return -1;
1075}
1076
1077void
1078_elm_dbus_menu_item_delete(Elm_DBus_Menu *dbus_menu EINA_UNUSED, int id EINA_UNUSED)
1079{
1080}
1081
1082void
1083_elm_dbus_menu_update(Elm_DBus_Menu *dbus_menu EINA_UNUSED)
1084{
1085}
1086
1087#endif
diff --git a/src/lib/elm_icon.c b/src/lib/elm_icon.c
index d6ede5ddb..f9553dd1f 100644
--- a/src/lib/elm_icon.c
+++ b/src/lib/elm_icon.c
@@ -8,10 +8,8 @@
8#include "elm_widget_icon.h" 8#include "elm_widget_icon.h"
9#include "elm_widget_image.h" 9#include "elm_widget_image.h"
10 10
11#ifdef ELM_EFREET
12#define NON_EXISTING (void *)-1 11#define NON_EXISTING (void *)-1
13static const char *icon_theme = NULL; 12static const char *icon_theme = NULL;
14#endif
15 13
16EAPI Eo_Op ELM_OBJ_ICON_BASE_ID = EO_NOOP; 14EAPI Eo_Op ELM_OBJ_ICON_BASE_ID = EO_NOOP;
17 15
@@ -19,10 +17,8 @@ EAPI Eo_Op ELM_OBJ_ICON_BASE_ID = EO_NOOP;
19#define MY_CLASS_NAME "Elm_Icon" 17#define MY_CLASS_NAME "Elm_Icon"
20#define MY_CLASS_NAME_LEGACY "elm_icon" 18#define MY_CLASS_NAME_LEGACY "elm_icon"
21 19
22#ifdef HAVE_ELEMENTARY_ETHUMB
23static Eina_List *_elm_icon_retry = NULL; 20static Eina_List *_elm_icon_retry = NULL;
24static int _icon_pending_request = 0; 21static int _icon_pending_request = 0;
25#endif
26 22
27static const char SIG_THUMB_DONE[] = "thumb,done"; 23static const char SIG_THUMB_DONE[] = "thumb,done";
28static const char SIG_THUMB_ERROR[] = "thumb,error"; 24static const char SIG_THUMB_ERROR[] = "thumb,error";
@@ -61,7 +57,6 @@ _icon_size_min_get(Evas_Object *icon)
61 return (size < 16) ? 16 : size; 57 return (size < 16) ? 16 : size;
62} 58}
63 59
64#ifdef HAVE_ELEMENTARY_ETHUMB
65static void 60static void
66_icon_thumb_stop(Elm_Icon_Smart_Data *sd, 61_icon_thumb_stop(Elm_Icon_Smart_Data *sd,
67 void *ethumbd) 62 void *ethumbd)
@@ -264,20 +259,11 @@ _icon_thumb_apply_cb(void *data,
264 return ECORE_CALLBACK_RENEW; 259 return ECORE_CALLBACK_RENEW;
265} 260}
266 261
267#endif
268
269static Eina_Bool 262static Eina_Bool
270#ifdef ELM_EFREET
271_icon_freedesktop_set(Evas_Object *obj, 263_icon_freedesktop_set(Evas_Object *obj,
272 const char *name, 264 const char *name,
273 int size) 265 int size)
274#else
275_icon_freedesktop_set(Evas_Object * obj __UNUSED__,
276 const char *name __UNUSED__,
277 int size __UNUSED__)
278#endif
279{ 266{
280#ifdef ELM_EFREET
281 const char *path; 267 const char *path;
282 268
283 ELM_ICON_DATA_GET(obj, sd); 269 ELM_ICON_DATA_GET(obj, sd);
@@ -320,7 +306,6 @@ _icon_freedesktop_set(Evas_Object * obj __UNUSED__,
320 elm_image_file_set(obj, path, NULL); 306 elm_image_file_set(obj, path, NULL);
321 return EINA_TRUE; 307 return EINA_TRUE;
322 } 308 }
323#endif
324 return EINA_FALSE; 309 return EINA_FALSE;
325} 310}
326 311
@@ -336,7 +321,6 @@ _elm_icon_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
336 sd->in_eval++; 321 sd->in_eval++;
337 elm_image_object_size_get(obj, &w, &h); 322 elm_image_object_size_get(obj, &w, &h);
338 323
339#ifdef ELM_EFREET
340 if (sd->freedesktop.use && sd->stdicon) 324 if (sd->freedesktop.use && sd->stdicon)
341 { 325 {
342 int size; 326 int size;
@@ -348,7 +332,6 @@ _elm_icon_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
348 size = ((w / 16) + 1) * 16; 332 size = ((w / 16) + 1) * 16;
349 _icon_freedesktop_set(obj, sd->stdicon, size); 333 _icon_freedesktop_set(obj, sd->stdicon, size);
350 } 334 }
351#endif
352 335
353 eo_do_super(obj, MY_CLASS, elm_obj_image_sizing_eval()); 336 eo_do_super(obj, MY_CLASS, elm_obj_image_sizing_eval());
354 337
@@ -386,10 +369,8 @@ _elm_icon_smart_file_set(Eo *obj, void *_pd, va_list *list)
386 369
387 _edje_signals_free(sd); 370 _edje_signals_free(sd);
388 371
389#ifdef ELM_EFREET
390 if (!sd->freedesktop.use) 372 if (!sd->freedesktop.use)
391 ELM_SAFE_FREE(sd->stdicon, eina_stringshare_del); 373 ELM_SAFE_FREE(sd->stdicon, eina_stringshare_del);
392#endif
393 374
394 if (!sd->is_video) 375 if (!sd->is_video)
395 { 376 {
@@ -482,10 +463,8 @@ _icon_standard_set(Evas_Object *obj,
482 463
483 if (_elm_theme_object_icon_set(obj, name, "default")) 464 if (_elm_theme_object_icon_set(obj, name, "default"))
484 { 465 {
485#ifdef ELM_EFREET
486 /* TODO: elm_unneed_efreet() */ 466 /* TODO: elm_unneed_efreet() */
487 sd->freedesktop.use = EINA_FALSE; 467 sd->freedesktop.use = EINA_FALSE;
488#endif
489 return EINA_TRUE; 468 return EINA_TRUE;
490 } 469 }
491 470
@@ -493,22 +472,14 @@ _icon_standard_set(Evas_Object *obj,
493} 472}
494 473
495static Eina_Bool 474static Eina_Bool
496#ifdef ELM_EFREET
497_icon_file_set(Elm_Icon_Smart_Data *sd, 475_icon_file_set(Elm_Icon_Smart_Data *sd,
498 Evas_Object *obj, 476 Evas_Object *obj,
499 const char *path) 477 const char *path)
500#else
501_icon_file_set(Elm_Icon_Smart_Data * sd __UNUSED__,
502 Evas_Object * obj,
503 const char *path)
504#endif
505{ 478{
506 if (elm_image_file_set(obj, path, NULL)) 479 if (elm_image_file_set(obj, path, NULL))
507 { 480 {
508#ifdef ELM_EFREET
509 /* TODO: elm_unneed_efreet() */ 481 /* TODO: elm_unneed_efreet() */
510 sd->freedesktop.use = EINA_FALSE; 482 sd->freedesktop.use = EINA_FALSE;
511#endif
512 return EINA_TRUE; 483 return EINA_TRUE;
513 } 484 }
514 return EINA_FALSE; 485 return EINA_FALSE;
@@ -590,7 +561,6 @@ _elm_icon_standard_resize_cb(void *data,
590 eina_stringshare_del(refup); 561 eina_stringshare_del(refup);
591} 562}
592 563
593#ifdef HAVE_ELEMENTARY_ETHUMB
594static void 564static void
595_elm_icon_thumb_resize_cb(void *data, 565_elm_icon_thumb_resize_cb(void *data,
596 Evas *e __UNUSED__, 566 Evas *e __UNUSED__,
@@ -603,8 +573,6 @@ _elm_icon_thumb_resize_cb(void *data,
603 elm_icon_thumb_set(obj, sd->thumb.file.path, sd->thumb.file.key); 573 elm_icon_thumb_set(obj, sd->thumb.file.path, sd->thumb.file.key);
604} 574}
605 575
606#endif
607
608static void 576static void
609_elm_icon_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) 577_elm_icon_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
610{ 578{
@@ -615,9 +583,7 @@ _elm_icon_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
615 583
616 priv->lookup_order = ELM_ICON_LOOKUP_THEME_FDO; 584 priv->lookup_order = ELM_ICON_LOOKUP_THEME_FDO;
617 585
618#ifdef HAVE_ELEMENTARY_ETHUMB
619 priv->thumb.request = NULL; 586 priv->thumb.request = NULL;
620#endif
621} 587}
622 588
623static void 589static void
@@ -627,7 +593,6 @@ _elm_icon_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
627 593
628 if (sd->stdicon) eina_stringshare_del(sd->stdicon); 594 if (sd->stdicon) eina_stringshare_del(sd->stdicon);
629 595
630#ifdef HAVE_ELEMENTARY_ETHUMB
631 if (sd->thumb.request) 596 if (sd->thumb.request)
632 { 597 {
633 Ethumb_Client *ethumbd = elm_thumb_ethumb_client_get(); 598 Ethumb_Client *ethumbd = elm_thumb_ethumb_client_get();
@@ -641,7 +606,6 @@ _elm_icon_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
641 606
642 if (sd->thumb.eeh) 607 if (sd->thumb.eeh)
643 ecore_event_handler_del(sd->thumb.eeh); 608 ecore_event_handler_del(sd->thumb.eeh);
644#endif
645 609
646 _edje_signals_free(sd); 610 _edje_signals_free(sd);
647 611
@@ -814,7 +778,6 @@ _thumb_set(Eo *obj, void *_pd, va_list *list)
814{ 778{
815 const char *file = va_arg(*list, const char *); 779 const char *file = va_arg(*list, const char *);
816 const char *group = va_arg(*list, const char *); 780 const char *group = va_arg(*list, const char *);
817#ifdef HAVE_ELEMENTARY_ETHUMB
818 Elm_Icon_Smart_Data *sd = _pd; 781 Elm_Icon_Smart_Data *sd = _pd;
819 782
820 evas_object_event_callback_del_full 783 evas_object_event_callback_del_full
@@ -839,12 +802,6 @@ _thumb_set(Eo *obj, void *_pd, va_list *list)
839 sd->thumb.eeh = ecore_event_handler_add 802 sd->thumb.eeh = ecore_event_handler_add
840 (ELM_ECORE_EVENT_ETHUMB_CONNECT, _icon_thumb_apply_cb, obj); 803 (ELM_ECORE_EVENT_ETHUMB_CONNECT, _icon_thumb_apply_cb, obj);
841 } 804 }
842#else
843 (void)obj;
844 (void)_pd;
845 (void)file;
846 (void)group;
847#endif
848} 805}
849 806
850EAPI Eina_Bool 807EAPI Eina_Bool
diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 927481ff3..061949326 100644
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -12,9 +12,7 @@
12# include <Evil.h> 12# include <Evil.h>
13#endif 13#endif
14 14
15#ifdef HAVE_EMOTION 15#include <Emotion.h>
16# include <Emotion.h>
17#endif
18 16
19#include <Elementary.h> 17#include <Elementary.h>
20#include "elm_priv.h" 18#include "elm_priv.h"
@@ -99,10 +97,8 @@ _elm_emotion_init(void)
99{ 97{
100 if (_emotion_inited) return ; 98 if (_emotion_inited) return ;
101 99
102#if HAVE_EMOTION
103 emotion_init(); 100 emotion_init();
104 _emotion_inited = EINA_TRUE; 101 _emotion_inited = EINA_TRUE;
105#endif
106} 102}
107 103
108void 104void
@@ -110,10 +106,8 @@ _elm_emotion_shutdown(void)
110{ 106{
111 if (!_emotion_inited) return ; 107 if (!_emotion_inited) return ;
112 108
113#if HAVE_EMOTION
114 emotion_shutdown(); 109 emotion_shutdown();
115 _emotion_inited = EINA_FALSE; 110 _emotion_inited = EINA_FALSE;
116#endif
117} 111}
118 112
119static void *app_mainfunc = NULL; 113static void *app_mainfunc = NULL;
@@ -502,30 +496,22 @@ _elm_unneed_e_dbus(void)
502 e_dbus_handle = NULL; 496 e_dbus_handle = NULL;
503} 497}
504 498
505#ifdef ELM_ELDBUS
506static Eina_Bool _elm_need_eldbus = EINA_FALSE; 499static Eina_Bool _elm_need_eldbus = EINA_FALSE;
507#endif
508EAPI Eina_Bool 500EAPI Eina_Bool
509elm_need_eldbus(void) 501elm_need_eldbus(void)
510{ 502{
511#ifdef ELM_ELDBUS
512 if (_elm_need_eldbus) return EINA_TRUE; 503 if (_elm_need_eldbus) return EINA_TRUE;
513 _elm_need_eldbus = EINA_TRUE; 504 _elm_need_eldbus = EINA_TRUE;
514 eldbus_init(); 505 eldbus_init();
515 return EINA_TRUE; 506 return EINA_TRUE;
516#else
517 return EINA_FALSE;
518#endif
519} 507}
520 508
521static void 509static void
522_elm_unneed_eldbus(void) 510_elm_unneed_eldbus(void)
523{ 511{
524#ifdef ELM_ELDBUS
525 if (!_elm_need_eldbus) return; 512 if (!_elm_need_eldbus) return;
526 _elm_need_eldbus = EINA_FALSE; 513 _elm_need_eldbus = EINA_FALSE;
527 eldbus_shutdown(); 514 eldbus_shutdown();
528#endif
529} 515}
530 516
531#ifdef ELM_ELOCATION 517#ifdef ELM_ELOCATION
@@ -554,13 +540,11 @@ _elm_unneed_elocation(void)
554#endif 540#endif
555} 541}
556 542
557#ifdef ELM_EFREET
558static Eina_Bool _elm_need_efreet = EINA_FALSE; 543static Eina_Bool _elm_need_efreet = EINA_FALSE;
559#endif 544
560EAPI Eina_Bool 545EAPI Eina_Bool
561elm_need_efreet(void) 546elm_need_efreet(void)
562{ 547{
563#ifdef ELM_EFREET
564 if (_elm_need_efreet) return EINA_TRUE; 548 if (_elm_need_efreet) return EINA_TRUE;
565 _elm_need_efreet = EINA_TRUE; 549 _elm_need_efreet = EINA_TRUE;
566 efreet_init(); 550 efreet_init();
@@ -581,21 +565,16 @@ elm_need_efreet(void)
581 } 565 }
582 */ 566 */
583 return EINA_TRUE; 567 return EINA_TRUE;
584#else
585 return EINA_FALSE;
586#endif
587} 568}
588 569
589static void 570static void
590_elm_unneed_efreet(void) 571_elm_unneed_efreet(void)
591{ 572{
592#ifdef ELM_EFREET
593 if (!_elm_need_efreet) return; 573 if (!_elm_need_efreet) return;
594 _elm_need_efreet = EINA_FALSE; 574 _elm_need_efreet = EINA_FALSE;
595 efreet_trash_shutdown(); 575 efreet_trash_shutdown();
596 efreet_mime_shutdown(); 576 efreet_mime_shutdown();
597 efreet_shutdown(); 577 efreet_shutdown();
598#endif
599} 578}
600 579
601EAPI void 580EAPI void
@@ -691,13 +670,9 @@ elm_quicklaunch_sub_init(int argc,
691 _elm_config_init(); 670 _elm_config_init();
692 _elm_config_sub_init(); 671 _elm_config_sub_init();
693 ecore_evas_init(); // FIXME: check errors 672 ecore_evas_init(); // FIXME: check errors
694#ifdef HAVE_ELEMENTARY_ECORE_IMF
695 ecore_imf_init(); 673 ecore_imf_init();
696#endif
697#ifdef HAVE_ELEMENTARY_ECORE_CON
698 ecore_con_init(); 674 ecore_con_init();
699 ecore_con_url_init(); 675 ecore_con_url_init();
700#endif
701 _elm_prefs_init(); 676 _elm_prefs_init();
702 _elm_ews_wm_init(); 677 _elm_ews_wm_init();
703 } 678 }
@@ -721,13 +696,9 @@ elm_quicklaunch_sub_shutdown(void)
721 _elm_module_shutdown(); 696 _elm_module_shutdown();
722 _elm_prefs_shutdown(); 697 _elm_prefs_shutdown();
723 _elm_ews_wm_shutdown(); 698 _elm_ews_wm_shutdown();
724#ifdef HAVE_ELEMENTARY_ECORE_CON
725 ecore_con_url_shutdown(); 699 ecore_con_url_shutdown();
726 ecore_con_shutdown(); 700 ecore_con_shutdown();
727#endif
728#ifdef HAVE_ELEMENTARY_ECORE_IMF
729 ecore_imf_shutdown(); 701 ecore_imf_shutdown();
730#endif
731 ecore_evas_shutdown(); 702 ecore_evas_shutdown();
732 _elm_config_sub_shutdown(); 703 _elm_config_sub_shutdown();
733#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name)) 704#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name))
@@ -784,9 +755,7 @@ elm_quicklaunch_shutdown(void)
784#ifdef HAVE_ELEMENTARY_EMAP 755#ifdef HAVE_ELEMENTARY_EMAP
785 emap_shutdown(); 756 emap_shutdown();
786#endif 757#endif
787#ifdef HAVE_EMOTION
788 _elm_emotion_shutdown(); 758 _elm_emotion_shutdown();
789#endif
790 759
791 ecore_shutdown(); 760 ecore_shutdown();
792 eet_shutdown(); 761 eet_shutdown();
@@ -1002,9 +971,7 @@ elm_quicklaunch_fork(int argc,
1002# endif 971# endif
1003 } 972 }
1004 ecore_evas_init(); // FIXME: check errors 973 ecore_evas_init(); // FIXME: check errors
1005# ifdef HAVE_ELEMENTARY_ECORE_IMF
1006 ecore_imf_init(); 974 ecore_imf_init();
1007# endif
1008#endif 975#endif
1009 } 976 }
1010 977
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 6465403be..71d40407a 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -52,8 +52,6 @@ EAPI Eo_Op ELM_OBJ_MAP_BASE_ID = EO_NOOP;
52#define NOMINATIM_ATTR_LAT "lat" 52#define NOMINATIM_ATTR_LAT "lat"
53#define NOMINATIM_ATTR_ADDRESS "display_name" 53#define NOMINATIM_ATTR_ADDRESS "display_name"
54 54
55#ifdef HAVE_ELEMENTARY_ECORE_CON
56
57static char * 55static char *
58_mapnik_url_cb(const Evas_Object *obj __UNUSED__, 56_mapnik_url_cb(const Evas_Object *obj __UNUSED__,
59 int x, 57 int x,
@@ -696,19 +694,8 @@ _grid_item_create(Grid *g,
696 evas_object_pass_events_set(gi->img, EINA_TRUE); 694 evas_object_pass_events_set(gi->img, EINA_TRUE);
697 evas_object_stack_below(gi->img, g->wsd->sep_maps_overlays); 695 evas_object_stack_below(gi->img, g->wsd->sep_maps_overlays);
698 696
699 { 697 snprintf(buf, sizeof(buf), "%s" CACHE_TILE_ROOT, efreet_cache_home_get(),
700 const char *cachedir; 698 g->wsd->id, g->zoom, x);
701
702#ifdef ELM_EFREET
703 snprintf(buf, sizeof(buf), "%s" CACHE_TILE_ROOT, efreet_cache_home_get(),
704 g->wsd->id, g->zoom, x);
705 (void)cachedir;
706#else
707 cachedir = getenv("XDG_CACHE_HOME");
708 snprintf(buf, sizeof(buf), "%s/%s" CACHE_TILE_ROOT, getenv("HOME"),
709 cachedir ? : "/.config", g->wsd->id, g->zoom, x);
710#endif
711 }
712 699
713 snprintf(buf2, sizeof(buf2), CACHE_TILE_PATH, buf, y); 700 snprintf(buf2, sizeof(buf2), CACHE_TILE_PATH, buf, y);
714 if (!ecore_file_exists(buf)) ecore_file_mkpath(buf); 701 if (!ecore_file_exists(buf)) ecore_file_mkpath(buf);
@@ -3093,20 +3080,10 @@ static char *
3093_prepare_download() 3080_prepare_download()
3094{ 3081{
3095 char fname[PATH_MAX]; 3082 char fname[PATH_MAX];
3096 {
3097 const char *cachedir;
3098 3083
3099#ifdef ELM_EFREET 3084 snprintf(fname, sizeof(fname), "%s" CACHE_NAME_ROOT,
3100 snprintf(fname, sizeof(fname), "%s" CACHE_NAME_ROOT, 3085 efreet_cache_home_get());
3101 efreet_cache_home_get()); 3086 if (!ecore_file_exists(fname)) ecore_file_mkpath(fname);
3102 (void)cachedir;
3103#else
3104 cachedir = getenv("XDG_CACHE_HOME");
3105 snprintf(fname, sizeof(fname), "%s/%s" CACHE_NAME_ROOT, getenv("HOME"),
3106 cachedir ? : "/.config");
3107#endif
3108 if (!ecore_file_exists(fname)) ecore_file_mkpath(fname);
3109 }
3110 return strdup(fname); 3087 return strdup(fname);
3111} 3088}
3112 3089
@@ -4125,16 +4102,8 @@ _elm_map_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
4125 4102
4126 { 4103 {
4127 char buf[4096]; 4104 char buf[4096];
4128 const char *cachedir;
4129 4105
4130#ifdef ELM_EFREET
4131 snprintf(buf, sizeof(buf), "%s" CACHE_ROOT, efreet_cache_home_get()); 4106 snprintf(buf, sizeof(buf), "%s" CACHE_ROOT, efreet_cache_home_get());
4132 (void)cachedir;
4133#else
4134 cachedir = getenv("XDG_CACHE_HOME");
4135 snprintf(buf, sizeof(buf), "%s/%s" CACHE_ROOT, getenv("HOME"),
4136 cachedir ? : "/.config");
4137#endif
4138 if (!ecore_file_recursive_rm(buf)) 4107 if (!ecore_file_recursive_rm(buf))
4139 ERR("Deletion of %s failed", buf); 4108 ERR("Deletion of %s failed", buf);
4140 } 4109 }
@@ -4184,26 +4153,19 @@ _elm_map_smart_member_add(Eo *obj, void *_pd, va_list *list)
4184 if (sd->hit_rect) 4153 if (sd->hit_rect)
4185 evas_object_raise(sd->hit_rect); 4154 evas_object_raise(sd->hit_rect);
4186} 4155}
4187#endif
4188 4156
4189EAPI Evas_Object * 4157EAPI Evas_Object *
4190elm_map_add(Evas_Object *parent) 4158elm_map_add(Evas_Object *parent)
4191{ 4159{
4192#ifdef HAVE_ELEMENTARY_ECORE_CON
4193 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 4160 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
4194 Evas_Object *obj = eo_add(MY_CLASS, parent); 4161 Evas_Object *obj = eo_add(MY_CLASS, parent);
4195 eo_unref(obj); 4162 eo_unref(obj);
4196 return obj; 4163 return obj;
4197#else
4198 (void)parent;
4199 return NULL;
4200#endif
4201} 4164}
4202 4165
4203static void 4166static void
4204_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) 4167_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
4205{ 4168{
4206#ifdef HAVE_ELEMENTARY_ECORE_CON
4207 Elm_Map_Smart_Data *sd = _pd; 4169 Elm_Map_Smart_Data *sd = _pd;
4208 sd->obj = obj; 4170 sd->obj = obj;
4209 4171
@@ -4211,9 +4173,6 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
4211 eo_do(obj, 4173 eo_do(obj,
4212 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 4174 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
4213 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); 4175 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
4214#else
4215 eo_error_set(obj);
4216#endif
4217} 4176}
4218 4177
4219EAPI void 4178EAPI void
@@ -4227,7 +4186,6 @@ static void
4227_zoom_set(Eo *obj, void *_pd, va_list *list) 4186_zoom_set(Eo *obj, void *_pd, va_list *list)
4228{ 4187{
4229 int zoom = va_arg(*list, int); 4188 int zoom = va_arg(*list, int);
4230#ifdef HAVE_ELEMENTARY_ECORE_CON
4231 4189
4232 ELM_MAP_CHECK(obj); 4190 ELM_MAP_CHECK(obj);
4233 Elm_Map_Smart_Data *sd = _pd; 4191 Elm_Map_Smart_Data *sd = _pd;
@@ -4241,11 +4199,6 @@ _zoom_set(Eo *obj, void *_pd, va_list *list)
4241 sd->calc_job.zoom_mode_set = _zoom_mode_set; 4199 sd->calc_job.zoom_mode_set = _zoom_mode_set;
4242 4200
4243 evas_object_smart_changed(sd->pan_obj); 4201 evas_object_smart_changed(sd->pan_obj);
4244#else
4245 (void)obj;
4246 (void)_pd;
4247 (void)zoom;
4248#endif
4249} 4202}
4250 4203
4251EAPI int 4204EAPI int
@@ -4261,15 +4214,9 @@ static void
4261_zoom_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) 4214_zoom_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4262{ 4215{
4263 int *ret = va_arg(*list, int *); 4216 int *ret = va_arg(*list, int *);
4264#ifdef HAVE_ELEMENTARY_ECORE_CON
4265 Elm_Map_Smart_Data *sd = _pd; 4217 Elm_Map_Smart_Data *sd = _pd;
4266 4218
4267 *ret = sd->zoom; 4219 *ret = sd->zoom;
4268#else
4269 (void)obj;
4270 (void)_pd;
4271 *ret = 0;
4272#endif
4273} 4220}
4274 4221
4275EAPI void 4222EAPI void
@@ -4284,7 +4231,6 @@ static void
4284_zoom_mode_set_eo(Eo *obj EINA_UNUSED, void *_pd, va_list *list) 4231_zoom_mode_set_eo(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4285{ 4232{
4286 Elm_Map_Zoom_Mode mode = va_arg(*list, Elm_Map_Zoom_Mode); 4233 Elm_Map_Zoom_Mode mode = va_arg(*list, Elm_Map_Zoom_Mode);
4287#ifdef HAVE_ELEMENTARY_ECORE_CON
4288 Elm_Map_Smart_Data *sd = _pd; 4234 Elm_Map_Smart_Data *sd = _pd;
4289 4235
4290 if ((mode == ELM_MAP_ZOOM_MODE_MANUAL) && (sd->mode == !!mode)) return; 4236 if ((mode == ELM_MAP_ZOOM_MODE_MANUAL) && (sd->mode == !!mode)) return;
@@ -4294,11 +4240,6 @@ _zoom_mode_set_eo(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4294 sd->calc_job.zoom_mode_set = _zoom_mode_set; 4240 sd->calc_job.zoom_mode_set = _zoom_mode_set;
4295 4241
4296 evas_object_smart_changed(sd->pan_obj); 4242 evas_object_smart_changed(sd->pan_obj);
4297#else
4298 (void)obj;
4299 (void)_pd;
4300 (void)mode;
4301#endif
4302} 4243}
4303 4244
4304EAPI Elm_Map_Zoom_Mode 4245EAPI Elm_Map_Zoom_Mode
@@ -4314,15 +4255,9 @@ static void
4314_zoom_mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) 4255_zoom_mode_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4315{ 4256{
4316 Elm_Map_Zoom_Mode *ret = va_arg(*list, Elm_Map_Zoom_Mode *); 4257 Elm_Map_Zoom_Mode *ret = va_arg(*list, Elm_Map_Zoom_Mode *);
4317#ifdef HAVE_ELEMENTARY_ECORE_CON
4318 Elm_Map_Smart_Data *sd = _pd; 4258 Elm_Map_Smart_Data *sd = _pd;
4319 4259
4320 *ret = sd->mode; 4260 *ret = sd->mode;
4321#else
4322 (void)obj;
4323 (void)_pd;
4324 *ret = ELM_MAP_ZOOM_MODE_MANUAL;
4325#endif
4326} 4261}
4327 4262
4328EAPI void 4263EAPI void
@@ -4337,16 +4272,10 @@ static void
4337_zoom_max_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) 4272_zoom_max_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4338{ 4273{
4339 int zoom = va_arg(*list, int); 4274 int zoom = va_arg(*list, int);
4340#ifdef HAVE_ELEMENTARY_ECORE_CON
4341 Elm_Map_Smart_Data *sd = _pd; 4275 Elm_Map_Smart_Data *sd = _pd;
4342 EINA_SAFETY_ON_NULL_RETURN(sd->src_tile); 4276 EINA_SAFETY_ON_NULL_RETURN(sd->src_tile);
4343 4277
4344 sd->zoom_max = zoom; 4278 sd->zoom_max = zoom;
4345#else
4346 (void)obj;
4347 (void)_pd;
4348 (void)zoom;
4349#endif
4350} 4279}
4351 4280
4352EAPI int 4281EAPI int
@@ -4363,15 +4292,10 @@ _zoom_max_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4363{ 4292{
4364 int *ret = va_arg(*list, int *); 4293 int *ret = va_arg(*list, int *);
4365 *ret = -1; 4294 *ret = -1;
4366#ifdef HAVE_ELEMENTARY_ECORE_CON
4367 Elm_Map_Smart_Data *sd = _pd; 4295 Elm_Map_Smart_Data *sd = _pd;
4368 EINA_SAFETY_ON_NULL_RETURN(sd->src_tile); 4296 EINA_SAFETY_ON_NULL_RETURN(sd->src_tile);
4369 4297
4370 *ret = sd->zoom_max; 4298 *ret = sd->zoom_max;
4371#else
4372 (void)obj;
4373 (void)_pd;
4374#endif
4375} 4299}
4376 4300
4377EAPI void 4301EAPI void
@@ -4386,16 +4310,10 @@ static void
4386_zoom_min_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) 4310_zoom_min_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4387{ 4311{
4388 int zoom = va_arg(*list, int); 4312 int zoom = va_arg(*list, int);
4389#ifdef HAVE_ELEMENTARY_ECORE_CON
4390 Elm_Map_Smart_Data *sd = _pd; 4313 Elm_Map_Smart_Data *sd = _pd;
4391 EINA_SAFETY_ON_NULL_RETURN(sd->src_tile); 4314 EINA_SAFETY_ON_NULL_RETURN(sd->src_tile);
4392 4315
4393 sd->zoom_min = zoom; 4316 sd->zoom_min = zoom;
4394#else
4395 (void)obj;
4396 (void)_pd;
4397 (void)zoom;
4398#endif
4399} 4317}
4400 4318
4401EAPI int 4319EAPI int
@@ -4412,15 +4330,10 @@ _zoom_min_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4412{ 4330{
4413 int *ret = va_arg(*list, int *); 4331 int *ret = va_arg(*list, int *);
4414 *ret = -1; 4332 *ret = -1;
4415#ifdef HAVE_ELEMENTARY_ECORE_CON
4416 Elm_Map_Smart_Data *sd = _pd; 4333 Elm_Map_Smart_Data *sd = _pd;
4417 EINA_SAFETY_ON_NULL_RETURN(sd->src_tile); 4334 EINA_SAFETY_ON_NULL_RETURN(sd->src_tile);
4418 4335
4419 *ret = sd->zoom_min; 4336 *ret = sd->zoom_min;
4420#else
4421 (void)obj;
4422 (void)_pd;
4423#endif
4424} 4337}
4425 4338
4426EAPI void 4339EAPI void
@@ -4437,7 +4350,6 @@ _region_bring_in(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4437{ 4350{
4438 double lon = va_arg(*list, double); 4351 double lon = va_arg(*list, double);
4439 double lat = va_arg(*list, double); 4352 double lat = va_arg(*list, double);
4440#ifdef HAVE_ELEMENTARY_ECORE_CON
4441 Elm_Map_Smart_Data *sd = _pd; 4353 Elm_Map_Smart_Data *sd = _pd;
4442 4354
4443 sd->calc_job.bring_in = EINA_TRUE; 4355 sd->calc_job.bring_in = EINA_TRUE;
@@ -4446,12 +4358,6 @@ _region_bring_in(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4446 sd->calc_job.region_show_bring_in = _region_show_bring_in; 4358 sd->calc_job.region_show_bring_in = _region_show_bring_in;
4447 4359
4448 evas_object_smart_changed(sd->pan_obj); 4360 evas_object_smart_changed(sd->pan_obj);
4449#else
4450 (void)obj;
4451 (void)_pd;
4452 (void)lon;
4453 (void)lat;
4454#endif
4455} 4361}
4456 4362
4457EAPI void 4363EAPI void
@@ -4468,7 +4374,6 @@ _region_show(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4468{ 4374{
4469 double lon = va_arg(*list, double); 4375 double lon = va_arg(*list, double);
4470 double lat = va_arg(*list, double); 4376 double lat = va_arg(*list, double);
4471#ifdef HAVE_ELEMENTARY_ECORE_CON
4472 Elm_Map_Smart_Data *sd = _pd; 4377 Elm_Map_Smart_Data *sd = _pd;
4473 4378
4474 sd->calc_job.bring_in = EINA_FALSE; 4379 sd->calc_job.bring_in = EINA_FALSE;
@@ -4477,12 +4382,6 @@ _region_show(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4477 sd->calc_job.region_show_bring_in = _region_show_bring_in; 4382 sd->calc_job.region_show_bring_in = _region_show_bring_in;
4478 4383
4479 evas_object_smart_changed(sd->pan_obj); 4384 evas_object_smart_changed(sd->pan_obj);
4480#else
4481 (void)obj;
4482 (void)_pd;
4483 (void)lon;
4484 (void)lat;
4485#endif
4486} 4385}
4487 4386
4488EAPI void 4387EAPI void
@@ -4499,7 +4398,6 @@ _region_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4499{ 4398{
4500 double *lon = va_arg(*list, double *); 4399 double *lon = va_arg(*list, double *);
4501 double *lat = va_arg(*list, double *); 4400 double *lat = va_arg(*list, double *);
4502#ifdef HAVE_ELEMENTARY_ECORE_CON
4503 double tlon, tlat; 4401 double tlon, tlat;
4504 Evas_Coord vx, vy, vw, vh; 4402 Evas_Coord vx, vy, vw, vh;
4505 4403
@@ -4510,12 +4408,6 @@ _region_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4510 (sd, vx + vw / 2, vy + vh / 2, sd->size.w, &tlon, &tlat); 4408 (sd, vx + vw / 2, vy + vh / 2, sd->size.w, &tlon, &tlat);
4511 if (lon) *lon = tlon; 4409 if (lon) *lon = tlon;
4512 if (lat) *lat = tlat; 4410 if (lat) *lat = tlat;
4513#else
4514 (void)obj;
4515 (void)_pd;
4516 (void)lon;
4517 (void)lat;
4518#endif
4519} 4411}
4520 4412
4521EAPI void 4413EAPI void
@@ -4530,7 +4422,6 @@ static void
4530_paused_set(Eo *obj, void *_pd, va_list *list) 4422_paused_set(Eo *obj, void *_pd, va_list *list)
4531{ 4423{
4532 Eina_Bool paused = va_arg(*list, int); 4424 Eina_Bool paused = va_arg(*list, int);
4533#ifdef HAVE_ELEMENTARY_ECORE_CON
4534 Elm_Map_Smart_Data *sd = _pd; 4425 Elm_Map_Smart_Data *sd = _pd;
4535 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 4426 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
4536 4427
@@ -4553,11 +4444,6 @@ _paused_set(Eo *obj, void *_pd, va_list *list)
4553 edje_object_signal_emit(wd->resize_obj, 4444 edje_object_signal_emit(wd->resize_obj,
4554 "elm,state,busy,start", "elm"); 4445 "elm,state,busy,start", "elm");
4555 } 4446 }
4556#else
4557 (void)obj;
4558 (void)_pd;
4559 (void)paused;
4560#endif
4561} 4447}
4562 4448
4563EAPI Eina_Bool 4449EAPI Eina_Bool
@@ -4573,15 +4459,9 @@ static void
4573_paused_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) 4459_paused_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4574{ 4460{
4575 Eina_Bool *ret = va_arg(*list, Eina_Bool *); 4461 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
4576#ifdef HAVE_ELEMENTARY_ECORE_CON
4577 Elm_Map_Smart_Data *sd = _pd; 4462 Elm_Map_Smart_Data *sd = _pd;
4578 4463
4579 *ret = sd->paused; 4464 *ret = sd->paused;
4580#else
4581 (void)obj;
4582 (void)_pd;
4583 *ret = EINA_FALSE;
4584#endif
4585} 4465}
4586 4466
4587EAPI void 4467EAPI void
@@ -4600,7 +4480,6 @@ _rotate_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4600 double degree = va_arg(*list, double); 4480 double degree = va_arg(*list, double);
4601 Evas_Coord cx = va_arg(*list, Evas_Coord); 4481 Evas_Coord cx = va_arg(*list, Evas_Coord);
4602 Evas_Coord cy = va_arg(*list, Evas_Coord); 4482 Evas_Coord cy = va_arg(*list, Evas_Coord);
4603#ifdef HAVE_ELEMENTARY_ECORE_CON
4604 Elm_Map_Smart_Data *sd = _pd; 4483 Elm_Map_Smart_Data *sd = _pd;
4605 4484
4606 sd->rotate.d = degree; 4485 sd->rotate.d = degree;
@@ -4608,13 +4487,6 @@ _rotate_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4608 sd->rotate.cy = cy; 4487 sd->rotate.cy = cy;
4609 4488
4610 evas_object_smart_changed(sd->pan_obj); 4489 evas_object_smart_changed(sd->pan_obj);
4611#else
4612 (void)obj;
4613 (void)_pd;
4614 (void)degree;
4615 (void)cx;
4616 (void)cy;
4617#endif
4618} 4490}
4619 4491
4620EAPI void 4492EAPI void
@@ -4633,19 +4505,11 @@ _rotate_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4633 double *degree = va_arg(*list, double *); 4505 double *degree = va_arg(*list, double *);
4634 Evas_Coord *cx = va_arg(*list, Evas_Coord *); 4506 Evas_Coord *cx = va_arg(*list, Evas_Coord *);
4635 Evas_Coord *cy = va_arg(*list, Evas_Coord *); 4507 Evas_Coord *cy = va_arg(*list, Evas_Coord *);
4636#ifdef HAVE_ELEMENTARY_ECORE_CON
4637 Elm_Map_Smart_Data *sd = _pd; 4508 Elm_Map_Smart_Data *sd = _pd;
4638 4509
4639 if (degree) *degree = sd->rotate.d; 4510 if (degree) *degree = sd->rotate.d;
4640 if (cx) *cx = sd->rotate.cx; 4511 if (cx) *cx = sd->rotate.cx;
4641 if (cy) *cy = sd->rotate.cy; 4512 if (cy) *cy = sd->rotate.cy;
4642#else
4643 (void)obj;
4644 (void)_pd;
4645 (void)degree;
4646 (void)cx;
4647 (void)cy;
4648#endif
4649} 4513}
4650 4514
4651EAPI void 4515EAPI void
@@ -4660,7 +4524,6 @@ static void
4660_wheel_disabled_set(Eo *obj, void *_pd, va_list *list) 4524_wheel_disabled_set(Eo *obj, void *_pd, va_list *list)
4661{ 4525{
4662 Eina_Bool disabled = va_arg(*list, int); 4526 Eina_Bool disabled = va_arg(*list, int);
4663#ifdef HAVE_ELEMENTARY_ECORE_CON
4664 Elm_Map_Smart_Data *sd = _pd; 4527 Elm_Map_Smart_Data *sd = _pd;
4665 4528
4666 if ((!sd->wheel_disabled) && (disabled)) 4529 if ((!sd->wheel_disabled) && (disabled))
@@ -4670,11 +4533,6 @@ _wheel_disabled_set(Eo *obj, void *_pd, va_list *list)
4670 evas_object_event_callback_add 4533 evas_object_event_callback_add
4671 (obj, EVAS_CALLBACK_MOUSE_WHEEL, _mouse_wheel_cb, obj); 4534 (obj, EVAS_CALLBACK_MOUSE_WHEEL, _mouse_wheel_cb, obj);
4672 sd->wheel_disabled = !!disabled; 4535 sd->wheel_disabled = !!disabled;
4673#else
4674 (void)obj;
4675 (void)_pd;
4676 (void)disabled;
4677#endif
4678} 4536}
4679 4537
4680EAPI Eina_Bool 4538EAPI Eina_Bool
@@ -4690,15 +4548,9 @@ static void
4690_wheel_disabled_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) 4548_wheel_disabled_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4691{ 4549{
4692 Eina_Bool *ret = va_arg(*list, Eina_Bool *); 4550 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
4693#ifdef HAVE_ELEMENTARY_ECORE_CON
4694 Elm_Map_Smart_Data *sd = _pd; 4551 Elm_Map_Smart_Data *sd = _pd;
4695 4552
4696 *ret = sd->wheel_disabled; 4553 *ret = sd->wheel_disabled;
4697#else
4698 (void)obj;
4699 (void)_pd;
4700 *ret = EINA_FALSE;
4701#endif
4702} 4554}
4703 4555
4704EAPI void 4556EAPI void
@@ -4715,17 +4567,10 @@ _tile_load_status_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4715{ 4567{
4716 int *try_num = va_arg(*list, int *); 4568 int *try_num = va_arg(*list, int *);
4717 int *finish_num = va_arg(*list, int *); 4569 int *finish_num = va_arg(*list, int *);
4718#ifdef HAVE_ELEMENTARY_ECORE_CON
4719 Elm_Map_Smart_Data *sd = _pd; 4570 Elm_Map_Smart_Data *sd = _pd;
4720 4571
4721 if (try_num) *try_num = sd->try_num; 4572 if (try_num) *try_num = sd->try_num;
4722 if (finish_num) *finish_num = sd->finish_num; 4573 if (finish_num) *finish_num = sd->finish_num;
4723#else
4724 (void)obj;
4725 (void)_pd;
4726 (void)try_num;
4727 (void)finish_num;
4728#endif
4729} 4574}
4730 4575
4731EAPI void 4576EAPI void
@@ -4746,21 +4591,12 @@ _canvas_to_region_convert(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4746 Evas_Coord y = va_arg(*list, Evas_Coord); 4591 Evas_Coord y = va_arg(*list, Evas_Coord);
4747 double *lon = va_arg(*list, double *); 4592 double *lon = va_arg(*list, double *);
4748 double *lat = va_arg(*list, double *); 4593 double *lat = va_arg(*list, double *);
4749#ifdef HAVE_ELEMENTARY_ECORE_CON
4750 Elm_Map_Smart_Data *sd = _pd; 4594 Elm_Map_Smart_Data *sd = _pd;
4751 EINA_SAFETY_ON_NULL_RETURN(lon); 4595 EINA_SAFETY_ON_NULL_RETURN(lon);
4752 EINA_SAFETY_ON_NULL_RETURN(lat); 4596 EINA_SAFETY_ON_NULL_RETURN(lat);
4753 4597
4754 _canvas_to_coord(sd, x, y, &x, &y); 4598 _canvas_to_coord(sd, x, y, &x, &y);
4755 _coord_to_region_convert(sd, x, y, sd->size.w, lon, lat); 4599 _coord_to_region_convert(sd, x, y, sd->size.w, lon, lat);
4756#else
4757 (void)obj;
4758 (void)_pd;
4759 (void)x;
4760 (void)y;
4761 (void)lon;
4762 (void)lat;
4763#endif
4764} 4600}
4765 4601
4766EAPI void 4602EAPI void
@@ -4781,21 +4617,12 @@ _region_to_canvas_convert(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4781 double lat = va_arg(*list, double); 4617 double lat = va_arg(*list, double);
4782 Evas_Coord *x = va_arg(*list, Evas_Coord *); 4618 Evas_Coord *x = va_arg(*list, Evas_Coord *);
4783 Evas_Coord *y = va_arg(*list, Evas_Coord *); 4619 Evas_Coord *y = va_arg(*list, Evas_Coord *);
4784#ifdef HAVE_ELEMENTARY_ECORE_CON
4785 Elm_Map_Smart_Data *sd = _pd; 4620 Elm_Map_Smart_Data *sd = _pd;
4786 EINA_SAFETY_ON_NULL_RETURN(x); 4621 EINA_SAFETY_ON_NULL_RETURN(x);
4787 EINA_SAFETY_ON_NULL_RETURN(y); 4622 EINA_SAFETY_ON_NULL_RETURN(y);
4788 4623
4789 _region_to_coord_convert(sd, lon, lat, sd->size.w, x, y); 4624 _region_to_coord_convert(sd, lon, lat, sd->size.w, x, y);
4790 _coord_to_canvas(sd, *x, *y, x, y); 4625 _coord_to_canvas(sd, *x, *y, x, y);
4791#else
4792 (void)obj;
4793 (void)_pd;
4794 (void)lon;
4795 (void)lat;
4796 (void)x;
4797 (void)y;
4798#endif
4799} 4626}
4800 4627
4801EAPI void 4628EAPI void
@@ -4810,7 +4637,6 @@ static void
4810_user_agent_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) 4637_user_agent_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4811{ 4638{
4812 const char *user_agent = va_arg(*list, const char *); 4639 const char *user_agent = va_arg(*list, const char *);
4813#ifdef HAVE_ELEMENTARY_ECORE_CON
4814 Elm_Map_Smart_Data *sd = _pd; 4640 Elm_Map_Smart_Data *sd = _pd;
4815 EINA_SAFETY_ON_NULL_RETURN(user_agent); 4641 EINA_SAFETY_ON_NULL_RETURN(user_agent);
4816 4642
@@ -4818,11 +4644,6 @@ _user_agent_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4818 4644
4819 if (!sd->ua) sd->ua = eina_hash_string_small_new(NULL); 4645 if (!sd->ua) sd->ua = eina_hash_string_small_new(NULL);
4820 eina_hash_set(sd->ua, "User-Agent", sd->user_agent); 4646 eina_hash_set(sd->ua, "User-Agent", sd->user_agent);
4821#else
4822 (void)obj;
4823 (void)_pd;
4824 (void)user_agent;
4825#endif
4826} 4647}
4827 4648
4828EAPI const char * 4649EAPI const char *
@@ -4838,15 +4659,9 @@ static void
4838_user_agent_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) 4659_user_agent_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4839{ 4660{
4840 const char **ret = va_arg(*list, const char **); 4661 const char **ret = va_arg(*list, const char **);
4841#ifdef HAVE_ELEMENTARY_ECORE_CON
4842 Elm_Map_Smart_Data *sd = _pd; 4662 Elm_Map_Smart_Data *sd = _pd;
4843 4663
4844 *ret = sd->user_agent; 4664 *ret = sd->user_agent;
4845#else
4846 (void)obj;
4847 (void)_pd;
4848 *ret = NULL;
4849#endif
4850} 4665}
4851 4666
4852EAPI void 4667EAPI void
@@ -4863,7 +4678,6 @@ _source_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4863{ 4678{
4864 Elm_Map_Source_Type type = va_arg(*list, Elm_Map_Source_Type); 4679 Elm_Map_Source_Type type = va_arg(*list, Elm_Map_Source_Type);
4865 const char *source_name = va_arg(*list, const char *); 4680 const char *source_name = va_arg(*list, const char *);
4866#ifdef HAVE_ELEMENTARY_ECORE_CON
4867 Elm_Map_Smart_Data *sd = _pd; 4681 Elm_Map_Smart_Data *sd = _pd;
4868 EINA_SAFETY_ON_NULL_RETURN(source_name); 4682 EINA_SAFETY_ON_NULL_RETURN(source_name);
4869 4683
@@ -4874,12 +4688,6 @@ _source_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4874 _source_name_set(sd, source_name); 4688 _source_name_set(sd, source_name);
4875 else ERR("Not supported map source type: %d", type); 4689 else ERR("Not supported map source type: %d", type);
4876 4690
4877#else
4878 (void)obj;
4879 (void)type;
4880 (void)_pd;
4881 (void)source_name;
4882#endif
4883} 4691}
4884 4692
4885EAPI const char * 4693EAPI const char *
@@ -4898,7 +4706,6 @@ _source_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4898 Elm_Map_Source_Type type = va_arg(*list, Elm_Map_Source_Type); 4706 Elm_Map_Source_Type type = va_arg(*list, Elm_Map_Source_Type);
4899 const char **ret = va_arg(*list, const char **); 4707 const char **ret = va_arg(*list, const char **);
4900 *ret = NULL; 4708 *ret = NULL;
4901#ifdef HAVE_ELEMENTARY_ECORE_CON
4902 Elm_Map_Smart_Data *sd = _pd; 4709 Elm_Map_Smart_Data *sd = _pd;
4903 4710
4904 EINA_SAFETY_ON_NULL_RETURN(sd->src_tile); 4711 EINA_SAFETY_ON_NULL_RETURN(sd->src_tile);
@@ -4909,11 +4716,6 @@ _source_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4909 else if (type == ELM_MAP_SOURCE_TYPE_NAME) 4716 else if (type == ELM_MAP_SOURCE_TYPE_NAME)
4910 *ret = sd->src_name->name; 4717 *ret = sd->src_name->name;
4911 else ERR("Not supported map source type: %d", type); 4718 else ERR("Not supported map source type: %d", type);
4912#else
4913 (void)obj;
4914 (void)type;
4915 (void)_pd;
4916#endif
4917} 4719}
4918 4720
4919EAPI const char ** 4721EAPI const char **
@@ -4932,7 +4734,6 @@ _sources_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4932 Elm_Map_Source_Type type = va_arg(*list, Elm_Map_Source_Type); 4734 Elm_Map_Source_Type type = va_arg(*list, Elm_Map_Source_Type);
4933 const char ***ret = va_arg(*list, const char ***); 4735 const char ***ret = va_arg(*list, const char ***);
4934 *ret = NULL; 4736 *ret = NULL;
4935#ifdef HAVE_ELEMENTARY_ECORE_CON
4936 Elm_Map_Smart_Data *sd = _pd; 4737 Elm_Map_Smart_Data *sd = _pd;
4937 4738
4938 if (type == ELM_MAP_SOURCE_TYPE_TILE) *ret = sd->src_tile_names; 4739 if (type == ELM_MAP_SOURCE_TYPE_TILE) *ret = sd->src_tile_names;
@@ -4941,11 +4742,6 @@ _sources_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
4941 else if (type == ELM_MAP_SOURCE_TYPE_NAME) 4742 else if (type == ELM_MAP_SOURCE_TYPE_NAME)
4942 *ret = sd->src_name_names; 4743 *ret = sd->src_name_names;
4943 else ERR("Not supported map source type: %d", type); 4744 else ERR("Not supported map source type: %d", type);
4944#else
4945 (void)obj;
4946 (void)type;
4947 (void)_pd;
4948#endif
4949} 4745}
4950 4746
4951EAPI Elm_Map_Route * 4747EAPI Elm_Map_Route *
@@ -4978,7 +4774,6 @@ _route_add(Eo *obj, void *_pd, va_list *list)
4978 void *data = va_arg(*list, void *); 4774 void *data = va_arg(*list, void *);
4979 Elm_Map_Route **ret = va_arg(*list, Elm_Map_Route **); 4775 Elm_Map_Route **ret = va_arg(*list, Elm_Map_Route **);
4980 *ret = NULL; 4776 *ret = NULL;
4981#ifdef HAVE_ELEMENTARY_ECORE_CON
4982 char *url; 4777 char *url;
4983 char *type_name; 4778 char *type_name;
4984 Elm_Map_Route *route; 4779 Elm_Map_Route *route;
@@ -4990,17 +4785,8 @@ _route_add(Eo *obj, void *_pd, va_list *list)
4990 EINA_SAFETY_ON_NULL_RETURN(sd->src_route); 4785 EINA_SAFETY_ON_NULL_RETURN(sd->src_route);
4991 4786
4992 { 4787 {
4993 const char *cachedir;
4994
4995#ifdef ELM_EFREET
4996 snprintf(fname, sizeof(fname), "%s" CACHE_ROUTE_ROOT, 4788 snprintf(fname, sizeof(fname), "%s" CACHE_ROUTE_ROOT,
4997 efreet_cache_home_get()); 4789 efreet_cache_home_get());
4998 (void)cachedir;
4999#else
5000 cachedir = getenv("XDG_CACHE_HOME");
5001 snprintf(fname, sizeof(fname), "%s/%s" CACHE_ROUTE_ROOT, getenv("HOME"),
5002 cachedir ? : "/.config");
5003#endif
5004 if (!ecore_file_exists(fname)) ecore_file_mkpath(fname); 4790 if (!ecore_file_exists(fname)) ecore_file_mkpath(fname);
5005 } 4791 }
5006 4792
@@ -5051,24 +4837,11 @@ _route_add(Eo *obj, void *_pd, va_list *list)
5051 edje_object_signal_emit(wd->resize_obj, 4837 edje_object_signal_emit(wd->resize_obj,
5052 "elm,state,busy,start", "elm"); 4838 "elm,state,busy,start", "elm");
5053 *ret = route; 4839 *ret = route;
5054#else
5055 (void)obj;
5056 (void)_pd;
5057 (void)type;
5058 (void)method;
5059 (void)flon;
5060 (void)flat;
5061 (void)tlon;
5062 (void)tlat;
5063 (void)route_cb;
5064 (void)data;
5065#endif
5066} 4840}
5067 4841
5068EAPI void 4842EAPI void
5069elm_map_route_del(Elm_Map_Route *route) 4843elm_map_route_del(Elm_Map_Route *route)
5070{ 4844{
5071#ifdef HAVE_ELEMENTARY_ECORE_CON
5072 Path_Waypoint *w; 4845 Path_Waypoint *w;
5073 Path_Node *n; 4846 Path_Node *n;
5074 4847
@@ -5098,45 +4871,27 @@ elm_map_route_del(Elm_Map_Route *route)
5098 4871
5099 route->wsd->routes = eina_list_remove(route->wsd->routes, route); 4872 route->wsd->routes = eina_list_remove(route->wsd->routes, route);
5100 free(route); 4873 free(route);
5101#else
5102 (void)route;
5103#endif
5104} 4874}
5105 4875
5106EAPI double 4876EAPI double
5107elm_map_route_distance_get(const Elm_Map_Route *route) 4877elm_map_route_distance_get(const Elm_Map_Route *route)
5108{ 4878{
5109#ifdef HAVE_ELEMENTARY_ECORE_CON
5110 EINA_SAFETY_ON_NULL_RETURN_VAL(route, 0.0); 4879 EINA_SAFETY_ON_NULL_RETURN_VAL(route, 0.0);
5111 return route->info.distance; 4880 return route->info.distance;
5112#else
5113 (void)route;
5114 return 0.0;
5115#endif
5116} 4881}
5117 4882
5118EAPI const char * 4883EAPI const char *
5119elm_map_route_node_get(const Elm_Map_Route *route) 4884elm_map_route_node_get(const Elm_Map_Route *route)
5120{ 4885{
5121#ifdef HAVE_ELEMENTARY_ECORE_CON
5122 EINA_SAFETY_ON_NULL_RETURN_VAL(route, NULL); 4886 EINA_SAFETY_ON_NULL_RETURN_VAL(route, NULL);
5123 return route->info.nodes; 4887 return route->info.nodes;
5124#else
5125 (void)route;
5126 return NULL;
5127#endif
5128} 4888}
5129 4889
5130EAPI const char * 4890EAPI const char *
5131elm_map_route_waypoint_get(const Elm_Map_Route *route) 4891elm_map_route_waypoint_get(const Elm_Map_Route *route)
5132{ 4892{
5133#ifdef HAVE_ELEMENTARY_ECORE_CON
5134 EINA_SAFETY_ON_NULL_RETURN_VAL(route, NULL); 4893 EINA_SAFETY_ON_NULL_RETURN_VAL(route, NULL);
5135 return route->info.waypoints; 4894 return route->info.waypoints;
5136#else
5137 (void)route;
5138 return NULL;
5139#endif
5140} 4895}
5141 4896
5142EAPI Elm_Map_Name * 4897EAPI Elm_Map_Name *
@@ -5162,24 +4917,12 @@ _name_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
5162 Elm_Map_Name_Cb name_cb = va_arg(*list, Elm_Map_Name_Cb); 4917 Elm_Map_Name_Cb name_cb = va_arg(*list, Elm_Map_Name_Cb);
5163 void *data = va_arg(*list, void *); 4918 void *data = va_arg(*list, void *);
5164 Elm_Map_Name **ret = va_arg(*list, Elm_Map_Name **); 4919 Elm_Map_Name **ret = va_arg(*list, Elm_Map_Name **);
5165#ifdef HAVE_ELEMENTARY_ECORE_CON
5166
5167 if (address) 4920 if (address)
5168 *ret = _name_request(obj, ELM_MAP_NAME_METHOD_SEARCH, address, 0, 0, 4921 *ret = _name_request(obj, ELM_MAP_NAME_METHOD_SEARCH, address, 0, 0,
5169 name_cb, data); 4922 name_cb, data);
5170 else 4923 else
5171 *ret = _name_request(obj, ELM_MAP_NAME_METHOD_REVERSE, NULL, lon, lat, 4924 *ret = _name_request(obj, ELM_MAP_NAME_METHOD_REVERSE, NULL, lon, lat,
5172 name_cb, data); 4925 name_cb, data);
5173#else
5174 (void)obj;
5175 (void)_pd;
5176 (void)address;
5177 (void)lon;
5178 (void)lat;
5179 (void)name_cb;
5180 (void)data;
5181 *ret = NULL;
5182#endif
5183} 4926}
5184 4927
5185EAPI void 4928EAPI void
@@ -5188,23 +4931,15 @@ elm_map_name_search(const Evas_Object *obj,
5188 Elm_Map_Name_List_Cb name_cb, 4931 Elm_Map_Name_List_Cb name_cb,
5189 void *data) 4932 void *data)
5190{ 4933{
5191#ifdef HAVE_ELEMENTARY_ECORE_CON
5192 ELM_MAP_CHECK(obj); 4934 ELM_MAP_CHECK(obj);
5193 if (address) 4935 if (address)
5194 _name_list_request(obj, ELM_MAP_NAME_METHOD_SEARCH, address, 0, 0, 4936 _name_list_request(obj, ELM_MAP_NAME_METHOD_SEARCH, address, 0, 0,
5195 name_cb, data); 4937 name_cb, data);
5196#else
5197 (void) obj;
5198 (void) address;
5199 (void) name_cb;
5200 (void) data;
5201#endif
5202} 4938}
5203 4939
5204EAPI void 4940EAPI void
5205elm_map_name_del(Elm_Map_Name *name) 4941elm_map_name_del(Elm_Map_Name *name)
5206{ 4942{
5207#ifdef HAVE_ELEMENTARY_ECORE_CON
5208 EINA_SAFETY_ON_NULL_RETURN(name); 4943 EINA_SAFETY_ON_NULL_RETURN(name);
5209 EINA_SAFETY_ON_NULL_RETURN(name->wsd); 4944 EINA_SAFETY_ON_NULL_RETURN(name->wsd);
5210 ELM_MAP_CHECK((name->wsd)->obj); 4945 ELM_MAP_CHECK((name->wsd)->obj);
@@ -5219,24 +4954,16 @@ elm_map_name_del(Elm_Map_Name *name)
5219 4954
5220 name->wsd->names = eina_list_remove(name->wsd->names, name); 4955 name->wsd->names = eina_list_remove(name->wsd->names, name);
5221 free(name); 4956 free(name);
5222#else
5223 (void)name;
5224#endif
5225} 4957}
5226 4958
5227EAPI const char * 4959EAPI const char *
5228elm_map_name_address_get(const Elm_Map_Name *name) 4960elm_map_name_address_get(const Elm_Map_Name *name)
5229{ 4961{
5230#ifdef HAVE_ELEMENTARY_ECORE_CON
5231 EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL); 4962 EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL);
5232 EINA_SAFETY_ON_NULL_RETURN_VAL(name->wsd, NULL); 4963 EINA_SAFETY_ON_NULL_RETURN_VAL(name->wsd, NULL);
5233 ELM_MAP_CHECK((name->wsd)->obj) NULL; 4964 ELM_MAP_CHECK((name->wsd)->obj) NULL;
5234 4965
5235 return name->address; 4966 return name->address;
5236#else
5237 (void)name;
5238 return NULL;
5239#endif
5240} 4967}
5241 4968
5242EAPI void 4969EAPI void
@@ -5244,18 +4971,12 @@ elm_map_name_region_get(const Elm_Map_Name *name,
5244 double *lon, 4971 double *lon,
5245 double *lat) 4972 double *lat)
5246{ 4973{
5247#ifdef HAVE_ELEMENTARY_ECORE_CON
5248 EINA_SAFETY_ON_NULL_RETURN(name); 4974 EINA_SAFETY_ON_NULL_RETURN(name);
5249 EINA_SAFETY_ON_NULL_RETURN(name->wsd); 4975 EINA_SAFETY_ON_NULL_RETURN(name->wsd);
5250 ELM_MAP_CHECK((name->wsd)->obj); 4976 ELM_MAP_CHECK((name->wsd)->obj);
5251 4977
5252 if (lon) *lon = name->lon; 4978 if (lon) *lon = name->lon;
5253 if (lat) *lat = name->lat; 4979 if (lat) *lat = name->lat;
5254#else
5255 (void)name;
5256 (void)lon;
5257 (void)lat;
5258#endif
5259} 4980}
5260 4981
5261EAPI Elm_Map_Overlay * 4982EAPI Elm_Map_Overlay *
@@ -5275,7 +4996,6 @@ _overlay_add(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
5275 double lon = va_arg(*list, double); 4996 double lon = va_arg(*list, double);
5276 double lat = va_arg(*list, double); 4997 double lat = va_arg(*list, double);
5277 Elm_Map_Overlay **ret = va_arg(*list, Elm_Map_Overlay **); 4998 Elm_Map_Overlay **ret = va_arg(*list, Elm_Map_Overlay **);
5278#ifdef HAVE_ELEMENTARY_ECORE_CON
5279 Elm_Map_Overlay *overlay; 4999 Elm_Map_Overlay *overlay;
5280 5000
5281 Elm_Map_Smart_Data *sd = _pd; 5001 Elm_Map_Smart_Data *sd = _pd;
@@ -5294,13 +5014,6 @@ _overlay_add(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
5294 evas_object_smart_changed(sd->pan_obj); 5014 evas_object_smart_changed(sd->pan_obj);
5295 5015
5296 *ret = overlay; 5016 *ret = overlay;
5297#else
5298 (void)obj;
5299 (void)_pd;
5300 (void)lon;
5301 (void)lat;
5302 *ret = NULL;
5303#endif
5304} 5017}
5305 5018
5306EAPI Eina_List * 5019EAPI Eina_List *
@@ -5316,7 +5029,6 @@ static void
5316_overlays_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) 5029_overlays_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
5317{ 5030{
5318 Eina_List **ret = va_arg(*list, Eina_List **); 5031 Eina_List **ret = va_arg(*list, Eina_List **);
5319#ifdef HAVE_ELEMENTARY_ECORE_CON
5320 Eina_List *l; 5032 Eina_List *l;
5321 Elm_Map_Overlay *ovl; 5033 Elm_Map_Overlay *ovl;
5322 5034
@@ -5330,17 +5042,11 @@ _overlays_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
5330 sd->all_overlays = eina_list_append(sd->all_overlays, ovl); 5042 sd->all_overlays = eina_list_append(sd->all_overlays, ovl);
5331 5043
5332 *ret = sd->all_overlays; 5044 *ret = sd->all_overlays;
5333#else
5334 (void)obj;
5335 (void)_pd;
5336 *ret = NULL;
5337#endif
5338} 5045}
5339 5046
5340EAPI void 5047EAPI void
5341elm_map_overlay_del(Elm_Map_Overlay *overlay) 5048elm_map_overlay_del(Elm_Map_Overlay *overlay)
5342{ 5049{
5343#ifdef HAVE_ELEMENTARY_ECORE_CON
5344 EINA_SAFETY_ON_NULL_RETURN(overlay); 5050 EINA_SAFETY_ON_NULL_RETURN(overlay);
5345 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd); 5051 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd);
5346 ELM_MAP_CHECK((overlay->wsd)->obj); 5052 ELM_MAP_CHECK((overlay->wsd)->obj);
@@ -5380,62 +5086,43 @@ elm_map_overlay_del(Elm_Map_Overlay *overlay)
5380 evas_object_smart_changed(overlay->wsd->pan_obj); 5086 evas_object_smart_changed(overlay->wsd->pan_obj);
5381 5087
5382 free(overlay); 5088 free(overlay);
5383#else
5384 (void)overlay;
5385#endif
5386} 5089}
5387 5090
5388EAPI Elm_Map_Overlay_Type 5091EAPI Elm_Map_Overlay_Type
5389elm_map_overlay_type_get(const Elm_Map_Overlay *overlay) 5092elm_map_overlay_type_get(const Elm_Map_Overlay *overlay)
5390{ 5093{
5391#ifdef HAVE_ELEMENTARY_ECORE_CON
5392 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, ELM_MAP_OVERLAY_TYPE_NONE); 5094 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, ELM_MAP_OVERLAY_TYPE_NONE);
5393 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay->wsd, ELM_MAP_OVERLAY_TYPE_NONE); 5095 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay->wsd, ELM_MAP_OVERLAY_TYPE_NONE);
5394 ELM_MAP_CHECK((overlay->wsd)->obj) ELM_MAP_OVERLAY_TYPE_NONE; 5096 ELM_MAP_CHECK((overlay->wsd)->obj) ELM_MAP_OVERLAY_TYPE_NONE;
5395 5097
5396 return overlay->type; 5098 return overlay->type;
5397#else
5398 (void)overlay;
5399 return ELM_MAP_OVERLAY_TYPE_NONE;
5400#endif
5401} 5099}
5402 5100
5403EAPI void 5101EAPI void
5404elm_map_overlay_data_set(Elm_Map_Overlay *overlay, 5102elm_map_overlay_data_set(Elm_Map_Overlay *overlay,
5405 void *data) 5103 void *data)
5406{ 5104{
5407#ifdef HAVE_ELEMENTARY_ECORE_CON
5408 EINA_SAFETY_ON_NULL_RETURN(overlay); 5105 EINA_SAFETY_ON_NULL_RETURN(overlay);
5409 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd); 5106 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd);
5410 ELM_MAP_CHECK((overlay->wsd)->obj); 5107 ELM_MAP_CHECK((overlay->wsd)->obj);
5411 5108
5412 overlay->data = data; 5109 overlay->data = data;
5413#else
5414 (void)overlay;
5415 (void)data;
5416#endif
5417} 5110}
5418 5111
5419EAPI void * 5112EAPI void *
5420elm_map_overlay_data_get(const Elm_Map_Overlay *overlay) 5113elm_map_overlay_data_get(const Elm_Map_Overlay *overlay)
5421{ 5114{
5422#ifdef HAVE_ELEMENTARY_ECORE_CON
5423 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, NULL); 5115 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, NULL);
5424 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay->wsd, NULL); 5116 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay->wsd, NULL);
5425 ELM_MAP_CHECK((overlay->wsd)->obj) NULL; 5117 ELM_MAP_CHECK((overlay->wsd)->obj) NULL;
5426 5118
5427 return overlay->data; 5119 return overlay->data;
5428#else
5429 (void)overlay;
5430 return NULL;
5431#endif
5432} 5120}
5433 5121
5434EAPI void 5122EAPI void
5435elm_map_overlay_hide_set(Elm_Map_Overlay *overlay, 5123elm_map_overlay_hide_set(Elm_Map_Overlay *overlay,
5436 Eina_Bool hide) 5124 Eina_Bool hide)
5437{ 5125{
5438#ifdef HAVE_ELEMENTARY_ECORE_CON
5439 EINA_SAFETY_ON_NULL_RETURN(overlay); 5126 EINA_SAFETY_ON_NULL_RETURN(overlay);
5440 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd); 5127 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd);
5441 ELM_MAP_CHECK((overlay->wsd)->obj); 5128 ELM_MAP_CHECK((overlay->wsd)->obj);
@@ -5444,64 +5131,44 @@ elm_map_overlay_hide_set(Elm_Map_Overlay *overlay,
5444 overlay->hide = hide; 5131 overlay->hide = hide;
5445 5132
5446 evas_object_smart_changed(overlay->wsd->pan_obj); 5133 evas_object_smart_changed(overlay->wsd->pan_obj);
5447#else
5448 (void)overlay;
5449 (void)hide;
5450#endif
5451} 5134}
5452 5135
5453EAPI Eina_Bool 5136EAPI Eina_Bool
5454elm_map_overlay_hide_get(const Elm_Map_Overlay *overlay) 5137elm_map_overlay_hide_get(const Elm_Map_Overlay *overlay)
5455{ 5138{
5456#ifdef HAVE_ELEMENTARY_ECORE_CON
5457 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, EINA_FALSE); 5139 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, EINA_FALSE);
5458 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay->wsd, EINA_FALSE); 5140 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay->wsd, EINA_FALSE);
5459 ELM_MAP_CHECK((overlay->wsd)->obj) EINA_FALSE; 5141 ELM_MAP_CHECK((overlay->wsd)->obj) EINA_FALSE;
5460 5142
5461 return overlay->hide; 5143 return overlay->hide;
5462#else
5463 (void)overlay;
5464 return EINA_FALSE;
5465#endif
5466} 5144}
5467 5145
5468EAPI void 5146EAPI void
5469elm_map_overlay_displayed_zoom_min_set(Elm_Map_Overlay *overlay, 5147elm_map_overlay_displayed_zoom_min_set(Elm_Map_Overlay *overlay,
5470 int zoom) 5148 int zoom)
5471{ 5149{
5472#ifdef HAVE_ELEMENTARY_ECORE_CON
5473 EINA_SAFETY_ON_NULL_RETURN(overlay); 5150 EINA_SAFETY_ON_NULL_RETURN(overlay);
5474 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd); 5151 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd);
5475 ELM_MAP_CHECK((overlay->wsd)->obj); 5152 ELM_MAP_CHECK((overlay->wsd)->obj);
5476 5153
5477 overlay->zoom_min = zoom; 5154 overlay->zoom_min = zoom;
5478 evas_object_smart_changed(overlay->wsd->pan_obj); 5155 evas_object_smart_changed(overlay->wsd->pan_obj);
5479#else
5480 (void)overlay;
5481 (void)zoom;
5482#endif
5483} 5156}
5484 5157
5485EAPI int 5158EAPI int
5486elm_map_overlay_displayed_zoom_min_get(const Elm_Map_Overlay *overlay) 5159elm_map_overlay_displayed_zoom_min_get(const Elm_Map_Overlay *overlay)
5487{ 5160{
5488#ifdef HAVE_ELEMENTARY_ECORE_CON
5489 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, 0); 5161 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, 0);
5490 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay->wsd, 0); 5162 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay->wsd, 0);
5491 ELM_MAP_CHECK((overlay->wsd)->obj) 0; 5163 ELM_MAP_CHECK((overlay->wsd)->obj) 0;
5492 5164
5493 return overlay->zoom_min; 5165 return overlay->zoom_min;
5494#else
5495 (void)overlay;
5496 return 0;
5497#endif
5498} 5166}
5499 5167
5500EAPI void 5168EAPI void
5501elm_map_overlay_paused_set(Elm_Map_Overlay *overlay, 5169elm_map_overlay_paused_set(Elm_Map_Overlay *overlay,
5502 Eina_Bool paused) 5170 Eina_Bool paused)
5503{ 5171{
5504#ifdef HAVE_ELEMENTARY_ECORE_CON
5505 EINA_SAFETY_ON_NULL_RETURN(overlay); 5172 EINA_SAFETY_ON_NULL_RETURN(overlay);
5506 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd); 5173 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd);
5507 ELM_MAP_CHECK((overlay->wsd)->obj); 5174 ELM_MAP_CHECK((overlay->wsd)->obj);
@@ -5510,46 +5177,31 @@ elm_map_overlay_paused_set(Elm_Map_Overlay *overlay,
5510 overlay->paused = paused; 5177 overlay->paused = paused;
5511 5178
5512 evas_object_smart_changed(overlay->wsd->pan_obj); 5179 evas_object_smart_changed(overlay->wsd->pan_obj);
5513#else
5514 (void)overlay;
5515 (void)paused;
5516#endif
5517} 5180}
5518 5181
5519EAPI Eina_Bool 5182EAPI Eina_Bool
5520elm_map_overlay_paused_get(const Elm_Map_Overlay *overlay) 5183elm_map_overlay_paused_get(const Elm_Map_Overlay *overlay)
5521{ 5184{
5522#ifdef HAVE_ELEMENTARY_ECORE_CON
5523 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, EINA_FALSE); 5185 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, EINA_FALSE);
5524 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay->wsd, EINA_FALSE); 5186 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay->wsd, EINA_FALSE);
5525 ELM_MAP_CHECK((overlay->wsd)->obj) EINA_FALSE; 5187 ELM_MAP_CHECK((overlay->wsd)->obj) EINA_FALSE;
5526 5188
5527 return overlay->paused; 5189 return overlay->paused;
5528#else
5529 (void)overlay;
5530 return EINA_FALSE;
5531#endif
5532} 5190}
5533 5191
5534EAPI Eina_Bool 5192EAPI Eina_Bool
5535elm_map_overlay_visible_get(const Elm_Map_Overlay *overlay) 5193elm_map_overlay_visible_get(const Elm_Map_Overlay *overlay)
5536{ 5194{
5537#ifdef HAVE_ELEMENTARY_ECORE_CON
5538 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, EINA_FALSE); 5195 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, EINA_FALSE);
5539 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay->wsd, EINA_FALSE); 5196 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay->wsd, EINA_FALSE);
5540 ELM_MAP_CHECK((overlay->wsd)->obj) EINA_FALSE; 5197 ELM_MAP_CHECK((overlay->wsd)->obj) EINA_FALSE;
5541 5198
5542 return overlay->visible; 5199 return overlay->visible;
5543#else
5544 (void)overlay;
5545 return EINA_FALSE;
5546#endif
5547} 5200}
5548 5201
5549EAPI void 5202EAPI void
5550elm_map_overlay_show(Elm_Map_Overlay *overlay) 5203elm_map_overlay_show(Elm_Map_Overlay *overlay)
5551{ 5204{
5552#ifdef HAVE_ELEMENTARY_ECORE_CON
5553 EINA_SAFETY_ON_NULL_RETURN(overlay); 5205 EINA_SAFETY_ON_NULL_RETURN(overlay);
5554 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd); 5206 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd);
5555 ELM_MAP_CHECK((overlay->wsd)->obj); 5207 ELM_MAP_CHECK((overlay->wsd)->obj);
@@ -5581,15 +5233,11 @@ elm_map_overlay_show(Elm_Map_Overlay *overlay)
5581 else ERR("Not supported overlay type: %d", overlay->type); 5233 else ERR("Not supported overlay type: %d", overlay->type);
5582 5234
5583 evas_object_smart_changed(overlay->wsd->pan_obj); 5235 evas_object_smart_changed(overlay->wsd->pan_obj);
5584#else
5585 (void)overlay;
5586#endif
5587} 5236}
5588 5237
5589EAPI void 5238EAPI void
5590elm_map_overlays_show(Eina_List *overlays) 5239elm_map_overlays_show(Eina_List *overlays)
5591{ 5240{
5592#ifdef HAVE_ELEMENTARY_ECORE_CON
5593 Elm_Map_Overlay *overlay; 5241 Elm_Map_Overlay *overlay;
5594 5242
5595 EINA_SAFETY_ON_NULL_RETURN(overlays); 5243 EINA_SAFETY_ON_NULL_RETURN(overlays);
@@ -5601,9 +5249,6 @@ elm_map_overlays_show(Eina_List *overlays)
5601 overlay->wsd->calc_job.overlays_show = _overlays_show; 5249 overlay->wsd->calc_job.overlays_show = _overlays_show;
5602 5250
5603 evas_object_smart_changed(overlay->wsd->pan_obj); 5251 evas_object_smart_changed(overlay->wsd->pan_obj);
5604#else
5605 (void)overlays;
5606#endif
5607} 5252}
5608 5253
5609EAPI void 5254EAPI void
@@ -5611,7 +5256,6 @@ elm_map_overlay_region_set(Elm_Map_Overlay *overlay,
5611 double lon, 5256 double lon,
5612 double lat) 5257 double lat)
5613{ 5258{
5614#ifdef HAVE_ELEMENTARY_ECORE_CON
5615 EINA_SAFETY_ON_NULL_RETURN(overlay); 5259 EINA_SAFETY_ON_NULL_RETURN(overlay);
5616 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd); 5260 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd);
5617 ELM_MAP_CHECK((overlay->wsd)->obj); 5261 ELM_MAP_CHECK((overlay->wsd)->obj);
@@ -5634,11 +5278,6 @@ elm_map_overlay_region_set(Elm_Map_Overlay *overlay,
5634 else ERR("Not supported overlay type: %d", overlay->type); 5278 else ERR("Not supported overlay type: %d", overlay->type);
5635 5279
5636 evas_object_smart_changed(overlay->wsd->pan_obj); 5280 evas_object_smart_changed(overlay->wsd->pan_obj);
5637#else
5638 (void)overlay;
5639 (void)lon;
5640 (void)lat;
5641#endif
5642} 5281}
5643 5282
5644EAPI void 5283EAPI void
@@ -5646,7 +5285,6 @@ elm_map_overlay_region_get(const Elm_Map_Overlay *overlay,
5646 double *lon, 5285 double *lon,
5647 double *lat) 5286 double *lat)
5648{ 5287{
5649#ifdef HAVE_ELEMENTARY_ECORE_CON
5650 EINA_SAFETY_ON_NULL_RETURN(overlay); 5288 EINA_SAFETY_ON_NULL_RETURN(overlay);
5651 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd); 5289 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd);
5652 ELM_MAP_CHECK((overlay->wsd)->obj); 5290 ELM_MAP_CHECK((overlay->wsd)->obj);
@@ -5673,18 +5311,12 @@ elm_map_overlay_region_get(const Elm_Map_Overlay *overlay,
5673 if (lat) *lat = ovl->lat; 5311 if (lat) *lat = ovl->lat;
5674 } 5312 }
5675 else ERR("Not supported overlay type: %d", overlay->type); 5313 else ERR("Not supported overlay type: %d", overlay->type);
5676#else
5677 (void)overlay;
5678 (void)lon;
5679 (void)lat;
5680#endif
5681} 5314}
5682 5315
5683EAPI void 5316EAPI void
5684elm_map_overlay_icon_set(Elm_Map_Overlay *overlay, 5317elm_map_overlay_icon_set(Elm_Map_Overlay *overlay,
5685 Evas_Object *icon) 5318 Evas_Object *icon)
5686{ 5319{
5687#ifdef HAVE_ELEMENTARY_ECORE_CON
5688 EINA_SAFETY_ON_NULL_RETURN(overlay); 5320 EINA_SAFETY_ON_NULL_RETURN(overlay);
5689 EINA_SAFETY_ON_NULL_RETURN(icon); 5321 EINA_SAFETY_ON_NULL_RETURN(icon);
5690 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd); 5322 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd);
@@ -5697,16 +5329,11 @@ elm_map_overlay_icon_set(Elm_Map_Overlay *overlay,
5697 else ERR("Not supported overlay type: %d", overlay->type); 5329 else ERR("Not supported overlay type: %d", overlay->type);
5698 5330
5699 evas_object_smart_changed(overlay->wsd->pan_obj); 5331 evas_object_smart_changed(overlay->wsd->pan_obj);
5700#else
5701 (void)overlay;
5702 (void)icon;
5703#endif
5704} 5332}
5705 5333
5706EAPI const Evas_Object * 5334EAPI const Evas_Object *
5707elm_map_overlay_icon_get(const Elm_Map_Overlay *overlay) 5335elm_map_overlay_icon_get(const Elm_Map_Overlay *overlay)
5708{ 5336{
5709#ifdef HAVE_ELEMENTARY_ECORE_CON
5710 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, NULL); 5337 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, NULL);
5711 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay->wsd, NULL); 5338 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay->wsd, NULL);
5712 ELM_MAP_CHECK((overlay->wsd)->obj) NULL; 5339 ELM_MAP_CHECK((overlay->wsd)->obj) NULL;
@@ -5728,17 +5355,12 @@ elm_map_overlay_icon_get(const Elm_Map_Overlay *overlay)
5728 ERR("Not supported overlay type: %d", overlay->type); 5355 ERR("Not supported overlay type: %d", overlay->type);
5729 return NULL; 5356 return NULL;
5730 } 5357 }
5731#else
5732 (void)overlay;
5733 return NULL;
5734#endif
5735} 5358}
5736 5359
5737EAPI void 5360EAPI void
5738elm_map_overlay_content_set(Elm_Map_Overlay *overlay, 5361elm_map_overlay_content_set(Elm_Map_Overlay *overlay,
5739 Evas_Object *content) 5362 Evas_Object *content)
5740{ 5363{
5741#ifdef HAVE_ELEMENTARY_ECORE_CON
5742 EINA_SAFETY_ON_NULL_RETURN(overlay); 5364 EINA_SAFETY_ON_NULL_RETURN(overlay);
5743 EINA_SAFETY_ON_NULL_RETURN(content); 5365 EINA_SAFETY_ON_NULL_RETURN(content);
5744 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd); 5366 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd);
@@ -5751,16 +5373,11 @@ elm_map_overlay_content_set(Elm_Map_Overlay *overlay,
5751 else ERR("Not supported overlay type: %d", overlay->type); 5373 else ERR("Not supported overlay type: %d", overlay->type);
5752 5374
5753 evas_object_smart_changed(overlay->wsd->pan_obj); 5375 evas_object_smart_changed(overlay->wsd->pan_obj);
5754#else
5755 (void)overlay;
5756 (void)content;
5757#endif
5758} 5376}
5759 5377
5760EAPI const Evas_Object * 5378EAPI const Evas_Object *
5761elm_map_overlay_content_get(const Elm_Map_Overlay *overlay) 5379elm_map_overlay_content_get(const Elm_Map_Overlay *overlay)
5762{ 5380{
5763#ifdef HAVE_ELEMENTARY_ECORE_CON
5764 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, NULL); 5381 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay, NULL);
5765 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay->wsd, NULL); 5382 EINA_SAFETY_ON_NULL_RETURN_VAL(overlay->wsd, NULL);
5766 5383
@@ -5781,10 +5398,6 @@ elm_map_overlay_content_get(const Elm_Map_Overlay *overlay)
5781 ERR("Not supported overlay type: %d", overlay->type); 5398 ERR("Not supported overlay type: %d", overlay->type);
5782 return NULL; 5399 return NULL;
5783 } 5400 }
5784#else
5785 (void)overlay;
5786 return NULL;
5787#endif
5788} 5401}
5789 5402
5790EAPI void 5403EAPI void
@@ -5794,7 +5407,6 @@ elm_map_overlay_color_set(Elm_Map_Overlay *overlay,
5794 int b, 5407 int b,
5795 int a) 5408 int a)
5796{ 5409{
5797#ifdef HAVE_ELEMENTARY_ECORE_CON
5798 EINA_SAFETY_ON_NULL_RETURN(overlay); 5410 EINA_SAFETY_ON_NULL_RETURN(overlay);
5799 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd); 5411 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd);
5800 ELM_MAP_CHECK((overlay->wsd)->obj); 5412 ELM_MAP_CHECK((overlay->wsd)->obj);
@@ -5814,14 +5426,6 @@ elm_map_overlay_color_set(Elm_Map_Overlay *overlay,
5814 { 5426 {
5815 ERR("Not supported overlay type: %d", overlay->type); 5427 ERR("Not supported overlay type: %d", overlay->type);
5816 } 5428 }
5817
5818#else
5819 (void)overlay;
5820 (void)r;
5821 (void)g;
5822 (void)b;
5823 (void)a;
5824#endif
5825} 5429}
5826 5430
5827EAPI void 5431EAPI void
@@ -5831,7 +5435,6 @@ elm_map_overlay_color_get(const Elm_Map_Overlay *overlay,
5831 int *b, 5435 int *b,
5832 int *a) 5436 int *a)
5833{ 5437{
5834#ifdef HAVE_ELEMENTARY_ECORE_CON
5835 EINA_SAFETY_ON_NULL_RETURN(overlay); 5438 EINA_SAFETY_ON_NULL_RETURN(overlay);
5836 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd); 5439 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd);
5837 ELM_MAP_CHECK((overlay->wsd)->obj); 5440 ELM_MAP_CHECK((overlay->wsd)->obj);
@@ -5844,13 +5447,6 @@ elm_map_overlay_color_get(const Elm_Map_Overlay *overlay,
5844 if (a) *a = overlay->c.a; 5447 if (a) *a = overlay->c.a;
5845 } 5448 }
5846 else ERR("Not supported overlay type: %d", overlay->type); 5449 else ERR("Not supported overlay type: %d", overlay->type);
5847#else
5848 (void)overlay;
5849 (void)r;
5850 (void)g;
5851 (void)b;
5852 (void)a;
5853#endif
5854} 5450}
5855 5451
5856EAPI void 5452EAPI void
@@ -5858,7 +5454,6 @@ elm_map_overlay_get_cb_set(Elm_Map_Overlay *overlay,
5858 Elm_Map_Overlay_Get_Cb get_cb, 5454 Elm_Map_Overlay_Get_Cb get_cb,
5859 void *data) 5455 void *data)
5860{ 5456{
5861#ifdef HAVE_ELEMENTARY_ECORE_CON
5862 EINA_SAFETY_ON_NULL_RETURN(overlay); 5457 EINA_SAFETY_ON_NULL_RETURN(overlay);
5863 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd); 5458 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd);
5864 ELM_MAP_CHECK((overlay->wsd)->obj); 5459 ELM_MAP_CHECK((overlay->wsd)->obj);
@@ -5868,11 +5463,6 @@ elm_map_overlay_get_cb_set(Elm_Map_Overlay *overlay,
5868 5463
5869 if (overlay->type == ELM_MAP_OVERLAY_TYPE_CLASS) 5464 if (overlay->type == ELM_MAP_OVERLAY_TYPE_CLASS)
5870 _overlay_class_cb_set(overlay->ovl, get_cb, data); 5465 _overlay_class_cb_set(overlay->ovl, get_cb, data);
5871#else
5872 (void)overlay;
5873 (void)get_cb;
5874 (void)data;
5875#endif
5876} 5466}
5877 5467
5878EAPI void 5468EAPI void
@@ -5880,18 +5470,12 @@ elm_map_overlay_del_cb_set(Elm_Map_Overlay *overlay,
5880 Elm_Map_Overlay_Del_Cb del_cb, 5470 Elm_Map_Overlay_Del_Cb del_cb,
5881 void *data) 5471 void *data)
5882{ 5472{
5883#ifdef HAVE_ELEMENTARY_ECORE_CON
5884 EINA_SAFETY_ON_NULL_RETURN(overlay); 5473 EINA_SAFETY_ON_NULL_RETURN(overlay);
5885 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd); 5474 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd);
5886 ELM_MAP_CHECK((overlay->wsd)->obj); 5475 ELM_MAP_CHECK((overlay->wsd)->obj);
5887 5476
5888 overlay->del_cb = del_cb; 5477 overlay->del_cb = del_cb;
5889 overlay->del_cb_data = data; 5478 overlay->del_cb_data = data;
5890#else
5891 (void)overlay;
5892 (void)del_cb;
5893 (void)data;
5894#endif
5895} 5479}
5896 5480
5897EAPI Elm_Map_Overlay * 5481EAPI Elm_Map_Overlay *
@@ -5907,7 +5491,6 @@ static void
5907_overlay_class_add(Eo *obj EINA_UNUSED, void *_pd, va_list *list) 5491_overlay_class_add(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
5908{ 5492{
5909 Elm_Map_Overlay **ret = va_arg(*list, Elm_Map_Overlay **); 5493 Elm_Map_Overlay **ret = va_arg(*list, Elm_Map_Overlay **);
5910#ifdef HAVE_ELEMENTARY_ECORE_CON
5911 Elm_Map_Overlay *overlay; 5494 Elm_Map_Overlay *overlay;
5912 5495
5913 Elm_Map_Smart_Data *sd = _pd; 5496 Elm_Map_Smart_Data *sd = _pd;
@@ -5924,18 +5507,12 @@ _overlay_class_add(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
5924 5507
5925 evas_object_smart_changed(sd->pan_obj); 5508 evas_object_smart_changed(sd->pan_obj);
5926 *ret = overlay; 5509 *ret = overlay;
5927#else
5928 (void)obj;
5929 (void)_pd;
5930 *ret = NULL;
5931#endif
5932} 5510}
5933 5511
5934EAPI void 5512EAPI void
5935elm_map_overlay_class_append(Elm_Map_Overlay *klass, 5513elm_map_overlay_class_append(Elm_Map_Overlay *klass,
5936 Elm_Map_Overlay *overlay) 5514 Elm_Map_Overlay *overlay)
5937{ 5515{
5938#ifdef HAVE_ELEMENTARY_ECORE_CON
5939 Overlay_Class *class_ovl; 5516 Overlay_Class *class_ovl;
5940 5517
5941 EINA_SAFETY_ON_NULL_RETURN(klass); 5518 EINA_SAFETY_ON_NULL_RETURN(klass);
@@ -5966,17 +5543,12 @@ elm_map_overlay_class_append(Elm_Map_Overlay *klass,
5966 } 5543 }
5967 5544
5968 evas_object_smart_changed(klass->wsd->pan_obj); 5545 evas_object_smart_changed(klass->wsd->pan_obj);
5969#else
5970 (void)klass;
5971 (void)overlay;
5972#endif
5973} 5546}
5974 5547
5975EAPI void 5548EAPI void
5976elm_map_overlay_class_remove(Elm_Map_Overlay *klass, 5549elm_map_overlay_class_remove(Elm_Map_Overlay *klass,
5977 Elm_Map_Overlay *overlay) 5550 Elm_Map_Overlay *overlay)
5978{ 5551{
5979#ifdef HAVE_ELEMENTARY_ECORE_CON
5980 Overlay_Class *ovl; 5552 Overlay_Class *ovl;
5981 5553
5982 EINA_SAFETY_ON_NULL_RETURN(klass); 5554 EINA_SAFETY_ON_NULL_RETURN(klass);
@@ -5998,17 +5570,12 @@ elm_map_overlay_class_remove(Elm_Map_Overlay *klass,
5998 } 5570 }
5999 5571
6000 evas_object_smart_changed(klass->wsd->pan_obj); 5572 evas_object_smart_changed(klass->wsd->pan_obj);
6001#else
6002 (void)klass;
6003 (void)overlay;
6004#endif
6005} 5573}
6006 5574
6007EAPI void 5575EAPI void
6008elm_map_overlay_class_zoom_max_set(Elm_Map_Overlay *klass, 5576elm_map_overlay_class_zoom_max_set(Elm_Map_Overlay *klass,
6009 int zoom) 5577 int zoom)
6010{ 5578{
6011#ifdef HAVE_ELEMENTARY_ECORE_CON
6012 Overlay_Class *ovl; 5579 Overlay_Class *ovl;
6013 5580
6014 EINA_SAFETY_ON_NULL_RETURN(klass); 5581 EINA_SAFETY_ON_NULL_RETURN(klass);
@@ -6021,16 +5588,11 @@ elm_map_overlay_class_zoom_max_set(Elm_Map_Overlay *klass,
6021 ovl->zoom_max = zoom; 5588 ovl->zoom_max = zoom;
6022 5589
6023 evas_object_smart_changed(klass->wsd->pan_obj); 5590 evas_object_smart_changed(klass->wsd->pan_obj);
6024#else
6025 (void)klass;
6026 (void)zoom;
6027#endif
6028} 5591}
6029 5592
6030EAPI int 5593EAPI int
6031elm_map_overlay_class_zoom_max_get(const Elm_Map_Overlay *klass) 5594elm_map_overlay_class_zoom_max_get(const Elm_Map_Overlay *klass)
6032{ 5595{
6033#ifdef HAVE_ELEMENTARY_ECORE_CON
6034 const Overlay_Class *ovl; 5596 const Overlay_Class *ovl;
6035 5597
6036 EINA_SAFETY_ON_NULL_RETURN_VAL(klass, OVERLAY_CLASS_ZOOM_MAX); 5598 EINA_SAFETY_ON_NULL_RETURN_VAL(klass, OVERLAY_CLASS_ZOOM_MAX);
@@ -6042,16 +5604,11 @@ elm_map_overlay_class_zoom_max_get(const Elm_Map_Overlay *klass)
6042 5604
6043 ovl = klass->ovl; 5605 ovl = klass->ovl;
6044 return ovl->zoom_max; 5606 return ovl->zoom_max;
6045#else
6046 (void)klass;
6047 return OVERLAY_CLASS_ZOOM_MAX;
6048#endif
6049} 5607}
6050 5608
6051EAPI Eina_List * 5609EAPI Eina_List *
6052elm_map_overlay_group_members_get(const Elm_Map_Overlay *grp) 5610elm_map_overlay_group_members_get(const Elm_Map_Overlay *grp)
6053{ 5611{
6054#ifdef HAVE_ELEMENTARY_ECORE_CON
6055 Overlay_Group *ovl; 5612 Overlay_Group *ovl;
6056 5613
6057 EINA_SAFETY_ON_NULL_RETURN_VAL(grp, NULL); 5614 EINA_SAFETY_ON_NULL_RETURN_VAL(grp, NULL);
@@ -6063,10 +5620,6 @@ elm_map_overlay_group_members_get(const Elm_Map_Overlay *grp)
6063 5620
6064 ovl = grp->ovl; 5621 ovl = grp->ovl;
6065 return ovl->members; 5622 return ovl->members;
6066#else
6067 (void)grp;
6068 return NULL;
6069#endif
6070} 5623}
6071 5624
6072EAPI Elm_Map_Overlay * 5625EAPI Elm_Map_Overlay *
@@ -6082,7 +5635,6 @@ static void
6082_overlay_bubble_add(Eo *obj EINA_UNUSED, void *_pd, va_list *list) 5635_overlay_bubble_add(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
6083{ 5636{
6084 Elm_Map_Overlay **ret = va_arg(*list, Elm_Map_Overlay **); 5637 Elm_Map_Overlay **ret = va_arg(*list, Elm_Map_Overlay **);
6085#ifdef HAVE_ELEMENTARY_ECORE_CON
6086 Elm_Map_Overlay *overlay; 5638 Elm_Map_Overlay *overlay;
6087 5639
6088 Elm_Map_Smart_Data *sd = _pd; 5640 Elm_Map_Smart_Data *sd = _pd;
@@ -6100,18 +5652,12 @@ _overlay_bubble_add(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
6100 5652
6101 evas_object_smart_changed(sd->pan_obj); 5653 evas_object_smart_changed(sd->pan_obj);
6102 *ret = overlay; 5654 *ret = overlay;
6103#else
6104 (void)obj;
6105 (void)_pd;
6106 *ret = NULL;
6107#endif
6108} 5655}
6109 5656
6110EAPI void 5657EAPI void
6111elm_map_overlay_bubble_follow(Elm_Map_Overlay *bubble, 5658elm_map_overlay_bubble_follow(Elm_Map_Overlay *bubble,
6112 const Elm_Map_Overlay *parent) 5659 const Elm_Map_Overlay *parent)
6113{ 5660{
6114#ifdef HAVE_ELEMENTARY_ECORE_CON
6115 Overlay_Bubble *ovl; 5661 Overlay_Bubble *ovl;
6116 Evas_Object *pobj; 5662 Evas_Object *pobj;
6117 5663
@@ -6126,17 +5672,12 @@ elm_map_overlay_bubble_follow(Elm_Map_Overlay *bubble,
6126 5672
6127 ovl->pobj = pobj; 5673 ovl->pobj = pobj;
6128 evas_object_smart_changed(bubble->wsd->pan_obj); 5674 evas_object_smart_changed(bubble->wsd->pan_obj);
6129#else
6130 (void)bubble;
6131 (void)parent;
6132#endif
6133} 5675}
6134 5676
6135EAPI void 5677EAPI void
6136elm_map_overlay_bubble_content_append(Elm_Map_Overlay *bubble, 5678elm_map_overlay_bubble_content_append(Elm_Map_Overlay *bubble,
6137 Evas_Object *content) 5679 Evas_Object *content)
6138{ 5680{
6139#ifdef HAVE_ELEMENTARY_ECORE_CON
6140 Overlay_Bubble *bb; 5681 Overlay_Bubble *bb;
6141 5682
6142 EINA_SAFETY_ON_NULL_RETURN(bubble); 5683 EINA_SAFETY_ON_NULL_RETURN(bubble);
@@ -6148,16 +5689,11 @@ elm_map_overlay_bubble_content_append(Elm_Map_Overlay *bubble,
6148 elm_box_pack_end(bb->bx, content); 5689 elm_box_pack_end(bb->bx, content);
6149 5690
6150 evas_object_smart_changed(bubble->wsd->pan_obj); 5691 evas_object_smart_changed(bubble->wsd->pan_obj);
6151#else
6152 (void)bubble;
6153 (void)content;
6154#endif
6155} 5692}
6156 5693
6157EAPI void 5694EAPI void
6158elm_map_overlay_bubble_content_clear(Elm_Map_Overlay *bubble) 5695elm_map_overlay_bubble_content_clear(Elm_Map_Overlay *bubble)
6159{ 5696{
6160#ifdef HAVE_ELEMENTARY_ECORE_CON
6161 Overlay_Bubble *bb; 5697 Overlay_Bubble *bb;
6162 5698
6163 EINA_SAFETY_ON_NULL_RETURN(bubble); 5699 EINA_SAFETY_ON_NULL_RETURN(bubble);
@@ -6168,9 +5704,6 @@ elm_map_overlay_bubble_content_clear(Elm_Map_Overlay *bubble)
6168 elm_box_clear(bb->bx); 5704 elm_box_clear(bb->bx);
6169 5705
6170 evas_object_smart_changed(bubble->wsd->pan_obj); 5706 evas_object_smart_changed(bubble->wsd->pan_obj);
6171#else
6172 (void)bubble;
6173#endif
6174} 5707}
6175 5708
6176EAPI Elm_Map_Overlay * 5709EAPI Elm_Map_Overlay *
@@ -6189,7 +5722,6 @@ _overlay_route_add(Eo *obj, void *_pd, va_list *list)
6189 const Elm_Map_Route *route = va_arg(*list, const Elm_Map_Route *); 5722 const Elm_Map_Route *route = va_arg(*list, const Elm_Map_Route *);
6190 Elm_Map_Overlay **ret = va_arg(*list, Elm_Map_Overlay **); 5723 Elm_Map_Overlay **ret = va_arg(*list, Elm_Map_Overlay **);
6191 *ret = NULL; 5724 *ret = NULL;
6192#ifdef HAVE_ELEMENTARY_ECORE_CON
6193 Elm_Map_Overlay *overlay; 5725 Elm_Map_Overlay *overlay;
6194 5726
6195 Elm_Map_Smart_Data *sd = _pd; 5727 Elm_Map_Smart_Data *sd = _pd;
@@ -6212,11 +5744,6 @@ _overlay_route_add(Eo *obj, void *_pd, va_list *list)
6212 5744
6213 evas_object_smart_changed(sd->pan_obj); 5745 evas_object_smart_changed(sd->pan_obj);
6214 *ret = overlay; 5746 *ret = overlay;
6215#else
6216 (void)obj;
6217 (void)_pd;
6218 (void)route;
6219#endif
6220} 5747}
6221 5748
6222EAPI Elm_Map_Overlay * 5749EAPI Elm_Map_Overlay *
@@ -6240,7 +5767,6 @@ _overlay_line_add(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
6240 double tlon = va_arg(*list, double); 5767 double tlon = va_arg(*list, double);
6241 double tlat = va_arg(*list, double); 5768 double tlat = va_arg(*list, double);
6242 Elm_Map_Overlay **ret = va_arg(*list, Elm_Map_Overlay **); 5769 Elm_Map_Overlay **ret = va_arg(*list, Elm_Map_Overlay **);
6243#ifdef HAVE_ELEMENTARY_ECORE_CON
6244 Elm_Map_Overlay *overlay; 5770 Elm_Map_Overlay *overlay;
6245 5771
6246 Elm_Map_Smart_Data *sd = _pd; 5772 Elm_Map_Smart_Data *sd = _pd;
@@ -6258,22 +5784,12 @@ _overlay_line_add(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
6258 5784
6259 evas_object_smart_changed(sd->pan_obj); 5785 evas_object_smart_changed(sd->pan_obj);
6260 *ret = overlay; 5786 *ret = overlay;
6261#else
6262 (void)obj;
6263 (void)_pd;
6264 (void)flon;
6265 (void)flat;
6266 (void)tlon;
6267 (void)tlat;
6268 *ret = NULL;
6269#endif
6270} 5787}
6271 5788
6272EAPI Elm_Map_Overlay * 5789EAPI Elm_Map_Overlay *
6273elm_map_overlay_polygon_add(Evas_Object *obj) 5790elm_map_overlay_polygon_add(Evas_Object *obj)
6274{ 5791{
6275 ELM_MAP_CHECK(obj) NULL; 5792 ELM_MAP_CHECK(obj) NULL;
6276#ifdef HAVE_ELEMENTARY_ECORE_CON
6277 Elm_Map_Overlay *ret = NULL; 5793 Elm_Map_Overlay *ret = NULL;
6278 eo_do(obj, elm_obj_map_overlay_polygon_add(&ret)); 5794 eo_do(obj, elm_obj_map_overlay_polygon_add(&ret));
6279 return ret; 5795 return ret;
@@ -6299,11 +5815,6 @@ _overlay_polygon_add(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
6299 sd->overlays = eina_list_append(sd->overlays, overlay); 5815 sd->overlays = eina_list_append(sd->overlays, overlay);
6300 evas_object_smart_changed(sd->pan_obj); 5816 evas_object_smart_changed(sd->pan_obj);
6301 *ret = overlay; 5817 *ret = overlay;
6302#else
6303 (void)obj;
6304 (void)_pd;
6305 *ret = NULL;
6306#endif
6307} 5818}
6308 5819
6309EAPI void 5820EAPI void
@@ -6311,7 +5822,6 @@ elm_map_overlay_polygon_region_add(Elm_Map_Overlay *overlay,
6311 double lon, 5822 double lon,
6312 double lat) 5823 double lat)
6313{ 5824{
6314#ifdef HAVE_ELEMENTARY_ECORE_CON
6315 Overlay_Polygon *ovl; 5825 Overlay_Polygon *ovl;
6316 Region *r; 5826 Region *r;
6317 5827
@@ -6326,11 +5836,6 @@ elm_map_overlay_polygon_region_add(Elm_Map_Overlay *overlay,
6326 ovl->regions = eina_list_append(ovl->regions, r); 5836 ovl->regions = eina_list_append(ovl->regions, r);
6327 5837
6328 evas_object_smart_changed(ovl->wsd->pan_obj); 5838 evas_object_smart_changed(ovl->wsd->pan_obj);
6329#else
6330 (void)overlay;
6331 (void)lon;
6332 (void)lat;
6333#endif
6334} 5839}
6335 5840
6336EAPI Elm_Map_Overlay * 5841EAPI Elm_Map_Overlay *
@@ -6352,7 +5857,6 @@ _overlay_circle_add(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
6352 double lat = va_arg(*list, double); 5857 double lat = va_arg(*list, double);
6353 double radius = va_arg(*list, double); 5858 double radius = va_arg(*list, double);
6354 Elm_Map_Overlay **ret = va_arg(*list, Elm_Map_Overlay **); 5859 Elm_Map_Overlay **ret = va_arg(*list, Elm_Map_Overlay **);
6355#ifdef HAVE_ELEMENTARY_ECORE_CON
6356 Elm_Map_Overlay *overlay; 5860 Elm_Map_Overlay *overlay;
6357 5861
6358 Elm_Map_Smart_Data *sd = _pd; 5862 Elm_Map_Smart_Data *sd = _pd;
@@ -6370,14 +5874,6 @@ _overlay_circle_add(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
6370 5874
6371 evas_object_smart_changed(sd->pan_obj); 5875 evas_object_smart_changed(sd->pan_obj);
6372 *ret = overlay; 5876 *ret = overlay;
6373#else
6374 (void)obj;
6375 (void)lon;
6376 (void)lat;
6377 (void)radius;
6378 (void)_pd;
6379 *ret = NULL;
6380#endif
6381} 5877}
6382 5878
6383EAPI Elm_Map_Overlay * 5879EAPI Elm_Map_Overlay *
@@ -6397,7 +5893,6 @@ _overlay_scale_add(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
6397 Evas_Coord x = va_arg(*list, Evas_Coord); 5893 Evas_Coord x = va_arg(*list, Evas_Coord);
6398 Evas_Coord y = va_arg(*list, Evas_Coord); 5894 Evas_Coord y = va_arg(*list, Evas_Coord);
6399 Elm_Map_Overlay **ret = va_arg(*list, Elm_Map_Overlay **); 5895 Elm_Map_Overlay **ret = va_arg(*list, Elm_Map_Overlay **);
6400#ifdef HAVE_ELEMENTARY_ECORE_CON
6401 Elm_Map_Overlay *overlay; 5896 Elm_Map_Overlay *overlay;
6402 5897
6403 Elm_Map_Smart_Data *sd = _pd; 5898 Elm_Map_Smart_Data *sd = _pd;
@@ -6415,13 +5910,6 @@ _overlay_scale_add(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
6415 5910
6416 evas_object_smart_changed(sd->pan_obj); 5911 evas_object_smart_changed(sd->pan_obj);
6417 *ret = overlay; 5912 *ret = overlay;
6418#else
6419 (void)obj;
6420 (void)x;
6421 (void)y;
6422 (void)_pd;
6423 *ret = NULL;
6424#endif
6425} 5913}
6426 5914
6427#ifdef ELM_EMAP 5915#ifdef ELM_EMAP
@@ -6464,7 +5952,7 @@ _track_add(Eo *obj, void *_pd, va_list *list)
6464 void *emap = va_arg(*list, void *); 5952 void *emap = va_arg(*list, void *);
6465 Evas_Object **ret = va_arg(*list, Evas_Object **); 5953 Evas_Object **ret = va_arg(*list, Evas_Object **);
6466 *ret = NULL; 5954 *ret = NULL;
6467#if defined (ELM_EMAP) && defined (HAVE_ELEMENTARY_ECORE_CON) 5955#ifdef ELM_EMAP
6468 EMap_Route *emapr = emap; 5956 EMap_Route *emapr = emap;
6469 Evas_Object *route; 5957 Evas_Object *route;
6470 5958
@@ -6486,7 +5974,7 @@ static void
6486_track_remove(Eo *obj EINA_UNUSED, void *_pd, va_list *list) 5974_track_remove(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
6487{ 5975{
6488 Evas_Object *route = va_arg(*list, Evas_Object *); 5976 Evas_Object *route = va_arg(*list, Evas_Object *);
6489#if defined (ELM_EMAP) && defined (HAVE_ELEMENTARY_ECORE_CON) 5977#ifdef ELM_EMAP
6490 Elm_Map_Smart_Data *sd = _pd; 5978 Elm_Map_Smart_Data *sd = _pd;
6491 5979
6492 sd->track = eina_list_remove(sd->track, route); 5980 sd->track = eina_list_remove(sd->track, route);
diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index f646e84f2..f337411f2 100644
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -102,10 +102,8 @@ _icon_move_resize_cb(void *data,
102 (wd->resize_obj, EDJE_MESSAGE_INT_SET, 0, msg); 102 (wd->resize_obj, EDJE_MESSAGE_INT_SET, 0, msg);
103 } 103 }
104 104
105#ifdef HAVE_ELEMENTARY_ETHUMB
106 if (sd->thumb.file.path) 105 if (sd->thumb.file.path)
107 elm_icon_thumb_set(sd->icon, sd->thumb.file.path, sd->thumb.file.key); 106 elm_icon_thumb_set(sd->icon, sd->thumb.file.path, sd->thumb.file.key);
108#endif
109} 107}
110 108
111static void 109static void
@@ -458,18 +456,12 @@ _thumb_set(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
458 const char *file = va_arg(*list, const char *); 456 const char *file = va_arg(*list, const char *);
459 const char *group = va_arg(*list, const char *); 457 const char *group = va_arg(*list, const char *);
460 458
461#ifdef HAVE_ELEMENTARY_ETHUMB
462 Elm_Photo_Smart_Data *sd = _pd; 459 Elm_Photo_Smart_Data *sd = _pd;
463 460
464 eina_stringshare_replace(&sd->thumb.file.path, file); 461 eina_stringshare_replace(&sd->thumb.file.path, file);
465 eina_stringshare_replace(&sd->thumb.file.key, group); 462 eina_stringshare_replace(&sd->thumb.file.key, group);
466 463
467 elm_icon_thumb_set(sd->icon, file, group); 464 elm_icon_thumb_set(sd->icon, file, group);
468#else
469 (void)obj;
470 (void)file;
471 (void)group;
472#endif
473} 465}
474 466
475EAPI void 467EAPI void
diff --git a/src/lib/elm_prefs_data.c b/src/lib/elm_prefs_data.c
index 3d192c34a..1d4548fdc 100644
--- a/src/lib/elm_prefs_data.c
+++ b/src/lib/elm_prefs_data.c
@@ -345,24 +345,8 @@ elm_prefs_data_new(const char *data_file,
345 345
346 if (data_file) prefs_data->data_file = eina_stringshare_add(data_file); 346 if (data_file) prefs_data->data_file = eina_stringshare_add(data_file);
347 else 347 else
348 { 348 prefs_data->data_file = eina_stringshare_printf
349 const char *home; 349 ("%s/%s", efreet_config_home_get(), _elm_appname);
350#ifdef ELM_EFREET
351 prefs_data->data_file = eina_stringshare_printf
352 ("%s/%s", efreet_config_home_get(), _elm_appname);
353 (void)home;
354#else
355# ifdef _WIN32
356 home = evil_homedir_get();
357# else
358 home = getenv("HOME");
359# endif
360 if (!home)
361 home = "/";
362 prefs_data->data_file = eina_stringshare_printf
363 ("%s/%s/%s", home, ".config", _elm_appname);
364#endif
365 }
366 350
367 prefs_data->key = eina_stringshare_add(key ? key : "main"); 351 prefs_data->key = eina_stringshare_add(key ? key : "main");
368 352
diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index fc1c06320..8b5846694 100644
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -13,9 +13,7 @@
13#include <Ecore_Wayland.h> 13#include <Ecore_Wayland.h>
14#endif 14#endif
15 15
16#ifdef HAVE_EIO 16#include <Eio.h>
17# include <Eio.h>
18#endif
19 17
20#ifdef EAPI 18#ifdef EAPI
21# undef EAPI 19# undef EAPI
diff --git a/src/lib/elm_sys_notify.c b/src/lib/elm_sys_notify.c
index 1e1627e04..9c354ccc2 100644
--- a/src/lib/elm_sys_notify.c
+++ b/src/lib/elm_sys_notify.c
@@ -13,7 +13,6 @@
13EAPI int ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED = 0; 13EAPI int ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED = 0;
14EAPI int ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED = 0; 14EAPI int ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED = 0;
15 15
16#ifdef ELM_ELDBUS
17static Eina_Bool _elm_need_sys_notify = EINA_FALSE; 16static Eina_Bool _elm_need_sys_notify = EINA_FALSE;
18 17
19static Eldbus_Connection *_elm_sysnotif_conn = NULL; 18static Eldbus_Connection *_elm_sysnotif_conn = NULL;
@@ -107,24 +106,18 @@ _close_notification_cb(void *data EINA_UNUSED,
107 ERR("Eldbus Error: %s %s", errname, errmsg); 106 ERR("Eldbus Error: %s %s", errname, errmsg);
108 } 107 }
109} 108}
110#endif
111 109
112EAPI void 110EAPI void
113elm_sys_notify_close(unsigned int id) 111elm_sys_notify_close(unsigned int id)
114{ 112{
115#ifdef ELM_ELDBUS
116 EINA_SAFETY_ON_FALSE_RETURN(_elm_need_sys_notify); 113 EINA_SAFETY_ON_FALSE_RETURN(_elm_need_sys_notify);
117 EINA_SAFETY_ON_NULL_RETURN(_elm_sysnotif_proxy); 114 EINA_SAFETY_ON_NULL_RETURN(_elm_sysnotif_proxy);
118 115
119 if (!eldbus_proxy_call(_elm_sysnotif_proxy, "CloseNotification", 116 if (!eldbus_proxy_call(_elm_sysnotif_proxy, "CloseNotification",
120 _close_notification_cb, NULL, -1, "u", id)) 117 _close_notification_cb, NULL, -1, "u", id))
121 ERR("Error sending message: "INTERFACE".CloseNotification."); 118 ERR("Error sending message: "INTERFACE".CloseNotification.");
122#else
123 (void) id;
124#endif
125} 119}
126 120
127#ifdef ELM_ELDBUS
128static void 121static void
129_notify_cb(void *data, 122_notify_cb(void *data,
130 const Eldbus_Message *msg, 123 const Eldbus_Message *msg,
@@ -145,7 +138,6 @@ _notify_cb(void *data,
145 if (d->cb) d->cb((void *)d->data, id); 138 if (d->cb) d->cb((void *)d->data, id);
146 free(d); 139 free(d);
147} 140}
148#endif
149 141
150EAPI void 142EAPI void
151elm_sys_notify_send(unsigned int replaces_id, const char *icon, 143elm_sys_notify_send(unsigned int replaces_id, const char *icon,
@@ -153,7 +145,6 @@ elm_sys_notify_send(unsigned int replaces_id, const char *icon,
153 Elm_Sys_Notify_Urgency urgency, int timeout, 145 Elm_Sys_Notify_Urgency urgency, int timeout,
154 Elm_Sys_Notify_Send_Cb cb, const void *cb_data) 146 Elm_Sys_Notify_Send_Cb cb, const void *cb_data)
155{ 147{
156#ifdef ELM_ELDBUS
157 Eldbus_Message *msg; 148 Eldbus_Message *msg;
158 Eldbus_Message_Iter *iter, *actions, *hints; 149 Eldbus_Message_Iter *iter, *actions, *hints;
159 Elm_Sys_Notify_Send_Data *data; 150 Elm_Sys_Notify_Send_Data *data;
@@ -206,18 +197,9 @@ elm_sys_notify_send(unsigned int replaces_id, const char *icon,
206 return; 197 return;
207 198
208error: 199error:
209#else
210 (void) replaces_id;
211 (void) icon;
212 (void) summary;
213 (void) body;
214 (void) urgency;
215 (void) timeout;
216#endif
217 if (cb) cb((void *)cb_data, 0); 200 if (cb) cb((void *)cb_data, 0);
218} 201}
219 202
220#ifdef ELM_ELDBUS
221static void 203static void
222_on_notification_closed(void *data EINA_UNUSED, 204_on_notification_closed(void *data EINA_UNUSED,
223 const Eldbus_Message *msg) 205 const Eldbus_Message *msg)
@@ -349,12 +331,10 @@ _name_owner_changed_cb(void *data EINA_UNUSED,
349 else 331 else
350 _update(); 332 _update();
351} 333}
352#endif
353 334
354EAPI Eina_Bool 335EAPI Eina_Bool
355elm_need_sys_notify(void) 336elm_need_sys_notify(void)
356{ 337{
357#ifdef ELM_ELDBUS
358 if (_elm_need_sys_notify) return EINA_TRUE; 338 if (_elm_need_sys_notify) return EINA_TRUE;
359 339
360 if (!elm_need_eldbus()) return EINA_FALSE; 340 if (!elm_need_eldbus()) return EINA_FALSE;
@@ -376,15 +356,11 @@ elm_need_sys_notify(void)
376 _elm_need_sys_notify = EINA_TRUE; 356 _elm_need_sys_notify = EINA_TRUE;
377 357
378 return EINA_TRUE; 358 return EINA_TRUE;
379#else
380 return EINA_FALSE;
381#endif
382} 359}
383 360
384void 361void
385_elm_unneed_sys_notify(void) 362_elm_unneed_sys_notify(void)
386{ 363{
387#ifdef ELM_ELDBUS
388 if (!_elm_need_sys_notify) return; 364 if (!_elm_need_sys_notify) return;
389 365
390 _elm_need_sys_notify = EINA_FALSE; 366 _elm_need_sys_notify = EINA_FALSE;
@@ -393,5 +369,4 @@ _elm_unneed_sys_notify(void)
393 369
394 eldbus_connection_unref(_elm_sysnotif_conn); 370 eldbus_connection_unref(_elm_sysnotif_conn);
395 _elm_sysnotif_conn = NULL; 371 _elm_sysnotif_conn = NULL;
396#endif
397} 372}
diff --git a/src/lib/elm_systray.c b/src/lib/elm_systray.c
index 2c850e343..3e948d0bc 100644
--- a/src/lib/elm_systray.c
+++ b/src/lib/elm_systray.c
@@ -40,8 +40,6 @@ static Elm_Systray_Private_Data _item = {
40 .menu_obj = NULL 40 .menu_obj = NULL
41}; 41};
42 42
43#ifdef ELM_ELDBUS
44
45#define OBJ_PATH "/org/ayatana/NotificationItem/StatusNotifierItem" 43#define OBJ_PATH "/org/ayatana/NotificationItem/StatusNotifierItem"
46#define INTERFACE "org.kde.StatusNotifierItem" 44#define INTERFACE "org.kde.StatusNotifierItem"
47 45
@@ -296,7 +294,6 @@ static const Eldbus_Property properties[] = {
296static const Eldbus_Service_Interface_Desc _iface_desc = { 294static const Eldbus_Service_Interface_Desc _iface_desc = {
297 INTERFACE, methods, signals, properties, NULL, NULL 295 INTERFACE, methods, signals, properties, NULL, NULL
298}; 296};
299#endif
300// ============================================================================= 297// =============================================================================
301 298
302static void 299static void
@@ -309,9 +306,7 @@ _menu_died(void *data EINA_UNUSED,
309 306
310 eina_stringshare_replace(&(_item.menu), NULL); 307 eina_stringshare_replace(&(_item.menu), NULL);
311 308
312#ifdef ELM_ELDBUS
313 eldbus_service_property_changed(_iface, "Menu"); 309 eldbus_service_property_changed(_iface, "Menu");
314#endif
315} 310}
316 311
317static void 312static void
@@ -322,9 +317,7 @@ _category_set(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args)
322 if (_item.cat == cat) return; 317 if (_item.cat == cat) return;
323 318
324 _item.cat = cat; 319 _item.cat = cat;
325#ifdef ELM_ELDBUS
326 eldbus_service_property_changed(_iface, "Category"); 320 eldbus_service_property_changed(_iface, "Category");
327#endif
328} 321}
329 322
330static void 323static void
@@ -343,11 +336,9 @@ _status_set(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args)
343 if (_item.status == st) return; 336 if (_item.status == st) return;
344 337
345 _item.status = st; 338 _item.status = st;
346#ifdef ELM_ELDBUS
347 eldbus_service_property_changed(_iface, "Status"); 339 eldbus_service_property_changed(_iface, "Status");
348 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWSTATUS, 340 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWSTATUS,
349 _Elm_Systray_Status_Str[_item.status]); 341 _Elm_Systray_Status_Str[_item.status]);
350#endif
351} 342}
352 343
353static void 344static void
@@ -364,10 +355,8 @@ _att_icon_name_set(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args)
364 355
365 if (!eina_stringshare_replace(&(_item.att_icon_name), att_icon_name)) return; 356 if (!eina_stringshare_replace(&(_item.att_icon_name), att_icon_name)) return;
366 357
367#ifdef ELM_ELDBUS
368 eldbus_service_property_changed(_iface, "AttentionIconName"); 358 eldbus_service_property_changed(_iface, "AttentionIconName");
369 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWATTENTIONICON, NULL); 359 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWATTENTIONICON, NULL);
370#endif
371} 360}
372 361
373static void 362static void
@@ -384,10 +373,8 @@ _icon_name_set(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args)
384 373
385 if (!eina_stringshare_replace(&(_item.icon_name), icon_name)) return; 374 if (!eina_stringshare_replace(&(_item.icon_name), icon_name)) return;
386 375
387#ifdef ELM_ELDBUS
388 eldbus_service_property_changed(_iface, "IconName"); 376 eldbus_service_property_changed(_iface, "IconName");
389 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWICON, NULL); 377 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWICON, NULL);
390#endif
391} 378}
392 379
393static void 380static void
@@ -405,11 +392,9 @@ _icon_theme_path_set(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args)
405 if (!eina_stringshare_replace(&(_item.icon_theme_path), icon_theme_path)) 392 if (!eina_stringshare_replace(&(_item.icon_theme_path), icon_theme_path))
406 return; 393 return;
407 394
408#ifdef ELM_ELDBUS
409 eldbus_service_property_changed(_iface, "IconThemePath"); 395 eldbus_service_property_changed(_iface, "IconThemePath");
410 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWICONTHEMEPATH, 396 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWICONTHEMEPATH,
411 _item.icon_theme_path); 397 _item.icon_theme_path);
412#endif
413} 398}
414 399
415static void 400static void
@@ -426,9 +411,7 @@ _id_set(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args)
426 411
427 if (!eina_stringshare_replace(&(_item.id), id)) return; 412 if (!eina_stringshare_replace(&(_item.id), id)) return;
428 413
429#ifdef ELM_ELDBUS
430 eldbus_service_property_changed(_iface, "Id"); 414 eldbus_service_property_changed(_iface, "Id");
431#endif
432} 415}
433 416
434static void 417static void
@@ -445,10 +428,8 @@ _title_set(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args)
445 428
446 if (!eina_stringshare_replace(&(_item.title), title)) return; 429 if (!eina_stringshare_replace(&(_item.title), title)) return;
447 430
448#ifdef ELM_ELDBUS
449 eldbus_service_property_changed(_iface, "Title"); 431 eldbus_service_property_changed(_iface, "Title");
450 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWTITLE, NULL); 432 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWTITLE, NULL);
451#endif
452} 433}
453 434
454static void 435static void
@@ -481,9 +462,7 @@ _menu_set(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args)
481 462
482 _item.menu_obj = menu_obj; 463 _item.menu_obj = menu_obj;
483 464
484#ifdef ELM_ELDBUS
485 eldbus_service_property_changed(_iface, "Menu"); 465 eldbus_service_property_changed(_iface, "Menu");
486#endif
487} 466}
488 467
489static void 468static void
@@ -497,21 +476,18 @@ static void
497_register(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args) 476_register(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args)
498{ 477{
499 Eina_Bool *ret = va_arg(*args, Eina_Bool *); 478 Eina_Bool *ret = va_arg(*args, Eina_Bool *);
500#ifdef ELM_ELDBUS
501 if (!_elm_need_systray) goto err; 479 if (!_elm_need_systray) goto err;
502 480
503 *ret = _elm_systray_watcher_status_notifier_item_register(OBJ_PATH); 481 *ret = _elm_systray_watcher_status_notifier_item_register(OBJ_PATH);
504 return; 482 return;
505 483
506err: 484err:
507#endif
508 *ret = EINA_FALSE; 485 *ret = EINA_FALSE;
509} 486}
510 487
511EAPI Eina_Bool 488EAPI Eina_Bool
512elm_need_systray(void) 489elm_need_systray(void)
513{ 490{
514#ifdef ELM_ELDBUS
515 if (_elm_need_systray) return EINA_TRUE; 491 if (_elm_need_systray) return EINA_TRUE;
516 492
517 if (!elm_need_eldbus()) return EINA_FALSE; 493 if (!elm_need_eldbus()) return EINA_FALSE;
@@ -538,14 +514,12 @@ err:
538 } 514 }
539 515
540 _elm_systray_watcher_shutdown(); 516 _elm_systray_watcher_shutdown();
541#endif
542 return EINA_FALSE; 517 return EINA_FALSE;
543} 518}
544 519
545void 520void
546_elm_unneed_systray(void) 521_elm_unneed_systray(void)
547{ 522{
548#ifdef ELM_ELDBUS
549 if (!_elm_need_systray) return; 523 if (!_elm_need_systray) return;
550 524
551 _elm_need_systray = EINA_FALSE; 525 _elm_need_systray = EINA_FALSE;
@@ -570,7 +544,6 @@ _elm_unneed_systray(void)
570 NULL); 544 NULL);
571 _item.menu_obj = NULL; 545 _item.menu_obj = NULL;
572 } 546 }
573#endif
574} 547}
575 548
576// ============================================================================= 549// =============================================================================
diff --git a/src/lib/elm_systray_watcher.c b/src/lib/elm_systray_watcher.c
index 929149876..44f66427c 100644
--- a/src/lib/elm_systray_watcher.c
+++ b/src/lib/elm_systray_watcher.c
@@ -8,7 +8,6 @@
8 8
9#include "elm_systray_watcher.h" 9#include "elm_systray_watcher.h"
10 10
11#ifdef ELM_ELDBUS
12#define OBJ "/StatusNotifierWatcher" 11#define OBJ "/StatusNotifierWatcher"
13#define BUS "org.kde.StatusNotifierWatcher" 12#define BUS "org.kde.StatusNotifierWatcher"
14#define INTERFACE "org.kde.StatusNotifierWatcher" 13#define INTERFACE "org.kde.StatusNotifierWatcher"
@@ -29,12 +28,10 @@ _status_notifier_item_register_cb(void *data EINA_UNUSED,
29 if (eldbus_message_error_get(msg, &errname, &errmsg)) 28 if (eldbus_message_error_get(msg, &errname, &errmsg))
30 ERR("Eldbus Error: %s %s", errname, errmsg); 29 ERR("Eldbus Error: %s %s", errname, errmsg);
31} 30}
32#endif
33 31
34Eina_Bool 32Eina_Bool
35_elm_systray_watcher_status_notifier_item_register(const char *obj) 33_elm_systray_watcher_status_notifier_item_register(const char *obj)
36{ 34{
37#ifdef ELM_ELDBUS
38 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE); 35 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
39 EINA_SAFETY_ON_NULL_RETURN_VAL(_watcher_proxy, EINA_FALSE); 36 EINA_SAFETY_ON_NULL_RETURN_VAL(_watcher_proxy, EINA_FALSE);
40 37
@@ -47,13 +44,8 @@ _elm_systray_watcher_status_notifier_item_register(const char *obj)
47 } 44 }
48 45
49 return EINA_TRUE; 46 return EINA_TRUE;
50#else
51 (void) obj;
52 return EINA_FALSE;
53#endif
54} 47}
55 48
56#ifdef ELM_ELDBUS
57static void 49static void
58_release(void) 50_release(void)
59{ 51{
@@ -92,12 +84,10 @@ _name_owner_changed_cb(void *data EINA_UNUSED,
92 else 84 else
93 _update(); 85 _update();
94} 86}
95#endif
96 87
97Eina_Bool 88Eina_Bool
98_elm_systray_watcher_init(void) 89_elm_systray_watcher_init(void)
99{ 90{
100#ifdef ELM_ELDBUS
101 if (_elm_systray_watcher) return EINA_TRUE; 91 if (_elm_systray_watcher) return EINA_TRUE;
102 92
103 if (!elm_need_eldbus()) return EINA_FALSE; 93 if (!elm_need_eldbus()) return EINA_FALSE;
@@ -110,15 +100,11 @@ _elm_systray_watcher_init(void)
110 100
111 _elm_systray_watcher = EINA_TRUE; 101 _elm_systray_watcher = EINA_TRUE;
112 return EINA_TRUE; 102 return EINA_TRUE;
113#else
114 return EINA_FALSE;
115#endif
116} 103}
117 104
118void 105void
119_elm_systray_watcher_shutdown(void) 106_elm_systray_watcher_shutdown(void)
120{ 107{
121#ifdef ELM_ELDBUS
122 if (!_elm_systray_watcher) return; 108 if (!_elm_systray_watcher) return;
123 109
124 _elm_systray_watcher = EINA_FALSE; 110 _elm_systray_watcher = EINA_FALSE;
@@ -127,5 +113,4 @@ _elm_systray_watcher_shutdown(void)
127 113
128 eldbus_connection_unref(_watcher_conn); 114 eldbus_connection_unref(_watcher_conn);
129 _watcher_conn = NULL; 115 _watcher_conn = NULL;
130#endif
131} 116}
diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c
index 882f87552..9f7b4e13c 100644
--- a/src/lib/elm_thumb.c
+++ b/src/lib/elm_thumb.c
@@ -43,14 +43,11 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
43static struct _Ethumb_Client *_elm_ethumb_client = NULL; 43static struct _Ethumb_Client *_elm_ethumb_client = NULL;
44static Eina_Bool _elm_ethumb_connected = EINA_FALSE; 44static Eina_Bool _elm_ethumb_connected = EINA_FALSE;
45 45
46#ifdef HAVE_ELEMENTARY_ETHUMB
47static Eina_List *retry = NULL; 46static Eina_List *retry = NULL;
48static int pending_request = 0; 47static int pending_request = 0;
49#endif
50 48
51EAPI int ELM_ECORE_EVENT_ETHUMB_CONNECT = 0; 49EAPI int ELM_ECORE_EVENT_ETHUMB_CONNECT = 0;
52 50
53#ifdef HAVE_ELEMENTARY_ETHUMB
54static void 51static void
55_mouse_down_cb(void *data, 52_mouse_down_cb(void *data,
56 Evas *e __UNUSED__, 53 Evas *e __UNUSED__,
@@ -468,8 +465,6 @@ _thumb_show(Elm_Thumb_Smart_Data *sd)
468 (ELM_ECORE_EVENT_ETHUMB_CONNECT, _thumbnailing_available_cb, sd->obj); 465 (ELM_ECORE_EVENT_ETHUMB_CONNECT, _thumbnailing_available_cb, sd->obj);
469} 466}
470 467
471#endif
472
473static void 468static void
474_elm_thumb_smart_show(Eo *obj, void *_pd, va_list *list EINA_UNUSED) 469_elm_thumb_smart_show(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
475{ 470{
@@ -477,26 +472,17 @@ _elm_thumb_smart_show(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
477 472
478 eo_do_super(obj, MY_CLASS, evas_obj_smart_show()); 473 eo_do_super(obj, MY_CLASS, evas_obj_smart_show());
479 474
480#ifdef ELM_ETHUMB
481 _thumb_show(sd); 475 _thumb_show(sd);
482#else
483 (void)sd;
484#endif
485} 476}
486 477
487static void 478static void
488_elm_thumb_smart_hide(Eo *obj, void *_pd, va_list *list EINA_UNUSED) 479_elm_thumb_smart_hide(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
489{ 480{
490#ifdef ELM_ETHUMB
491 Elm_Thumb_Smart_Data *sd = _pd; 481 Elm_Thumb_Smart_Data *sd = _pd;
492#else
493 (void) _pd;
494#endif
495 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 482 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
496 483
497 eo_do_super(obj, MY_CLASS, evas_obj_smart_hide()); 484 eo_do_super(obj, MY_CLASS, evas_obj_smart_hide());
498 485
499#ifdef ELM_ETHUMB
500 if (sd->thumb.request) 486 if (sd->thumb.request)
501 { 487 {
502 ethumb_client_thumb_async_cancel(_elm_ethumb_client, sd->thumb.request); 488 ethumb_client_thumb_async_cancel(_elm_ethumb_client, sd->thumb.request);
@@ -516,13 +502,11 @@ _elm_thumb_smart_hide(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
516 } 502 }
517 503
518 ELM_SAFE_FREE(sd->eeh, ecore_event_handler_del); 504 ELM_SAFE_FREE(sd->eeh, ecore_event_handler_del);
519#endif
520} 505}
521 506
522void 507void
523_elm_unneed_ethumb(void) 508_elm_unneed_ethumb(void)
524{ 509{
525#ifdef ELM_ETHUMB
526 if (!_elm_need_ethumb) return; 510 if (!_elm_need_ethumb) return;
527 _elm_need_ethumb = EINA_FALSE; 511 _elm_need_ethumb = EINA_FALSE;
528 512
@@ -533,7 +517,6 @@ _elm_unneed_ethumb(void)
533 } 517 }
534 ethumb_client_shutdown(); 518 ethumb_client_shutdown();
535 ELM_ECORE_EVENT_ETHUMB_CONNECT = 0; 519 ELM_ECORE_EVENT_ETHUMB_CONNECT = 0;
536#endif
537} 520}
538 521
539static Eina_Bool 522static Eina_Bool
@@ -549,7 +532,6 @@ _elm_thumb_dnd_cb(void *data __UNUSED__,
549EAPI Eina_Bool 532EAPI Eina_Bool
550elm_need_ethumb(void) 533elm_need_ethumb(void)
551{ 534{
552#ifdef ELM_ETHUMB
553 if (_elm_need_ethumb) return EINA_TRUE; 535 if (_elm_need_ethumb) return EINA_TRUE;
554 _elm_need_ethumb = EINA_TRUE; 536 _elm_need_ethumb = EINA_TRUE;
555 537
@@ -557,9 +539,6 @@ elm_need_ethumb(void)
557 ethumb_client_init(); 539 ethumb_client_init();
558 540
559 return EINA_TRUE; 541 return EINA_TRUE;
560#else
561 return EINA_FALSE;
562#endif
563} 542}
564 543
565static void 544static void
@@ -573,14 +552,10 @@ _elm_thumb_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
573 if (!elm_layout_theme_set(obj, "thumb", "base", elm_widget_style_get(obj))) 552 if (!elm_layout_theme_set(obj, "thumb", "base", elm_widget_style_get(obj)))
574 CRITICAL("Failed to set layout!"); 553 CRITICAL("Failed to set layout!");
575 554
576#ifdef HAVE_ELEMENTARY_ETHUMB
577 evas_object_event_callback_add 555 evas_object_event_callback_add
578 (obj, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down_cb, obj); 556 (obj, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down_cb, obj);
579 evas_object_event_callback_add 557 evas_object_event_callback_add
580 (obj, EVAS_CALLBACK_MOUSE_UP, _mouse_up_cb, obj); 558 (obj, EVAS_CALLBACK_MOUSE_UP, _mouse_up_cb, obj);
581#else
582 (void) obj;
583#endif
584 559
585 elm_widget_can_focus_set(obj, EINA_FALSE); 560 elm_widget_can_focus_set(obj, EINA_FALSE);
586} 561}
@@ -590,7 +565,6 @@ _elm_thumb_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
590{ 565{
591 Elm_Thumb_Smart_Data *sd = _pd; 566 Elm_Thumb_Smart_Data *sd = _pd;
592 567
593#ifdef HAVE_ELEMENTARY_ETHUMB
594 if (sd->thumb.request) 568 if (sd->thumb.request)
595 { 569 {
596 ethumb_client_thumb_async_cancel(_elm_ethumb_client, sd->thumb.request); 570 ethumb_client_thumb_async_cancel(_elm_ethumb_client, sd->thumb.request);
@@ -608,7 +582,6 @@ _elm_thumb_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
608 582
609 eina_stringshare_del(sd->thumb.thumb_path); 583 eina_stringshare_del(sd->thumb.thumb_path);
610 eina_stringshare_del(sd->thumb.thumb_key); 584 eina_stringshare_del(sd->thumb.thumb_key);
611#endif
612 585
613 eina_stringshare_del(sd->file); 586 eina_stringshare_del(sd->file);
614 eina_stringshare_del(sd->key); 587 eina_stringshare_del(sd->key);
@@ -654,10 +627,8 @@ _reload(Eo *obj EINA_UNUSED, void *_pd, va_list *list EINA_UNUSED)
654 eina_stringshare_replace(&(sd->thumb.file), NULL); 627 eina_stringshare_replace(&(sd->thumb.file), NULL);
655 eina_stringshare_replace(&(sd->thumb.key), NULL); 628 eina_stringshare_replace(&(sd->thumb.key), NULL);
656 629
657#ifdef HAVE_ELEMENTARY_ETHUMB
658 if (evas_object_visible_get(obj)) 630 if (evas_object_visible_get(obj))
659 _thumb_show(sd); 631 _thumb_show(sd);
660#endif
661} 632}
662 633
663EAPI void 634EAPI void
@@ -707,12 +678,8 @@ _file_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
707 eina_stringshare_replace(&(sd->thumb.file), NULL); 678 eina_stringshare_replace(&(sd->thumb.file), NULL);
708 eina_stringshare_replace(&(sd->thumb.key), NULL); 679 eina_stringshare_replace(&(sd->thumb.key), NULL);
709 680
710#ifdef HAVE_ELEMENTARY_ETHUMB
711 if (((file_replaced) || (key_replaced)) && (evas_object_visible_get(obj))) 681 if (((file_replaced) || (key_replaced)) && (evas_object_visible_get(obj)))
712 _thumb_show(sd); 682 _thumb_show(sd);
713#else
714 (void)key_replaced;
715#endif
716} 683}
717 684
718EAPI void 685EAPI void
@@ -1067,7 +1034,6 @@ _animate_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
1067 1034
1068 sd->anim_setting = setting; 1035 sd->anim_setting = setting;
1069 1036
1070#ifdef HAVE_ELEMENTARY_ETHUMB
1071 if ((sd->is_video) && (sd->thumb.format == ETHUMB_THUMB_EET)) 1037 if ((sd->is_video) && (sd->thumb.format == ETHUMB_THUMB_EET))
1072 { 1038 {
1073 if (setting == ELM_THUMB_ANIMATION_LOOP) 1039 if (setting == ELM_THUMB_ANIMATION_LOOP)
@@ -1077,7 +1043,6 @@ _animate_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
1077 else if (setting == ELM_THUMB_ANIMATION_STOP) 1043 else if (setting == ELM_THUMB_ANIMATION_STOP)
1078 edje_object_signal_emit(sd->view, "elm,action,animate_stop", "elm"); 1044 edje_object_signal_emit(sd->view, "elm,action,animate_stop", "elm");
1079 } 1045 }
1080#endif
1081} 1046}
1082 1047
1083EAPI Elm_Thumb_Animation_Setting 1048EAPI Elm_Thumb_Animation_Setting
diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index 3643c1fd3..7cc8fcda0 100644
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -2,9 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#ifdef HAVE_EMOTION 5#include <Emotion.h>
6# include <Emotion.h>
7#endif
8 6
9#include <Elementary.h> 7#include <Elementary.h>
10 8
@@ -39,7 +37,6 @@ _elm_video_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
39 if (ret) *ret = EINA_FALSE; 37 if (ret) *ret = EINA_FALSE;
40 (void) src; 38 (void) src;
41 39
42#ifdef HAVE_EMOTION
43 if (elm_widget_disabled_get(obj)) return; 40 if (elm_widget_disabled_get(obj)) return;
44 if (type != EVAS_CALLBACK_KEY_DOWN) return; 41 if (type != EVAS_CALLBACK_KEY_DOWN) return;
45 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return; 42 if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
@@ -98,18 +95,11 @@ _elm_video_smart_event(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
98 } 95 }
99 96
100 INF("keyname: '%s' not handled", ev->key); 97 INF("keyname: '%s' not handled", ev->key);
101
102#else
103 (void) obj;
104 (void) type;
105 (void) ev;
106#endif
107} 98}
108 99
109static void 100static void
110_elm_video_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UNUSED) 101_elm_video_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
111{ 102{
112#ifdef HAVE_EMOTION
113 Elm_Video_Smart_Data *sd = _pd; 103 Elm_Video_Smart_Data *sd = _pd;
114 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 104 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
115 105
@@ -128,14 +118,8 @@ _elm_video_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
128 } 118 }
129 119
130 evas_object_size_hint_aspect_set(obj, EVAS_ASPECT_CONTROL_BOTH, minw, minh); 120 evas_object_size_hint_aspect_set(obj, EVAS_ASPECT_CONTROL_BOTH, minw, minh);
131#else
132
133 (void) obj;
134 (void) _pd;
135#endif
136} 121}
137 122
138#ifdef HAVE_EMOTION
139static void 123static void
140_on_size_hints_changed(void *data __UNUSED__, 124_on_size_hints_changed(void *data __UNUSED__,
141 Evas *e __UNUSED__, 125 Evas *e __UNUSED__,
@@ -225,20 +209,11 @@ _suspend_cb(void *data)
225 return ECORE_CALLBACK_RENEW; 209 return ECORE_CALLBACK_RENEW;
226} 210}
227 211
228#endif
229
230Eina_Bool 212Eina_Bool
231_elm_video_check(Evas_Object *video) 213_elm_video_check(Evas_Object *video)
232{ 214{
233#ifdef HAVE_EMOTION
234 ELM_VIDEO_CHECK(video) EINA_FALSE; 215 ELM_VIDEO_CHECK(video) EINA_FALSE;
235
236 return EINA_TRUE; 216 return EINA_TRUE;
237#else
238 (void)video;
239
240 return EINA_FALSE;
241#endif
242} 217}
243 218
244static void 219static void
@@ -252,7 +227,6 @@ _elm_video_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
252 elm_widget_sub_object_parent_add(obj); 227 elm_widget_sub_object_parent_add(obj);
253 elm_widget_can_focus_set(obj, EINA_TRUE); 228 elm_widget_can_focus_set(obj, EINA_TRUE);
254 229
255#ifdef HAVE_EMOTION
256 priv->emotion = emotion_object_add(evas_object_evas_get(obj)); 230 priv->emotion = emotion_object_add(evas_object_evas_get(obj));
257 emotion_object_init(priv->emotion, NULL); 231 emotion_object_init(priv->emotion, NULL);
258 232
@@ -278,9 +252,6 @@ _elm_video_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
278 (obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, NULL); 252 (obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _on_size_hints_changed, NULL);
279 253
280 priv->timer = ecore_timer_add(20.0, _suspend_cb, obj); 254 priv->timer = ecore_timer_add(20.0, _suspend_cb, obj);
281#else
282 (void) priv;
283#endif
284} 255}
285 256
286static void 257static void
@@ -288,12 +259,8 @@ _elm_video_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
288{ 259{
289 Elm_Video_Smart_Data *sd = _pd; 260 Elm_Video_Smart_Data *sd = _pd;
290 261
291#ifdef HAVE_EMOTION
292 if (sd->timer) ecore_timer_del(sd->timer); 262 if (sd->timer) ecore_timer_del(sd->timer);
293 if (sd->remember) emotion_object_last_position_save(sd->emotion); 263 if (sd->remember) emotion_object_last_position_save(sd->emotion);
294#else
295 (void) sd;
296#endif
297 264
298 eo_do_super(obj, MY_CLASS, evas_obj_smart_del()); 265 eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
299} 266}
@@ -301,28 +268,19 @@ _elm_video_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
301EAPI Evas_Object * 268EAPI Evas_Object *
302elm_video_add(Evas_Object *parent) 269elm_video_add(Evas_Object *parent)
303{ 270{
304#ifdef HAVE_EMOTION
305 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL); 271 EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
306 Evas_Object *obj = eo_add(MY_CLASS, parent); 272 Evas_Object *obj = eo_add(MY_CLASS, parent);
307 eo_unref(obj); 273 eo_unref(obj);
308 return obj; 274 return obj;
309#else
310 (void) parent;
311 return NULL;
312#endif
313} 275}
314 276
315static void 277static void
316_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) 278_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
317{ 279{
318#ifdef HAVE_EMOTION
319 eo_do_super(obj, MY_CLASS, eo_constructor()); 280 eo_do_super(obj, MY_CLASS, eo_constructor());
320 eo_do(obj, 281 eo_do(obj,
321 evas_obj_type_set(MY_CLASS_NAME_LEGACY), 282 evas_obj_type_set(MY_CLASS_NAME_LEGACY),
322 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL)); 283 evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
323#else
324 eo_error_set(obj);
325#endif
326} 284}
327 285
328EAPI Eina_Bool 286EAPI Eina_Bool
@@ -341,7 +299,6 @@ _file_set(Eo *obj, void *_pd, va_list *list)
341 const char *filename = va_arg(*list, const char *); 299 const char *filename = va_arg(*list, const char *);
342 Eina_Bool *ret = va_arg(*list, Eina_Bool *); 300 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
343 if (ret) *ret = EINA_FALSE; 301 if (ret) *ret = EINA_FALSE;
344#ifdef HAVE_EMOTION
345 Elm_Video_Smart_Data *sd = _pd; 302 Elm_Video_Smart_Data *sd = _pd;
346 303
347 if (sd->remember) emotion_object_last_position_save(sd->emotion); 304 if (sd->remember) emotion_object_last_position_save(sd->emotion);
@@ -354,11 +311,6 @@ _file_set(Eo *obj, void *_pd, va_list *list)
354 elm_layout_signal_emit(obj, "elm,video,load", "elm"); 311 elm_layout_signal_emit(obj, "elm,video,load", "elm");
355 312
356 if (ret) *ret = EINA_TRUE; 313 if (ret) *ret = EINA_TRUE;
357#else
358 (void) obj;
359 (void) _pd;
360 (void) filename;
361#endif
362} 314}
363 315
364EAPI Evas_Object * 316EAPI Evas_Object *
@@ -375,12 +327,8 @@ _emotion_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
375{ 327{
376 Evas_Object **ret = va_arg(*list, Evas_Object **); 328 Evas_Object **ret = va_arg(*list, Evas_Object **);
377 *ret = NULL; 329 *ret = NULL;
378#ifdef HAVE_EMOTION
379 Elm_Video_Smart_Data *sd = _pd; 330 Elm_Video_Smart_Data *sd = _pd;
380 *ret = sd->emotion; 331 *ret = sd->emotion;
381#else
382 (void) _pd;
383#endif
384} 332}
385 333
386EAPI void 334EAPI void
@@ -393,7 +341,6 @@ elm_video_play(Evas_Object *obj)
393static void 341static void
394_play(Eo *obj EINA_UNUSED, void *_pd, va_list *list EINA_UNUSED) 342_play(Eo *obj EINA_UNUSED, void *_pd, va_list *list EINA_UNUSED)
395{ 343{
396#ifdef HAVE_EMOTION
397 Elm_Video_Smart_Data *sd = _pd; 344 Elm_Video_Smart_Data *sd = _pd;
398 345
399 if (emotion_object_play_get(sd->emotion)) return; 346 if (emotion_object_play_get(sd->emotion)) return;
@@ -402,9 +349,6 @@ _play(Eo *obj EINA_UNUSED, void *_pd, va_list *list EINA_UNUSED)
402 sd->stop = EINA_FALSE; 349 sd->stop = EINA_FALSE;
403 emotion_object_play_set(sd->emotion, EINA_TRUE); 350 emotion_object_play_set(sd->emotion, EINA_TRUE);
404 elm_layout_signal_emit(obj, "elm,video,play", "elm"); 351 elm_layout_signal_emit(obj, "elm,video,play", "elm");
405#else
406 (void) _pd;
407#endif
408} 352}
409 353
410/* FIXME: pause will setup timer and go into sleep or 354/* FIXME: pause will setup timer and go into sleep or
@@ -420,7 +364,6 @@ elm_video_pause(Evas_Object *obj)
420static void 364static void
421_pause(Eo *obj, void *_pd, va_list *list EINA_UNUSED) 365_pause(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
422{ 366{
423#ifdef HAVE_EMOTION
424 Elm_Video_Smart_Data *sd = _pd; 367 Elm_Video_Smart_Data *sd = _pd;
425 368
426 if (!emotion_object_play_get(sd->emotion)) return; 369 if (!emotion_object_play_get(sd->emotion)) return;
@@ -428,10 +371,6 @@ _pause(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
428 if (!sd->timer) sd->timer = ecore_timer_add(20.0, _suspend_cb, obj); 371 if (!sd->timer) sd->timer = ecore_timer_add(20.0, _suspend_cb, obj);
429 emotion_object_play_set(sd->emotion, EINA_FALSE); 372 emotion_object_play_set(sd->emotion, EINA_FALSE);
430 elm_layout_signal_emit(obj, "elm,video,pause", "elm"); 373 elm_layout_signal_emit(obj, "elm,video,pause", "elm");
431#else
432 (void) obj;
433 (void) _pd;
434#endif
435} 374}
436 375
437/* FIXME: stop should go into hibernate state directly. 376/* FIXME: stop should go into hibernate state directly.
@@ -446,7 +385,6 @@ elm_video_stop(Evas_Object *obj)
446static void 385static void
447_stop(Eo *obj, void *_pd, va_list *list EINA_UNUSED) 386_stop(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
448{ 387{
449#ifdef HAVE_EMOTION
450 Elm_Video_Smart_Data *sd = _pd; 388 Elm_Video_Smart_Data *sd = _pd;
451 389
452 if (!emotion_object_play_get(sd->emotion) && sd->stop) return; 390 if (!emotion_object_play_get(sd->emotion) && sd->stop) return;
@@ -457,10 +395,6 @@ _stop(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
457 emotion_object_play_set(sd->emotion, EINA_FALSE); 395 emotion_object_play_set(sd->emotion, EINA_FALSE);
458 elm_layout_signal_emit(obj, "elm,video,stop", "elm"); 396 elm_layout_signal_emit(obj, "elm,video,stop", "elm");
459 emotion_object_suspend_set(sd->emotion, EMOTION_HIBERNATE); 397 emotion_object_suspend_set(sd->emotion, EMOTION_HIBERNATE);
460#else
461 (void) obj;
462 (void) _pd;
463#endif
464} 398}
465 399
466EAPI Eina_Bool 400EAPI Eina_Bool
@@ -477,12 +411,8 @@ _is_playing_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
477{ 411{
478 Eina_Bool *ret = va_arg(*list, Eina_Bool *); 412 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
479 *ret = EINA_FALSE; 413 *ret = EINA_FALSE;
480#ifdef HAVE_EMOTION
481 Elm_Video_Smart_Data *sd = _pd; 414 Elm_Video_Smart_Data *sd = _pd;
482 *ret = emotion_object_play_get(sd->emotion); 415 *ret = emotion_object_play_get(sd->emotion);
483#else
484 (void) _pd;
485#endif
486} 416}
487 417
488EAPI Eina_Bool 418EAPI Eina_Bool
@@ -498,13 +428,8 @@ static void
498_is_seekable_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) 428_is_seekable_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
499{ 429{
500 Eina_Bool *ret = va_arg(*list, Eina_Bool *); 430 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
501#ifdef HAVE_EMOTION
502 Elm_Video_Smart_Data *sd = _pd; 431 Elm_Video_Smart_Data *sd = _pd;
503 *ret = emotion_object_seekable_get(sd->emotion); 432 *ret = emotion_object_seekable_get(sd->emotion);
504#else
505 (void) _pd;
506 (void) ret;
507#endif
508} 433}
509 434
510EAPI Eina_Bool 435EAPI Eina_Bool
@@ -521,12 +446,8 @@ _audio_mute_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
521{ 446{
522 Eina_Bool *ret = va_arg(*list, Eina_Bool *); 447 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
523 *ret = EINA_FALSE; 448 *ret = EINA_FALSE;
524#ifdef HAVE_EMOTION
525 Elm_Video_Smart_Data *sd = _pd; 449 Elm_Video_Smart_Data *sd = _pd;
526 *ret = emotion_object_audio_mute_get(sd->emotion); 450 *ret = emotion_object_audio_mute_get(sd->emotion);
527#else
528 (void) _pd;
529#endif
530} 451}
531 452
532EAPI void 453EAPI void
@@ -541,13 +462,8 @@ static void
541_audio_mute_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) 462_audio_mute_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
542{ 463{
543 Eina_Bool mute = va_arg(*list, int); 464 Eina_Bool mute = va_arg(*list, int);
544#ifdef HAVE_EMOTION
545 Elm_Video_Smart_Data *sd = _pd; 465 Elm_Video_Smart_Data *sd = _pd;
546 emotion_object_audio_mute_set(sd->emotion, mute); 466 emotion_object_audio_mute_set(sd->emotion, mute);
547#else
548 (void) _pd;
549 (void) mute;
550#endif
551} 467}
552 468
553EAPI double 469EAPI double
@@ -564,12 +480,8 @@ _audio_level_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
564{ 480{
565 double *ret = va_arg(*list, double *); 481 double *ret = va_arg(*list, double *);
566 *ret = 0.0; 482 *ret = 0.0;
567#ifdef HAVE_EMOTION
568 Elm_Video_Smart_Data *sd = _pd; 483 Elm_Video_Smart_Data *sd = _pd;
569 *ret = emotion_object_audio_volume_get(sd->emotion); 484 *ret = emotion_object_audio_volume_get(sd->emotion);
570#else
571 (void) _pd;
572#endif
573} 485}
574 486
575EAPI void 487EAPI void
@@ -584,13 +496,8 @@ static void
584_audio_level_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) 496_audio_level_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
585{ 497{
586 double volume = va_arg(*list, double); 498 double volume = va_arg(*list, double);
587#ifdef HAVE_EMOTION
588 Elm_Video_Smart_Data *sd = _pd; 499 Elm_Video_Smart_Data *sd = _pd;
589 emotion_object_audio_volume_set(sd->emotion, volume); 500 emotion_object_audio_volume_set(sd->emotion, volume);
590#else
591 (void) _pd;
592 (void) volume;
593#endif
594} 501}
595 502
596EAPI double 503EAPI double
@@ -607,12 +514,8 @@ _play_position_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
607{ 514{
608 double *ret = va_arg(*list, double *); 515 double *ret = va_arg(*list, double *);
609 *ret = 0.0; 516 *ret = 0.0;
610#ifdef HAVE_EMOTION
611 Elm_Video_Smart_Data *sd = _pd; 517 Elm_Video_Smart_Data *sd = _pd;
612 *ret = emotion_object_position_get(sd->emotion); 518 *ret = emotion_object_position_get(sd->emotion);
613#else
614 (void) _pd;
615#endif
616} 519}
617 520
618EAPI void 521EAPI void
@@ -627,13 +530,8 @@ static void
627_play_position_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) 530_play_position_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
628{ 531{
629 double position = va_arg(*list, double); 532 double position = va_arg(*list, double);
630#ifdef HAVE_EMOTION
631 Elm_Video_Smart_Data *sd = _pd; 533 Elm_Video_Smart_Data *sd = _pd;
632 emotion_object_position_set(sd->emotion, position); 534 emotion_object_position_set(sd->emotion, position);
633#else
634 (void) _pd;
635 (void) position;
636#endif
637} 535}
638 536
639EAPI double 537EAPI double
@@ -650,12 +548,8 @@ _play_length_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
650{ 548{
651 double *ret = va_arg(*list, double *); 549 double *ret = va_arg(*list, double *);
652 *ret = 0.0; 550 *ret = 0.0;
653#ifdef HAVE_EMOTION
654 Elm_Video_Smart_Data *sd = _pd; 551 Elm_Video_Smart_Data *sd = _pd;
655 *ret = emotion_object_play_length_get(sd->emotion); 552 *ret = emotion_object_play_length_get(sd->emotion);
656#else
657 (void) _pd;
658#endif
659} 553}
660 554
661EAPI const char * 555EAPI const char *
@@ -672,12 +566,8 @@ _title_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
672{ 566{
673 const char **ret = va_arg(*list, const char **); 567 const char **ret = va_arg(*list, const char **);
674 *ret = NULL; 568 *ret = NULL;
675#ifdef HAVE_EMOTION
676 Elm_Video_Smart_Data *sd = _pd; 569 Elm_Video_Smart_Data *sd = _pd;
677 *ret = emotion_object_title_get(sd->emotion); 570 *ret = emotion_object_title_get(sd->emotion);
678#else
679 (void) _pd;
680#endif
681} 571}
682 572
683EAPI void 573EAPI void
@@ -692,13 +582,8 @@ static void
692_remember_position_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list) 582_remember_position_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
693{ 583{
694 Eina_Bool remember = va_arg(*list, int); 584 Eina_Bool remember = va_arg(*list, int);
695#ifdef HAVE_EMOTION
696 Elm_Video_Smart_Data *sd = _pd; 585 Elm_Video_Smart_Data *sd = _pd;
697 sd->remember = remember; 586 sd->remember = remember;
698#else
699 (void) _pd;
700 (void) remember;
701#endif
702} 587}
703 588
704EAPI Eina_Bool 589EAPI Eina_Bool
@@ -715,12 +600,8 @@ _remember_position_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
715{ 600{
716 Eina_Bool *ret = va_arg(*list, Eina_Bool *); 601 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
717 *ret = EINA_FALSE; 602 *ret = EINA_FALSE;
718#ifdef HAVE_EMOTION
719 Elm_Video_Smart_Data *sd = _pd; 603 Elm_Video_Smart_Data *sd = _pd;
720 *ret = sd->remember; 604 *ret = sd->remember;
721#else
722 (void) _pd;
723#endif
724} 605}
725 606
726static void 607static void
diff --git a/src/lib/elm_widget_clock.h b/src/lib/elm_widget_clock.h
index 249caa27b..ec47232fd 100644
--- a/src/lib/elm_widget_clock.h
+++ b/src/lib/elm_widget_clock.h
@@ -3,9 +3,7 @@
3 3
4#include "Elementary.h" 4#include "Elementary.h"
5 5
6#ifdef HAVE_EIO 6#include <Eio.h>
7# include <Eio.h>
8#endif
9 7
10/** 8/**
11 * @addtogroup Widget 9 * @addtogroup Widget
diff --git a/src/lib/elm_widget_fileselector.h b/src/lib/elm_widget_fileselector.h
index ee6adafe9..cda2471db 100644
--- a/src/lib/elm_widget_fileselector.h
+++ b/src/lib/elm_widget_fileselector.h
@@ -47,11 +47,9 @@ struct _Elm_Fileselector_Smart_Data
47 47
48 const char *path_separator; 48 const char *path_separator;
49 49
50#ifdef HAVE_EIO
51 Eio_File *current;