diff --git a/AUTHORS b/AUTHORS index 44ad2de304..b8f024e5cb 100644 --- a/AUTHORS +++ b/AUTHORS @@ -204,3 +204,12 @@ Mikael SANS Mike Blumenkrantz (zmike/discomfitor) Jérôme Pinot Daniel Willmann + + +EDBus +----- + +Gustavo Sverzut Barbieri +José Roberto de Souza +Leandro Pereira +Lucas De Marchi diff --git a/Makefile.am b/Makefile.am index 33e9e8d202..7c26d2aee2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -94,7 +94,8 @@ pc/ecore-imf.pc \ pc/ecore-imf-evas.pc \ pc/ecore-evas.pc \ pc/embryo.pc \ -pc/eio.pc +pc/eio.pc \ +pc/edbus2.pc pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = @@ -122,7 +123,8 @@ pc/ecore-imf.pc \ pc/ecore-imf-evas.pc \ pc/ecore-evas.pc \ pc/embryo.pc \ -pc/eio.pc +pc/eio.pc \ +pc/edbus2.pc if BUILD_ENGINE_SOFTWARE_X11 pkgconfig_DATA += pc/evas-software-x11.pc diff --git a/configure.ac b/configure.ac index e8ed15dd3f..f8bfbe6b55 100644 --- a/configure.ac +++ b/configure.ac @@ -155,9 +155,9 @@ requirements_libs_ecore_x="" requirements_libs_ecore_evas="" requirements_libs_embryo="" requirements_libs_eio="" +requirements_libs_edbus="" #requirements_libs_edje="" #requirements_libs_efreet="" -#requirements_libs_e_dbus="" #requirements_libs_eeze="" #requirements_libs_emotion="" #requirements_libs_ethumb="" @@ -185,9 +185,9 @@ requirements_pc_ecore_x="" requirements_pc_ecore_evas="" requirements_pc_embryo="" requirements_pc_eio="" +requirements_pc_edbus="" #requirements_pc_edje="" #requirements_pc_efreet="" -#requirements_pc_e_dbus="" #requirements_pc_eeze="" #requirements_pc_emotion="" #requirements_pc_ethumb="" @@ -204,9 +204,9 @@ requirements_pc_deps_ecore_sdl="" requirements_pc_deps_ecore_wayland="" requirements_pc_deps_ecore_evas="" requirements_pc_deps_embryo="" +requirements_pc_deps_edbus="" #requirements_pc_deps_edje="" #requirements_pc_deps_efreet="" -#requirements_pc_deps_e_dbus="" #requirements_pc_deps_eeze="" #requirements_pc_deps_emotion="" #requirements_pc_deps_ethumb="" @@ -234,9 +234,9 @@ AC_SUBST([requirements_libs_ecore_x]) AC_SUBST([requirements_libs_ecore_evas]) AC_SUBST([requirements_libs_embryo]) AC_SUBST([requirements_libs_eio]) +AC_SUBST([requirements_libs_edbus]) #AC_SUBST([requirements_libs_edje]) #AC_SUBST([requirements_libs_efreet]) -#AC_SUBST([requirements_libs_e_dbus]) #AC_SUBST([requirements_libs_eeze]) #AC_SUBST([requirements_libs_emotion]) #AC_SUBST([requirements_libs_ethumb]) @@ -264,9 +264,9 @@ AC_SUBST([requirements_pc_ecore_x]) AC_SUBST([requirements_pc_ecore_evas]) AC_SUBST([requirements_pc_embryo]) AC_SUBST([requirements_pc_eio]) +AC_SUBST([requirements_pc_edbus]) #AC_SUBST([requirements_pc_edje]) #AC_SUBST([requirements_pc_efreet]) -#AC_SUBST([requirements_pc_e_dbus]) #AC_SUBST([requirements_pc_eeze]) #AC_SUBST([requirements_pc_emotion]) #AC_SUBST([requirements_pc_ethumb]) @@ -3344,6 +3344,42 @@ AC_MSG_RESULT([${have_xattr}]) #### End of Eio +#### EDBus + +AC_MSG_NOTICE([EDBus checks]) + +### Additional options to configure + +### Default values + +### Checks for programs + +### Checks for libraries + +## Eina, Ecore, Ecore_Input + +requirements_pc_edbus="ecore >= ${PACKAGE_VERSION} eina >= ${PACKAGE_VERSION}" + +EFL_DEPEND_PKG([edbus], [DBUS], [dbus-1]) + +PKG_CHECK_MODULES([EDBUS], [${requirements_pc_deps_edbus}]) + +### Checks for header files + +### Checks for types + +### Checks for structures + +### Checks for compiler characteristics + +### Checks for linker characteristics + +### Checks for library functions + +#### End of EDBus + + + AC_CONFIG_FILES([ Makefile data/Makefile @@ -3360,6 +3396,7 @@ src/examples/eo/Makefile src/examples/evas/Makefile src/examples/ecore/Makefile src/examples/eio/Makefile +src/examples/edbus/Makefile src/lib/eina/eina_config.h src/lib/ecore_x/ecore_x_version.h spec/efl.spec @@ -3401,6 +3438,7 @@ pc/ecore-imf-evas.pc pc/ecore-audio.pc pc/embryo.pc pc/eio.pc +pc/edbus2.pc $po_makefile_in ]) diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 69da95dd61..260147dbdb 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -598,7 +598,8 @@ INPUT = @top_srcdir@/src/lib \ @srcdir@/eet_examples.dox \ @srcdir@/evas_examples.dox \ @srcdir@/eo_tutorial.dox \ - @builddir@/eio.dox + @builddir@/eio.dox \ + @builddir@/edbus.dox # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is diff --git a/doc/main.dox b/doc/main.dox index 0bee84e79a..e18b4a5352 100644 --- a/doc/main.dox +++ b/doc/main.dox @@ -14,98 +14,102 @@ * @li @ref ecore_main * @li @ref escape_main * @li @ref evil_main + * @li @ref edbus_main * */ /** * @page authors Authors * - * @author Carsten Haitzler - * @author Tom Gilbert - * @author Burra - * @author Chris Ross - * @author Term - * @author Tilman Sauerbeck - * @author Ibukun Olumuyiwa - * @author Yuri - * @author Nicholas Curran - * @author Howell Tam - * @author Nathan Ingersoll - * @author Andrew Elcock - * @author Kim Woelders - * @author Sebastian Dransfeld - * @author Simon Poole - * @author Jorge Luis Zapata Muga - * @author dan sinclair - * @author Michael 'Mickey' Lauer - * @author David 'onefang' Seikel - * @author Hisham 'CodeWarrior' Mardam Bey - * @author Brian 'rephorm' Mattern - * @author Tim Horton - * @author Arnaud de Turckheim 'quarium' - * @author Matt Barclay - * @author Peter Wehrfritz + * @author Adam Simpkins * @author Albin "Lutin" Tonnerre - * @author Vincent Torri - * @author Lars Munch * @author Andre Dieb + * @author Andrew Elcock + * @author Arnaud de Turckheim 'quarium' + * @author Bernhard Nemec + * @author Bluezery + * @author Boris "billiob" Faure + * @author Brett Nash + * @author Brian 'rephorm' Mattern + * @author Burra + * @author Carsten Haitzler + * @author Cedric Bail + * @author Chidambar Zinnoury + * @author Chris Ross + * @author Christopher 'devilhorns' Michael + * @author ChunEon Park + * @author Corey "atmos" Donohoe + * @author dan sinclair + * @author Daniel Juyung Seo + * @author Daniel Willmann + * @author David 'onefang' Seikel + * @author David Goodlad + * @author Doyoun Kang + * @author Guillaume Friloux + * @author Gustavo Chaves + * @author Gustavo Sverzut Barbieri + * @author Gwanglim Lee + * @author Haifeng Deng + * @author Hisham 'CodeWarrior' Mardam Bey + * @author Howell Tam + * @author Hyoyoung Chang + * @author Ibukun Olumuyiwa + * @author Iván Briano + * @author Jihoon Kim + * @author Jorge Luis Zapata Muga + * @author Jose O Gonzalez + * @author José Roberto de Souza + * @author Jérémy Zurcher + * @author Jérôme Pinot + * @author Kim Woelders + * @author Kim Yunhan + * @author Lars Munch + * @author Leandro Pereira + * @author Leif Middelschulte + * @author Lucas De Marchi + * @author Luis Felipe Strano Moraes * @author Mathieu Taillefumier + * @author Matt Barclay + * @author Michael 'Mickey' Lauer + * @author Mike Blumenkrantz + * @author Mike McCormack + * @author Myoungwoon Roy Kim(roy_kim) + * @author Myungjae Lee + * @author Nathan Ingersoll + * @author Nathan Ingersoll + * @author Nicholas Curran + * @author Nicolas Aguirre + * @author Peter Wehrfritz + * @author PnB + * @author Rafael Antognolli + * @author Rafal Krypa + * @author Raphael Kubo da Costa * @author Rui Miguel Silva Seabra * @author Samsung Electronics * @author Samsung SAIT - * @author Nicolas Aguirre - * @author Brett Nash - * @author Mike Blumenkrantz - * @author Leif Middelschulte - * @author Mike McCormack * @author Sangho Park - * @author Jihoon Kim - * @author PnB - * @author Daniel Juyung Seo - * @author Christopher 'devilhorns' Michael - * @author ChunEon Park - * @author xlopez@@igalia.com - * @author Rafael Antognolli - * @author Kim Yunhan - * @author Youness Alaoui - * @author Bluezery - * @author Doyoun Kang - * @author Haifeng Deng - * @author Jérémy Zurcher - * @author Vikram Narayanan - * @author Gwanglim Lee - * @author Daniel Willmann - * @author David Goodlad - * @author Cedric Bail - * @author Luis Felipe Strano Moraes - * @author Chidambar Zinnoury - * @author Vincent Torri - * @author Gustavo Sverzut Barbieri - * @author Raphael Kubo da Costa - * @author Adam Simpkins - * @author Corey "atmos" Donohoe - * @author Gustavo Chaves - * @author Tom Hacohen * @author Sebastian Dransfeld - * @author Myungjae Lee - * @author Boris "billiob" Faure - * @author Sung W. Park - * @author Guillaume Friloux - * @author Till Adam - * @author Steve Ireland - * @author Yuri Hudobin - * @author Nathan Ingersoll - * @author Willem Monsuwe - * @author Jose O Gonzalez - * @author Bernhard Nemec - * @author Iván Briano - * @author Myoungwoon Roy Kim(roy_kim) - * @author Thierry el Borgi - * @author Shilpa Singh + * @author Sebastian Dransfeld * @author Seungsoo Woo - * @author Rafal Krypa - * @author Hyoyoung Chang - * @author Jérôme Pinot + * @author Shilpa Singh + * @author Simon Poole + * @author Steve Ireland + * @author Sung W. Park + * @author Term + * @author Thierry el Borgi + * @author Till Adam + * @author Tilman Sauerbeck + * @author Tim Horton + * @author Tom Gilbert + * @author Tom Hacohen + * @author Vikram Narayanan + * @author Vincent Torri + * @author Vincent Torri + * @author Willem Monsuwe + * @author xlopez@@igalia.com + * @author Youness Alaoui + * @author Yuri + * @author Yuri Hudobin * * Please contact to get in * contact with the developers and maintainers. @@ -147,3 +151,9 @@ * * @brief Ecore */ + +/** + * @defgroup EDBus + * + * @brief EDBus + */ diff --git a/legacy/edbus/README b/old/README.edbus similarity index 100% rename from legacy/edbus/README rename to old/README.edbus diff --git a/legacy/edbus/edbus2.pc.in b/pc/edbus2.pc.in similarity index 59% rename from legacy/edbus/edbus2.pc.in rename to pc/edbus2.pc.in index 713e1f8dcb..512ba7f5ef 100644 --- a/legacy/edbus/edbus2.pc.in +++ b/pc/edbus2.pc.in @@ -5,7 +5,9 @@ includedir=@includedir@ Name: edbus Description: D-Bus access from Ecore -Requires.private: ecore dbus-1 +Requires.private: @requirements_pc_edbus@ Version: @VERSION@ Libs: -L${libdir} -ledbus2 -Cflags: -I${includedir} +Libs.private: @requirements_libs_edbus@ +Cflags: -I${includedir}/edbus-@VMAJ@ + diff --git a/src/Makefile.am b/src/Makefile.am index a9c4f3d74b..b109c6500d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -58,6 +58,7 @@ include Makefile_Ecore_Audio.am endif include Makefile_Embryo.am include Makefile_Eio.am +include Makefile_EDBus.am .PHONY: benchmark examples @@ -88,6 +89,7 @@ clean-local: rm -rf lib/evas/cserve2/*.gcno rm -rf lib/evas/file/*.gcno rm -rf lib/embryo/*.gcno + rm -rf lib/edbus/*.gcno rm -rf modules/eina/mp/pass_through/*.gcno rm -rf modules/eina/mp/one_big/*.gcno rm -rf modules/eina/mp/chained_pool/*.gcno diff --git a/src/Makefile_EDBus.am b/src/Makefile_EDBus.am new file mode 100644 index 0000000000..bf546f8597 --- /dev/null +++ b/src/Makefile_EDBus.am @@ -0,0 +1,85 @@ + +### Library + +lib_LTLIBRARIES += lib/edbus/libedbus2.la + +installed_edbusmainheadersdir = $(includedir)/edbus-@VMAJ@ +dist_installed_edbusmainheaders_DATA = \ +lib/edbus/EDBus.h \ +lib/edbus/edbus_connection.h \ +lib/edbus/edbus_freedesktop.h \ +lib/edbus/edbus_message.h \ +lib/edbus/edbus_object.h \ +lib/edbus/edbus_pending.h \ +lib/edbus/edbus_proxy.h \ +lib/edbus/edbus_service.h \ +lib/edbus/edbus_signal_handler.h \ +lib/edbus/edbus_message_helper.h \ +lib/edbus/edbus_message_eina_value.h + +lib_edbus_libedbus2_la_SOURCES = \ +lib/edbus/edbus_private.h \ +lib/edbus/edbus_private_types.h \ +lib/edbus/edbus_proxy.c \ +lib/edbus/edbus_core.c \ +lib/edbus/edbus_message.c \ +lib/edbus/edbus_object.c \ +lib/edbus/edbus_pending.c \ +lib/edbus/edbus_freedesktop.c \ +lib/edbus/edbus_service.c \ +lib/edbus/edbus_signal_handler.c \ +lib/edbus/edbus_message_helper.c \ +lib/edbus/edbus_message_to_eina_value.c \ +lib/edbus/edbus_message_from_eina_value.c + +lib_edbus_libedbus2_la_CPPFLAGS = \ +-include $(top_builddir)/config.h \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/ecore \ +-I$(top_srcdir)/src/lib/edbus \ +-DEFL_EDBUS_BUILD \ +@EFL_CFLAGS@ \ +@EFL_COV_CFLAGS@ \ +@EDBUS_CFLAGS@ + +lib_edbus_libedbus2_la_LIBADD = \ +lib/eina/libeina.la \ +lib/eo/libeo.la \ +lib/ecore/libecore.la \ +@EDBUS_LIBS@ \ +@EFL_COV_LIBS@ + +lib_edbus_libedbus2_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ + +### Binary + +bin_PROGRAMS += bin/edbus/edbus-codegen + +bin_edbus_edbus_codegen_SOURCES = \ +bin/edbus/codegen.h \ +bin/edbus/utils.c \ +bin/edbus/parser.c \ +bin/edbus/dbus.c \ +bin/edbus/source_client.c \ +bin/edbus/client.c + +bin_edbus_edbus_codegen_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/ecore \ +-I$(top_srcdir)/src/lib/edbus \ +-DPACKAGE_BIN_DIR=\"$(bindir)\" \ +-DPACKAGE_LIB_DIR=\"$(libdir)\" \ +-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ +@EFL_CFLAGS@ \ +@EFL_COV_CFLAGS@ + +bin_edbus_edbus_codegen_LDADD = \ +lib/eina/libeina.la \ +lib/eo/libeo.la \ +lib/ecore/libecore.la \ +lib/edbus/libedbus2.la \ +@EFL_COV_LIBS@ diff --git a/legacy/edbus/src/codegen/client.c b/src/bin/edbus/client.c similarity index 100% rename from legacy/edbus/src/codegen/client.c rename to src/bin/edbus/client.c diff --git a/legacy/edbus/src/codegen/codegen.h b/src/bin/edbus/codegen.h similarity index 100% rename from legacy/edbus/src/codegen/codegen.h rename to src/bin/edbus/codegen.h diff --git a/legacy/edbus/src/codegen/dbus.c b/src/bin/edbus/dbus.c similarity index 100% rename from legacy/edbus/src/codegen/dbus.c rename to src/bin/edbus/dbus.c diff --git a/legacy/edbus/src/codegen/parser.c b/src/bin/edbus/parser.c similarity index 100% rename from legacy/edbus/src/codegen/parser.c rename to src/bin/edbus/parser.c diff --git a/legacy/edbus/src/codegen/source_client.c b/src/bin/edbus/source_client.c similarity index 100% rename from legacy/edbus/src/codegen/source_client.c rename to src/bin/edbus/source_client.c diff --git a/legacy/edbus/src/codegen/utils.c b/src/bin/edbus/utils.c similarity index 100% rename from legacy/edbus/src/codegen/utils.c rename to src/bin/edbus/utils.c diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am index da0ba7df1b..8d5c8aa05c 100644 --- a/src/examples/Makefile.am +++ b/src/examples/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = eina eo eet evas ecore eio +SUBDIRS = eina eo eet evas ecore eio edbus examples: @$(MAKE) $(AM_MAKEFLAGS) -C eina examples @@ -9,6 +9,7 @@ examples: @$(MAKE) $(AM_MAKEFLAGS) -C evas examples @$(MAKE) $(AM_MAKEFLAGS) -C ecore examples @$(MAKE) $(AM_MAKEFLAGS) -C eio examples + @$(MAKE) $(AM_MAKEFLAGS) -C edbus examples install-examples: @$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples @@ -17,3 +18,4 @@ install-examples: @$(MAKE) $(AM_MAKEFLAGS) -C evas install-examples @$(MAKE) $(AM_MAKEFLAGS) -C ecore install-examples @$(MAKE) $(AM_MAKEFLAGS) -C eio install-examples + @$(MAKE) $(AM_MAKEFLAGS) -C edbus install-examples diff --git a/src/examples/edbus/Makefile.am b/src/examples/edbus/Makefile.am new file mode 100644 index 0000000000..33e8e80a02 --- /dev/null +++ b/src/examples/edbus/Makefile.am @@ -0,0 +1,71 @@ +MAINTAINERCLEANFILES = Makefile.in + +AM_CPPFLAGS = \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_srcdir)/src/lib/ecore \ +-I$(top_srcdir)/src/lib/edbus \ +-I$(top_builddir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eo \ +-I$(top_builddir)/src/lib/ecore \ +-I$(top_builddir)/src/lib/edbus \ +@EDBUS_CFLAGS@ + +EXAMPLES_LIBS = \ +$(top_builddir)/src/lib/ecore/libecore.la \ +$(top_builddir)/src/lib/eina/libeina.la \ +$(top_builddir)/src/lib/edbus/libedbus2.la + +EXTRA_PROGRAMS = \ +connman-list-services \ +ofono-dial \ +banshee \ +complex-types \ +complex-types-server \ +server \ +client \ +simple-signal-emit \ +complex-types-client-eina-value + +connman_list_services_SOURCES = connman-list-services.c +connman_list_services_LDADD = $(EXAMPLES_LIBS) + +ofono_dial_SOURCES = ofono-dial.c +ofono_dial_LDADD = $(EXAMPLES_LIBS) + +banshee_SOURCES = banshee.c +banshee_LDADD = $(EXAMPLES_LIBS) + +complex_types_SOURCES = complex-types.c +complex_types_LDADD = $(EXAMPLES_LIBS) + +complex_types_server_SOURCES = complex-types-server.c +complex_types_server_LDADD = $(EXAMPLES_LIBS) + +server_SOURCES = server.c +server_LDADD = $(EXAMPLES_LIBS) + +client_SOURCES = client.c +client_LDADD = $(EXAMPLES_LIBS) + +simple_signal_emit_SOURCES = simple-signal-emit.c +simple_signal_emit_LDADD = $(EXAMPLES_LIBS) + +complex_types_client_eina_value_SOURCES = complex-types-client-eina-value.c +complex_types_client_eina_value_LDADD = $(EXAMPLES_LIBS) + +SRCS = $(EXTRA_PROGRAMS) + +examples: $(EXTRA_PROGRAMS) + +clean-local: + rm -f $(EXTRA_PROGRAMS) + +install-examples: + mkdir -p $(datadir)/edbus/examples + $(install_sh_DATA) -c $(SRCS) $(datadir)/edbus/examples + +uninstall-local: + for f in $(SRCS) ; do \ + rm -f $(datadir)/edbus/examples/$$f ; \ + done diff --git a/legacy/edbus/src/examples/banshee.c b/src/examples/edbus/banshee.c similarity index 100% rename from legacy/edbus/src/examples/banshee.c rename to src/examples/edbus/banshee.c diff --git a/legacy/edbus/src/examples/client.c b/src/examples/edbus/client.c similarity index 100% rename from legacy/edbus/src/examples/client.c rename to src/examples/edbus/client.c diff --git a/legacy/edbus/src/examples/complex_types_client_eina_value.c b/src/examples/edbus/complex-types-client-eina-value.c similarity index 100% rename from legacy/edbus/src/examples/complex_types_client_eina_value.c rename to src/examples/edbus/complex-types-client-eina-value.c diff --git a/legacy/edbus/src/examples/complex_types_server.c b/src/examples/edbus/complex-types-server.c similarity index 100% rename from legacy/edbus/src/examples/complex_types_server.c rename to src/examples/edbus/complex-types-server.c diff --git a/legacy/edbus/src/examples/complex_types.c b/src/examples/edbus/complex-types.c similarity index 100% rename from legacy/edbus/src/examples/complex_types.c rename to src/examples/edbus/complex-types.c diff --git a/legacy/edbus/src/examples/connman-list-services.c b/src/examples/edbus/connman-list-services.c similarity index 100% rename from legacy/edbus/src/examples/connman-list-services.c rename to src/examples/edbus/connman-list-services.c diff --git a/legacy/edbus/src/examples/ofono-dial.c b/src/examples/edbus/ofono-dial.c similarity index 100% rename from legacy/edbus/src/examples/ofono-dial.c rename to src/examples/edbus/ofono-dial.c diff --git a/legacy/edbus/src/examples/server.c b/src/examples/edbus/server.c similarity index 100% rename from legacy/edbus/src/examples/server.c rename to src/examples/edbus/server.c diff --git a/legacy/edbus/src/examples/simple-signal-emit.c b/src/examples/edbus/simple-signal-emit.c similarity index 100% rename from legacy/edbus/src/examples/simple-signal-emit.c rename to src/examples/edbus/simple-signal-emit.c diff --git a/legacy/edbus/src/lib/EDBus.h b/src/lib/edbus/EDBus.h similarity index 76% rename from legacy/edbus/src/lib/EDBus.h rename to src/lib/edbus/EDBus.h index 46d065434b..36cdf2e245 100644 --- a/legacy/edbus/src/lib/EDBus.h +++ b/src/lib/edbus/EDBus.h @@ -1,5 +1,5 @@ /** - * @mainpage EDBus + * @page edbus_main EDBus * * @section edbus_intro_sec Introduction * @@ -31,20 +31,46 @@ * * Here some EDBus examples: * - * @li @ref banshee - * @li @ref simple_dbus_client - * @li @ref simple_dbus_server - * @li @ref complex_types - * @li @ref complex_types_server - * @li @ref eina_value - * @li @ref signal_emmiter - * @li @ref connman - * @li @ref ofono + * @li @ref banshee.c + * @li @ref client.c + * @li @ref complex-types.c + * @li @ref complex-types-client-eina-value.c + * @li @ref complex-types-server.c + * @li @ref connman-list-services.c + * @li @ref ofono-dial.c + * @li @ref server.c + * @li @ref simple-signal-emit.c * - * @author Gustavo Sverzut Barbieri - * @author José Roberto de Souza - * @author Leandro Pereira - * @author Lucas De Marchi + * @example banshee.c + * Access Banshee music player and send commands to it. + * + * @example client.c + * Client to test various call message types against a provided server + * (@ref server.c) + * + * @example complex-types.c + * Client to test complex types (arrays, structs, dicts) against a + * provided server (@ref complex-types-server.c) + * + * @example complex-types-client-eina-value.c + * Client to test complex types (arrays, structs, dicts) against a + * provided server (@ref complex-types-server.c) returning them as + * @ref Eina_Value. + * + * @example complex-types-server.c + * Server to test complex types (arrays, structs, dicts). + * + * @example connman-list-services.c + * Client to list networks/services from connman. + * + * @example ofono-dial.c + * Client to ask oFono to dial. + * + * @example server.c + * Server to reply to @ref client.c requests. + * + * @example simple-signal-emit.c + * Server that registers a service interface and emits simple signals. */ #ifndef EDBUS_H #define EDBUS_H @@ -84,6 +110,7 @@ extern "C" { /** * @defgroup EDBus_Core Core + * @ingroup EDBus * * @{ */ diff --git a/legacy/edbus/src/lib/edbus_connection.h b/src/lib/edbus/edbus_connection.h similarity index 99% rename from legacy/edbus/src/lib/edbus_connection.h rename to src/lib/edbus/edbus_connection.h index e3fb3db20d..5573f204a4 100644 --- a/legacy/edbus/src/lib/edbus_connection.h +++ b/src/lib/edbus/edbus_connection.h @@ -3,6 +3,7 @@ /** * @defgroup EDBus_Conneciton Connection + * @ingroup EDBus * * @{ */ diff --git a/legacy/edbus/src/lib/edbus_core.c b/src/lib/edbus/edbus_core.c similarity index 100% rename from legacy/edbus/src/lib/edbus_core.c rename to src/lib/edbus/edbus_core.c diff --git a/legacy/edbus/src/lib/edbus_freedesktop.c b/src/lib/edbus/edbus_freedesktop.c similarity index 100% rename from legacy/edbus/src/lib/edbus_freedesktop.c rename to src/lib/edbus/edbus_freedesktop.c diff --git a/legacy/edbus/src/lib/edbus_freedesktop.h b/src/lib/edbus/edbus_freedesktop.h similarity index 98% rename from legacy/edbus/src/lib/edbus_freedesktop.h rename to src/lib/edbus/edbus_freedesktop.h index a341928a95..f80e8c35c2 100644 --- a/legacy/edbus/src/lib/edbus_freedesktop.h +++ b/src/lib/edbus/edbus_freedesktop.h @@ -2,7 +2,8 @@ #define EDBUS_FREEDESKTOP_H 1 /** - * @defgroup EDBus_Basic Basic Methods + * @defgroup EDBus_Basic Basic FreeDesktop.Org Methods + * @ingroup EDBus * * @{ */ diff --git a/legacy/edbus/src/lib/edbus_message.c b/src/lib/edbus/edbus_message.c similarity index 100% rename from legacy/edbus/src/lib/edbus_message.c rename to src/lib/edbus/edbus_message.c diff --git a/legacy/edbus/src/lib/edbus_message.h b/src/lib/edbus/edbus_message.h similarity index 99% rename from legacy/edbus/src/lib/edbus_message.h rename to src/lib/edbus/edbus_message.h index 211bc6714a..ac4d251aa1 100644 --- a/legacy/edbus/src/lib/edbus_message.h +++ b/src/lib/edbus/edbus_message.h @@ -3,6 +3,7 @@ /** * @defgroup EDBus_Message Message + * @ingroup EDBus * * @{ */ diff --git a/legacy/edbus/src/lib/edbus_message_eina_value.h b/src/lib/edbus/edbus_message_eina_value.h similarity index 100% rename from legacy/edbus/src/lib/edbus_message_eina_value.h rename to src/lib/edbus/edbus_message_eina_value.h diff --git a/legacy/edbus/src/lib/edbus_message_from_eina_value.c b/src/lib/edbus/edbus_message_from_eina_value.c similarity index 100% rename from legacy/edbus/src/lib/edbus_message_from_eina_value.c rename to src/lib/edbus/edbus_message_from_eina_value.c diff --git a/legacy/edbus/src/lib/edbus_message_helper.c b/src/lib/edbus/edbus_message_helper.c similarity index 100% rename from legacy/edbus/src/lib/edbus_message_helper.c rename to src/lib/edbus/edbus_message_helper.c diff --git a/legacy/edbus/src/lib/edbus_message_helper.h b/src/lib/edbus/edbus_message_helper.h similarity index 100% rename from legacy/edbus/src/lib/edbus_message_helper.h rename to src/lib/edbus/edbus_message_helper.h diff --git a/legacy/edbus/src/lib/edbus_message_to_eina_value.c b/src/lib/edbus/edbus_message_to_eina_value.c similarity index 100% rename from legacy/edbus/src/lib/edbus_message_to_eina_value.c rename to src/lib/edbus/edbus_message_to_eina_value.c diff --git a/legacy/edbus/src/lib/edbus_object.c b/src/lib/edbus/edbus_object.c similarity index 100% rename from legacy/edbus/src/lib/edbus_object.c rename to src/lib/edbus/edbus_object.c diff --git a/legacy/edbus/src/lib/edbus_object.h b/src/lib/edbus/edbus_object.h similarity index 99% rename from legacy/edbus/src/lib/edbus_object.h rename to src/lib/edbus/edbus_object.h index 85ebffcb90..680cdfb4d7 100644 --- a/legacy/edbus/src/lib/edbus_object.h +++ b/src/lib/edbus/edbus_object.h @@ -3,6 +3,7 @@ /** * @defgroup EDBus_Object_Mapper Object Mapper + * @ingroup EDBus * * @{ */ diff --git a/legacy/edbus/src/lib/edbus_pending.c b/src/lib/edbus/edbus_pending.c similarity index 100% rename from legacy/edbus/src/lib/edbus_pending.c rename to src/lib/edbus/edbus_pending.c diff --git a/legacy/edbus/src/lib/edbus_pending.h b/src/lib/edbus/edbus_pending.h similarity index 98% rename from legacy/edbus/src/lib/edbus_pending.h rename to src/lib/edbus/edbus_pending.h index da70e48b31..a42aa026b9 100644 --- a/legacy/edbus/src/lib/edbus_pending.h +++ b/src/lib/edbus/edbus_pending.h @@ -3,6 +3,7 @@ /** * @defgroup EDBus_Pending Pending + * @ingroup EDBus * * @{ */ diff --git a/legacy/edbus/src/lib/edbus_private.h b/src/lib/edbus/edbus_private.h similarity index 100% rename from legacy/edbus/src/lib/edbus_private.h rename to src/lib/edbus/edbus_private.h diff --git a/legacy/edbus/src/lib/edbus_private_types.h b/src/lib/edbus/edbus_private_types.h similarity index 100% rename from legacy/edbus/src/lib/edbus_private_types.h rename to src/lib/edbus/edbus_private_types.h diff --git a/legacy/edbus/src/lib/edbus_proxy.c b/src/lib/edbus/edbus_proxy.c similarity index 100% rename from legacy/edbus/src/lib/edbus_proxy.c rename to src/lib/edbus/edbus_proxy.c diff --git a/legacy/edbus/src/lib/edbus_proxy.h b/src/lib/edbus/edbus_proxy.h similarity index 99% rename from legacy/edbus/src/lib/edbus_proxy.h rename to src/lib/edbus/edbus_proxy.h index b3020cd8dd..00b365266e 100644 --- a/legacy/edbus/src/lib/edbus_proxy.h +++ b/src/lib/edbus/edbus_proxy.h @@ -3,6 +3,7 @@ /** * @defgroup EDBus_Proxy Proxy + * @ingroup EDBus * * @{ */ diff --git a/legacy/edbus/src/lib/edbus_service.c b/src/lib/edbus/edbus_service.c similarity index 100% rename from legacy/edbus/src/lib/edbus_service.c rename to src/lib/edbus/edbus_service.c diff --git a/legacy/edbus/src/lib/edbus_service.h b/src/lib/edbus/edbus_service.h similarity index 99% rename from legacy/edbus/src/lib/edbus_service.h rename to src/lib/edbus/edbus_service.h index ee5ead30ef..4496a67312 100644 --- a/legacy/edbus/src/lib/edbus_service.h +++ b/src/lib/edbus/edbus_service.h @@ -3,6 +3,7 @@ /** * @defgroup EDBus_Service Service + * @ingroup EDBus * * @{ */ diff --git a/legacy/edbus/src/lib/edbus_signal_handler.c b/src/lib/edbus/edbus_signal_handler.c similarity index 100% rename from legacy/edbus/src/lib/edbus_signal_handler.c rename to src/lib/edbus/edbus_signal_handler.c diff --git a/legacy/edbus/src/lib/edbus_signal_handler.h b/src/lib/edbus/edbus_signal_handler.h similarity index 99% rename from legacy/edbus/src/lib/edbus_signal_handler.h rename to src/lib/edbus/edbus_signal_handler.h index e04330021b..235b209806 100644 --- a/legacy/edbus/src/lib/edbus_signal_handler.h +++ b/src/lib/edbus/edbus_signal_handler.h @@ -3,6 +3,7 @@ /** * @defgroup EDBus_Signal_Handler Signal Handler + * @ingroup EDBus * * @{ */