Download as
Browse Code »

Commit db77a72302ed54cdeb9f34bbbdf1773393bab26e

Authored by perry.werneck@gmail.com
1 parent 2b27f48e
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Versão sem suporte DBUS estava dando erro ao compilar

Showing 2 changed files with 23 additions and 16 deletions   Show diff stats
po/pt_BR.po
  Diff comments   View file @db77a72
... ... @@ -5,7 +5,7 @@ msgid ""
5 5 msgstr ""
6 6 "Project-Id-Version: pw3270 5.0\n"
7 7 "Report-Msgid-Bugs-To: \n"
8   -"POT-Creation-Date: 2013-07-17 11:07-0300\n"
  8 +"POT-Creation-Date: 2013-07-18 10:34-0300\n"
9 9 "PO-Revision-Date: 2013-07-03 10:51-0300\n"
10 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 11 "Language-Team: Português <perry.werneck@gmail.com>\n"
... ... @@ -312,7 +312,7 @@ msgstr &quot;Erro na assinatura CRL&quot;
312 312 msgid "C_haracter Coding:"
313 313 msgstr "C_odificação de caracteres:"
314 314  
315   -#: print.c:409
  315 +#: print.c:412
316 316 msgid "C_olor scheme:"
317 317 msgstr "Tema de c_ores:"
318 318  
... ... @@ -1011,7 +1011,7 @@ msgstr &quot;Estado normal na OIA&quot;
1011 1011 msgid "Option '%c:' is not supported"
1012 1012 msgstr "Opção não suportada: '%c:'"
1013 1013  
1014   -#: print.c:601
  1014 +#: print.c:604
1015 1015 msgid "Options"
1016 1016 msgstr "Opções"
1017 1017  
... ... @@ -1208,11 +1208,11 @@ msgstr &quot;Operação de impressão falhou&quot;
1208 1208 msgid "Print selected"
1209 1209 msgstr "Imprimir seleção"
1210 1210  
1211   -#: print.c:495
  1211 +#: print.c:498
1212 1212 msgid "Print selection box"
1213 1213 msgstr "Imprimir marca de seleção"
1214 1214  
1215   -#: print.c:903 ui/00default.xml:372
  1215 +#: print.c:906 ui/00default.xml:372
1216 1216 msgid "Print settings"
1217 1217 msgstr "Configurações de impressão"
1218 1218  
... ... @@ -2262,7 +2262,7 @@ msgstr &quot;_Editar&quot;
2262 2262 msgid "_File"
2263 2263 msgstr "_Arquivo"
2264 2264  
2265   -#: print.c:409
  2265 +#: print.c:412
2266 2266 msgid "_Font:"
2267 2267 msgstr "_Fonte:"
2268 2268  
... ...
src/classlib/remote.cc
  Diff comments   View file @db77a72
... ... @@ -41,6 +41,14 @@
41 41 #if defined(WIN32)
42 42 #include <windows.h>
43 43 #include <pw3270/ipcpackets.h>
  44 + #else
  45 + #define HLLAPI_PACKET_IS_CONNECTED "isConnected"
  46 + #define HLLAPI_PACKET_GET_CSTATE "getConnectionState"
  47 + #define HLLAPI_PACKET_IS_READY "isReady"
  48 + #define HLLAPI_PACKET_DISCONNECT "disconnect"
  49 + #define HLLAPI_PACKET_GET_CURSOR "getCursorAddress"
  50 + #define HLLAPI_PACKET_ENTER "enter"
  51 + #define HLLAPI_PACKET_QUIT "quit"
44 52 #endif // WIN32
45 53  
46 54 #include <pw3270/class.h>
... ... @@ -59,6 +67,7 @@
59 67 class remote : public session
60 68 {
61 69 private:
  70 +
62 71 #if defined(WIN32)
63 72  
64 73 HANDLE hPipe;
... ... @@ -121,14 +130,6 @@
121 130  
122 131 #elif defined(HAVE_DBUS)
123 132  
124   - #define HLLAPI_PACKET_IS_CONNECTED "isConnected"
125   - #define HLLAPI_PACKET_GET_CSTATE "getConnectionState"
126   - #define HLLAPI_PACKET_IS_READY "isReady"
127   - #define HLLAPI_PACKET_DISCONNECT "disconnect"
128   - #define HLLAPI_PACKET_GET_CURSOR "getCursorAddress"
129   - #define HLLAPI_PACKET_ENTER "enter"
130   - #define HLLAPI_PACKET_QUIT "quit"
131   -
132 133 DBusConnection * conn;
133 134 char * dest;
134 135 char * path;
... ... @@ -257,10 +258,11 @@
257 258  
258 259 #else
259 260  
  261 +
260 262 int query_intval(const char *method)
261 263 {
262 264 throw exception("Call to unimplemented RPC method \"%s\"",method);
263   - return -1
  265 + return -1;
264 266 }
265 267  
266 268 #endif
... ... @@ -738,7 +740,9 @@
738 740 #if defined(WIN32)
739 741 struct hllapi_packet_query_offset query = { HLLAPI_PACKET_GET_TEXT_AT_OFFSET, (unsigned short) baddr, (unsigned short) len };
740 742 return query_string(&query,sizeof(query),len);
741   -#else
  743 +
  744 +#elif defined(HAVE_DBUS)
  745 +
742 746 dbus_int32_t b = (dbus_int32_t) baddr;
743 747 dbus_int32_t l = (dbus_int32_t) len;
744 748  
... ... @@ -750,6 +754,9 @@
750 754 dbus_message_append_args(msg, DBUS_TYPE_INT32, &b, DBUS_TYPE_INT32, &l, DBUS_TYPE_INVALID);
751 755  
752 756 return get_string(call(msg));
  757 +#else
  758 + throw exception("%s","IPC support is unavailable");
  759 + return NULL;
753 760 #endif
754 761 }
755 762  
... ...