From 5933730c5b8c40c9e478edda790eec38a71a2936 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Tue, 19 Feb 2013 20:45:58 +0000 Subject: [PATCH] Trabalhando no plugin DBUS --- configure.ac | 2 +- po/pt_BR.po | 2 +- src/include/lib3270/log.h | 1 + src/plugins/3270dbus/gobject.c | 12 +++++++++++- src/plugins/3270dbus/pw3270dbus.xml | 2 +- src/plugins/3270dbus/service.h | 2 +- 6 files changed, 16 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index fce2b6d..e313089 100644 --- a/configure.ac +++ b/configure.ac @@ -348,7 +348,7 @@ AC_SUBST(GLIB_CFLAGS) #--[ Check DBUS ]--------------------------------------------------------------------------------------------------------------------------------------------- -PKG_CHECK_MODULES( [DBUS], [dbus-glib-1], AC_DEFINE(HAVE_DBUS) ) +PKG_CHECK_MODULES( [DBUS], [dbus-glib-1], AC_DEFINE(HAVE_DBUS), AC_MSG_NOTICE([No DBUS support.]) ) AC_SUBST(DBUS_LIBS) AC_SUBST(DBUS_CFLAGS) diff --git a/po/pt_BR.po b/po/pt_BR.po index bc6729c..b93064e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: pw3270 5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-15 16:38-0200\n" +"POT-Creation-Date: 2013-02-19 17:42-0300\n" "PO-Revision-Date: 2013-01-14 09:49-0200\n" "Last-Translator: Perry Werneck \n" "Language-Team: Português <>\n" diff --git a/src/include/lib3270/log.h b/src/include/lib3270/log.h index 9a838da..355862c 100644 --- a/src/include/lib3270/log.h +++ b/src/include/lib3270/log.h @@ -56,6 +56,7 @@ LIB3270_EXPORT void lib3270_write_va_log(H3270 *session, const char *module, const char *fmt, va_list arg); #ifdef DEBUG + #include #define trace( fmt, ... ) fprintf(stderr, "%s(%d) " fmt "\n", __FILE__, __LINE__, __VA_ARGS__ ); fflush(stderr); #else #define trace(x, ...) // __VA_ARGS__ diff --git a/src/plugins/3270dbus/gobject.c b/src/plugins/3270dbus/gobject.c index 0f04600..eeef452 100644 --- a/src/plugins/3270dbus/gobject.c +++ b/src/plugins/3270dbus/gobject.c @@ -74,24 +74,30 @@ PW3270Dbus * pw3270_dbus_new(void) void pw3270_dbus_get_revision(PW3270Dbus *object, DBusGMethodInvocation *context) { + trace("%s object=%p context=%p",__FUNCTION__,object,context); dbus_g_method_return(context,PACKAGE_REVISION); } void pw3270_dbus_connect(PW3270Dbus *object, const gchar *uri, DBusGMethodInvocation *context) { + trace("%s object=%p context=%p",__FUNCTION__,object,context); + g_message("Connecting to \"%s\" by remote request",uri); dbus_g_method_return(context,lib3270_connect(pw3270_dbus_get_session_handle(PW3270_DBUS(object)),uri,0)); } void pw3270_dbus_disconnect(PW3270Dbus *object, DBusGMethodInvocation *context) { + trace("%s object=%p context=%p",__FUNCTION__,object,context); + g_message("Disconnecting by remote request"); lib3270_disconnect(pw3270_dbus_get_session_handle(object)); dbus_g_method_return(context,0); } -void pw3270_dbus_get_program_message(PW3270Dbus *object, DBusGMethodInvocation *context) +void pw3270_dbus_get_message_id(PW3270Dbus *object, DBusGMethodInvocation *context) { + trace("%s object=%p context=%p",__FUNCTION__,object,context); dbus_g_method_return(context,lib3270_get_program_message(pw3270_dbus_get_session_handle(object))); } @@ -105,6 +111,8 @@ int pw3270_dbus_check_valid_state(PW3270Dbus *object, DBusGMethodInvocation *con H3270 * hSession = pw3270_dbus_get_session_handle(object); GError * error = NULL; + trace("%s object=%p context=%p",__FUNCTION__,object,context); + if(!lib3270_is_connected(hSession)) { error = pw3270_dbus_get_error_from_errno(ENOTCONN); @@ -164,6 +172,8 @@ void pw3270_dbus_get_screen_contents(PW3270Dbus *object, DBusGMethodInvocation * gchar * utftext; H3270 * hSession = pw3270_dbus_get_session_handle(object); + trace("%s object=%p context=%p",__FUNCTION__,object,context); + if(pw3270_dbus_check_valid_state(object,context)) return; diff --git a/src/plugins/3270dbus/pw3270dbus.xml b/src/plugins/3270dbus/pw3270dbus.xml index 6080769..46153a5 100644 --- a/src/plugins/3270dbus/pw3270dbus.xml +++ b/src/plugins/3270dbus/pw3270dbus.xml @@ -18,7 +18,7 @@ - + diff --git a/src/plugins/3270dbus/service.h b/src/plugins/3270dbus/service.h index 82ecd7d..62fc5da 100644 --- a/src/plugins/3270dbus/service.h +++ b/src/plugins/3270dbus/service.h @@ -70,7 +70,7 @@ void pw3270_dbus_quit(PW3270Dbus *object, DBusGMethodInvocation *context); void pw3270_dbus_connect(PW3270Dbus *object, const gchar *uri, DBusGMethodInvocation *context); void pw3270_dbus_disconnect(PW3270Dbus *object, DBusGMethodInvocation *context); - void pw3270_dbus_get_program_message(PW3270Dbus *object, DBusGMethodInvocation *context); + void pw3270_dbus_get_message_id(PW3270Dbus *object, DBusGMethodInvocation *context); void pw3270_dbus_get_screen_contents(PW3270Dbus *object, DBusGMethodInvocation *context); H3270 * pw3270_dbus_get_session_handle(PW3270Dbus *object); GError * pw3270_dbus_get_error_from_errno(int code); -- libgit2 0.21.2