summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS2
-rw-r--r--configure.ac42
-rw-r--r--doc/widgets/Makefile.am4
-rw-r--r--src/bin/Makefile.am14
-rw-r--r--src/bin/test_flipselector.c2
-rw-r--r--src/edje_externals/Makefile.am2
-rw-r--r--src/examples/Makefile.am2
-rw-r--r--src/examples/flipselector_example.c2
-rw-r--r--src/lib/Elementary.h.in6
-rw-r--r--src/lib/Makefile.am4
-rw-r--r--src/lib/elm_dbus_menu.c428
-rw-r--r--src/lib/elm_main.c32
-rw-r--r--src/lib/elm_need.h14
-rw-r--r--src/lib/elm_sys_notify.c150
-rw-r--r--src/lib/elm_systray.c190
-rw-r--r--src/lib/elm_systray_watcher.c42
-rw-r--r--src/modules/access_output/Makefile.am2
-rw-r--r--src/modules/datetime_input_ctxpopup/Makefile.am2
-rw-r--r--src/modules/prefs/Makefile.am2
-rw-r--r--src/modules/test_entry/Makefile.am2
-rw-r--r--src/modules/test_map/Makefile.am2
22 files changed, 475 insertions, 475 deletions
diff --git a/ChangeLog b/ChangeLog
index d011f9136..c3a866016 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -741,8 +741,8 @@
741 741
7422012-12-03 Gustavo Sverzut Barbieri (k-s) 7422012-12-03 Gustavo Sverzut Barbieri (k-s)
743 743
744 * Add elm_need_edbus(), deprecate elm_need_e_dbus(), integrating 744 * Add elm_need_eldbus(), deprecate elm_need_e_dbus(), integrating
745 edbus (v2). 745 eldbus.
746 746
7472012-12-04 Cedric Bail 7472012-12-04 Cedric Bail
748 748
diff --git a/NEWS b/NEWS
index d6374030b..fdded2313 100644
--- a/NEWS
+++ b/NEWS
@@ -18,7 +18,7 @@ Additions:
18 * Add elm_genlist_nth_item_get 18 * Add elm_genlist_nth_item_get
19 * Add elm_gengrid_nth_item_get 19 * Add elm_gengrid_nth_item_get
20 * Add elm_config_selection_unfocused_clear_get and elm_config_selection_unfocused_clear_set 20 * Add elm_config_selection_unfocused_clear_get and elm_config_selection_unfocused_clear_set
21 * Add elm_need_edbus() and EDBus.h support with ELM_EDBUS2 macro to integrate edbus (v2). Deprecated elm_need_e_dbus() (e_dbus, v1). 21 * Add elm_need_eldbus() and Eldbus.h support with ELM_ELDBUS macro to integrate eldbus. Deprecated elm_need_e_dbus() (e_dbus, v1).
22 * Add window profile set/get API in elm_win 22 * Add window profile set/get API in elm_win
23 * Add elm_sys_notify.[ch] 23 * Add elm_sys_notify.[ch]
24 * Add elm_need_elocation() and Elocation.h support with ELM_ELOCATION macro to integrate elocation. 24 * Add elm_need_elocation() and Elocation.h support with ELM_ELOCATION macro to integrate elocation.
diff --git a/configure.ac b/configure.ac
index 0bcff378a..c6f7d3ee8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -482,33 +482,33 @@ if test "x$want_elementary_wayland" = "xyes" -a "x$have_elementary_wayland" = "x
482 AC_MSG_ERROR([ecore-wayland support requested, but not found by pkg-config.]) 482 AC_MSG_ERROR([ecore-wayland support requested, but not found by pkg-config.])
483fi 483fi
484 484
485ELM_EDBUS2_DEF="#undef" 485ELM_ELDBUS_DEF="#undef"
486have_elementary_edbus2="no" 486have_elementary_eldbus="no"
487want_elementary_edbus2="auto" 487want_elementary_eldbus="auto"
488AC_ARG_ENABLE([edbus2], 488AC_ARG_ENABLE([eldbus],
489 [AC_HELP_STRING([--disable-edbus2], [disable edbus2 support. @<:@default=detect@:>@])], 489 [AC_HELP_STRING([--disable-eldbus], [disable eldbus support. @<:@default=detect@:>@])],
490 [want_elementary_edbus2=$enableval], []) 490 [want_elementary_eldbus=$enableval], [])
491 491
492if test "x$want_elementary_edbus2" != "xno"; then 492if test "x$want_elementary_eldbus" != "xno"; then
493 PKG_CHECK_MODULES([ELEMENTARY_EDBUS2], 493 PKG_CHECK_MODULES([ELEMENTARY_ELDBUS],
494 [ 494 [
495 edbus2 >= 1.6.99 495 eldbus >= 1.6.99
496 ], 496 ],
497 [ 497 [
498 AC_DEFINE(HAVE_ELEMENTARY_EDBUS2, 1, [EDbus2 support for Elementary]) 498 AC_DEFINE(HAVE_ELEMENTARY_ELDBUS, 1, [Eldbus support for Elementary])
499 have_elementary_edbus2="yes" 499 have_elementary_eldbus="yes"
500 ELM_EDBUS2_DEF="#define" 500 ELM_ELDBUS_DEF="#define"
501 requirement_elm="edbus2 >= 1.6.99 ${requirement_elm}" 501 requirement_elm="eldbus >= 1.6.99 ${requirement_elm}"
502 ], 502 ],
503 [have_elementary_edbus2="no"] 503 [have_elementary_eldbus="no"]
504 ) 504 )
505else 505else
506 have_elementary_edbus2="no" 506 have_elementary_eldbus="no"
507fi 507fi
508if test "x$want_elementary_edbus2" = "xyes" -a "x$have_elementary_edbus2" = "xno"; then 508if test "x$want_elementary_eldbus" = "xyes" -a "x$have_elementary_eldbus" = "xno"; then
509 AC_MSG_ERROR([EDBus (v2) support requested, but no edbus2 found by pkg-config.]) 509 AC_MSG_ERROR([Eldbus (v2) support requested, but no eldbus found by pkg-config.])
510fi 510fi
511AC_SUBST(ELM_EDBUS2_DEF) 511AC_SUBST(ELM_ELDBUS_DEF)
512 512
513ELM_ELOCATION_DEF="#undef" 513ELM_ELOCATION_DEF="#undef"
514have_elementary_elocation="no" 514have_elementary_elocation="no"
@@ -534,7 +534,7 @@ else
534 have_elementary_elocation="no" 534 have_elementary_elocation="no"
535fi 535fi
536if test "x$want_elementary_elocation" = "xyes" -a "x$have_elementary_elocation" = "xno"; then 536if test "x$want_elementary_elocation" = "xyes" -a "x$have_elementary_elocation" = "xno"; then
537 AC_MSG_ERROR([EDBus (v2) support requested, but no elocation found by pkg-config.]) 537 AC_MSG_ERROR([Eldbus (v2) support requested, but no elocation found by pkg-config.])
538fi 538fi
539AC_SUBST(ELM_ELOCATION_DEF) 539AC_SUBST(ELM_ELOCATION_DEF)
540 540
@@ -857,7 +857,7 @@ echo
857echo " Features:" 857echo " Features:"
858echo " Ecore_IMF..............: ${have_ecore_imf}" 858echo " Ecore_IMF..............: ${have_ecore_imf}"
859echo " Ecore_Con..............: ${have_ecore_con}" 859echo " Ecore_Con..............: ${have_ecore_con}"
860echo " EDBus..................: v2=${have_elementary_edbus2}" 860echo " Eldbus..................: v2=${have_elementary_eldbus}"
861echo " EFreet.................: ${have_elementary_efreet}" 861echo " EFreet.................: ${have_elementary_efreet}"
862echo " EWeather...............: ${have_elementary_eweather}" 862echo " EWeather...............: ${have_elementary_eweather}"
863echo " EMap...................: ${have_elementary_emap}" 863echo " EMap...................: ${have_elementary_emap}"
diff --git a/doc/widgets/Makefile.am b/doc/widgets/Makefile.am
index 8f2fd12e6..0a9ec3ea3 100644
--- a/doc/widgets/Makefile.am
+++ b/doc/widgets/Makefile.am
@@ -15,7 +15,7 @@ AM_CPPFLAGS = \
15@ELEMENTARY_FB_CFLAGS@ \ 15@ELEMENTARY_FB_CFLAGS@ \
16@ELEMENTARY_WIN32_CFLAGS@ \ 16@ELEMENTARY_WIN32_CFLAGS@ \
17@ELEMENTARY_WINCE_CFLAGS@ \ 17@ELEMENTARY_WINCE_CFLAGS@ \
18@ELEMENTARY_EDBUS2_CFLAGS@ \ 18@ELEMENTARY_ELDBUS_CFLAGS@ \
19@ELEMENTARY_ELOCATION_CFLAGS@ \ 19@ELEMENTARY_ELOCATION_CFLAGS@ \
20@ELEMENTARY_EFREET_CFLAGS@ \ 20@ELEMENTARY_EFREET_CFLAGS@ \
21@ELEMENTARY_EWEATHER_CFLAGS@ \ 21@ELEMENTARY_EWEATHER_CFLAGS@ \
@@ -107,7 +107,7 @@ widget_preview_toolbar \
107widget_preview_web \ 107widget_preview_web \
108widget_preview_win 108widget_preview_win
109 109
110LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_EDBUS2_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_EMAP_LIBS@ @ELEMENTARY_LIBS@ @EIO_LIBS@ @my_libs@ 110LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_ELDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_EMAP_LIBS@ @ELEMENTARY_LIBS@ @EIO_LIBS@ @my_libs@
111 111
112endif 112endif
113 113
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index b1ae9353a..521346a51 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -16,7 +16,7 @@ AM_CPPFLAGS = \
16@ELEMENTARY_SDL_CFLAGS@ \ 16@ELEMENTARY_SDL_CFLAGS@ \
17@ELEMENTARY_WIN32_CFLAGS@ \ 17@ELEMENTARY_WIN32_CFLAGS@ \
18@ELEMENTARY_WINCE_CFLAGS@ \ 18@ELEMENTARY_WINCE_CFLAGS@ \
19@ELEMENTARY_EDBUS2_CFLAGS@ \ 19@ELEMENTARY_ELDBUS_CFLAGS@ \
20@ELEMENTARY_EFREET_CFLAGS@ \ 20@ELEMENTARY_EFREET_CFLAGS@ \
21@ELEMENTARY_ELOCATION_CFLAGS@ \ 21@ELEMENTARY_ELOCATION_CFLAGS@ \
22@ELEMENTARY_EWEATHER_CFLAGS@ \ 22@ELEMENTARY_EWEATHER_CFLAGS@ \
@@ -144,7 +144,7 @@ endif
144 144
145elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \ 145elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \
146 @ELEMENTARY_EWEATHER_LIBS@ \ 146 @ELEMENTARY_EWEATHER_LIBS@ \
147 @ELEMENTARY_EDBUS2_LIBS@ \ 147 @ELEMENTARY_ELDBUS_LIBS@ \
148 @ELEMENTARY_EFREET_LIBS@ \ 148 @ELEMENTARY_EFREET_LIBS@ \
149 @ELEMENTARY_ELOCATION_LIBS@ \ 149 @ELEMENTARY_ELOCATION_LIBS@ \
150 @ELEMENTARY_EMAP_LIBS@ \ 150 @ELEMENTARY_EMAP_LIBS@ \
@@ -159,7 +159,7 @@ config.c
159 159
160elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la \ 160elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la \
161 @ELEMENTARY_EWEATHER_LIBS@ \ 161 @ELEMENTARY_EWEATHER_LIBS@ \
162 @ELEMENTARY_EDBUS2_LIBS@ \ 162 @ELEMENTARY_ELDBUS_LIBS@ \
163 @ELEMENTARY_EFREET_LIBS@ \ 163 @ELEMENTARY_EFREET_LIBS@ \
164 @ELEMENTARY_ELOCATION_LIBS@ \ 164 @ELEMENTARY_ELOCATION_LIBS@ \
165 @ELEMENTARY_EMAP_LIBS@ \ 165 @ELEMENTARY_EMAP_LIBS@ \
@@ -175,7 +175,7 @@ elementary_codegen.c
175elementary_codegen_LDADD = \ 175elementary_codegen_LDADD = \
176 $(top_builddir)/src/lib/libelementary.la \ 176 $(top_builddir)/src/lib/libelementary.la \
177 @ELEMENTARY_EWEATHER_LIBS@ \ 177 @ELEMENTARY_EWEATHER_LIBS@ \
178 @ELEMENTARY_EDBUS2_LIBS@ \ 178 @ELEMENTARY_ELDBUS_LIBS@ \
179 @ELEMENTARY_EFREET_LIBS@ \ 179 @ELEMENTARY_EFREET_LIBS@ \
180 @ELEMENTARY_ELOCATION_LIBS@ \ 180 @ELEMENTARY_ELOCATION_LIBS@ \
181 @ELEMENTARY_EMAP_LIBS@ \ 181 @ELEMENTARY_EMAP_LIBS@ \
@@ -205,7 +205,7 @@ if BUILD_QUICKLAUNCH
205elementary_quicklaunch_SOURCES = quicklaunch.c 205elementary_quicklaunch_SOURCES = quicklaunch.c
206elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la \ 206elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la \
207 @ELEMENTARY_EWEATHER_LIBS@ \ 207 @ELEMENTARY_EWEATHER_LIBS@ \
208 @ELEMENTARY_EDBUS2_LIBS@ \ 208 @ELEMENTARY_ELDBUS_LIBS@ \
209 @ELEMENTARY_EFREET_LIBS@ \ 209 @ELEMENTARY_EFREET_LIBS@ \
210 @ELEMENTARY_ELOCATION_LIBS@ \ 210 @ELEMENTARY_ELOCATION_LIBS@ \
211 @ELEMENTARY_EMAP_LIBS@ \ 211 @ELEMENTARY_EMAP_LIBS@ \
@@ -231,7 +231,7 @@ elementary_testql_LTLIBRARIES = elementary_testql.la
231elementary_testql_la_SOURCES = $(elementary_test_SOURCES) 231elementary_testql_la_SOURCES = $(elementary_test_SOURCES)
232elementary_testql_la_LIBADD = $(top_builddir)/src/lib/libelementary.la \ 232elementary_testql_la_LIBADD = $(top_builddir)/src/lib/libelementary.la \
233 @ELEMENTARY_EWEATHER_LIBS@ \ 233 @ELEMENTARY_EWEATHER_LIBS@ \
234 @ELEMENTARY_EDBUS2_LIBS@ \ 234 @ELEMENTARY_ELDBUS_LIBS@ \
235 @ELEMENTARY_EFREET_LIBS@ \ 235 @ELEMENTARY_EFREET_LIBS@ \
236 @ELEMENTARY_ELOCATION_LIBS@ \ 236 @ELEMENTARY_ELOCATION_LIBS@ \
237 @ELEMENTARY_EMAP_LIBS@ \ 237 @ELEMENTARY_EMAP_LIBS@ \
@@ -245,7 +245,7 @@ elementary_testql_la_LDFLAGS = -module -avoid-version -no-undefined
245elementary_testql_SOURCES = $(elementary_test_SOURCES) 245elementary_testql_SOURCES = $(elementary_test_SOURCES)
246elementary_testql_LDADD = $(top_builddir)/src/lib/libelementary.la \ 246elementary_testql_LDADD = $(top_builddir)/src/lib/libelementary.la \
247 @ELEMENTARY_EWEATHER_LIBS@ \ 247 @ELEMENTARY_EWEATHER_LIBS@ \
248 @ELEMENTARY_EDBUS2_LIBS@ \ 248 @ELEMENTARY_ELDBUS_LIBS@ \
249 @ELEMENTARY_EFREET_LIBS@ \ 249 @ELEMENTARY_EFREET_LIBS@ \
250 @ELEMENTARY_ELOCATION_LIBS@ \ 250 @ELEMENTARY_ELOCATION_LIBS@ \
251 @ELEMENTARY_EMAP_LIBS@ \ 251 @ELEMENTARY_EMAP_LIBS@ \
diff --git a/src/bin/test_flipselector.c b/src/bin/test_flipselector.c
index 13ac8b7b0..d5123bbd4 100644
--- a/src/bin/test_flipselector.c
+++ b/src/bin/test_flipselector.c
@@ -92,7 +92,7 @@ test_flipselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
92 "Eet", 92 "Eet",
93 "Ecore", 93 "Ecore",
94 "Efreet", 94 "Efreet",
95 "Edbus" 95 "Eldbus"
96 }; 96 };
97 97
98 win = elm_win_util_standard_add("flipselector", "Flip Selector"); 98 win = elm_win_util_standard_add("flipselector", "Flip Selector");
diff --git a/src/edje_externals/Makefile.am b/src/edje_externals/Makefile.am
index eec24631d..4d47af000 100644
--- a/src/edje_externals/Makefile.am
+++ b/src/edje_externals/Makefile.am
@@ -14,7 +14,7 @@ AM_CPPFLAGS = \
14@ELEMENTARY_FB_CFLAGS@ \ 14@ELEMENTARY_FB_CFLAGS@ \
15@ELEMENTARY_WIN32_CFLAGS@ \ 15@ELEMENTARY_WIN32_CFLAGS@ \
16@ELEMENTARY_WINCE_CFLAGS@ \ 16@ELEMENTARY_WINCE_CFLAGS@ \
17@ELEMENTARY_EDBUS2_CFLAGS@ \ 17@ELEMENTARY_ELDBUS_CFLAGS@ \
18@ELEMENTARY_EFREET_CFLAGS@ \ 18@ELEMENTARY_EFREET_CFLAGS@ \
19@ELEMENTARY_ELOCATION_CFLAGS@ \ 19@ELEMENTARY_ELOCATION_CFLAGS@ \
20@ELEMENTARY_ETHUMB_CFLAGS@ \ 20@ELEMENTARY_ETHUMB_CFLAGS@ \
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index f41026207..13d279777 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -14,7 +14,7 @@ AM_CPPFLAGS = \
14-DPACKAGE_DATA_DIR="\"$(pkgdatadir)\"" \ 14-DPACKAGE_DATA_DIR="\"$(pkgdatadir)\"" \
15-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 15-DPACKAGE_BIN_DIR=\"$(bindir)\" \
16-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 16-DPACKAGE_LIB_DIR=\"$(libdir)\" \
17@ELEMENTARY_EDBUS2_CFLAGS@ \ 17@ELEMENTARY_ELDBUS_CFLAGS@ \
18@ELEMENTARY_EFREET_CFLAGS@ \ 18@ELEMENTARY_EFREET_CFLAGS@ \
19@ELEMENTARY_ELOCATION_CFLAGS@ \ 19@ELEMENTARY_ELOCATION_CFLAGS@ \
20@ELEMENTARY_EWEATHER_CFLAGS@ \ 20@ELEMENTARY_EWEATHER_CFLAGS@ \
diff --git a/src/examples/flipselector_example.c b/src/examples/flipselector_example.c
index 891bc69bf..3879451d8 100644
--- a/src/examples/flipselector_example.c
+++ b/src/examples/flipselector_example.c
@@ -155,7 +155,7 @@ elm_main(int argc, char **argv)
155 "Eet", 155 "Eet",
156 "Ecore", 156 "Ecore",
157 "Efreet", 157 "Efreet",
158 "Edbus" 158 "Eldbus"
159 }; 159 };
160 160
161 win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC); 161 win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC);
diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index af516e820..5f2af2b25 100644
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -10,7 +10,7 @@
10@ELM_UNIX_DEF@ ELM_UNIX 10@ELM_UNIX_DEF@ ELM_UNIX
11@ELM_WIN32_DEF@ ELM_WIN32 11@ELM_WIN32_DEF@ ELM_WIN32
12@ELM_WINCE_DEF@ ELM_WINCE 12@ELM_WINCE_DEF@ ELM_WINCE
13@ELM_EDBUS2_DEF@ ELM_EDBUS2 13@ELM_ELDBUS_DEF@ ELM_ELDBUS
14@ELM_EFREET_DEF@ ELM_EFREET 14@ELM_EFREET_DEF@ ELM_EFREET
15@ELM_ELOCATION_DEF@ ELM_ELOCATION 15@ELM_ELOCATION_DEF@ ELM_ELOCATION
16@ELM_ETHUMB_DEF@ ELM_ETHUMB 16@ELM_ETHUMB_DEF@ ELM_ETHUMB
@@ -75,8 +75,8 @@
75@ELEMENTARY_ECORE_CON_INC@ 75@ELEMENTARY_ECORE_CON_INC@
76#include <Edje.h> 76#include <Edje.h>
77 77
78#ifdef ELM_EDBUS2 78#ifdef ELM_ELDBUS
79#include <EDBus.h> 79#include <Eldbus.h>
80#endif 80#endif
81 81
82#ifdef ELM_EFREET 82#ifdef ELM_EFREET
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index a09a6dd88..a95339c19 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -19,7 +19,7 @@ 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_EDBUS2_CFLAGS@ \ 22@ELEMENTARY_ELDBUS_CFLAGS@ \
23@ELEMENTARY_EFREET_CFLAGS@ \ 23@ELEMENTARY_EFREET_CFLAGS@ \
24@ELEMENTARY_ELOCATION_CFLAGS@ \ 24@ELEMENTARY_ELOCATION_CFLAGS@ \
25@ELEMENTARY_EWEATHER_CFLAGS@ \ 25@ELEMENTARY_EWEATHER_CFLAGS@ \
@@ -315,7 +315,7 @@ libelementary_la_LIBADD = \
315@ELEMENTARY_SDL_LIBS@ \ 315@ELEMENTARY_SDL_LIBS@ \
316@ELEMENTARY_WIN32_LIBS@ \ 316@ELEMENTARY_WIN32_LIBS@ \
317@ELEMENTARY_WINCE_LIBS@ \ 317@ELEMENTARY_WINCE_LIBS@ \
318@ELEMENTARY_EDBUS2_LIBS@ \ 318@ELEMENTARY_ELDBUS_LIBS@ \
319@ELEMENTARY_EFREET_LIBS@ \ 319@ELEMENTARY_EFREET_LIBS@ \
320@ELEMENTARY_ELOCATION_LIBS@ \ 320@ELEMENTARY_ELOCATION_LIBS@ \
321@ELEMENTARY_ETHUMB_LIBS@ \ 321@ELEMENTARY_ETHUMB_LIBS@ \
diff --git a/src/lib/elm_dbus_menu.c b/src/lib/elm_dbus_menu.c
index 7559b67e6..cd5241d2f 100644
--- a/src/lib/elm_dbus_menu.c
+++ b/src/lib/elm_dbus_menu.c
@@ -4,7 +4,7 @@
4#include "elm_widget_menu.h" 4#include "elm_widget_menu.h"
5#include "elm_widget_icon.h" 5#include "elm_widget_icon.h"
6 6
7#ifdef ELM_EDBUS2 7#ifdef ELM_ELDBUS
8 8
9#define DBUS_PATH "/com/canonical/dbusmenu" 9#define DBUS_PATH "/com/canonical/dbusmenu"
10#define DBUS_INTERFACE "com.canonical.dbusmenu" 10#define DBUS_INTERFACE "com.canonical.dbusmenu"
@@ -21,10 +21,10 @@ typedef struct _Callback_Data Callback_Data;
21 21
22struct _Elm_DBus_Menu 22struct _Elm_DBus_Menu
23{ 23{
24#ifdef ELM_EDBUS2 24#ifdef ELM_ELDBUS
25 Eo *menu; 25 Eo *menu;
26 EDBus_Connection *bus; 26 Eldbus_Connection *bus;
27 EDBus_Service_Interface *iface; 27 Eldbus_Service_Interface *iface;
28 unsigned timestamp; 28 unsigned timestamp;
29 Eina_Hash *elements; 29 Eina_Hash *elements;
30 Ecore_Idler *signal_idler; 30 Ecore_Idler *signal_idler;
@@ -32,8 +32,8 @@ struct _Elm_DBus_Menu
32#endif 32#endif
33}; 33};
34 34
35#ifdef ELM_EDBUS2 35#ifdef ELM_ELDBUS
36static const EDBus_Service_Interface_Desc _interface; 36static const Eldbus_Service_Interface_Desc _interface;
37static unsigned last_object_path; 37static unsigned last_object_path;
38 38
39typedef enum _Elm_DBus_Property 39typedef enum _Elm_DBus_Property
@@ -56,7 +56,7 @@ struct _Callback_Data
56{ 56{
57 void (*result_cb)(Eina_Bool, void *); 57 void (*result_cb)(Eina_Bool, void *);
58 void *data; 58 void *data;
59 EDBus_Pending *pending_register; 59 Eldbus_Pending *pending_register;
60 Ecore_X_Window xid; 60 Ecore_X_Window xid;
61}; 61};
62 62
@@ -83,8 +83,8 @@ _menu_add_recursive(Elm_DBus_Menu *dbus_menu, Elm_Menu_Item *item)
83} 83}
84 84
85static void 85static void
86_app_register_cb(void *data, const EDBus_Message *msg, 86_app_register_cb(void *data, const Eldbus_Message *msg,
87 EDBus_Pending *pending EINA_UNUSED) 87 Eldbus_Pending *pending EINA_UNUSED)
88{ 88{
89 Elm_DBus_Menu *menu = data; 89 Elm_DBus_Menu *menu = data;
90 Callback_Data *cd = menu->app_menu_data; 90 Callback_Data *cd = menu->app_menu_data;
@@ -93,8 +93,8 @@ _app_register_cb(void *data, const EDBus_Message *msg,
93 93
94 cd->pending_register = NULL; 94 cd->pending_register = NULL;
95 95
96 result = !edbus_message_error_get(msg, &error_name, NULL); 96 result = !eldbus_message_error_get(msg, &error_name, NULL);
97 if (!result && !strcmp(error_name, EDBUS_ERROR_PENDING_CANCELED)) 97 if (!result && !strcmp(error_name, ELDBUS_ERROR_PENDING_CANCELED))
98 { 98 {
99 DBG("Register canceled"); 99 DBG("Register canceled");
100 return; 100 return;
@@ -109,24 +109,24 @@ _app_menu_watch_cb(void *data, const char *bus EINA_UNUSED,
109{ 109{
110 Elm_DBus_Menu *menu = data; 110 Elm_DBus_Menu *menu = data;
111 Callback_Data *cd = menu->app_menu_data; 111 Callback_Data *cd = menu->app_menu_data;
112 EDBus_Message *msg; 112 Eldbus_Message *msg;
113 const char *obj_path; 113 const char *obj_path;
114 114
115 if (!strcmp(new_id, "")) 115 if (!strcmp(new_id, ""))
116 { 116 {
117 if (cd->pending_register) edbus_pending_cancel(cd->pending_register); 117 if (cd->pending_register) eldbus_pending_cancel(cd->pending_register);
118 118
119 if (cd->result_cb) cd->result_cb(EINA_FALSE, cd->data); 119 if (cd->result_cb) cd->result_cb(EINA_FALSE, cd->data);
120 } 120 }
121 else 121 else
122 { 122 {
123 msg = edbus_message_method_call_new(REGISTRAR_NAME, REGISTRAR_PATH, 123 msg = eldbus_message_method_call_new(REGISTRAR_NAME, REGISTRAR_PATH,
124 REGISTRAR_INTERFACE, 124 REGISTRAR_INTERFACE,
125 "RegisterWindow"); 125 "RegisterWindow");
126 obj_path = edbus_service_object_path_get(menu->iface); 126 obj_path = eldbus_service_object_path_get(menu->iface);
127 edbus_message_arguments_append(msg, "uo", (unsigned)cd->xid, 127 eldbus_message_arguments_append(msg, "uo", (unsigned)cd->xid,
128 obj_path); 128 obj_path);
129 cd->pending_register = edbus_connection_send(menu->bus, msg, 129 cd->pending_register = eldbus_connection_send(menu->bus, msg,
130 _app_register_cb, data, -1); 130 _app_register_cb, data, -1);
131 } 131 }
132} 132}
@@ -136,7 +136,7 @@ _layout_idler(void *data)
136{ 136{
137 Elm_DBus_Menu *dbus_menu = data; 137 Elm_DBus_Menu *dbus_menu = data;
138 138
139 edbus_service_signal_emit(dbus_menu->iface, ELM_DBUS_SIGNAL_LAYOUT_UPDATED, 139 eldbus_service_signal_emit(dbus_menu->iface, ELM_DBUS_SIGNAL_LAYOUT_UPDATED,
140 dbus_menu->timestamp, 0); 140 dbus_menu->timestamp, 0);
141 141
142 dbus_menu->signal_idler = NULL; 142 dbus_menu->signal_idler = NULL;
@@ -227,16 +227,16 @@ _property_exists(Elm_Menu_Item *item,
227static void 227static void
228_property_append(Elm_Menu_Item *item, 228_property_append(Elm_Menu_Item *item,
229 Elm_DBus_Property property, 229 Elm_DBus_Property property,
230 EDBus_Message_Iter *iter) 230 Eldbus_Message_Iter *iter)
231{ 231{
232 EDBus_Message_Iter *variant = NULL; 232 Eldbus_Message_Iter *variant = NULL;
233 Elm_Object_Item *item_obj = (Elm_Object_Item *)item; 233 Elm_Object_Item *item_obj = (Elm_Object_Item *)item;
234 const char *t; 234 const char *t;
235 235
236 switch (property) 236 switch (property)
237 { 237 {
238 case ELM_DBUS_PROPERTY_LABEL: 238 case ELM_DBUS_PROPERTY_LABEL:
239 variant = edbus_message_iter_container_new(iter, 'v', "s"); 239 variant = eldbus_message_iter_container_new(iter, 'v', "s");
240 t = elm_object_item_part_text_get(item_obj, NULL); 240 t = elm_object_item_part_text_get(item_obj, NULL);
241 if (!t) 241 if (!t)
242 { 242 {
@@ -244,27 +244,27 @@ _property_append(Elm_Menu_Item *item,
244 if (!t) t = ""; 244 if (!t) t = "";
245 } 245 }
246 246
247 edbus_message_iter_basic_append(variant, 's', t); 247 eldbus_message_iter_basic_append(variant, 's', t);
248 break; 248 break;
249 249
250 case ELM_DBUS_PROPERTY_CHILDREN_DISPLAY: 250 case ELM_DBUS_PROPERTY_CHILDREN_DISPLAY:
251 variant = edbus_message_iter_container_new(iter, 'v', "s"); 251 variant = eldbus_message_iter_container_new(iter, 'v', "s");
252 edbus_message_iter_basic_append(variant, 's', "submenu"); 252 eldbus_message_iter_basic_append(variant, 's', "submenu");
253 break; 253 break;
254 254
255 case ELM_DBUS_PROPERTY_ENABLED: 255 case ELM_DBUS_PROPERTY_ENABLED:
256 variant = edbus_message_iter_container_new(iter, 'v', "b"); 256 variant = eldbus_message_iter_container_new(iter, 'v', "b");
257 edbus_message_iter_basic_append(variant, 'b', EINA_FALSE); 257 eldbus_message_iter_basic_append(variant, 'b', EINA_FALSE);
258 break; 258 break;
259 259
260 case ELM_DBUS_PROPERTY_TYPE: 260 case ELM_DBUS_PROPERTY_TYPE:
261 variant = edbus_message_iter_container_new(iter, 'v', "s"); 261 variant = eldbus_message_iter_container_new(iter, 'v', "s");
262 edbus_message_iter_basic_append(variant, 's', "separator"); 262 eldbus_message_iter_basic_append(variant, 's', "separator");
263 break; 263 break;
264 264
265 case ELM_DBUS_PROPERTY_ICON_NAME: 265 case ELM_DBUS_PROPERTY_ICON_NAME:
266 variant = edbus_message_iter_container_new(iter, 'v', "s"); 266 variant = eldbus_message_iter_container_new(iter, 'v', "s");
267 edbus_message_iter_basic_append(variant, 's', item->icon_str); 267 eldbus_message_iter_basic_append(variant, 's', item->icon_str);
268 break; 268 break;
269 269
270 case ELM_DBUS_PROPERTY_UNKNOWN: 270 case ELM_DBUS_PROPERTY_UNKNOWN:
@@ -272,19 +272,19 @@ _property_append(Elm_Menu_Item *item,
272 return; 272 return;
273 } 273 }
274 274
275 edbus_message_iter_container_close(iter, variant); 275 eldbus_message_iter_container_close(iter, variant);
276} 276}
277 277
278static void 278static void
279_property_dict_build(Elm_Menu_Item *item, 279_property_dict_build(Elm_Menu_Item *item,
280 Eina_List *property_list, EDBus_Message_Iter *iter) 280 Eina_List *property_list, Eldbus_Message_Iter *iter)
281{ 281{
282 char *propstr; 282 char *propstr;
283 Elm_DBus_Property property; 283 Elm_DBus_Property property;
284 EDBus_Message_Iter *array, *pair; 284 Eldbus_Message_Iter *array, *pair;
285 Eina_List *l; 285 Eina_List *l;
286 286
287 array = edbus_message_iter_container_new(iter, 'a', "{sv}"); 287 array = eldbus_message_iter_container_new(iter, 'a', "{sv}");
288 288
289 EINA_LIST_FOREACH (property_list, l, propstr) 289 EINA_LIST_FOREACH (property_list, l, propstr)
290 { 290 {
@@ -293,76 +293,76 @@ _property_dict_build(Elm_Menu_Item *item,
293 if (property == ELM_DBUS_PROPERTY_UNKNOWN) continue; 293 if (property == ELM_DBUS_PROPERTY_UNKNOWN) continue;
294 if (!_property_exists(item, property)) continue; 294 if (!_property_exists(item, property)) continue;
295 295
296 pair = edbus_message_iter_container_new(array, 'e', NULL); 296 pair = eldbus_message_iter_container_new(array, 'e', NULL);
297 edbus_message_iter_basic_append(pair, 's', propstr); 297 eldbus_message_iter_basic_append(pair, 's', propstr);
298 _property_append(item, property, pair); 298 _property_append(item, property, pair);
299 edbus_message_iter_container_close(array, pair); 299 eldbus_message_iter_container_close(array, pair);
300 } 300 }
301 301
302 edbus_message_iter_container_close(iter, array); 302 eldbus_message_iter_container_close(iter, array);
303} 303}
304 304
305static void 305static void
306_layout_build_recursive(Elm_Menu_Item *item, 306_layout_build_recursive(Elm_Menu_Item *item,
307 Eina_List *property_list, unsigned recursion_depth, 307 Eina_List *property_list, unsigned recursion_depth,
308 EDBus_Message_Iter *iter) 308 Eldbus_Message_Iter *iter)
309{ 309{
310 Eina_List *l; 310 Eina_List *l;
311 Elm_Menu_Item *subitem; 311 Elm_Menu_Item *subitem;
312 EDBus_Message_Iter *layout, *array, *variant; 312 Eldbus_Message_Iter *layout, *array, *variant;
313 313
314 layout = edbus_message_iter_container_new(iter, 'r', NULL); 314 layout = eldbus_message_iter_container_new(iter, 'r', NULL);
315 edbus_message_iter_basic_append(layout, 'i', item->dbus_idx); 315 eldbus_message_iter_basic_append(layout, 'i', item->dbus_idx);
316 _property_dict_build(item, property_list, layout); 316 _property_dict_build(item, property_list, layout);
317 array = edbus_message_iter_container_new(layout, 'a', "v"); 317 array = eldbus_message_iter_container_new(layout, 'a', "v");
318 318
319 if (recursion_depth > 0) 319 if (recursion_depth > 0)
320 { 320 {
321 EINA_LIST_FOREACH (item->submenu.items, l, subitem) 321 EINA_LIST_FOREACH (item->submenu.items, l, subitem)
322 { 322 {
323 variant = edbus_message_iter_container_new(array, 'v', 323 variant = eldbus_message_iter_container_new(array, 'v',
324 "(ia{sv}av)"); 324 "(ia{sv}av)");
325 _layout_build_recursive(subitem, property_list, 325 _layout_build_recursive(subitem, property_list,
326 recursion_depth - 1, variant); 326 recursion_depth - 1, variant);
327 edbus_message_iter_container_close(array, variant); 327 eldbus_message_iter_container_close(array, variant);
328 } 328 }
329 } 329 }
330 330
331 edbus_message_iter_container_close(layout, array); 331 eldbus_message_iter_container_close(layout, array);
332 edbus_message_iter_container_close(iter, layout); 332 eldbus_message_iter_container_close(iter, layout);
333} 333}
334 334
335static void 335static void
336_root_layout_build(Elm_DBus_Menu *dbus_menu, Eina_List *property_list, 336_root_layout_build(Elm_DBus_Menu *dbus_menu, Eina_List *property_list,
337 unsigned recursion_depth, EDBus_Message_Iter *iter) 337 unsigned recursion_depth, Eldbus_Message_Iter *iter)
338{ 338{
339 char *property; 339 char *property;
340 EDBus_Message_Iter *layout, *array, *pair, *variant; 340 Eldbus_Message_Iter *layout, *array, *pair, *variant;
341 const Eina_List *ret = NULL; 341 const Eina_List *ret = NULL;
342 Eina_List *items; 342 Eina_List *items;
343 Eina_List *l; 343 Eina_List *l;
344 Elm_Menu_Item *item; 344 Elm_Menu_Item *item;
345 345
346 layout = edbus_message_iter_container_new(iter, 'r', NULL); 346 layout = eldbus_message_iter_container_new(iter, 'r', NULL);
347 edbus_message_iter_basic_append(layout, 'i', 0); 347 eldbus_message_iter_basic_append(layout, 'i', 0);
348 array = edbus_message_iter_container_new(layout, 'a', "{sv}"); 348 array = eldbus_message_iter_container_new(layout, 'a', "{sv}");
349 349
350 EINA_LIST_FOREACH (property_list, l, property) 350 EINA_LIST_FOREACH (property_list, l, property)
351 { 351 {
352 if (!strcmp(property, "children-display")) 352 if (!strcmp(property, "children-display"))
353 { 353 {
354 pair = edbus_message_iter_container_new(array, 'e', NULL); 354 pair = eldbus_message_iter_container_new(array, 'e', NULL);
355 edbus_message_iter_basic_append(pair, 's', property); 355 eldbus_message_iter_basic_append(pair, 's', property);
356 variant = edbus_message_iter_container_new(pair, 'v', "s"); 356 variant = eldbus_message_iter_container_new(pair, 'v', "s");
357 edbus_message_iter_basic_append(variant, 's', "submenu"); 357 eldbus_message_iter_basic_append(variant, 's', "submenu");
358 edbus_message_iter_container_close(pair, variant); 358 eldbus_message_iter_container_close(pair, variant);
359 edbus_message_iter_container_close(array, pair); 359 eldbus_message_iter_container_close(array, pair);
360 break; 360 break;
361 } 361 }
362 } 362 }
363 363
364 edbus_message_iter_container_close(layout, array); 364 eldbus_message_iter_container_close(layout, array);
365 array = edbus_message_iter_container_new(layout, 'a', "v"); 365 array = eldbus_message_iter_container_new(layout, 'a', "v");
366 366
367 if (recursion_depth > 0) 367 if (recursion_depth > 0)
368 { 368 {
@@ -370,16 +370,16 @@ _root_layout_build(Elm_DBus_Menu *dbus_menu, Eina_List *property_list,
370 items = (Eina_List *)ret; 370 items = (Eina_List *)ret;
371 EINA_LIST_FOREACH (items, l, item) 371 EINA_LIST_FOREACH (items, l, item)
372 { 372 {
373 variant = edbus_message_iter_container_new(array, 'v', 373 variant = eldbus_message_iter_container_new(array, 'v',
374 "(ia{sv}av)"); 374 "(ia{sv}av)");
375 _layout_build_recursive(item, property_list, 375 _layout_build_recursive(item, property_list,
376 recursion_depth - 1, variant); 376 recursion_depth - 1, variant);
377 edbus_message_iter_container_close(array, variant); 377 eldbus_message_iter_container_close(array, variant);
378 } 378 }
379 } 379 }
380 380
381 edbus_message_iter_container_close(layout, array); 381 eldbus_message_iter_container_close(layout, array);
382 edbus_message_iter_container_close(iter, layout); 382 eldbus_message_iter_container_close(iter, layout);
383} 383}
384 384
385static Eina_List * 385static Eina_List *
@@ -397,16 +397,16 @@ _empty_properties_handle(Eina_List *property_list)
397} 397}
398 398
399static Eina_Bool 399static Eina_Bool
400_event_handle(Elm_DBus_Menu *dbus_menu, EDBus_Message_Iter *iter, int *error_id) 400_event_handle(Elm_DBus_Menu *dbus_menu, Eldbus_Message_Iter *iter, int *error_id)
401{ 401{
402 Elm_Menu_Item *item; 402 Elm_Menu_Item *item;
403 const char *event; 403 const char *event;
404 int id; 404 int id;
405 int32_t i; 405 int32_t i;
406 EDBus_Message_Iter *data; 406 Eldbus_Message_Iter *data;
407 unsigned *timestamp; 407 unsigned *timestamp;
408 408
409 edbus_message_iter_arguments_get(iter, "isvu", &id, &event, &data, 409 eldbus_message_iter_arguments_get(iter, "isvu", &id, &event, &data,
410 &timestamp); 410 &timestamp);
411 i = id; 411 i = id;
412 item = eina_hash_find(dbus_menu->elements, &i); 412 item = eina_hash_find(dbus_menu->elements, &i);
@@ -474,9 +474,9 @@ error_menu:
474// ============================================================================= 474// =============================================================================
475// Methods 475// Methods
476// ============================================================================= 476// =============================================================================
477static EDBus_Message * 477static Eldbus_Message *
478_method_layout_get(const EDBus_Service_Interface *iface, 478_method_layout_get(const Eldbus_Service_Interface *iface,
479 const EDBus_Message *msg) 479 const Eldbus_Message *msg)
480{ 480{
481 int parent_id; 481 int parent_id;
482 int32_t id; 482 int32_t id;
@@ -484,19 +484,19 @@ _method_layout_get(const EDBus_Service_Interface *iface,
484 unsigned recursion_depth; 484 unsigned recursion_depth;
485 char *property; 485 char *property;
486 Eina_List *property_list = NULL; 486 Eina_List *property_list = NULL;
487 EDBus_Message *reply; 487 Eldbus_Message *reply;
488 EDBus_Message_Iter *iter, *array; 488 Eldbus_Message_Iter *iter, *array;
489 Elm_DBus_Menu *dbus_menu; 489 Elm_DBus_Menu *dbus_menu;
490 Elm_Menu_Item *item = NULL; 490 Elm_Menu_Item *item = NULL;
491 491
492 dbus_menu = edbus_service_object_data_get(iface, DBUS_DATA_KEY); 492 dbus_menu = eldbus_service_object_data_get(iface, DBUS_DATA_KEY);
493 493
494 if (!edbus_message_arguments_get(msg, "iias", &parent_id, &r, &array)) 494 if (!eldbus_message_arguments_get(msg, "iias", &parent_id, &r, &array))
495 ERR("Invalid arguments in D-Bus message"); 495 ERR("Invalid arguments in D-Bus message");
496 496
497 recursion_depth = r; 497 recursion_depth = r;
498 498
499 while (edbus_message_iter_get_and_next(array, 's', &property)) 499 while (eldbus_message_iter_get_and_next(array, 's', &property))
500 property_list = eina_list_append(property_list, property); 500 property_list = eina_list_append(property_list, property);
501 501
502 property_list = _empty_properties_handle(property_list); 502 property_list = _empty_properties_handle(property_list);
@@ -507,15 +507,15 @@ _method_layout_get(const EDBus_Service_Interface *iface,
507 item = eina_hash_find(dbus_menu->elements, &id); 507 item = eina_hash_find(dbus_menu->elements, &id);
508 if (!item) 508 if (!item)
509 { 509 {
510 reply = edbus_message_error_new(msg, DBUS_INTERFACE ".Error", 510 reply = eldbus_message_error_new(msg, DBUS_INTERFACE ".Error",
511 "Invalid parent"); 511 "Invalid parent");
512 return reply; 512 return reply;
513 } 513 }
514 } 514 }
515 515
516 reply = edbus_message_method_return_new(msg); 516 reply = eldbus_message_method_return_new(msg);
517 iter = edbus_message_iter_get(reply); 517 iter = eldbus_message_iter_get(reply);
518 edbus_message_iter_basic_append(iter, 'u', dbus_menu->timestamp); 518 eldbus_message_iter_basic_append(iter, 'u', dbus_menu->timestamp);
519 519
520 if (parent_id) 520 if (parent_id)
521 _layout_build_recursive(item, property_list, recursion_depth, iter); 521 _layout_build_recursive(item, property_list, recursion_depth, iter);
@@ -526,14 +526,14 @@ _method_layout_get(const EDBus_Service_Interface *iface,
526 return reply; 526 return reply;
527} 527}
528 528
529static EDBus_Message * 529static Eldbus_Message *
530_method_group_properties_get(const EDBus_Service_Interface *iface, 530_method_group_properties_get(const Eldbus_Service_Interface *iface,
531 const EDBus_Message *msg) 531 const Eldbus_Message *msg)
532{ 532{
533 Eina_Iterator *hash_iter; 533 Eina_Iterator *hash_iter;
534 EDBus_Message *reply; 534 Eldbus_Message *reply;
535 EDBus_Message_Iter *ids, *property_names; 535 Eldbus_Message_Iter *ids, *property_names;
536 EDBus_Message_Iter *iter, *array, *tuple; 536 Eldbus_Message_Iter *iter, *array, *tuple;
537 Eina_List *property_list = NULL; 537 Eina_List *property_list = NULL;
538 Elm_DBus_Menu *dbus_menu; 538 Elm_DBus_Menu *dbus_menu;
539 Elm_Menu_Item *item; 539 Elm_Menu_Item *item;
@@ -542,31 +542,31 @@ _method_group_properties_get(const EDBus_Service_Interface *iface,
542 int32_t i; 542 int32_t i;
543 void *data; 543 void *data;
544 544
545 dbus_menu = edbus_service_object_data_get(iface, DBUS_DATA_KEY); 545 dbus_menu = eldbus_service_object_data_get(iface, DBUS_DATA_KEY);
546 546
547 if (!edbus_message_arguments_get(msg, "aias", &ids, &property_names)) 547 if (!eldbus_message_arguments_get(msg, "aias", &ids, &property_names))
548 ERR("Invalid arguments in D-Bus message"); 548 ERR("Invalid arguments in D-Bus message");
549 549
550 while (edbus_message_iter_get_and_next(property_names, 's', &property)) 550 while (eldbus_message_iter_get_and_next(property_names, 's', &property))
551 property_list = eina_list_append(property_list, property); 551 property_list = eina_list_append(property_list, property);
552 552
553 property_list = _empty_properties_handle(property_list); 553 property_list = _empty_properties_handle(property_list);
554 554
555 reply = edbus_message_method_return_new(msg); 555 reply = eldbus_message_method_return_new(msg);
556 iter = edbus_message_iter_get(reply); 556 iter = eldbus_message_iter_get(reply);
557 array = edbus_message_iter_container_new(iter, 'a', "(ia{sv})"); 557 array = eldbus_message_iter_container_new(iter, 'a', "(ia{sv})");
558 558
559 if (!edbus_message_iter_get_and_next(ids, 'i', &id)) 559 if (!eldbus_message_iter_get_and_next(ids, 'i', &id))
560 { 560 {
561 hash_iter = eina_hash_iterator_data_new(dbus_menu->elements); 561 hash_iter = eina_hash_iterator_data_new(dbus_menu->elements);
562 562
563 while (eina_iterator_next(hash_iter, &data)) 563 while (eina_iterator_next(hash_iter, &data))
564 { 564 {
565 item = data; 565 item = data;
566 tuple = edbus_message_iter_container_new(array, 'r', NULL); 566 tuple = eldbus_message_iter_container_new(array, 'r', NULL);
567 edbus_message_iter_basic_append(tuple, 'i', item->dbus_idx); 567 eldbus_message_iter_basic_append(tuple, 'i', item->dbus_idx);
568 _property_dict_build(item, property_list, tuple); 568 _property_dict_build(item, property_list, tuple);
569 edbus_message_iter_container_close(array, tuple); 569 eldbus_message_iter_container_close(array, tuple);
570 } 570 }
571 571
572 eina_iterator_free(hash_iter); 572 eina_iterator_free(hash_iter);
@@ -578,25 +578,25 @@ _method_group_properties_get(const EDBus_Service_Interface *iface,
578 item = eina_hash_find(dbus_menu->elements, &i); 578 item = eina_hash_find(dbus_menu->elements, &i);
579 if (!item) continue; 579 if (!item) continue;
580 580
581 tuple = edbus_message_iter_container_new(array, 'r', NULL); 581 tuple = eldbus_message_iter_container_new(array, 'r', NULL);
582 edbus_message_iter_basic_append(tuple, 'i', item->dbus_idx); 582 eldbus_message_iter_basic_append(tuple, 'i', item->dbus_idx);
583 _property_dict_build(item, property_list, tuple); 583 _property_dict_build(item, property_list, tuple);
584 edbus_message_iter_container_close(array, tuple); 584 eldbus_message_iter_container_close(array, tuple);
585 } 585 }
586 while (edbus_message_iter_get_and_next(ids, 'i', &id)); 586 while (eldbus_message_iter_get_and_next(ids, 'i', &id));
587 587
588 edbus_message_iter_container_close(iter, array); 588 eldbus_message_iter_container_close(iter, array);
589 eina_list_free(property_list); 589 eina_list_free(property_list);
590 590
591 return reply; 591 return reply;
592} 592}
593 593
594static EDBus_Message * 594static Eldbus_Message *
595_method_property_get(const EDBus_Service_Interface *iface, 595_method_property_get(const Eldbus_Service_Interface *iface,
596 const EDBus_Message *msg) 596 const Eldbus_Message *msg)
597{ 597{
598 EDBus_Message *reply; 598 Eldbus_Message *reply;
599 EDBus_Message_Iter *iter, *variant; 599 Eldbus_Message_Iter *iter, *variant;
600 Elm_DBus_Property property; 600 Elm_DBus_Property property;
601 Elm_DBus_Menu *dbus_menu; 601 Elm_DBus_Menu *dbus_menu;
602 Elm_Menu_Item *item; 602 Elm_Menu_Item *item;
@@ -604,16 +604,16 @@ _method_property_get(const EDBus_Service_Interface *iface,
604 int32_t i; 604 int32_t i;
605 char *name; 605 char *name;
606 606
607 dbus_menu = edbus_service_object_data_get(iface, DBUS_DATA_KEY); 607 dbus_menu = eldbus_service_object_data_get(iface, DBUS_DATA_KEY);
608 608
609 if (!edbus_message_arguments_get(msg, "is", &id, &name)) 609 if (!eldbus_message_arguments_get(msg, "is", &id, &name))
610 ERR("Invalid arguments in D-Bus message"); 610 ERR("Invalid arguments in D-Bus message");
611 611
612 property = _str_to_property(name); 612 property = _str_to_property(name);
613 613
614 if (property == ELM_DBUS_PROPERTY_UNKNOWN) 614 if (property == ELM_DBUS_PROPERTY_UNKNOWN)
615 { 615 {
616 reply = edbus_message_error_new(msg, DBUS_INTERFACE ".Error", 616 reply = eldbus_message_error_new(msg, DBUS_INTERFACE ".Error",
617 "Property not found"); 617 "Property not found");
618 return reply; 618 return reply;
619 } 619 }
@@ -621,15 +621,15 @@ _method_property_get(const EDBus_Service_Interface *iface,
621 if (!id) 621 if (!id)
622 { 622 {
623 if (property != ELM_DBUS_PROPERTY_CHILDREN_DISPLAY) 623 if (property != ELM_DBUS_PROPERTY_CHILDREN_DISPLAY)
624 reply = edbus_message_error_new(msg, DBUS_INTERFACE ".Error", 624 reply = eldbus_message_error_new(msg, DBUS_INTERFACE ".Error",
625 "Property not found"); 625 "Property not found");
626 else 626 else
627 { 627 {
628 reply = edbus_message_method_return_new(msg); 628 reply = eldbus_message_method_return_new(msg);
629 iter = edbus_message_iter_get(reply); 629 iter = eldbus_message_iter_get(reply);
630 variant = edbus_message_iter_container_new(iter, 'v', "s"); 630 variant = eldbus_message_iter_container_new(iter, 'v', "s");
631 edbus_message_iter_basic_append(variant, 's', "submenu"); 631 eldbus_message_iter_basic_append(variant, 's', "submenu");
632 edbus_message_iter_container_close(iter, variant); 632 eldbus_message_iter_container_close(iter, variant);
633 } 633 }
634 634
635 return reply; 635 return reply;
@@ -640,136 +640,136 @@ _method_property_get(const EDBus_Service_Interface *iface,
640 640
641 if (!item) 641 if (!item)
642 { 642 {
643 reply = edbus_message_error_new(msg, DBUS_INTERFACE ".Error", 643 reply = eldbus_message_error_new(msg, DBUS_INTERFACE ".Error",
644 "Invalid menu identifier"); 644 "Invalid menu identifier");
645 return reply; 645 return reply;
646 } 646 }
647 647
648 if (!_property_exists(item, property)) 648 if (!_property_exists(item, property))
649 { 649 {
650 reply = edbus_message_error_new(msg, DBUS_INTERFACE ".Error", 650 reply = eldbus_message_error_new(msg, DBUS_INTERFACE ".Error",
651 "Property not found"); 651 "Property not found");
652 return reply; 652 return reply;
653 } 653 }
654 654
655 reply = edbus_message_method_return_new(msg); 655 reply = eldbus_message_method_return_new(msg);
656 iter = edbus_message_iter_get(reply); 656 iter = eldbus_message_iter_get(reply);
657 _property_append(item, property, iter); 657 _property_append(item, property, iter);
658 658
659 return reply; 659 return reply;
660} 660}
661 661
662static EDBus_Message * 662static Eldbus_Message *
663_method_event(const EDBus_Service_Interface *iface, 663_method_event(const Eldbus_Service_Interface *iface,
664 const EDBus_Message *msg) 664 const Eldbus_Message *msg)
665{ 665{
666 Elm_DBus_Menu *dbus_menu; 666 Elm_DBus_Menu *dbus_menu;
667 EDBus_Message *reply; 667 Eldbus_Message *reply;
668 668
669 reply = edbus_message_method_return_new(msg); 669 reply = eldbus_message_method_return_new(msg);
670 dbus_menu = edbus_service_object_data_get(iface, DBUS_DATA_KEY); 670 dbus_menu = eldbus_service_object_data_get(iface, DBUS_DATA_KEY);
671 671
672 if (!_event_handle(dbus_menu, edbus_message_iter_get(msg), NULL)) 672 if (!_event_handle(dbus_menu, eldbus_message_iter_get(msg), NULL))
673 reply = edbus_message_error_new(msg, DBUS_INTERFACE ".Error", 673 reply = eldbus_message_error_new(msg, DBUS_INTERFACE ".Error",
674 "Invalid menu"); 674 "Invalid menu");
675 else 675 else
676 reply = edbus_message_method_return_new(msg); 676 reply = eldbus_message_method_return_new(msg);
677 677
678 return reply; 678 return reply;
679} 679}
680 680
681static EDBus_Message * 681static Eldbus_Message *
682_method_event_group(const EDBus_Service_Interface *iface, 682_method_event_group(const Eldbus_Service_Interface *iface,
683 const EDBus_Message *msg) 683 const Eldbus_Message *msg)
684{ 684{
685 EDBus_Message *reply; 685 Eldbus_Message *reply;
686 EDBus_Message_Iter *iter, *array, *tuple, *errors; 686 Eldbus_Message_Iter *iter, *array, *tuple, *errors;
687 int id; 687 int id;
688 Elm_DBus_Menu *dbus_menu; 688 Elm_DBus_Menu *dbus_menu;
689 Eina_Bool return_error = EINA_TRUE; 689 Eina_Bool return_error = EINA_TRUE;
690 690
691 dbus_menu = edbus_service_object_data_get(iface, DBUS_DATA_KEY); 691 dbus_menu = eldbus_service_object_data_get(iface, DBUS_DATA_KEY);
692 692
693 if (!edbus_message_arguments_get(msg, "a(isvu)", &array)) 693 if (!eldbus_message_arguments_get(msg, "a(isvu)", &array))
694 ERR("Invalid arguments in D-Bus message"); 694 ERR("Invalid arguments in D-Bus message");
695 695
696 reply = edbus_message_method_return_new(msg); 696 reply = eldbus_message_method_return_new(msg);
697 iter = edbus_message_iter_get(reply); 697 iter = eldbus_message_iter_get(reply);
698 errors = edbus_message_iter_container_new(iter, 'a', "i"); 698 errors = eldbus_message_iter_container_new(iter, 'a', "i");
699 699
700 while (edbus_message_iter_get_and_next(array, 'r', &tuple)) 700 while (eldbus_message_iter_get_and_next(array, 'r', &tuple))
701 { 701 {
702 if (_event_handle(dbus_menu, tuple, &id)) 702 if (_event_handle(dbus_menu, tuple, &id))
703 return_error = EINA_FALSE; 703 return_error = EINA_FALSE;
704 else 704 else
705 edbus_message_iter_basic_append(errors, 'i', id); 705 eldbus_message_iter_basic_append(errors, 'i', id);
706 } 706 }
707 707
708 if (return_error) 708 if (return_error)
709 { 709 {
710 edbus_message_unref(reply); 710 eldbus_message_unref(reply);
711 reply = edbus_message_error_new(msg, DBUS_INTERFACE ".Error", 711 reply = eldbus_message_error_new(msg, DBUS_INTERFACE ".Error",
712 "Invalid menu identifiers"); 712 "Invalid menu identifiers");
713 } 713 }
714 else 714 else
715 edbus_message_iter_container_close(iter, errors); 715 eldbus_message_iter_container_close(iter, errors);
716 716
717 return reply; 717 return reply;
718} 718}
719 719
720static EDBus_Message * 720static Eldbus_Message *
721_method_about_to_show(const EDBus_Service_Interface *iface EINA_UNUSED, 721_method_about_to_show(const Eldbus_Service_Interface *iface EINA_UNUSED,
722 const EDBus_Message *msg) 722 const Eldbus_Message *msg)
723{ 723{
724 EDBus_Message *reply = edbus_message_method_return_new(msg); 724 Eldbus_Message *reply = eldbus_message_method_return_new(msg);
725 edbus_message_arguments_append(reply, "b", EINA_TRUE); 725 eldbus_message_arguments_append(reply, "b", EINA_TRUE);
726 726
727 return reply; 727 return reply;
728} 728}
729 729
730static EDBus_Message * 730static Eldbus_Message *
731_method_about_to_show_group(const EDBus_Service_Interface *iface EINA_UNUSED, 731_method_about_to_show_group(const Eldbus_Service_Interface *iface EINA_UNUSED,
732 const EDBus_Message *msg) 732 const Eldbus_Message *msg)
733{ 733{
734 EDBus_Message *reply = edbus_message_method_return_new(msg); 734 Eldbus_Message *reply = eldbus_message_method_return_new(msg);
735 EDBus_Message_Iter *iter, *array; 735 Eldbus_Message_Iter *iter, *array;
736 736
737 iter = edbus_message_iter_get(reply); 737 iter = eldbus_message_iter_get(reply);
738 array = edbus_message_iter_container_new(iter, 'a', "i"); 738 array = eldbus_message_iter_container_new(iter, 'a', "i");
739 edbus_message_iter_container_close(iter, array); 739 eldbus_message_iter_container_close(iter, array);
740 array = edbus_message_iter_container_new(iter, 'a', "i"); 740 array = eldbus_message_iter_container_new(iter, 'a', "i");
741 edbus_message_iter_container_close(iter, array); 741 eldbus_message_iter_container_close(iter, array);
742 742
743 return reply; 743 return reply;
744} 744}
745 745
746static const EDBus_Method _methods[] = { 746static const Eldbus_Method _methods[] = {
747 { 747 {
748 "GetLayout", 748 "GetLayout",
749 EDBUS_ARGS({"i", "parentId"}, 749 ELDBUS_ARGS({"i", "parentId"},
750 {"i", "recursionDepth"}, 750 {"i", "recursionDepth"},
751 {"as", "propertyNames"}), 751 {"as", "propertyNames"}),
752 EDBUS_ARGS({"u", "revision"}, {"(ia{sv}av)", "layout"}), 752 ELDBUS_ARGS({"u", "revision"}, {"(ia{sv}av)", "layout"}),
753 _method_layout_get, 753 _method_layout_get,
754 0 754 0
755 }, 755 },
756 { 756 {
757 "GetGroupProperties", 757 "GetGroupProperties",
758 EDBUS_ARGS({"ai", "ids"}, {"as", "propertyNames"}), 758 ELDBUS_ARGS({"ai", "ids"}, {"as", "propertyNames"}),
759 EDBUS_ARGS({"a(ia{sv})", "properties"}), 759 ELDBUS_ARGS({"a(ia{sv})", "properties"}),
760 _method_group_properties_get, 760 _method_group_properties_get,
761 0 761 0
762 }, 762 },
763 { 763 {
764 "GetProperty", 764 "GetProperty",
765 EDBUS_ARGS({"i", "id"}, {"s", "name"}), 765 ELDBUS_ARGS({"i", "id"}, {"s", "name"}),
766 EDBUS_ARGS({"v", "value"}), 766 ELDBUS_ARGS({"v", "value"}),
767 _method_property_get, 767 _method_property_get,
768 0 768 0
769 }, 769 },
770 { 770 {
771 "Event", 771 "Event",
772 EDBUS_ARGS({"i", "id"}, 772 ELDBUS_ARGS({"i", "id"},
773 {"s", "eventId"}, 773 {"s", "eventId"},
774 {"v", "data"}, 774 {"v", "data"},
775 {"u", "timestamp"}), 775 {"u", "timestamp"}),
@@ -779,22 +779,22 @@ static const EDBus_Method _methods[] = {
779 }, 779 },
780 { 780 {
781 "EventGroup", 781 "EventGroup",
782 EDBUS_ARGS({"a(isvu)", "events"}), 782 ELDBUS_ARGS({"a(isvu)", "events"}),
783 EDBUS_ARGS({"ai", "idErrors"}), 783 ELDBUS_ARGS({"ai", "idErrors"}),
784 _method_event_group, 784 _method_event_group,
785 0 785 0
786 }, 786 },
787 { 787 {
788 "AboutToShow", 788 "AboutToShow",
789 EDBUS_ARGS({"i", "id"}), 789 ELDBUS_ARGS({"i", "id"}),
790 EDBUS_ARGS({"b", "needUpdate"}), 790 ELDBUS_ARGS({"b", "needUpdate"}),
791 _method_about_to_show, 791 _method_about_to_show,
792 0 792 0
793 }, 793 },
794 { 794 {
795 "AboutToShowGroup", 795 "AboutToShowGroup",
796 EDBUS_ARGS({"ai", "ids"}), 796 ELDBUS_ARGS({"ai", "ids"}),
797 EDBUS_ARGS({"ai", "updatesNeeded"}, {"ai", "idErrors"}), 797 ELDBUS_ARGS({"ai", "updatesNeeded"}, {"ai", "idErrors"}),
798 _method_about_to_show_group, 798 _method_about_to_show_group,
799 0 799 0
800 }, 800 },
@@ -805,12 +805,12 @@ static const EDBus_Method _methods[] = {
805// ============================================================================= 805// =============================================================================
806// Signals 806// Signals
807// ============================================================================= 807// =============================================================================
808static const EDBus_Signal _signals[] = { 808static const Eldbus_Signal _signals[] = {
809 [ELM_DBUS_SIGNAL_LAYOUT_UPDATED] = { 809 [ELM_DBUS_SIGNAL_LAYOUT_UPDATED] = {
810 "LayoutUpdated", EDBUS_ARGS({"u", "revision"}, {"i", "parent"}), 0 810 "LayoutUpdated", ELDBUS_ARGS({"u", "revision"}, {"i", "parent"}), 0
811 }, 811 },
812 [ELM_DBUS_SIGNAL_ITEM_ACTIVATION_REQUESTED] = { 812 [ELM_DBUS_SIGNAL_ITEM_ACTIVATION_REQUESTED] = {
813 "ItemActivationRequested", EDBUS_ARGS({"i", "id"}, {"u", "timestamp"}), 0 813 "ItemActivationRequested", ELDBUS_ARGS({"i", "id"}, {"u", "timestamp"}), 0
814 }, 814 },
815 {NULL, NULL, 0} 815 {NULL, NULL, 0}
816}; 816};
@@ -819,61 +819,61 @@ static const EDBus_Signal _signals[] = {
819// Properties 819// Properties
820// ============================================================================= 820// =============================================================================
821static Eina_Bool 821static Eina_Bool
822_prop_version_get(const EDBus_Service_Interface *iface EINA_UNUSED, 822_prop_version_get(const Eldbus_Service_Interface *iface EINA_UNUSED,
823 const char *propname EINA_UNUSED, 823 const char *propname EINA_UNUSED,
824 EDBus_Message_Iter *iter, 824 Eldbus_Message_Iter *iter,
825 const EDBus_Message *request_msg EINA_UNUSED, 825 const Eldbus_Message *request_msg EINA_UNUSED,
826 EDBus_Message **error EINA_UNUSED) 826 Eldbus_Message **error EINA_UNUSED)
827{ 827{
828 edbus_message_iter_basic_append(iter, 'u', DBUS_MENU_VERSION); 828 eldbus_message_iter_basic_append(iter, 'u', DBUS_MENU_VERSION);
829 829
830 return EINA_TRUE; 830 return EINA_TRUE;
831} 831}
832 832
833static Eina_Bool 833static Eina_Bool
834_prop_text_direction_get(const EDBus_Service_Interface *iface EINA_UNUSED, 834_prop_text_direction_get(const Eldbus_Service_Interface *iface EINA_UNUSED,
835 const char *propname EINA_UNUSED, 835 const char *propname EINA_UNUSED,
836 EDBus_Message_Iter *iter, 836 Eldbus_Message_Iter *iter,
837 const EDBus_Message *request_msg EINA_UNUSED, 837 const Eldbus_Message *request_msg EINA_UNUSED,
838 EDBus_Message **error EINA_UNUSED) 838 Eldbus_Message **error EINA_UNUSED)
839{ 839{
840 if (_elm_config->is_mirrored) 840 if (_elm_config->is_mirrored)
841 edbus_message_iter_basic_append(iter, 's', "rtl"); 841 eldbus_message_iter_basic_append(iter, 's', "rtl");
842 else 842 else
843 edbus_message_iter_basic_append(iter, 's', "ltr"); 843 eldbus_message_iter_basic_append(iter, 's', "ltr");
844 844
845 return EINA_TRUE; 845 return EINA_TRUE;
846} 846}
847 847
848static Eina_Bool 848static Eina_Bool
849_prop_status_get(const EDBus_Service_Interface *iface EINA_UNUSED, 849_prop_status_get(const Eldbus_Service_Interface *iface EINA_UNUSED,
850 const char *propname EINA_UNUSED, 850 const char *propname EINA_UNUSED,
851 EDBus_Message_Iter *iter, 851 Eldbus_Message_Iter *iter,
852 const EDBus_Message *request_msg EINA_UNUSED, 852 const Eldbus_Message *request_msg EINA_UNUSED,
853 EDBus_Message **error EINA_UNUSED) 853 Eldbus_Message **error EINA_UNUSED)
854{ 854{
855 static const char *normal = "normal"; 855 static const char *normal = "normal";
856 edbus_message_iter_basic_append(iter, 's', normal); 856 eldbus_message_iter_basic_append(iter, 's', normal);
857 857
858 return EINA_TRUE; 858 return EINA_TRUE;
859} 859}
860 860
861static Eina_Bool 861static Eina_Bool
862_prop_icon_theme_path_get(const EDBus_Service_Interface *iface EINA_UNUSED, 862_prop_icon_theme_path_get(const Eldbus_Service_Interface *iface EINA_UNUSED,
863 const char *propname EINA_UNUSED, 863 const char *propname EINA_UNUSED,
864 EDBus_Message_Iter *iter, 864 Eldbus_Message_Iter *iter,
865 const EDBus_Message *request_msg EINA_UNUSED, 865 const Eldbus_Message *request_msg EINA_UNUSED,
866 EDBus_Message **error EINA_UNUSED) 866 Eldbus_Message **error EINA_UNUSED)
867{ 867{
868 EDBus_Message_Iter *actions; 868 Eldbus_Message_Iter *actions;
869 edbus_message_iter_arguments_append(iter, "as", &actions); 869 eldbus_message_iter_arguments_append(iter, "as", &actions);
870 edbus_message_iter_arguments_append(actions, "s", ICON_DIR); 870 eldbus_message_iter_arguments_append(actions, "s", ICON_DIR);
871 edbus_message_iter_container_close(iter, actions); 871 eldbus_message_iter_container_close(iter, actions);
872 872
873 return EINA_TRUE; 873 return EINA_TRUE;
874} 874}
875 875
876static const EDBus_Property _properties[] = { 876static const Eldbus_Property _properties[] = {
877 { "Version", "u", _prop_version_get, NULL, 0 }, 877 { "Version", "u", _prop_version_get, NULL, 0 },
878 { "TextDirection", "s", _prop_text_direction_get, NULL, 0 }, 878 { "TextDirection", "s", _prop_text_direction_get, NULL, 0 },
879 { "Status", "s", _prop_status_get, NULL, 0 }, 879 { "Status", "s", _prop_status_get, NULL, 0 },
@@ -881,7 +881,7 @@ static const EDBus_Property _properties[] = {
881 { NULL, NULL, NULL, NULL, 0 }, 881 { NULL, NULL, NULL, NULL, 0 },
882}; 882};
883 883
884static const EDBus_Service_Interface_Desc _interface = { 884static const Eldbus_Service_Interface_Desc _interface = {
885 DBUS_INTERFACE, _methods, _signals, _properties, NULL, NULL 885 DBUS_INTERFACE, _methods, _signals, _properties, NULL, NULL
886}; 886};
887// ============================================================================= 887// =============================================================================
@@ -893,22 +893,22 @@ _elm_dbus_menu_register(Eo *obj)
893 ELM_MENU_CHECK(obj) NULL; 893 ELM_MENU_CHECK(obj) NULL;
894 ELM_MENU_DATA_GET(obj, sd); 894 ELM_MENU_DATA_GET(obj, sd);
895 895
896 elm_need_edbus(); 896 elm_need_eldbus();
897 897
898 if (sd->dbus_menu) 898 if (sd->dbus_menu)
899 goto end; 899 goto end;
900 900
901 sd->dbus_menu = _elm_dbus_menu_add(obj); 901 sd->dbus_menu = _elm_dbus_menu_add(obj);
902 sd->dbus_menu->bus = edbus_connection_get(EDBUS_CONNECTION_TYPE_SESSION); 902 sd->dbus_menu->bus = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
903 snprintf(buf, sizeof(buf), "%s/%u", DBUS_PATH, ++last_object_path); 903 snprintf(buf, sizeof(buf), "%s/%u", DBUS_PATH, ++last_object_path);
904 sd->dbus_menu->iface = edbus_service_interface_register(sd->dbus_menu->bus, 904 sd->dbus_menu->iface = eldbus_service_interface_register(sd->dbus_menu->bus,
905 buf, 905 buf,
906 &_interface); 906 &_interface);
907 edbus_service_object_data_set(sd->dbus_menu->iface, DBUS_DATA_KEY, 907 eldbus_service_object_data_set(sd->dbus_menu->iface, DBUS_DATA_KEY,
908 sd->dbus_menu); 908 sd->dbus_menu);
909 909
910end: 910end:
911 return edbus_service_object_path_get(sd->dbus_menu->iface); 911 return eldbus_service_object_path_get(sd->dbus_menu->iface);
912} 912}
913 913
914void 914void
@@ -923,8 +923,8 @@ _elm_dbus_menu_unregister(Eo *obj)
923 923
924 if (sd->dbus_menu->app_menu_data) 924 if (sd->dbus_menu->app_menu_data)
925 _elm_dbus_menu_app_menu_unregister(obj); 925 _elm_dbus_menu_app_menu_unregister(obj);
926 edbus_service_interface_unregister(sd->dbus_menu->iface); 926 eldbus_service_interface_unregister(sd->dbus_menu->iface);
927 edbus_connection_unref(sd->dbus_menu->bus); 927 eldbus_connection_unref(sd->dbus_menu->bus);
928 if (sd->dbus_menu->signal_idler) 928 if (sd->dbus_menu->signal_idler)
929 ecore_idler_del(sd->dbus_menu->signal_idler); 929 ecore_idler_del(sd->dbus_menu->signal_idler);
930 930
@@ -963,7 +963,7 @@ _elm_dbus_menu_app_menu_register(Ecore_X_Window xid, Eo *obj,
963 cd->data = data; 963 cd->data = data;
964 cd->pending_register = NULL; 964 cd->pending_register = NULL;
965 cd->xid = xid; 965 cd->xid = xid;
966 edbus_name_owner_changed_callback_add(sd->dbus_menu->bus, REGISTRAR_NAME, 966 eldbus_name_owner_changed_callback_add(sd->dbus_menu->bus, REGISTRAR_NAME,
967 _app_menu_watch_cb, sd->dbus_menu, 967 _app_menu_watch_cb, sd->dbus_menu,
968 EINA_TRUE); 968 EINA_TRUE);
969} 969}
@@ -971,7 +971,7 @@ _elm_dbus_menu_app_menu_register(Ecore_X_Window xid, Eo *obj,
971void 971void
972_elm_dbus_menu_app_menu_unregister(Eo *obj) 972_elm_dbus_menu_app_menu_unregister(Eo *obj)
973{ 973{
974 EDBus_Message *msg; 974 Eldbus_Message *msg;
975 Callback_Data *cd; 975 Callback_Data *cd;
976 976
977 ELM_MENU_CHECK(obj); 977 ELM_MENU_CHECK(obj);
@@ -988,13 +988,13 @@ _elm_dbus_menu_app_menu_unregister(Eo *obj)
988 if (!cd) return; 988 if (!cd) return;
989 989
990 if (cd->pending_register) 990 if (cd->pending_register)
991 edbus_pending_cancel(cd->pending_register); 991 eldbus_pending_cancel(cd->pending_register);
992 992
993 msg = edbus_message_method_call_new(REGISTRAR_NAME, REGISTRAR_PATH, 993 msg = eldbus_message_method_call_new(REGISTRAR_NAME, REGISTRAR_PATH,
994 REGISTRAR_INTERFACE, "UnregisterWindow"); 994 REGISTRAR_INTERFACE, "UnregisterWindow");
995 edbus_message_arguments_append(msg, "u", (unsigned)cd->xid); 995 eldbus_message_arguments_append(msg, "u", (unsigned)cd->xid);
996 edbus_connection_send(sd->dbus_menu->bus, msg, NULL, NULL, -1); 996 eldbus_connection_send(sd->dbus_menu->bus, msg, NULL, NULL, -1);
997 edbus_name_owner_changed_callback_del(sd->dbus_menu->bus, REGISTRAR_NAME, 997 eldbus_name_owner_changed_callback_del(sd->dbus_menu->bus, REGISTRAR_NAME,
998 _app_menu_watch_cb, sd->dbus_menu); 998 _app_menu_watch_cb, sd->dbus_menu);
999 free(cd); 999 free(cd);
1000 sd->dbus_menu->app_menu_data = NULL; 1000 sd->dbus_menu->app_menu_data = NULL;
diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 28561b37d..82875aa8e 100644
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -366,11 +366,11 @@ elm_need_e_dbus(void)
366 int (*init_func)(void) = NULL; 366 int (*init_func)(void) = NULL;
367 367
368 if (_elm_need_e_dbus) return EINA_TRUE; 368 if (_elm_need_e_dbus) return EINA_TRUE;
369 /* We use RTLD_NOLOAD when available, so we are sure to use the 'libedbus' that was linked to the binary */ 369 /* We use RTLD_NOLOAD when available, so we are sure to use the 'libeldbus' that was linked to the binary */
370#ifndef RTLD_NOLOAD 370#ifndef RTLD_NOLOAD
371# define RTLD_NOLOAD RTLD_GLOBAL 371# define RTLD_NOLOAD RTLD_GLOBAL
372#endif 372#endif
373 if (!e_dbus_handle) e_dbus_handle = dlopen("libedbus.so", RTLD_LAZY | RTLD_NOLOAD); 373 if (!e_dbus_handle) e_dbus_handle = dlopen("libeldbus.so", RTLD_LAZY | RTLD_NOLOAD);
374 if (!e_dbus_handle) return EINA_FALSE; 374 if (!e_dbus_handle) return EINA_FALSE;
375 init_func = dlsym(e_dbus_handle, "e_dbus_init"); 375 init_func = dlsym(e_dbus_handle, "e_dbus_init");
376 if (!init_func) return EINA_FALSE; 376 if (!init_func) return EINA_FALSE;
@@ -394,16 +394,16 @@ _elm_unneed_e_dbus(void)
394 e_dbus_handle = NULL; 394 e_dbus_handle = NULL;
395} 395}
396 396
397#ifdef ELM_EDBUS2 397#ifdef ELM_ELDBUS
398static Eina_Bool _elm_need_edbus = EINA_FALSE; 398static Eina_Bool _elm_need_eldbus = EINA_FALSE;
399#endif 399#endif
400EAPI Eina_Bool 400EAPI Eina_Bool
401elm_need_edbus(void) 401elm_need_eldbus(void)
402{ 402{
403#ifdef ELM_EDBUS2 403#ifdef ELM_ELDBUS
404 if (_elm_need_edbus) return EINA_TRUE; 404 if (_elm_need_eldbus) return EINA_TRUE;
405 _elm_need_edbus = EINA_TRUE; 405 _elm_need_eldbus = EINA_TRUE;
406 edbus_init(); 406 eldbus_init();
407 return EINA_TRUE; 407 return EINA_TRUE;
408#else 408#else
409 return EINA_FALSE; 409 return EINA_FALSE;
@@ -411,12 +411,12 @@ elm_need_edbus(void)
411} 411}
412 412
413static void 413static void
414_elm_unneed_edbus(void) 414_elm_unneed_eldbus(void)
415{ 415{
416#ifdef ELM_EDBUS2 416#ifdef ELM_ELDBUS
417 if (!_elm_need_edbus) return; 417 if (!_elm_need_eldbus) return;
418 _elm_need_edbus = EINA_FALSE; 418 _elm_need_eldbus = EINA_FALSE;
419 edbus_shutdown(); 419 eldbus_shutdown();
420#endif 420#endif
421} 421}
422 422
@@ -442,7 +442,7 @@ _elm_unneed_elocation(void)
442#ifdef ELM_ELOCATION 442#ifdef ELM_ELOCATION
443 if (!_elm_need_elocation) return; 443 if (!_elm_need_elocation) return;
444 _elm_need_elocation = EINA_FALSE; 444 _elm_need_elocation = EINA_FALSE;
445 edbus_shutdown(); 445 eldbus_shutdown();
446#endif 446#endif
447} 447}
448 448
@@ -662,7 +662,7 @@ elm_quicklaunch_shutdown(void)
662 _elm_unneed_sys_notify(); 662 _elm_unneed_sys_notify();
663 _elm_unneed_efreet(); 663 _elm_unneed_efreet();
664 _elm_unneed_e_dbus(); 664 _elm_unneed_e_dbus();
665 _elm_unneed_edbus(); 665 _elm_unneed_eldbus();
666 _elm_unneed_elocation(); 666 _elm_unneed_elocation();
667 _elm_unneed_ethumb(); 667 _elm_unneed_ethumb();
668 _elm_unneed_web(); 668 _elm_unneed_web();
diff --git a/src/lib/elm_need.h b/src/lib/elm_need.h
index 4a4532b46..137e97707 100644
--- a/src/lib/elm_need.h
+++ b/src/lib/elm_need.h
@@ -48,7 +48,7 @@ EAPI Eina_Bool elm_need_sys_notify(void);
48 * 48 *
49 * @return EINA_TRUE if support exists and initialization succeeded. 49 * @return EINA_TRUE if support exists and initialization succeeded.
50 * 50 *
51 * @deprecated use elm_need_edbus() for EDBus (v2) support. Old API is 51 * @deprecated use elm_need_eldbus() for Eldbus (v2) support. Old API is
52 * deprecated. 52 * deprecated.
53 * 53 *
54 * @ingroup E_dbus 54 * @ingroup E_dbus
@@ -56,19 +56,19 @@ EAPI Eina_Bool elm_need_sys_notify(void);
56EAPI Eina_Bool elm_need_e_dbus(void) EINA_DEPRECATED; 56EAPI Eina_Bool elm_need_e_dbus(void) EINA_DEPRECATED;
57 57
58/** 58/**
59 * Request that your elementary application needs edbus 59 * Request that your elementary application needs eldbus
60 * 60 *
61 * This initializes the edbus (aka v2) library when called and if 61 * This initializes the eldbus (aka v2) library when called and if
62 * support exists it returns EINA_TRUE, otherwise returns 62 * support exists it returns EINA_TRUE, otherwise returns
63 * EINA_FALSE. This must be called before any edbus calls. 63 * EINA_FALSE. This must be called before any eldbus calls.
64 * 64 *
65 * @return EINA_TRUE if support exists and initialization succeeded. 65 * @return EINA_TRUE if support exists and initialization succeeded.
66 * 66 *
67 * @since 1.8.0 67 * @since 1.8.0
68 * 68 *
69 * @ingroup edbus 69 * @ingroup eldbus
70 */ 70 */
71EAPI Eina_Bool elm_need_edbus(void); 71EAPI Eina_Bool elm_need_eldbus(void);
72 72
73/** 73/**
74 * Request that your elementary application needs elocation 74 * Request that your elementary application needs elocation
@@ -81,7 +81,7 @@ EAPI Eina_Bool elm_need_edbus(void);
81 * 81 *
82 * @since 1.8.0 82 * @since 1.8.0
83 * 83 *
84 * @ingroup edbus 84 * @ingroup eldbus
85 */ 85 */
86EAPI Eina_Bool elm_need_elocation(void); 86EAPI Eina_Bool elm_need_elocation(void);
87 87
diff --git a/src/lib/elm_sys_notify.c b/src/lib/elm_sys_notify.c
index ba18ee079..fa6a0852d 100644
--- a/src/lib/elm_sys_notify.c
+++ b/src/lib/elm_sys_notify.c
@@ -8,12 +8,12 @@
8EAPI int ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED = 0; 8EAPI int ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED = 0;
9EAPI int ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED = 0; 9EAPI int ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED = 0;
10 10
11#ifdef ELM_EDBUS2 11#ifdef ELM_ELDBUS
12static Eina_Bool _elm_need_sys_notify = EINA_FALSE; 12static Eina_Bool _elm_need_sys_notify = EINA_FALSE;
13 13
14static EDBus_Connection *_elm_sysnotif_conn = NULL; 14static Eldbus_Connection *_elm_sysnotif_conn = NULL;
15static EDBus_Object *_elm_sysnotif_obj = NULL; 15static Eldbus_Object *_elm_sysnotif_obj = NULL;
16static EDBus_Proxy *_elm_sysnotif_proxy = NULL; 16static Eldbus_Proxy *_elm_sysnotif_proxy = NULL;
17 17
18static Eina_Bool _has_markup = EINA_FALSE; 18static Eina_Bool _has_markup = EINA_FALSE;
19 19
@@ -24,49 +24,49 @@ typedef struct _Elm_Sys_Notify_Send_Data
24} Elm_Sys_Notify_Send_Data; 24} Elm_Sys_Notify_Send_Data;
25 25
26static void 26static void
27_elm_sys_notify_marshal_dict_byte(EDBus_Message_Iter *array, 27_elm_sys_notify_marshal_dict_byte(Eldbus_Message_Iter *array,
28 const char *key, 28 const char *key,
29 const char value) 29 const char value)
30{ 30{
31 EDBus_Message_Iter *var, *entry; 31 Eldbus_Message_Iter *var, *entry;
32 32
33 edbus_message_iter_arguments_append(array, "{sv}", &entry); 33 eldbus_message_iter_arguments_append(array, "{sv}", &entry);
34 edbus_message_iter_basic_append(entry, 's', key); 34 eldbus_message_iter_basic_append(entry, 's', key);
35 35
36 var = edbus_message_iter_container_new(entry, 'v', "y"); 36 var = eldbus_message_iter_container_new(entry, 'v', "y");
37 edbus_message_iter_basic_append(var, 'y', value); 37 eldbus_message_iter_basic_append(var, 'y', value);
38 edbus_message_iter_container_close(entry, var); 38 eldbus_message_iter_container_close(entry, var);
39 edbus_message_iter_container_close(array, entry); 39 eldbus_message_iter_container_close(array, entry);
40} 40}
41 41
42static void 42static void
43_elm_sys_notify_marshal_dict_string(EDBus_Message_Iter *array, 43_elm_sys_notify_marshal_dict_string(Eldbus_Message_Iter *array,
44 const char *key, 44 const char *key,
45 const char *value) 45 const char *value)
46{ 46{
47 EDBus_Message_Iter *var, *entry; 47 Eldbus_Message_Iter *var, *entry;
48 48
49 edbus_message_iter_arguments_append(array, "{sv}", &entry); 49 eldbus_message_iter_arguments_append(array, "{sv}", &entry);
50 edbus_message_iter_basic_append(entry, 's', key); 50 eldbus_message_iter_basic_append(entry, 's', key);
51 51
52 var = edbus_message_iter_container_new(entry, 'v', "s"); 52 var = eldbus_message_iter_container_new(entry, 'v', "s");
53 edbus_message_iter_basic_append(var, 's', value); 53 eldbus_message_iter_basic_append(var, 's', value);
54 edbus_message_iter_container_close(entry, var); 54 eldbus_message_iter_container_close(entry, var);
55 edbus_message_iter_container_close(array, entry); 55 eldbus_message_iter_container_close(array, entry);
56} 56}
57 57
58static void 58static void
59_get_capabilities_cb(void *data EINA_UNUSED, 59_get_capabilities_cb(void *data EINA_UNUSED,
60 const EDBus_Message *msg, 60 const Eldbus_Message *msg,
61 EDBus_Pending *pending EINA_UNUSED) 61 Eldbus_Pending *pending EINA_UNUSED)
62{ 62{
63 char *val; 63 char *val;
64 EDBus_Message_Iter *arr; 64 Eldbus_Message_Iter *arr;
65 65
66 if (edbus_message_error_get(msg, NULL, NULL) || 66 if (eldbus_message_error_get(msg, NULL, NULL) ||
67 !edbus_message_arguments_get(msg, "as", &arr)) goto end; 67 !eldbus_message_arguments_get(msg, "as", &arr)) goto end;
68 68
69 while(edbus_message_iter_get_and_next(arr, 's', &val)) 69 while(eldbus_message_iter_get_and_next(arr, 's', &val))
70 if (!strcmp(val, "body-markup")) 70 if (!strcmp(val, "body-markup"))
71 { 71 {
72 _has_markup = EINA_TRUE; 72 _has_markup = EINA_TRUE;
@@ -82,24 +82,24 @@ _elm_sys_notify_capabilities_get(void)
82{ 82{
83 EINA_SAFETY_ON_NULL_RETURN(_elm_sysnotif_proxy); 83 EINA_SAFETY_ON_NULL_RETURN(_elm_sysnotif_proxy);
84 84
85 if (!edbus_proxy_call(_elm_sysnotif_proxy, "GetCapabilities", 85 if (!eldbus_proxy_call(_elm_sysnotif_proxy, "GetCapabilities",
86 _get_capabilities_cb, NULL, -1, "")) 86 _get_capabilities_cb, NULL, -1, ""))
87 ERR("Error sending message: "INTERFACE".GetCapabilities."); 87 ERR("Error sending message: "INTERFACE".GetCapabilities.");
88} 88}
89 89
90static void 90static void
91_close_notification_cb(void *data EINA_UNUSED, 91_close_notification_cb(void *data EINA_UNUSED,
92 const EDBus_Message *msg, 92 const Eldbus_Message *msg,
93 EDBus_Pending *pending EINA_UNUSED) 93 Eldbus_Pending *pending EINA_UNUSED)
94{ 94{
95 const char *errname, *errmsg; 95 const char *errname, *errmsg;
96 96
97 if (edbus_message_error_get(msg, &errname, &errmsg)) 97 if (eldbus_message_error_get(msg, &errname, &errmsg))
98 { 98 {
99 if (errmsg && errmsg[0] == '\0') 99 if (errmsg && errmsg[0] == '\0')
100 INF("Notification no longer exists."); 100 INF("Notification no longer exists.");
101 else 101 else
102 ERR("Edbus Error: %s %s", errname, errmsg); 102 ERR("Eldbus Error: %s %s", errname, errmsg);
103 } 103 }
104} 104}
105#endif 105#endif
@@ -107,11 +107,11 @@ _close_notification_cb(void *data EINA_UNUSED,
107EAPI void 107EAPI void
108elm_sys_notify_close(unsigned int id) 108elm_sys_notify_close(unsigned int id)
109{ 109{
110#ifdef ELM_EDBUS2 110#ifdef ELM_ELDBUS
111 EINA_SAFETY_ON_FALSE_RETURN(_elm_need_sys_notify); 111 EINA_SAFETY_ON_FALSE_RETURN(_elm_need_sys_notify);
112 EINA_SAFETY_ON_NULL_RETURN(_elm_sysnotif_proxy); 112 EINA_SAFETY_ON_NULL_RETURN(_elm_sysnotif_proxy);
113 113
114 if (!edbus_proxy_call(_elm_sysnotif_proxy, "CloseNotification", 114 if (!eldbus_proxy_call(_elm_sysnotif_proxy, "CloseNotification",
115 _close_notification_cb, NULL, -1, "u", id)) 115 _close_notification_cb, NULL, -1, "u", id))
116 ERR("Error sending message: "INTERFACE".CloseNotification."); 116 ERR("Error sending message: "INTERFACE".CloseNotification.");
117#else 117#else
@@ -119,19 +119,19 @@ elm_sys_notify_close(unsigned int id)
119#endif 119#endif
120} 120}
121 121
122#ifdef ELM_EDBUS2 122#ifdef ELM_ELDBUS
123static void 123static void
124_notify_cb(void *data, 124_notify_cb(void *data,
125 const EDBus_Message *msg, 125 const Eldbus_Message *msg,
126 EDBus_Pending *pending EINA_UNUSED) 126 Eldbus_Pending *pending EINA_UNUSED)
127{ 127{
128 const char *errname, *errmsg; 128 const char *errname, *errmsg;
129 Elm_Sys_Notify_Send_Data *d = data; 129 Elm_Sys_Notify_Send_Data *d = data;
130 unsigned int id = 0; 130 unsigned int id = 0;
131 131
132 if (edbus_message_error_get(msg, &errname, &errmsg)) 132 if (eldbus_message_error_get(msg, &errname, &errmsg))
133 ERR("Error: %s %s", errname, errmsg); 133 ERR("Error: %s %s", errname, errmsg);
134 else if (!edbus_message_arguments_get(msg, "u", &id)) 134 else if (!eldbus_message_arguments_get(msg, "u", &id))
135 { 135 {
136 ERR("Error getting return values of "INTERFACE".Notify."); 136 ERR("Error getting return values of "INTERFACE".Notify.");
137 id = 0; 137 id = 0;
@@ -148,9 +148,9 @@ elm_sys_notify_send(unsigned int replaces_id, const char *icon,
148 Elm_Sys_Notify_Urgency urgency, int timeout, 148 Elm_Sys_Notify_Urgency urgency, int timeout,
149 Elm_Sys_Notify_Send_Cb cb, const void *cb_data) 149 Elm_Sys_Notify_Send_Cb cb, const void *cb_data)
150{ 150{
151#ifdef ELM_EDBUS2 151#ifdef ELM_ELDBUS
152 EDBus_Message *msg; 152 Eldbus_Message *msg;
153 EDBus_Message_Iter *iter, *actions, *hints; 153 Eldbus_Message_Iter *iter, *actions, *hints;
154 Elm_Sys_Notify_Send_Data *data; 154 Elm_Sys_Notify_Send_Data *data;
155 char *body_free = NULL; 155 char *body_free = NULL;
156 char *desk_free = NULL; 156 char *desk_free = NULL;
@@ -172,16 +172,16 @@ elm_sys_notify_send(unsigned int replaces_id, const char *icon,
172 else if (!_has_markup) 172 else if (!_has_markup)
173 body = body_free = elm_entry_markup_to_utf8(body); 173 body = body_free = elm_entry_markup_to_utf8(body);
174 174
175 msg = edbus_proxy_method_call_new(_elm_sysnotif_proxy, "Notify"); 175 msg = eldbus_proxy_method_call_new(_elm_sysnotif_proxy, "Notify");
176 176
177 iter = edbus_message_iter_get(msg); 177 iter = eldbus_message_iter_get(msg);
178 edbus_message_iter_arguments_append(iter, "susssas", appname, replaces_id, 178 eldbus_message_iter_arguments_append(iter, "susssas", appname, replaces_id,
179 icon, summary, body, &actions); 179 icon, summary, body, &actions);
180 /* actions */ 180 /* actions */
181 edbus_message_iter_container_close(iter, actions); 181 eldbus_message_iter_container_close(iter, actions);
182 182
183 /* hints */ 183 /* hints */
184 edbus_message_iter_arguments_append(iter, "a{sv}", &hints); 184 eldbus_message_iter_arguments_append(iter, "a{sv}", &hints);
185 _elm_sys_notify_marshal_dict_byte(hints, "urgency", (char) urgency); 185 _elm_sys_notify_marshal_dict_byte(hints, "urgency", (char) urgency);
186 186
187 if (strcmp(deskentry, "")) 187 if (strcmp(deskentry, ""))
@@ -190,12 +190,12 @@ elm_sys_notify_send(unsigned int replaces_id, const char *icon,
190 deskentry = desk_free = ecore_file_strip_ext(deskentry); 190 deskentry = desk_free = ecore_file_strip_ext(deskentry);
191 _elm_sys_notify_marshal_dict_string(hints, "desktop_entry", deskentry); 191 _elm_sys_notify_marshal_dict_string(hints, "desktop_entry", deskentry);
192 } 192 }
193 edbus_message_iter_container_close(iter, hints); 193 eldbus_message_iter_container_close(iter, hints);
194 194
195 /* timeout */ 195 /* timeout */
196 edbus_message_iter_arguments_append(iter, "i", timeout); 196 eldbus_message_iter_arguments_append(iter, "i", timeout);
197 197
198 edbus_proxy_send(_elm_sysnotif_proxy, msg, _notify_cb, data, -1); 198 eldbus_proxy_send(_elm_sysnotif_proxy, msg, _notify_cb, data, -1);
199 free(desk_free); 199 free(desk_free);
200 free(body_free); 200 free(body_free);
201 return; 201 return;
@@ -212,24 +212,24 @@ error:
212 if (cb) cb((void *)cb_data, 0); 212 if (cb) cb((void *)cb_data, 0);
213} 213}
214 214
215#ifdef ELM_EDBUS2 215#ifdef ELM_ELDBUS
216static void 216static void
217_on_notification_closed(void *data EINA_UNUSED, 217_on_notification_closed(void *data EINA_UNUSED,
218 const EDBus_Message *msg) 218 const Eldbus_Message *msg)
219{ 219{
220 const char *errname; 220 const char *errname;
221 const char *errmsg; 221 const char *errmsg;
222 Elm_Sys_Notify_Notification_Closed *d; 222 Elm_Sys_Notify_Notification_Closed *d;
223 223
224 if (edbus_message_error_get(msg, &errname, &errmsg)) 224 if (eldbus_message_error_get(msg, &errname, &errmsg))
225 { 225 {
226 ERR("Edbus Error: %s %s", errname, errmsg); 226 ERR("Eldbus Error: %s %s", errname, errmsg);
227 return; 227 return;
228 } 228 }
229 229
230 d = malloc(sizeof(*d)); 230 d = malloc(sizeof(*d));
231 231
232 if (!edbus_message_arguments_get(msg, "uu", &(d->id), &(d->reason))) 232 if (!eldbus_message_arguments_get(msg, "uu", &(d->id), &(d->reason)))
233 { 233 {
234 ERR("Error processing signal: "INTERFACE".NotificationClosed."); 234 ERR("Error processing signal: "INTERFACE".NotificationClosed.");
235 goto cleanup; 235 goto cleanup;
@@ -256,22 +256,22 @@ _ev_action_invoked_free(void *data EINA_UNUSED,
256 256
257static void 257static void
258_on_action_invoked(void *data EINA_UNUSED, 258_on_action_invoked(void *data EINA_UNUSED,
259 const EDBus_Message *msg) 259 const Eldbus_Message *msg)
260{ 260{
261 const char *errname; 261 const char *errname;
262 const char *aux; 262 const char *aux;
263 263
264 Elm_Sys_Notify_Action_Invoked *d; 264 Elm_Sys_Notify_Action_Invoked *d;
265 265
266 if (edbus_message_error_get(msg, &errname, &aux)) 266 if (eldbus_message_error_get(msg, &errname, &aux))
267 { 267 {
268 ERR("Edbus Error: %s %s", errname, aux); 268 ERR("Eldbus Error: %s %s", errname, aux);
269 return; 269 return;
270 } 270 }
271 271
272 d = malloc(sizeof(*d)); 272 d = malloc(sizeof(*d));
273 273
274 if (!edbus_message_arguments_get(msg, "us", &(d->id), &aux)) 274 if (!eldbus_message_arguments_get(msg, "us", &(d->id), &aux))
275 { 275 {
276 ERR("Error processing signal: "INTERFACE".ActionInvoked."); 276 ERR("Error processing signal: "INTERFACE".ActionInvoked.");
277 goto cleanup; 277 goto cleanup;
@@ -294,13 +294,13 @@ _release(void)
294{ 294{
295 if (_elm_sysnotif_proxy) 295 if (_elm_sysnotif_proxy)
296 { 296 {
297 edbus_proxy_unref(_elm_sysnotif_proxy); 297 eldbus_proxy_unref(_elm_sysnotif_proxy);
298 _elm_sysnotif_proxy = NULL; 298 _elm_sysnotif_proxy = NULL;
299 } 299 }
300 300
301 if (_elm_sysnotif_obj) 301 if (_elm_sysnotif_obj)
302 { 302 {
303 edbus_object_unref(_elm_sysnotif_obj); 303 eldbus_object_unref(_elm_sysnotif_obj);
304 _elm_sysnotif_obj = NULL; 304 _elm_sysnotif_obj = NULL;
305 } 305 }
306} 306}
@@ -309,26 +309,26 @@ static void
309_update(void) 309_update(void)
310{ 310{
311 _release(); 311 _release();
312 _elm_sysnotif_obj = edbus_object_get(_elm_sysnotif_conn, BUS, OBJ); 312 _elm_sysnotif_obj = eldbus_object_get(_elm_sysnotif_conn, BUS, OBJ);
313 _elm_sysnotif_proxy = edbus_proxy_get(_elm_sysnotif_obj, INTERFACE); 313 _elm_sysnotif_proxy = eldbus_proxy_get(_elm_sysnotif_obj, INTERFACE);
314 _elm_sys_notify_capabilities_get(); 314 _elm_sys_notify_capabilities_get();
315 315
316 edbus_proxy_signal_handler_add(_elm_sysnotif_proxy, "NotificationClosed", 316 eldbus_proxy_signal_handler_add(_elm_sysnotif_proxy, "NotificationClosed",
317 _on_notification_closed, NULL); 317 _on_notification_closed, NULL);
318 318
319 edbus_proxy_signal_handler_add(_elm_sysnotif_proxy, "ActionInvoked", 319 eldbus_proxy_signal_handler_add(_elm_sysnotif_proxy, "ActionInvoked",
320 _on_action_invoked, NULL); 320 _on_action_invoked, NULL);
321} 321}
322 322
323static void 323static void
324_name_owner_get_cb(void *data EINA_UNUSED, 324_name_owner_get_cb(void *data EINA_UNUSED,
325 const EDBus_Message *msg, 325 const Eldbus_Message *msg,
326 EDBus_Pending *pending EINA_UNUSED) 326 Eldbus_Pending *pending EINA_UNUSED)
327{ 327{
328 const char *errname, *errmsg; 328 const char *errname, *errmsg;
329 329
330 if (edbus_message_error_get(msg, &errname, &errmsg)) 330 if (eldbus_message_error_get(msg, &errname, &errmsg))
331 ERR("Edbus Error: %s %s", errname, errmsg); 331 ERR("Eldbus Error: %s %s", errname, errmsg);
332 else 332 else
333 _update(); 333 _update();
334} 334}
@@ -349,10 +349,10 @@ _name_owner_changed_cb(void *data EINA_UNUSED,
349EAPI Eina_Bool 349EAPI Eina_Bool
350elm_need_sys_notify(void) 350elm_need_sys_notify(void)
351{ 351{
352#ifdef ELM_EDBUS2 352#ifdef ELM_ELDBUS
353 if (_elm_need_sys_notify) return EINA_TRUE; 353 if (_elm_need_sys_notify) return EINA_TRUE;
354 354
355 if (!elm_need_edbus()) return EINA_FALSE; 355 if (!elm_need_eldbus()) return EINA_FALSE;
356 356
357 if (!ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED) 357 if (!ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED)
358 ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED = ecore_event_type_new(); 358 ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED = ecore_event_type_new();
@@ -360,13 +360,13 @@ elm_need_sys_notify(void)
360 if (!ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED) 360 if (!ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED)
361 ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED = ecore_event_type_new(); 361 ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED = ecore_event_type_new();
362 362
363 _elm_sysnotif_conn = edbus_connection_get(EDBUS_CONNECTION_TYPE_SESSION); 363 _elm_sysnotif_conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
364 364
365 edbus_name_owner_changed_callback_add(_elm_sysnotif_conn, BUS, 365 eldbus_name_owner_changed_callback_add(_elm_sysnotif_conn, BUS,
366 _name_owner_changed_cb, NULL, 366 _name_owner_changed_cb, NULL,
367 EINA_FALSE); 367 EINA_FALSE);
368 368
369 edbus_name_owner_get(_elm_sysnotif_conn, BUS, _name_owner_get_cb, NULL); 369 eldbus_name_owner_get(_elm_sysnotif_conn, BUS, _name_owner_get_cb, NULL);
370 370
371 _elm_need_sys_notify = EINA_TRUE; 371 _elm_need_sys_notify = EINA_TRUE;
372 372
@@ -379,14 +379,14 @@ elm_need_sys_notify(void)
379void 379void
380_elm_unneed_sys_notify(void) 380_elm_unneed_sys_notify(void)
381{ 381{
382#ifdef ELM_EDBUS2 382#ifdef ELM_ELDBUS
383 if (!_elm_need_sys_notify) return; 383 if (!_elm_need_sys_notify) return;
384 384
385 _elm_need_sys_notify = EINA_FALSE; 385 _elm_need_sys_notify = EINA_FALSE;
386 386
387 _release(); 387 _release();
388 388
389 edbus_connection_unref(_elm_sysnotif_conn); 389 eldbus_connection_unref(_elm_sysnotif_conn);
390 _elm_sysnotif_conn = NULL; 390 _elm_sysnotif_conn = NULL;
391#endif 391#endif
392} 392}
diff --git a/src/lib/elm_systray.c b/src/lib/elm_systray.c
index 321b94734..b742ef51f 100644
--- a/src/lib/elm_systray.c
+++ b/src/lib/elm_systray.c
@@ -35,15 +35,15 @@ static Elm_Systray_Private_Data _item = {
35 .menu_obj = NULL 35 .menu_obj = NULL
36}; 36};
37 37
38#ifdef ELM_EDBUS2 38#ifdef ELM_ELDBUS
39 39
40#define OBJ_PATH "/org/ayatana/NotificationItem/StatusNotifierItem" 40#define OBJ_PATH "/org/ayatana/NotificationItem/StatusNotifierItem"
41#define INTERFACE "org.kde.StatusNotifierItem" 41#define INTERFACE "org.kde.StatusNotifierItem"
42 42
43static Eina_Bool _elm_need_systray = EINA_FALSE; 43static Eina_Bool _elm_need_systray = EINA_FALSE;
44 44
45static EDBus_Connection *_conn = NULL; 45static Eldbus_Connection *_conn = NULL;
46static EDBus_Service_Interface *_iface = NULL; 46static Eldbus_Service_Interface *_iface = NULL;
47 47
48static const char *_Elm_Systray_Cat_Str[] = { 48static const char *_Elm_Systray_Cat_Str[] = {
49 [ELM_SYSTRAY_CATEGORY_APP_STATUS] = "ApplicationStatus", 49 [ELM_SYSTRAY_CATEGORY_APP_STATUS] = "ApplicationStatus",
@@ -65,31 +65,31 @@ static const char *_Elm_Systray_Status_Str[] = {
65// ============================================================================= 65// =============================================================================
66// Methods 66// Methods
67// ============================================================================= 67// =============================================================================
68static EDBus_Message * 68static Eldbus_Message *
69_empty_method(const EDBus_Service_Interface *iface EINA_UNUSED, 69_empty_method(const Eldbus_Service_Interface *iface EINA_UNUSED,
70 const EDBus_Message *msg) 70 const Eldbus_Message *msg)
71{ 71{
72 return edbus_message_method_return_new(msg); 72 return eldbus_message_method_return_new(msg);
73} 73}
74 74
75static const EDBus_Method methods[] = { 75static const Eldbus_Method methods[] = {
76 { 76 {
77 "Scroll", 77 "Scroll",
78 EDBUS_ARGS({"i", "delta"}, {"s", "orientation"}), 78 ELDBUS_ARGS({"i", "delta"}, {"s", "orientation"}),
79 NULL, 79 NULL,
80 _empty_method, 80 _empty_method,
81 0 81 0
82 }, 82 },
83 { 83 {
84 "SecondaryActivate", 84 "SecondaryActivate",
85 EDBUS_ARGS({"i", "x"}, {"i", "y"}), 85 ELDBUS_ARGS({"i", "x"}, {"i", "y"}),
86 NULL, 86 NULL,
87 _empty_method, 87 _empty_method,
88 0 88 0
89 }, 89 },
90 { 90 {
91 "XAyatanaSecondaryActivate", 91 "XAyatanaSecondaryActivate",
92 EDBUS_ARGS({"u", "timestamp"}), 92 ELDBUS_ARGS({"u", "timestamp"}),
93 NULL, 93 NULL,
94 _empty_method, 94 _empty_method,
95 0 95 0
@@ -111,9 +111,9 @@ typedef enum _Elm_Systray_Service_Signals
111} Elm_Systray_Service_Signals; 111} Elm_Systray_Service_Signals;
112 112
113#define _elm_systray_signal_emit(sig, ...) \ 113#define _elm_systray_signal_emit(sig, ...) \
114 edbus_service_signal_emit(_iface, sig, __VA_ARGS__) 114 eldbus_service_signal_emit(_iface, sig, __VA_ARGS__)
115 115
116static const EDBus_Signal signals[] = { 116static const Eldbus_Signal signals[] = {
117 [ELM_SYSTRAY_SIGNAL_NEWATTENTIONICON] = { 117 [ELM_SYSTRAY_SIGNAL_NEWATTENTIONICON] = {
118 "NewAttentionIcon", NULL, 0 118 "NewAttentionIcon", NULL, 0
119 }, 119 },
@@ -121,16 +121,16 @@ static const EDBus_Signal signals[] = {
121 "NewIcon", NULL, 0 121 "NewIcon", NULL, 0
122 }, 122 },
123 [ELM_SYSTRAY_SIGNAL_NEWICONTHEMEPATH] = { 123 [ELM_SYSTRAY_SIGNAL_NEWICONTHEMEPATH] = {
124 "NewIconThemePath", EDBUS_ARGS({"s", "icon_theme_path"}), 0 124 "NewIconThemePath", ELDBUS_ARGS({"s", "icon_theme_path"}), 0
125 }, 125 },
126 [ELM_SYSTRAY_SIGNAL_NEWSTATUS] = { 126 [ELM_SYSTRAY_SIGNAL_NEWSTATUS] = {
127 "NewStatus", EDBUS_ARGS({"s", "status"}), 0 127 "NewStatus", ELDBUS_ARGS({"s", "status"}), 0
128 }, 128 },
129 [ELM_SYSTRAY_SIGNAL_NEWTITLE] = { 129 [ELM_SYSTRAY_SIGNAL_NEWTITLE] = {
130 "NewTitle", NULL, 0 130 "NewTitle", NULL, 0
131 }, 131 },
132 [ELM_SYSTRAY_SIGNAL_XAYATANANEWLABEL] = { 132 [ELM_SYSTRAY_SIGNAL_XAYATANANEWLABEL] = {
133 "XAyatanaNewLabel", EDBUS_ARGS({"s", "label"}, {"s", "guide"}), 0 133 "XAyatanaNewLabel", ELDBUS_ARGS({"s", "label"}, {"s", "guide"}), 0
134 }, 134 },
135 { NULL, NULL, 0 } 135 { NULL, NULL, 0 }
136}; 136};
@@ -139,139 +139,139 @@ static const EDBus_Signal signals[] = {
139// Properties 139// Properties
140// ============================================================================= 140// =============================================================================
141static Eina_Bool 141static Eina_Bool
142_prop_str_empty_get(const EDBus_Service_Interface *iface EINA_UNUSED, 142_prop_str_empty_get(const Eldbus_Service_Interface *iface EINA_UNUSED,
143 const char *propname EINA_UNUSED, 143 const char *propname EINA_UNUSED,
144 EDBus_Message_Iter *iter, 144 Eldbus_Message_Iter *iter,
145 const EDBus_Message *request_msg EINA_UNUSED, 145 const Eldbus_Message *request_msg EINA_UNUSED,
146 EDBus_Message **error EINA_UNUSED) 146 Eldbus_Message **error EINA_UNUSED)
147{ 147{
148 edbus_message_iter_basic_append(iter, 's', ""); 148 eldbus_message_iter_basic_append(iter, 's', "");
149 149
150 return EINA_TRUE; 150 return EINA_TRUE;
151} 151}
152 152
153static Eina_Bool 153static Eina_Bool
154_prop_attention_icon_name_get(const EDBus_Service_Interface *iface EINA_UNUSED, 154_prop_attention_icon_name_get(const Eldbus_Service_Interface *iface EINA_UNUSED,
155 const char *propname EINA_UNUSED, 155 const char *propname EINA_UNUSED,
156 EDBus_Message_Iter *iter, 156 Eldbus_Message_Iter *iter,
157 const EDBus_Message *request_msg EINA_UNUSED, 157 const Eldbus_Message *request_msg EINA_UNUSED,
158 EDBus_Message **error EINA_UNUSED) 158 Eldbus_Message **error EINA_UNUSED)
159{ 159{
160 const char *s = _item.att_icon_name ? _item.att_icon_name : ""; 160 const char *s = _item.att_icon_name ? _item.att_icon_name : "";
161 161
162 edbus_message_iter_basic_append(iter, 's', s); 162 eldbus_message_iter_basic_append(iter, 's', s);
163 163
164 return EINA_TRUE; 164 return EINA_TRUE;
165} 165}
166 166
167static Eina_Bool 167static Eina_Bool
168_prop_category_get(const EDBus_Service_Interface *iface EINA_UNUSED, 168_prop_category_get(const Eldbus_Service_Interface *iface EINA_UNUSED,
169 const char *propname EINA_UNUSED, 169 const char *propname EINA_UNUSED,
170 EDBus_Message_Iter *iter, 170 Eldbus_Message_Iter *iter,
171 const EDBus_Message *request_msg EINA_UNUSED, 171 const Eldbus_Message *request_msg EINA_UNUSED,
172 EDBus_Message **error EINA_UNUSED) 172 Eldbus_Message **error EINA_UNUSED)
173{ 173{
174 edbus_message_iter_basic_append(iter, 's', _Elm_Systray_Cat_Str[_item.cat]); 174 eldbus_message_iter_basic_append(iter, 's', _Elm_Systray_Cat_Str[_item.cat]);
175 175
176 return EINA_TRUE; 176 return EINA_TRUE;
177} 177}
178 178
179static Eina_Bool 179static Eina_Bool
180_prop_icon_name_get(const EDBus_Service_Interface *iface EINA_UNUSED, 180_prop_icon_name_get(const Eldbus_Service_Interface *iface EINA_UNUSED,
181 const char *propname EINA_UNUSED, 181 const char *propname EINA_UNUSED,
182 EDBus_Message_Iter *iter, 182 Eldbus_Message_Iter *iter,
183 const EDBus_Message *request_msg EINA_UNUSED, 183 const Eldbus_Message *request_msg EINA_UNUSED,
184 EDBus_Message **error EINA_UNUSED) 184 Eldbus_Message **error EINA_UNUSED)
185{ 185{
186 const char *s = _item.icon_name ? _item.icon_name : ""; 186 const char *s = _item.icon_name ? _item.icon_name : "";
187 187
188 edbus_message_iter_basic_append(iter, 's', s); 188 eldbus_message_iter_basic_append(iter, 's', s);
189 189
190 return EINA_TRUE; 190 return EINA_TRUE;
191} 191}
192 192
193static Eina_Bool 193static Eina_Bool
194_prop_icon_theme_path_get(const EDBus_Service_Interface *iface EINA_UNUSED, 194_prop_icon_theme_path_get(const Eldbus_Service_Interface *iface EINA_UNUSED,
195 const char *propname EINA_UNUSED, 195 const char *propname EINA_UNUSED,
196 EDBus_Message_Iter *iter, 196 Eldbus_Message_Iter *iter,
197 const EDBus_Message *request_msg EINA_UNUSED, 197 const Eldbus_Message *request_msg EINA_UNUSED,
198 EDBus_Message **error EINA_UNUSED) 198 Eldbus_Message **error EINA_UNUSED)
199{ 199{
200 const char *s = _item.icon_theme_path ? _item.icon_theme_path : ""; 200 const char *s = _item.icon_theme_path ? _item.icon_theme_path : "";
201 201
202 edbus_message_iter_basic_append(iter, 's', s); 202 eldbus_message_iter_basic_append(iter, 's', s);
203 203
204 return EINA_TRUE; 204 return EINA_TRUE;
205} 205}
206 206
207static Eina_Bool 207static Eina_Bool
208_prop_id_get(const EDBus_Service_Interface *iface EINA_UNUSED, 208_prop_id_get(const Eldbus_Service_Interface *iface EINA_UNUSED,
209 const char *propname EINA_UNUSED, 209 const char *propname EINA_UNUSED,
210 EDBus_Message_Iter *iter, 210 Eldbus_Message_Iter *iter,
211 const EDBus_Message *request_msg EINA_UNUSED, 211 const Eldbus_Message *request_msg EINA_UNUSED,
212 EDBus_Message **error EINA_UNUSED) 212 Eldbus_Message **error EINA_UNUSED)
213{ 213{
214 const char *s = _item.id ? _item.id : ""; 214 const char *s = _item.id ? _item.id : "";
215 215
216 edbus_message_iter_basic_append(iter, 's', s); 216 eldbus_message_iter_basic_append(iter, 's', s);
217 217
218 return EINA_TRUE; 218 return EINA_TRUE;
219} 219}
220 220
221static Eina_Bool 221static Eina_Bool
222_prop_menu_get(const EDBus_Service_Interface *iface EINA_UNUSED, 222_prop_menu_get(const Eldbus_Service_Interface *iface EINA_UNUSED,
223 const char *propname EINA_UNUSED, 223 const char *propname EINA_UNUSED,
224 EDBus_Message_Iter *iter, 224 Eldbus_Message_Iter *iter,
225 const EDBus_Message *request_msg EINA_UNUSED, 225 const Eldbus_Message *request_msg EINA_UNUSED,
226 EDBus_Message **error EINA_UNUSED) 226 Eldbus_Message **error EINA_UNUSED)
227{ 227{
228 const char *s = _item.menu ? _item.menu : "/"; 228 const char *s = _item.menu ? _item.menu : "/";
229 229
230 edbus_message_iter_basic_append(iter, 'o', s); 230 eldbus_message_iter_basic_append(iter, 'o', s);
231 231
232 return EINA_TRUE; 232 return EINA_TRUE;
233} 233}
234 234
235static Eina_Bool 235static Eina_Bool
236_prop_status_get(const EDBus_Service_Interface *iface EINA_UNUSED, 236_prop_status_get(const Eldbus_Service_Interface *iface EINA_UNUSED,
237 const char *propname EINA_UNUSED, 237 const char *propname EINA_UNUSED,
238 EDBus_Message_Iter *iter, 238 Eldbus_Message_Iter *iter,
239 const EDBus_Message *request_msg EINA_UNUSED, 239 const Eldbus_Message *request_msg EINA_UNUSED,
240 EDBus_Message **error EINA_UNUSED) 240 Eldbus_Message **error EINA_UNUSED)
241{ 241{
242 edbus_message_iter_basic_append(iter, 's', 242 eldbus_message_iter_basic_append(iter, 's',
243 _Elm_Systray_Status_Str[_item.status]); 243 _Elm_Systray_Status_Str[_item.status]);
244 244
245 return EINA_TRUE; 245 return EINA_TRUE;
246} 246}
247 247
248static Eina_Bool 248static Eina_Bool
249_prop_title_get(const EDBus_Service_Interface *iface EINA_UNUSED, 249_prop_title_get(const Eldbus_Service_Interface *iface EINA_UNUSED,
250 const char *propname EINA_UNUSED, 250 const char *propname EINA_UNUSED,
251 EDBus_Message_Iter *iter, 251 Eldbus_Message_Iter *iter,
252 const EDBus_Message *request_msg EINA_UNUSED, 252 const Eldbus_Message *request_msg EINA_UNUSED,
253 EDBus_Message **error EINA_UNUSED) 253 Eldbus_Message **error EINA_UNUSED)
254{ 254{
255 const char *s = _item.title ? _item.title : ""; 255 const char *s = _item.title ? _item.title : "";
256 256
257 edbus_message_iter_basic_append(iter, 's', s); 257 eldbus_message_iter_basic_append(iter, 's', s);
258 258
259 return EINA_TRUE; 259 return EINA_TRUE;
260} 260}
261 261
262static Eina_Bool 262static Eina_Bool
263_prop_xayatana_orderindex_get(const EDBus_Service_Interface *iface EINA_UNUSED, 263_prop_xayatana_orderindex_get(const Eldbus_Service_Interface *iface EINA_UNUSED,
264 const char *propname EINA_UNUSED, 264 const char *propname EINA_UNUSED,
265 EDBus_Message_Iter *iter, 265 Eldbus_Message_Iter *iter,
266 const EDBus_Message *request_msg EINA_UNUSED, 266 const Eldbus_Message *request_msg EINA_UNUSED,
267 EDBus_Message **error EINA_UNUSED) 267 Eldbus_Message **error EINA_UNUSED)
268{ 268{
269 edbus_message_iter_basic_append(iter, 'u', 0); 269 eldbus_message_iter_basic_append(iter, 'u', 0);
270 270
271 return EINA_TRUE; 271 return EINA_TRUE;
272} 272}
273 273
274static const EDBus_Property properties[] = { 274static const Eldbus_Property properties[] = {
275 { "AttentionAcessibleDesc", "s", _prop_str_empty_get, NULL, 0 }, 275 { "AttentionAcessibleDesc", "s", _prop_str_empty_get, NULL, 0 },
276 { "AttentionIconName", "s", _prop_attention_icon_name_get, NULL, 0 }, 276 { "AttentionIconName", "s", _prop_attention_icon_name_get, NULL, 0 },
277 { "Category", "s", _prop_category_get, NULL, 0 }, 277 { "Category", "s", _prop_category_get, NULL, 0 },
@@ -288,7 +288,7 @@ static const EDBus_Property properties[] = {
288 { NULL, NULL, NULL, NULL, 0 } 288 { NULL, NULL, NULL, NULL, 0 }
289}; 289};
290 290
291static const EDBus_Service_Interface_Desc _iface_desc = { 291static const Eldbus_Service_Interface_Desc _iface_desc = {
292 INTERFACE, methods, signals, properties, NULL, NULL 292 INTERFACE, methods, signals, properties, NULL, NULL
293}; 293};
294#endif 294#endif
@@ -304,8 +304,8 @@ _menu_died(void *data EINA_UNUSED,
304 304
305 eina_stringshare_replace(&(_item.menu), NULL); 305 eina_stringshare_replace(&(_item.menu), NULL);
306 306
307#ifdef ELM_EDBUS2 307#ifdef ELM_ELDBUS
308 edbus_service_property_changed(_iface, "Menu"); 308 eldbus_service_property_changed(_iface, "Menu");
309#endif 309#endif
310} 310}
311 311
@@ -317,8 +317,8 @@ _category_set(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args)
317 if (_item.cat == cat) return; 317 if (_item.cat == cat) return;
318 318
319 _item.cat = cat; 319 _item.cat = cat;
320#ifdef ELM_EDBUS2 320#ifdef ELM_ELDBUS
321 edbus_service_property_changed(_iface, "Category"); 321 eldbus_service_property_changed(_iface, "Category");
322#endif 322#endif
323} 323}
324 324
@@ -338,8 +338,8 @@ _status_set(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args)
338 if (_item.status == st) return; 338 if (_item.status == st) return;
339 339
340 _item.status = st; 340 _item.status = st;
341#ifdef ELM_EDBUS2 341#ifdef ELM_ELDBUS
342 edbus_service_property_changed(_iface, "Status"); 342 eldbus_service_property_changed(_iface, "Status");
343 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWSTATUS, 343 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWSTATUS,
344 _Elm_Systray_Status_Str[_item.status]); 344 _Elm_Systray_Status_Str[_item.status]);
345#endif 345#endif
@@ -359,8 +359,8 @@ _att_icon_name_set(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args)
359 359
360 if (!eina_stringshare_replace(&(_item.att_icon_name), att_icon_name)) return; 360 if (!eina_stringshare_replace(&(_item.att_icon_name), att_icon_name)) return;
361 361
362#ifdef ELM_EDBUS2 362#ifdef ELM_ELDBUS
363 edbus_service_property_changed(_iface, "AttentionIconName"); 363 eldbus_service_property_changed(_iface, "AttentionIconName");
364 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWATTENTIONICON, NULL); 364 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWATTENTIONICON, NULL);
365#endif 365#endif
366} 366}
@@ -379,8 +379,8 @@ _icon_name_set(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args)
379 379
380 if (!eina_stringshare_replace(&(_item.icon_name), icon_name)) return; 380 if (!eina_stringshare_replace(&(_item.icon_name), icon_name)) return;
381 381
382#ifdef ELM_EDBUS2 382#ifdef ELM_ELDBUS
383 edbus_service_property_changed(_iface, "IconName"); 383 eldbus_service_property_changed(_iface, "IconName");
384 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWICON, NULL); 384 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWICON, NULL);
385#endif 385#endif
386} 386}
@@ -400,8 +400,8 @@ _icon_theme_path_set(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args)
400 if (!eina_stringshare_replace(&(_item.icon_theme_path), icon_theme_path)) 400 if (!eina_stringshare_replace(&(_item.icon_theme_path), icon_theme_path))
401 return; 401 return;
402 402
403#ifdef ELM_EDBUS2 403#ifdef ELM_ELDBUS
404 edbus_service_property_changed(_iface, "IconThemePath"); 404 eldbus_service_property_changed(_iface, "IconThemePath");
405 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWICONTHEMEPATH, 405 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWICONTHEMEPATH,
406 _item.icon_theme_path); 406 _item.icon_theme_path);
407#endif 407#endif
@@ -421,8 +421,8 @@ _id_set(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args)
421 421
422 if (!eina_stringshare_replace(&(_item.id), id)) return; 422 if (!eina_stringshare_replace(&(_item.id), id)) return;
423 423
424#ifdef ELM_EDBUS2 424#ifdef ELM_ELDBUS
425 edbus_service_property_changed(_iface, "Id"); 425 eldbus_service_property_changed(_iface, "Id");
426#endif 426#endif
427} 427}
428 428
@@ -440,8 +440,8 @@ _title_set(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args)
440 440
441 if (!eina_stringshare_replace(&(_item.title), title)) return; 441 if (!eina_stringshare_replace(&(_item.title), title)) return;
442 442
443#ifdef ELM_EDBUS2 443#ifdef ELM_ELDBUS
444 edbus_service_property_changed(_iface, "Title"); 444 eldbus_service_property_changed(_iface, "Title");
445 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWTITLE, NULL); 445 _elm_systray_signal_emit(ELM_SYSTRAY_SIGNAL_NEWTITLE, NULL);
446#endif 446#endif
447} 447}
@@ -476,8 +476,8 @@ _menu_set(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args)
476 476
477 _item.menu_obj = menu_obj; 477 _item.menu_obj = menu_obj;
478 478
479#ifdef ELM_EDBUS2 479#ifdef ELM_ELDBUS
480 edbus_service_property_changed(_iface, "Menu"); 480 eldbus_service_property_changed(_iface, "Menu");
481#endif 481#endif
482} 482}
483 483
@@ -492,7 +492,7 @@ static void
492_register(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args) 492_register(Eo *obj EINA_UNUSED, void *priv EINA_UNUSED, va_list *args)
493{ 493{
494 Eina_Bool *ret = va_arg(*args, Eina_Bool *); 494 Eina_Bool *ret = va_arg(*args, Eina_Bool *);
495#ifdef ELM_EDBUS2 495#ifdef ELM_ELDBUS
496 if (!_elm_need_systray) goto err; 496 if (!_elm_need_systray) goto err;
497 497
498 *ret = _elm_systray_watcher_status_notifier_item_register(OBJ_PATH); 498 *ret = _elm_systray_watcher_status_notifier_item_register(OBJ_PATH);
@@ -506,20 +506,20 @@ err:
506EAPI Eina_Bool 506EAPI Eina_Bool
507elm_need_systray(void) 507elm_need_systray(void)
508{ 508{
509#ifdef ELM_EDBUS2 509#ifdef ELM_ELDBUS
510 if (_elm_need_systray) return EINA_TRUE; 510 if (_elm_need_systray) return EINA_TRUE;
511 511
512 if (!elm_need_edbus()) return EINA_FALSE; 512 if (!elm_need_eldbus()) return EINA_FALSE;
513 513
514 if (!ELM_EVENT_SYSTRAY_READY) 514 if (!ELM_EVENT_SYSTRAY_READY)
515 ELM_EVENT_SYSTRAY_READY = ecore_event_type_new(); 515 ELM_EVENT_SYSTRAY_READY = ecore_event_type_new();
516 516
517 if (!_elm_systray_watcher_init()) return EINA_FALSE; 517 if (!_elm_systray_watcher_init()) return EINA_FALSE;
518 518
519 _conn = edbus_connection_get(EDBUS_CONNECTION_TYPE_SESSION); 519 _conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
520 if (!_conn) goto err; 520 if (!_conn) goto err;
521 521
522 _iface = edbus_service_interface_register(_conn, OBJ_PATH, &_iface_desc); 522 _iface = eldbus_service_interface_register(_conn, OBJ_PATH, &_iface_desc);
523 if (!_iface) goto err; 523 if (!_iface) goto err;
524 524
525 _elm_need_systray = EINA_TRUE; 525 _elm_need_systray = EINA_TRUE;
@@ -528,7 +528,7 @@ elm_need_systray(void)
528err: 528err:
529 if (_conn) 529 if (_conn)
530 { 530 {
531 edbus_connection_unref(_conn); 531 eldbus_connection_unref(_conn);
532 _conn = NULL; 532 _conn = NULL;
533 } 533 }
534 534
@@ -540,14 +540,14 @@ err:
540void 540void
541_elm_unneed_systray(void) 541_elm_unneed_systray(void)
542{ 542{
543#ifdef ELM_EDBUS2 543#ifdef ELM_ELDBUS
544 if (!_elm_need_systray) return; 544 if (!_elm_need_systray) return;
545 545
546 _elm_need_systray = EINA_FALSE; 546 _elm_need_systray = EINA_FALSE;
547 547
548 edbus_service_interface_unregister(_iface); 548 eldbus_service_interface_unregister(_iface);
549 549
550 edbus_connection_unref(_conn); 550 eldbus_connection_unref(_conn);
551 551
552 _elm_systray_watcher_shutdown(); 552 _elm_systray_watcher_shutdown();
553 553
diff --git a/src/lib/elm_systray_watcher.c b/src/lib/elm_systray_watcher.c
index 196381ec9..a602908a9 100644
--- a/src/lib/elm_systray_watcher.c
+++ b/src/lib/elm_systray_watcher.c
@@ -3,37 +3,37 @@
3 3
4#include "elm_systray_watcher.h" 4#include "elm_systray_watcher.h"
5 5
6#ifdef ELM_EDBUS2 6#ifdef ELM_ELDBUS
7#define OBJ "/StatusNotifierWatcher" 7#define OBJ "/StatusNotifierWatcher"
8#define BUS "org.kde.StatusNotifierWatcher" 8#define BUS "org.kde.StatusNotifierWatcher"
9#define INTERFACE "org.kde.StatusNotifierWatcher" 9#define INTERFACE "org.kde.StatusNotifierWatcher"
10 10
11static Eina_Bool _elm_systray_watcher = EINA_FALSE; 11static Eina_Bool _elm_systray_watcher = EINA_FALSE;
12 12
13static EDBus_Connection *_watcher_conn = NULL; 13static Eldbus_Connection *_watcher_conn = NULL;
14static EDBus_Object *_watcher_obj = NULL; 14static Eldbus_Object *_watcher_obj = NULL;
15static EDBus_Proxy *_watcher_proxy = NULL; 15static Eldbus_Proxy *_watcher_proxy = NULL;
16 16
17static void 17static void
18_status_notifier_item_register_cb(void *data EINA_UNUSED, 18_status_notifier_item_register_cb(void *data EINA_UNUSED,
19 const EDBus_Message *msg, 19 const Eldbus_Message *msg,
20 EDBus_Pending *pending EINA_UNUSED) 20 Eldbus_Pending *pending EINA_UNUSED)
21{ 21{
22 const char *errname, *errmsg; 22 const char *errname, *errmsg;
23 23
24 if (edbus_message_error_get(msg, &errname, &errmsg)) 24 if (eldbus_message_error_get(msg, &errname, &errmsg))
25 ERR("Edbus Error: %s %s", errname, errmsg); 25 ERR("Eldbus Error: %s %s", errname, errmsg);
26} 26}
27#endif 27#endif
28 28
29Eina_Bool 29Eina_Bool
30_elm_systray_watcher_status_notifier_item_register(const char *obj) 30_elm_systray_watcher_status_notifier_item_register(const char *obj)
31{ 31{
32#ifdef ELM_EDBUS2 32#ifdef ELM_ELDBUS
33 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE); 33 EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
34 EINA_SAFETY_ON_NULL_RETURN_VAL(_watcher_proxy, EINA_FALSE); 34 EINA_SAFETY_ON_NULL_RETURN_VAL(_watcher_proxy, EINA_FALSE);
35 35
36 if (!edbus_proxy_call(_watcher_proxy, "RegisterStatusNotifierItem", 36 if (!eldbus_proxy_call(_watcher_proxy, "RegisterStatusNotifierItem",
37 _status_notifier_item_register_cb, 37 _status_notifier_item_register_cb,
38 NULL, -1, "s", obj)) 38 NULL, -1, "s", obj))
39 { 39 {
@@ -48,19 +48,19 @@ _elm_systray_watcher_status_notifier_item_register(const char *obj)
48#endif 48#endif
49} 49}
50 50
51#ifdef ELM_EDBUS2 51#ifdef ELM_ELDBUS
52static void 52static void
53_release(void) 53_release(void)
54{ 54{
55 if (_watcher_proxy) 55 if (_watcher_proxy)
56 { 56 {
57 edbus_proxy_unref(_watcher_proxy); 57 eldbus_proxy_unref(_watcher_proxy);
58 _watcher_proxy = NULL; 58 _watcher_proxy = NULL;
59 } 59 }
60 60
61 if (_watcher_obj) 61 if (_watcher_obj)
62 { 62 {
63 edbus_object_unref(_watcher_obj); 63 eldbus_object_unref(_watcher_obj);
64 _watcher_obj = NULL; 64 _watcher_obj = NULL;
65 } 65 }
66} 66}
@@ -70,8 +70,8 @@ _update(void)
70{ 70{
71 _release(); 71 _release();
72 72
73 _watcher_obj = edbus_object_get(_watcher_conn, BUS, OBJ); 73 _watcher_obj = eldbus_object_get(_watcher_conn, BUS, OBJ);
74 _watcher_proxy = edbus_proxy_get(_watcher_obj, INTERFACE); 74 _watcher_proxy = eldbus_proxy_get(_watcher_obj, INTERFACE);
75 75
76 ecore_event_add(ELM_EVENT_SYSTRAY_READY, NULL, NULL, NULL); 76 ecore_event_add(ELM_EVENT_SYSTRAY_READY, NULL, NULL, NULL);
77} 77}
@@ -92,14 +92,14 @@ _name_owner_changed_cb(void *data EINA_UNUSED,
92Eina_Bool 92Eina_Bool
93_elm_systray_watcher_init(void) 93_elm_systray_watcher_init(void)
94{ 94{
95#ifdef ELM_EDBUS2 95#ifdef ELM_ELDBUS
96 if (_elm_systray_watcher) return EINA_TRUE; 96 if (_elm_systray_watcher) return EINA_TRUE;
97 97
98 if (!elm_need_edbus()) return EINA_FALSE; 98 if (!elm_need_eldbus()) return EINA_FALSE;
99 99
100 _watcher_conn = edbus_connection_get(EDBUS_CONNECTION_TYPE_SESSION); 100 _watcher_conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
101 101
102 edbus_name_owner_changed_callback_add(_watcher_conn, BUS, 102 eldbus_name_owner_changed_callback_add(_watcher_conn, BUS,
103 _name_owner_changed_cb, NULL, 103 _name_owner_changed_cb, NULL,
104 EINA_TRUE); 104 EINA_TRUE);
105 105
@@ -113,14 +113,14 @@ _elm_systray_watcher_init(void)
113void 113void
114_elm_systray_watcher_shutdown(void) 114_elm_systray_watcher_shutdown(void)
115{ 115{
116#ifdef ELM_EDBUS2 116#ifdef ELM_ELDBUS
117 if (!_elm_systray_watcher) return; 117 if (!_elm_systray_watcher) return;
118 118
119 _elm_systray_watcher = EINA_FALSE; 119 _elm_systray_watcher = EINA_FALSE;
120 120
121 _release(); 121 _release();
122 122
123 edbus_connection_unref(_watcher_conn); 123 eldbus_connection_unref(_watcher_conn);
124 _watcher_conn = NULL; 124 _watcher_conn = NULL;
125#endif 125#endif
126} 126}
diff --git a/src/modules/access_output/Makefile.am b/src/modules/access_output/Makefile.am
index 04b866d32..e60a859c5 100644
--- a/src/modules/access_output/Makefile.am
+++ b/src/modules/access_output/Makefile.am
@@ -15,7 +15,7 @@ AM_CPPFLAGS = \
15@ELEMENTARY_SDL_CFLAGS@ \ 15@ELEMENTARY_SDL_CFLAGS@ \
16@ELEMENTARY_WIN32_CFLAGS@ \ 16@ELEMENTARY_WIN32_CFLAGS@ \
17@ELEMENTARY_WINCE_CFLAGS@ \ 17@ELEMENTARY_WINCE_CFLAGS@ \
18@ELEMENTARY_EDBUS2_CFLAGS@ \ 18@ELEMENTARY_ELDBUS_CFLAGS@ \
19@ELEMENTARY_EFREET_CFLAGS@ \ 19@ELEMENTARY_EFREET_CFLAGS@ \
20@ELEMENTARY_ELOCATION_CFLAGS@ \ 20@ELEMENTARY_ELOCATION_CFLAGS@ \
21@ELEMENTARY_EWEATHER_CFLAGS@ \ 21@ELEMENTARY_EWEATHER_CFLAGS@ \
diff --git a/src/modules/datetime_input_ctxpopup/Makefile.am b/src/modules/datetime_input_ctxpopup/Makefile.am
index c95fcd8af..83f46e0fa 100644
--- a/src/modules/datetime_input_ctxpopup/Makefile.am
+++ b/src/modules/datetime_input_ctxpopup/Makefile.am
@@ -16,7 +16,7 @@ AM_CPPFLAGS = \
16@ELEMENTARY_SDL_CFLAGS@ \ 16@ELEMENTARY_SDL_CFLAGS@ \
17@ELEMENTARY_WIN32_CFLAGS@ \ 17@ELEMENTARY_WIN32_CFLAGS@ \
18@ELEMENTARY_WINCE_CFLAGS@ \ 18@ELEMENTARY_WINCE_CFLAGS@ \
19@ELEMENTARY_EDBUS2_CFLAGS@ \ 19@ELEMENTARY_ELDBUS_CFLAGS@ \
20@ELEMENTARY_EFREET_CFLAGS@ \ 20@ELEMENTARY_EFREET_CFLAGS@ \
21@ELEMENTARY_ELOCATION_CFLAGS@ \ 21@ELEMENTARY_ELOCATION_CFLAGS@ \
22@ELEMENTARY_EWEATHER_CFLAGS@ \ 22@ELEMENTARY_EWEATHER_CFLAGS@ \
diff --git a/src/modules/prefs/Makefile.am b/src/modules/prefs/Makefile.am
index bcf39ea23..98f33a2f5 100644
--- a/src/modules/prefs/Makefile.am
+++ b/src/modules/prefs/Makefile.am
@@ -32,7 +32,7 @@ AM_CPPFLAGS = \
32@ELEMENTARY_SDL_CFLAGS@ \ 32@ELEMENTARY_SDL_CFLAGS@ \
33@ELEMENTARY_WIN32_CFLAGS@ \ 33@ELEMENTARY_WIN32_CFLAGS@ \
34@ELEMENTARY_WINCE_CFLAGS@ \ 34@ELEMENTARY_WINCE_CFLAGS@ \
35@ELEMENTARY_EDBUS2_CFLAGS@ \ 35@ELEMENTARY_ELDBUS_CFLAGS@ \
36@ELEMENTARY_EFREET_CFLAGS@ \ 36@ELEMENTARY_EFREET_CFLAGS@ \
37@ELEMENTARY_ELOCATION_CFLAGS@ \ 37@ELEMENTARY_ELOCATION_CFLAGS@ \
38@ELEMENTARY_ETHUMB_CFLAGS@ \ 38@ELEMENTARY_ETHUMB_CFLAGS@ \
diff --git a/src/modules/test_entry/Makefile.am b/src/modules/test_entry/Makefile.am
index 6e74d5600..98b64efe2 100644
--- a/src/modules/test_entry/Makefile.am
+++ b/src/modules/test_entry/Makefile.am
@@ -15,7 +15,7 @@ AM_CPPFLAGS = \
15@ELEMENTARY_SDL_CFLAGS@ \ 15@ELEMENTARY_SDL_CFLAGS@ \
16@ELEMENTARY_WIN32_CFLAGS@ \ 16@ELEMENTARY_WIN32_CFLAGS@ \
17@ELEMENTARY_WINCE_CFLAGS@ \ 17@ELEMENTARY_WINCE_CFLAGS@ \
18@ELEMENTARY_EDBUS2_CFLAGS@ \ 18@ELEMENTARY_ELDBUS_CFLAGS@ \
19@ELEMENTARY_EFREET_CFLAGS@ \ 19@ELEMENTARY_EFREET_CFLAGS@ \
20@ELEMENTARY_ELOCATION_CFLAGS@ \ 20@ELEMENTARY_ELOCATION_CFLAGS@ \
21@ELEMENTARY_EWEATHER_CFLAGS@ \ 21@ELEMENTARY_EWEATHER_CFLAGS@ \
diff --git a/src/modules/test_map/Makefile.am b/src/modules/test_map/Makefile.am
index afff4de0c..87fa430b8 100644
--- a/src/modules/test_map/Makefile.am
+++ b/src/modules/test_map/Makefile.am
@@ -15,7 +15,7 @@ AM_CPPFLAGS = \
15@ELEMENTARY_SDL_CFLAGS@ \ 15@ELEMENTARY_SDL_CFLAGS@ \
16@ELEMENTARY_WIN32_CFLAGS@ \ 16@ELEMENTARY_WIN32_CFLAGS@ \
17@ELEMENTARY_WINCE_CFLAGS@ \ 17@ELEMENTARY_WINCE_CFLAGS@ \
18@ELEMENTARY_EDBUS2_CFLAGS@ \ 18@ELEMENTARY_ELDBUS_CFLAGS@ \
19@ELEMENTARY_EFREET_CFLAGS@ \ 19@ELEMENTARY_EFREET_CFLAGS@ \
20@ELEMENTARY_ELOCATION_CFLAGS@ \ 20@ELEMENTARY_ELOCATION_CFLAGS@ \
21@ELEMENTARY_EWEATHER_CFLAGS@ \ 21@ELEMENTARY_EWEATHER_CFLAGS@ \