Download as
Browse Code »

Commit ebebd49fe2d00f529fd7473e7ff2dcf38e5964a8

Authored by Perry Werneck
1 parent 37b5492d
Exists in master and in 1 other branch develop

Refactoring HLLAPI linux plugin.

Showing 8 changed files with 304 additions and 265 deletions   Show diff stats
.gitignore
  Diff comments   View file @ebebd49
... ... @@ -10,3 +10,4 @@ stamp-h1
10 10 *.layout
11 11 .bin
12 12 .obj
  13 +dbus-glue.h
... ...
Makefile.in
  Diff comments   View file @ebebd49
... ... @@ -50,6 +50,7 @@ XGETTEXT=@XGETTEXT@
50 50 MSGCAT=@MSGCAT@
51 51 WINDRES=@WINDRES@
52 52 AR=@AR@
  53 +DBUSBINDINGTOOL=@DBUSBINDINGTOOL@
53 54  
54 55 #---[ Paths ]----------------------------------------------------------------------------
55 56  
... ... @@ -79,7 +80,8 @@ BINRLS=$(BINDIR)/Release
79 80 #---[ Rules ]----------------------------------------------------------------------------
80 81  
81 82 DEPENDS= \
82   - Makefile
  83 + Makefile \
  84 + @DEPENDS@
83 85  
84 86 CFLAGS= \
85 87 @CFLAGS@ \
... ... @@ -89,17 +91,30 @@ CFLAGS= \
89 91 @LIB3270_CFLAGS@ \
90 92 @V3270_CFLAGS@ \
91 93 @GTK_CFLAGS@ \
92   - @GLIB_CFLAGS@
  94 + @GLIB_CFLAGS@ \
  95 + @PW3270_CFLAGS@
93 96  
94 97 GTK_LIBS=@GTK_LIBS@
95 98 V3270_LIBS=@V3270_LIBS@
96 99 GLIB_LIBS=@GLIB_LIBS@
  100 +DBUS_LIBS=@DBUS_LIBS@ @GDBUS_LIBS@
97 101  
98 102 LIBS= \
99 103 @LIBS@ \
100 104 @LIBICONV@ \
101 105 @INTL_LIBS@ \
102   - @LIB3270_LIBS@
  106 + @LIB3270_LIBS@ \
  107 + @PW3270_LIBS@
  108 +
  109 +src/include/dbus-glue.h: \
  110 + pw3270dbus.xml
  111 +
  112 + @echo $@ ...
  113 + @$(DBUSBINDINGTOOL) \
  114 + --mode=glib-server \
  115 + --output=$@ \
  116 + --prefix=pw3270_dbus $^
  117 +
103 118  
104 119 #---[ Debug Rules ]----------------------------------------------------------------------
105 120  
... ... @@ -191,7 +206,9 @@ $(BINRLS)/$(MODULE_NAME)@DLLEXT@: \
191 206 -L$(BINRLS) -l$(MODULE_NAME) \
192 207 $(V3270_LIBS) \
193 208 $(LIBS) \
194   - $(GTK_LIBS)
  209 + $(GTK_LIBS) \
  210 + $(DBUS_LIBS)
  211 +
195 212  
196 213 $(BINRLS)/lib$(MODULE_NAME).a: \
197 214 $(foreach SRC, $(basename $(CORE_SOURCES)), $(OBJRLS)/$(SRC).o)
... ... @@ -278,7 +295,8 @@ $(BINDBG)/$(MODULE_NAME)@DLLEXT@: \
278 295 -L$(BINDBG) -lpw3270cpp \
279 296 $(V3270_LIBS) \
280 297 $(LIBS) \
281   - $(GTK_LIBS)
  298 + $(GTK_LIBS) \
  299 + $(DBUS_LIBS)
282 300  
283 301  
284 302 #---[ Clean Targets ]--------------------------------------------------------------------
... ...
configure.ac
  Diff comments   View file @ebebd49
... ... @@ -66,6 +66,7 @@ APP_RESOURCES=""
66 66 APP_LDFLAGS=""
67 67 DLL_LDFLAGS="-shared"
68 68 STATIC_LDFLAGS=""
  69 +DEPENDS=""
