From 0186bf84a38c03bba9271b0705014da9f2efe867 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Mon, 18 Feb 2013 12:03:58 +0000 Subject: [PATCH] Iniciando implementação de plugin DBUS --- Makefile.in | 2 ++ configure.ac | 18 ++++++++++++++++-- pw3270.cbp | 13 +++++++++++++ src/plugins/dbus/Makefile.in | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/plugins/dbus/daemon.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/plugins/dbus/gobject.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/plugins/dbus/main.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/plugins/dbus/pw3270dbus.cbp | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/plugins/dbus/pw3270dbus.xml | 9 +++++++++ src/plugins/dbus/service.h | 42 ++++++++++++++++++++++++++++++++++++++++++ src/plugins/dbus/test.sh | 3 +++ src/sample/connect.c | 2 +- 12 files changed, 533 insertions(+), 3 deletions(-) create mode 100644 src/plugins/dbus/Makefile.in create mode 100644 src/plugins/dbus/daemon.c create mode 100644 src/plugins/dbus/gobject.c create mode 100644 src/plugins/dbus/main.c create mode 100644 src/plugins/dbus/pw3270dbus.cbp create mode 100644 src/plugins/dbus/pw3270dbus.xml create mode 100644 src/plugins/dbus/service.h create mode 100755 src/plugins/dbus/test.sh diff --git a/Makefile.in b/Makefile.in index 0e32efa..d7dfee8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -155,6 +155,8 @@ debian/lib3270-dev.install: Makefile @echo "$(includedir)/lib3270.h" > $@ @echo "$(includedir)/lib3270" >> $@ @echo "$(datarootdir)/@PACKAGE_NAME@/ui/99debug.xml" >> $@ + @echo "$(datarootdir)/@PACKAGE_NAME@/sample/*.c" >> $@ + @echo "$(datarootdir)/@PACKAGE_NAME@/sample/Makefile" >> $@ @echo "$(libdir)/pkgconfig/*.pc" >> $@ @echo "$(includedir)/pw3270.h" >> $@ @echo "$(includedir)/pw3270" >> $@ diff --git a/configure.ac b/configure.ac index 335c33e..0f4fb73 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,7 @@ AC_PATH_TOOL([VALGRIND], [valgrind], [no]) AC_PATH_TOOL([MAKENSIS], [makensis], [no]) AC_PATH_TOOL([WINDRES], [windres], [no]) +AC_PATH_TOOL([DBUSBINDINGTOOL],[dbus-binding-tool],[no]) AC_CHECK_PROGS(GZIP,[gzip],no) export GZIP; @@ -328,10 +329,10 @@ AC_CHECK_HEADER(malloc.h, AC_DEFINE(HAVE_MALLOC_H,,[do we have malloc.h?])) AC_CHECK_FUNCS(getaddrinfo, AC_DEFINE(HAVE_GETADDRINFO) ) -#--[ GTK 2/3 check ]------------------------------------------------------------------------------------------------------------------------------------------ - PKG_CHECK_EXISTS +#--[ GTK 2/3 check ]------------------------------------------------------------------------------------------------------------------------------------------ + PKG_CHECK_MODULES( [GTK], [gtk+-3.0 gmodule-2.0], [ GTK_VERSION="3.0" ], [ PKG_CHECK_MODULES( [GTK], [gtk+-2.0 >= 2.14 gthread-2.0 gmodule-2.0], [ GTK_VERSION="2.0" ] ) ], [ ] ) AC_SUBST(GTK_LIBS) @@ -339,6 +340,18 @@ AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_VERSION) AC_SUBST(GTK_MODVERSION,`pkg-config --modversion gtk+-$GTK_VERSION`) +#--[ GLIB check ]--------------------------------------------------------------------------------------------------------------------------------------------- + +PKG_CHECK_MODULES( [GLIB], [glib-2.0], AC_DEFINE(HAVE_GLIB) ) +AC_SUBST(GLIB_LIBS) +AC_SUBST(GLIB_CFLAGS) + +#--[ Check DBUS ]--------------------------------------------------------------------------------------------------------------------------------------------- + +PKG_CHECK_MODULES( [DBUS], [dbus-glib-1], AC_DEFINE(HAVE_DBUS) ) +AC_SUBST(DBUS_LIBS) +AC_SUBST(DBUS_CFLAGS) + #--[ SSL ]---------------------------------------------------------------------------------------------------------------------------------------------------- PKG_CHECK_MODULES( [LIBSSL], [libssl], AC_DEFINE(HAVE_LIBSSL), AC_MSG_NOTICE([libssl not present.]) ) @@ -416,6 +429,7 @@ AC_CONFIG_FILES([ src/tools/Makefile src/plugins/remotectl/Makefile src/plugins/rx3270/Makefile + src/plugins/dbus/Makefile man/Makefile makegtkruntime.sh src/sample/Makefile diff --git a/pw3270.cbp b/pw3270.cbp index 8f38842..45c532d 100644 --- a/pw3270.cbp +++ b/pw3270.cbp @@ -220,6 +220,19 @@ + + + + + + + + + +