69 70  
70 71 dnl ---------------------------------------------------------------------------
71 72 dnl Check for OS specifics
... ... @@ -167,6 +168,15 @@ AC_SUBST(LIB3270_LIBS)
167 168 AC_SUBST(LIB3270_CFLAGS)
168 169  
169 170 dnl ---------------------------------------------------------------------------
  171 +dnl Check for PW3270
  172 +dnl ---------------------------------------------------------------------------
  173 +
  174 +PKG_CHECK_MODULES( [PW3270], [pw3270], AC_DEFINE(HAVE_PW3270), AC_MSG_ERROR([PW3270 not present.]))
  175 +
  176 +AC_SUBST(PW3270_LIBS)
  177 +AC_SUBST(PW3270_CFLAGS)
  178 +
  179 +dnl ---------------------------------------------------------------------------
170 180 dnl Check for LIBV3270
171 181 dnl ---------------------------------------------------------------------------
172 182  
... ... @@ -196,6 +206,8 @@ dnl ---------------------------------------------------------------------------
196 206 dnl Check for D-Bus
197 207 dnl ---------------------------------------------------------------------------
198 208  
  209 +AC_PATH_TOOL([DBUSBINDINGTOOL],[dbus-binding-tool],[no])
  210 +
199 211 PKG_CHECK_MODULES( [DBUS], [dbus-1], app_cv_libdbus=yes, AC_MSG_NOTICE([ No DBUS support.]) )
200 212 AC_SUBST(DBUS_LIBS)
201 213 AC_SUBST(DBUS_CFLAGS)
... ... @@ -204,6 +216,12 @@ PKG_CHECK_MODULES( [GDBUS], [dbus-glib-1], app_cv_dbus=yes, AC_MSG_NOTICE([No GD
204 216 AC_SUBST(GDBUS_LIBS)
205 217 AC_SUBST(GDBUS_CFLAGS)
206 218  
  219 +if test "$app_cv_dbus" == "yes"; then
  220 + AC_DEFINE(HAVE_DBUS)
  221 + DEPENDS="$DEPENDS src/include/dbus-glue.h"
  222 +fi
  223 +
  224 +
207 225 dnl ---------------------------------------------------------------------------
208 226 dnl Check for pic
209 227 dnl ---------------------------------------------------------------------------
... ... @@ -238,6 +256,7 @@ dnl ---------------------------------------------------------------------------
238 256 dnl Configure which files to generate.
239 257 dnl ---------------------------------------------------------------------------
240 258  
  259 +AC_SUBST(DEPENDS)
241 260 AC_CONFIG_FILES(Makefile)
242 261  
243 262 dnl ---------------------------------------------------------------------------
... ...
pw3270dbus.xml 0 → 100644
  Diff comments   View file @ebebd49
... ... @@ -0,0 +1,251 @@
  1 +<?xml version="1.0" encoding="UTF-8" ?>
  2 +<node name="/br/com/bb/pw3270">
  3 + <interface name="br.com.bb.pw3270">
  4 + <method name="getRevision">
  5 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  6 + <arg type="s" name="revision" direction="out" />
  7 + </method>
  8 + <method name="quit">
  9 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  10 + <arg type="i" name="result" direction="out" />
  11 + </method>
  12 + <method name="connect">
  13 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  14 + <arg type="s" name="uri" direction="in" />
  15 + <arg type="i" name="result" direction="out" />
  16 + </method>
  17 + <method name="setURL">
  18 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  19 + <arg type="s" name="uri" direction="in" />
  20 + <arg type="i" name="result" direction="out" />
  21 + </method>
  22 + <method name="getURL">
  23 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  24 + <arg type="s" name="uri" direction="out" />
  25 + </method>
  26 + <method name="disconnect">
  27 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  28 + <arg type="i" name="result" direction="out" />
  29 + </method>
  30 + <method name="getMessageID">
  31 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  32 + <arg type="i" name="status" direction="out" />
  33 + </method>
  34 + <method name="getConnectionState">
  35 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  36 + <arg type="i" name="status" direction="out" />
  37 + </method>
  38 + <method name="getSecureState">
  39 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  40 + <arg type="i" name="status" direction="out" />
  41 + </method>
  42 + <method name="getScreenContents">
  43 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  44 + <arg type="s" name="contents" direction="out" />
  45 + </method>
  46 + <method name="enter">
  47 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  48 + <arg type="i" name="result" direction="out" />
  49 + </method>
  50 + <method name="pfKey">
  51 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  52 + <arg type="i" name="key" direction="in" />
  53 + <arg type="i" name="result" direction="out" />
  54 + </method>
  55 + <method name="paKey">
  56 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  57 + <arg type="i" name="key" direction="in" />
  58 + <arg type="i" name="result" direction="out" />
  59 + </method>
  60 + <method name="input">
  61 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  62 + <arg type="s" name="text" direction="in" />
  63 + </method>
  64 + <method name="setTextAt">
  65 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  66 + <arg type="i" name="row" direction="in" />
  67 + <arg type="i" name="col" direction="in" />
  68 + <arg type="s" name="text" direction="in" />
  69 + <arg type="i" name="result" direction="out" />
  70 + </method>
  71 + <method name="getTextAt">
  72 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  73 + <arg type="i" name="row" direction="in" />
  74 + <arg type="i" name="col" direction="in" />
  75 + <arg type="i" name="len" direction="in" />
  76 + <arg type="y" name="lf" direction="in" />
  77 + <arg type="s" name="text" direction="out" />
  78 + </method>
  79 + <method name="getText">
  80 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  81 + <arg type="i" name="addr" direction="in" />
  82 + <arg type="i" name="len" direction="in" />
  83 + <arg type="y" name="lf" direction="in" />
  84 + <arg type="s" name="text" direction="out" />
  85 + </method>
  86 + <method name="setClipboard">
  87 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  88 + <arg type="s" name="text" direction="in" />
  89 + <arg type="i" name="result" direction="out" />
  90 + </method>
  91 + <method name="getClipboard">
  92 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  93 + <arg type="s" name="text" direction="out" />
  94 + </method>
  95 + <method name="isConnected">
  96 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  97 + <arg type="i" name="result" direction="out" />
  98 + </method>
  99 + <method name="isReady">
  100 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  101 + <arg type="i" name="result" direction="out" />
  102 + </method>
  103 + <method name="inTN3270E">
  104 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  105 + <arg type="i" name="result" direction="out" />
  106 + </method>
  107 + <method name="waitForReady">
  108 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  109 + <arg type="i" name="timeout" direction="in" />
  110 + <arg type="i" name="result" direction="out" />
  111 + </method>
  112 + <method name="setCursorAt">
  113 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  114 + <arg type="i" name="row" direction="in" />
  115 + <arg type="i" name="col" direction="in" />
  116 + <arg type="i" name="result" direction="out" />
  117 + </method>
  118 + <method name="setCursorAddress">
  119 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  120 + <arg type="i" name="addr" direction="in" />
  121 + <arg type="i" name="result" direction="out" />
  122 + </method>
  123 + <method name="getCursorAddress">
  124 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  125 + <arg type="i" name="addr" direction="out" />
  126 + </method>
  127 + <method name="getScreenWidth">
  128 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  129 + <arg type="i" name="width" direction="out" />
  130 + </method>
  131 + <method name="getScreenHeight">
  132 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  133 + <arg type="i" name="height" direction="out" />
  134 + </method>
  135 + <method name="getScreenLength">
  136 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  137 + <arg type="i" name="len" direction="out" />
  138 + </method>
  139 + <method name="getNextUnprotected">
  140 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  141 + <arg type="i" name="addr" direction="in" />
  142 + <arg type="i" name="result" direction="out" />
  143 + </method>
  144 + <method name="getIsProtected">
  145 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  146 + <arg type="i" name="addr" direction="in" />
  147 + <arg type="i" name="result" direction="out" />
  148 + </method>
  149 + <method name="getIsProtectedAt">
  150 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  151 + <arg type="i" name="row" direction="in" />
  152 + <arg type="i" name="col" direction="in" />
  153 + <arg type="i" name="result" direction="out" />
  154 + </method>
  155 + <method name="setToggle">
  156 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  157 + <arg type="i" name="id" direction="in" />
  158 + <arg type="i" name="value" direction="in" />
  159 + <arg type="i" name="result" direction="out" />
  160 + </method>
  161 + <method name="cmpTextAt">
  162 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  163 + <arg type="i" name="row" direction="in" />
  164 + <arg type="i" name="col" direction="in" />
  165 + <arg type="s" name="text" direction="in" />
  166 + <arg type="y" name="lf" direction="in" />
  167 + <arg type="i" name="result" direction="out" />
  168 + </method>
  169 + <method name="getFieldStart">
  170 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  171 + <arg type="i" name="addr" direction="in" />
  172 + <arg type="i" name="result" direction="out" />
  173 + </method>
  174 + <method name="getFieldLength">
  175 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  176 + <arg type="i" name="addr" direction="in" />
  177 + <arg type="i" name="result" direction="out" />
  178 + </method>
  179 + <method name="setScript">
  180 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  181 + <arg type="s" name="id" direction="in" />
  182 + <arg type="i" name="status" direction="in" />
  183 + <arg type="i" name="result" direction="out" />
  184 + </method>
  185 + <method name="showPopup">
  186 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  187 + <arg type="i" name="id" direction="in" />
  188 + <arg type="s" name="title" direction="in" />
  189 + <arg type="s" name="msg" direction="in" />
  190 + <arg type="s" name="text" direction="in" />
  191 + </method>
  192 + <method name="getHostCharset">
  193 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  194 + <arg type="s" name="charset" direction="out" />
  195 + </method>
  196 + <method name="getDisplayCharset">
  197 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  198 + <arg type="s" name="charset" direction="out" />
  199 + </method>
  200 + <method name="setHostCharset">
  201 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  202 + <arg type="s" name="charset" direction="in" />
  203 + <arg type="i" name="result" direction="out" />
  204 + </method>
  205 + <method name="eraseEof">
  206 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  207 + <arg type="i" name="result" direction="out" />
  208 + </method>
  209 + <method name="print">
  210 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  211 + <arg type="i" name="result" direction="out" />
  212 + </method>
  213 + <method name="ebc2asc">
  214 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  215 + <arg type="s" name="from" direction="in" />
  216 + <arg type="s" name="to" direction="out" />
  217 + </method>
  218 + <method name="asc2ebc">
  219 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  220 + <arg type="s" name="from" direction="in" />
  221 + <arg type="s" name="to" direction="out" />
  222 + </method>
  223 +
  224 + <method name="action">
  225 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  226 + <arg type="s" name="name" direction="in" />
  227 + <arg type="i" name="result" direction="out" />
  228 + </method>
  229 +
  230 + <method name="filetransfer">
  231 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  232 + <arg type="s" name="local" direction="in" />
  233 + <arg type="s" name="remote" direction="in" />
  234 + <arg type="i" name="flags" direction="in" />
  235 + <arg type="i" name="lrecl" direction="in" />
  236 + <arg type="i" name="blksize" direction="in" />
  237 + <arg type="i" name="primspace" direction="in" />
  238 + <arg type="i" name="secspace" direction="in" />
  239 + <arg type="i" name="dft" direction="in" />
  240 + <arg type="i" name="result" direction="out" />
  241 + </method>
  242 +
  243 + <method name="setUnlockDelay">
  244 + <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
  245 + <arg type="i" name="value" direction="in" />
  246 + <arg type="i" name="result" direction="out" />
  247 + </method>
  248 +
  249 + </interface>
  250 +
  251 +</node>
... ...
src/dbus3270/pw3270dbus.xml
View file @37b5492
... ... @@ -1,251 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8" ?>
2   -<node name="/br/com/bb/pw3270">
3   - <interface name="br.com.bb.pw3270">
4   - <method name="getRevision">
5   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
6   - <arg type="s" name="revision" direction="out" />
7   - </method>
8   - <method name="quit">
9   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
10   - <arg type="i" name="result" direction="out" />
11   - </method>
12   - <method name="connect">
13   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
14   - <arg type="s" name="uri" direction="in" />
15   - <arg type="i" name="result" direction="out" />
16   - </method>
17   - <method name="setURL">
18   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
19   - <arg type="s" name="uri" direction="in" />
20   - <arg type="i" name="result" direction="out" />
21   - </method>
22   - <method name="getURL">
23   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
24   - <arg type="s" name="uri" direction="out" />
25   - </method>
26   - <method name="disconnect">
27   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
28   - <arg type="i" name="result" direction="out" />
29   - </method>
30   - <method name="getMessageID">
31   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
32   - <arg type="i" name="status" direction="out" />
33   - </method>
34   - <method name="getConnectionState">
35   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
36   - <arg type="i" name="status" direction="out" />
37   - </method>
38   - <method name="getSecureState">
39   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
40   - <arg type="i" name="status" direction="out" />
41   - </method>
42   - <method name="getScreenContents">
43   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
44   - <arg type="s" name="contents" direction="out" />
45   - </method>
46   - <method name="enter">
47   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
48   - <arg type="i" name="result" direction="out" />
49   - </method>
50   - <method name="pfKey">
51   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
52   - <arg type="i" name="key" direction="in" />
53   - <arg type="i" name="result" direction="out" />
54   - </method>
55   - <method name="paKey">
56   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
57   - <arg type="i" name="key" direction="in" />
58   - <arg type="i" name="result" direction="out" />
59   - </method>
60   - <method name="input">
61   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
62   - <arg type="s" name="text" direction="in" />
63   - </method>
64   - <method name="setTextAt">
65   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
66   - <arg type="i" name="row" direction="in" />
67   - <arg type="i" name="col" direction="in" />
68   - <arg type="s" name="text" direction="in" />
69   - <arg type="i" name="result" direction="out" />
70   - </method>
71   - <method name="getTextAt">
72   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
73   - <arg type="i" name="row" direction="in" />
74   - <arg type="i" name="col" direction="in" />
75   - <arg type="i" name="len" direction="in" />
76   - <arg type="y" name="lf" direction="in" />
77   - <arg type="s" name="text" direction="out" />
78   - </method>
79   - <method name="getText">
80   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
81   - <arg type="i" name="addr" direction="in" />
82   - <arg type="i" name="len" direction="in" />
83   - <arg type="y" name="lf" direction="in" />
84   - <arg type="s" name="text" direction="out" />
85   - </method>
86   - <method name="setClipboard">
87   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
88   - <arg type="s" name="text" direction="in" />
89   - <arg type="i" name="result" direction="out" />
90   - </method>
91   - <method name="getClipboard">
92   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
93   - <arg type="s" name="text" direction="out" />
94   - </method>
95   - <method name="isConnected">
96   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
97   - <arg type="i" name="result" direction="out" />
98   - </method>
99   - <method name="isReady">
100   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
101   - <arg type="i" name="result" direction="out" />
102   - </method>
103   - <method name="inTN3270E">
104   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
105   - <arg type="i" name="result" direction="out" />
106   - </method>
107   - <method name="waitForReady">
108   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
109   - <arg type="i" name="timeout" direction="in" />
110   - <arg type="i" name="result" direction="out" />
111   - </method>
112   - <method name="setCursorAt">
113   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
114   - <arg type="i" name="row" direction="in" />
115   - <arg type="i" name="col" direction="in" />
116   - <arg type="i" name="result" direction="out" />
117   - </method>
118   - <method name="setCursorAddress">
119   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
120   - <arg type="i" name="addr" direction="in" />
121   - <arg type="i" name="result" direction="out" />
122   - </method>
123   - <method name="getCursorAddress">
124   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
125   - <arg type="i" name="addr" direction="out" />
126   - </method>
127   - <method name="getScreenWidth">
128   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
129   - <arg type="i" name="width" direction="out" />
130   - </method>
131   - <method name="getScreenHeight">
132   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
133   - <arg type="i" name="height" direction="out" />
134   - </method>
135   - <method name="getScreenLength">
136   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
137   - <arg type="i" name="len" direction="out" />
138   - </method>
139   - <method name="getNextUnprotected">
140   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
141   - <arg type="i" name="addr" direction="in" />
142   - <arg type="i" name="result" direction="out" />
143   - </method>
144   - <method name="getIsProtected">
145   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
146   - <arg type="i" name="addr" direction="in" />
147   - <arg type="i" name="result" direction="out" />
148   - </method>
149   - <method name="getIsProtectedAt">
150   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
151   - <arg type="i" name="row" direction="in" />
152   - <arg type="i" name="col" direction="in" />
153   - <arg type="i" name="result" direction="out" />
154   - </method>
155   - <method name="setToggle">
156   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
157   - <arg type="i" name="id" direction="in" />
158   - <arg type="i" name="value" direction="in" />
159   - <arg type="i" name="result" direction="out" />
160   - </method>
161   - <method name="cmpTextAt">
162   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
163   - <arg type="i" name="row" direction="in" />
164   - <arg type="i" name="col" direction="in" />
165   - <arg type="s" name="text" direction="in" />
166   - <arg type="y" name="lf" direction="in" />
167   - <arg type="i" name="result" direction="out" />
168   - </method>
169   - <method name="getFieldStart">
170   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
171   - <arg type="i" name="addr" direction="in" />
172   - <arg type="i" name="result" direction="out" />
173   - </method>
174   - <method name="getFieldLength">
175   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
176   - <arg type="i" name="addr" direction="in" />
177   - <arg type="i" name="result" direction="out" />
178   - </method>
179   - <method name="setScript">
180   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
181   - <arg type="s" name="id" direction="in" />
182   - <arg type="i" name="status" direction="in" />
183   - <arg type="i" name="result" direction="out" />
184   - </method>
185   - <method name="showPopup">
186   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
187   - <arg type="i" name="id" direction="in" />
188   - <arg type="s" name="title" direction="in" />
189   - <arg type="s" name="msg" direction="in" />
190   - <arg type="s" name="text" direction="in" />
191   - </method>
192   - <method name="getHostCharset">
193   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
194   - <arg type="s" name="charset" direction="out" />
195   - </method>
196   - <method name="getDisplayCharset">
197   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
198   - <arg type="s" name="charset" direction="out" />
199   - </method>
200   - <method name="setHostCharset">
201   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
202   - <arg type="s" name="charset" direction="in" />
203   - <arg type="i" name="result" direction="out" />
204   - </method>
205   - <method name="eraseEof">
206   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
207   - <arg type="i" name="result" direction="out" />
208   - </method>
209   - <method name="print">
210   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
211   - <arg type="i" name="result" direction="out" />
212   - </method>
213   - <method name="ebc2asc">
214   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
215   - <arg type="s" name="from" direction="in" />
216   - <arg type="s" name="to" direction="out" />
217   - </method>
218   - <method name="asc2ebc">
219   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
220   - <arg type="s" name="from" direction="in" />
221   - <arg type="s" name="to" direction="out" />
222   - </method>
223   -
224   - <method name="action">
225   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
226   - <arg type="s" name="name" direction="in" />
227   - <arg type="i" name="result" direction="out" />
228   - </method>
229   -
230   - <method name="filetransfer">
231   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
232   - <arg type="s" name="local" direction="in" />
233   - <arg type="s" name="remote" direction="in" />
234   - <arg type="i" name="flags" direction="in" />
235   - <arg type="i" name="lrecl" direction="in" />
236   - <arg type="i" name="blksize" direction="in" />
237   - <arg type="i" name="primspace" direction="in" />
238   - <arg type="i" name="secspace" direction="in" />
239   - <arg type="i" name="dft" direction="in" />
240   - <arg type="i" name="result" direction="out" />
241   - </method>
242   -
243   - <method name="setUnlockDelay">
244   - <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
245   - <arg type="i" name="value" direction="in" />
246   - <arg type="i" name="result" direction="out" />
247   - </method>
248   -
249   - </interface>
250   -
251   -</node>
src/plugin/linux/gobject.c
  Diff comments   View file @ebebd49
... ... @@ -68,7 +68,7 @@ static void pw3270_dbus_class_init(PW3270DbusClass *klass)
68 68 object_class->finalize = pw3270_dbus_finalize;
69 69 }
70 70  
71   -static void pw3270_dbus_init(PW3270Dbus *object)
  71 +static void pw3270_dbus_init(PW3270Dbus G_GNUC_UNUSED(*object))
72 72 {
73 73  
74 74 }
... ... @@ -199,6 +199,7 @@ int pw3270_dbus_check_valid_state(PW3270Dbus *object, DBusGMethodInvocation *con
199 199 case LIB3270_MESSAGE_RESOLVING:
200 200 case LIB3270_MESSAGE_CONNECTING:
201 201 error = g_error_new(ERROR_DOMAIN,EINPROGRESS,_( "Connecting to host" ));
  202 + break;
202 203  
203 204 case LIB3270_MESSAGE_USER:
204 205 error = g_error_new(ERROR_DOMAIN,-1,_( "Unexpected state %04d" ),state);
... ... @@ -512,7 +513,7 @@ void pw3270_dbus_set_clipboard(PW3270Dbus *object, const gchar *text, DBusGMetho
512 513 dbus_g_method_return(context,0);
513 514 }
514 515  
515   -void pw3270_dbus_set_script(PW3270Dbus *object, const gchar *text, int mode, DBusGMethodInvocation *context)
  516 +void pw3270_dbus_set_script(PW3270Dbus *object, const gchar G_GNUC_UNUSED(*text), int mode, DBusGMethodInvocation *context)
516 517 {
517 518 GtkWidget *widget = pw3270_get_terminal_widget(NULL);
518 519  
... ... @@ -540,7 +541,7 @@ void pw3270_dbus_get_host_charset(PW3270Dbus *object, DBusGMethodInvocation *con
540 541 dbus_g_method_return(context,lib3270_get_host_charset(pw3270_dbus_get_session_handle(object)));
541 542 }
542 543  
543   -void pw3270_dbus_get_display_charset(PW3270Dbus *object, DBusGMethodInvocation *context)
  544 +void pw3270_dbus_get_display_charset(PW3270Dbus G_GNUC_UNUSED(*object), DBusGMethodInvocation *context)
544 545 {
545 546 // Allways return UTF-8 to avoid double conversion
546 547 dbus_g_method_return(context,"UTF-8");
... ...
src/plugin/linux/main.c
  Diff comments   View file @ebebd49
... ... @@ -40,7 +40,7 @@
40 40 #include <pw3270/plugin.h>
41 41  
42 42 #include "service.h"
43   -//#include "dbus-glue.h"
  43 +#include "dbus-glue.h"
44 44  
45 45 #include <gtk/gtk.h>
46 46  
... ... @@ -53,7 +53,7 @@
53 53  
54 54 /*---[ Implement ]-------------------------------------------------------------------------------*/
55 55  
56   - LIB3270_EXPORT int pw3270_plugin_start(GtkWidget *window, GtkWidget *terminal)
  56 + LIB3270_EXPORT int pw3270_plugin_start(GtkWidget *window, GtkWidget G_GNUC_UNUSED(*terminal))
57 57 {
58 58 GError * error = NULL;
59 59 guint result;
... ... @@ -144,7 +144,7 @@
144 144 return 0;
145 145 }
146 146  
147   - LIB3270_EXPORT int pw3270_plugin_stop(GtkWidget *window, GtkWidget *terminal)
  147 + LIB3270_EXPORT int pw3270_plugin_stop(GtkWidget G_GNUC_UNUSED(*window), GtkWidget G_GNUC_UNUSED(*terminal))
148 148 {
149 149 if(service_name)
150 150 {
... ... @@ -156,13 +156,13 @@
156 156 return 0;
157 157 }
158 158  
159   - void pw3270_dbus_quit(PW3270Dbus *object, DBusGMethodInvocation *context)
  159 + void pw3270_dbus_quit(PW3270Dbus G_GNUC_UNUSED(*object), DBusGMethodInvocation *context)
160 160 {
161 161 gtk_main_quit();
162 162 dbus_g_method_return(context,0);
163 163 }
164 164  
165   - H3270 * pw3270_dbus_get_session_handle(PW3270Dbus *object)
  165 + H3270 * pw3270_dbus_get_session_handle(PW3270Dbus G_GNUC_UNUSED(*object))
166 166 {
167 167 return lib3270_get_default_session_handle();
168 168 }
... ...
src/plugin/linux/misc.c
  Diff comments   View file @ebebd49
... ... @@ -37,7 +37,7 @@
37 37  
38 38 /*---[ Implement ]-------------------------------------------------------------------------------*/
39 39  
40   -gpointer pw3270_dbus_register_object(DBusGConnection *connection,DBusGProxy *proxy,GType object_type,const DBusGObjectInfo *info,const gchar *path)
  40 +gpointer pw3270_dbus_register_object(DBusGConnection *connection,DBusGProxy G_GNUC_UNUSED(*proxy),GType object_type,const DBusGObjectInfo *info,const gchar *path)
41 41 {
42 42 GObject *object = g_object_new (object_type, NULL);
43 43 dbus_g_object_type_install_info (object_type, info);
... ...