Ajustes para empacotamento MACOSX Mountain Lion com gtk3

perry.werneck@gmail.com
1 parent 90c10998
Showing 5 changed files with 199 additions and 32 deletions Show diff stats
mac/pw3270.bundle
po/pt_BR.po
pw3270.komodoproject
src/include/pw3270.h
src/pw3270/main.c
@@ -0,0 +1,160 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<app-bundle>
+
+  <meta>
+    <!-- Where to pick up the GTK+ installation, icon themes,
+         etc. Note that "${env:JHBUILD_PREFIX}" is evaluated to the
+         value of the environment variable JHBUILD_PREFIX. You can
+         define additional prefixes and refer to them in paths
+         throughout this file on the form "${prefix:name}". This is
+         useful for installing certain libraries or even the
+         application itself separately. Note that JHBUILD_PREFIX is
+         defined by jhbuild, so it you are not using jhbuild you can
+         either define your own or just hardcode the path here.
+    -->
+    <prefix name="default">${env:JHBUILD_PREFIX}</prefix>
+    <prefix name="bin">${project}/../.bin/Release</prefix>
+
+    <!-- The project directory is the default location of the created
+         app. If you leave out the path, the current directory is
+         used. Note the usage of an environment variable here again.
+    -->
+    <destination overwrite="yes">${project}/../.bin</destination>
+
+    <image>
+      <!-- Not implemented yet (DMG image). -->
+    </image>
+
+    <!-- Comment this out to keep the install names in binaries -->
+    <run-install-name-tool/>
+
+    <!-- Optionally specify a launcher script to use. If the
+         application sets up everything needed itself, like
+         environment variable, linker paths, etc, a launcher script is
+         not needed. If the source path is left out, the default
+         script will be used.
+    -->
+    <launcher-script>${project}/launcher.sh</launcher-script >
+
+    <!-- Not implemented: Optional runtime, could be python or mono
+         for example.
+    -->
+    <!-- runtime copy="yes">/usr/bin/python</runtime -->
+    <!-- Indicate the active gtk version to use. This is needed only
+         for gtk+-3.0 projects. -->
+    <gtk>gtk+-3.0</gtk>
+  </meta>
+
+  <!-- The special macro "${project}" refers to the directory where
+       this bundle file is located. The application name and bundle
+       identifier are taken from the plist file.
+  -->
+  <plist>${project}/Info.plist</plist>
+
+  <main-binary>${prefix:bin}/pw3270</main-binary>
+  <binary>
+	 ${prefix:bin}/lib/*.so.5.0
+  </binary>
+
+  <!-- Copy in GTK+ modules. Note the ${gtkdir} macro, which expands
+       to the correct library subdirectory for the specified gtk
+       version.
+  -->
+ <!--
+  <binary>
+     ${prefix}/lib/${gtkdir}/modules/*.so
+  </binary>
+-->
+  <!-- Copy in GTK+ theme engines and print backends. Note the use of the
+       "${pkg:module:variable}" macro, which evaluates to a pkg-config
+       variable in the specified module. Note that any libraries that
+       binaries link to are also copied in automatically.  Note also
+       the included ${gtk} macro, which gets the correct package name
+       to get. -->
+ <!---
+  <binary>
+    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/engines/*.so
+  </binary>
+ -->
+  <binary>
+    ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so
+  </binary>
+
+<!-- Starting with 2.24, gdk-pixbuf installs into its own directory. -->
+<!--
+  <binary>
+    ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/*.so
+  </binary>
+-->
+
+  <!-- Translation filenames, one for each program or library that you
+       want to copy in to the bundle. The "dest" attribute is
+       optional, as usual. Bundler will find all translations of that
+       library/program under the indicated directory and copy them.-->
+  <translations  name="gtk30">
+    ${prefix}/share/locale
+  </translations>
+
+
+  <!-- Data to copy in, usually Glade/UI files, images, sounds files
+       etc. The destination inside the bundle can be specified if the
+       files should end up at a different location, by using the
+       "dest" property. The destination must then start with the macro
+       "${bundle}", which refers to the bundle root directory.
+  -->
+  <data dest="${bundle}/Contents/Resources/share/ui/00default.xml">
+	 ${project}/../ui/00default.xml
+  </data>
+
+  <data dest="${bundle}/Contents/Resources/share/colors.conf">
+	 ${project}/../colors.conf
+  </data>
+
+  <data dest="${bundle}/Contents/LICENCA">
+	${project}/../LICENCA
+  </data>
+
+  <data dest="${bundle}/Contents/LICENSE">
+	${project}/../LICENSE
+  </data>
+
+  <data dest="${bundle}/Contents/AUTHORS">
+	${project}/../AUTHORS
+  </data>
+
+  <!-- Copy in the themes data. You may want to trim this to save space
+       in your bundle. -->
+  <data>
+    ${prefix}/share/themes
+  </data>
+
+  <!-- Copy icons. Note that the .icns file is an Apple format which
+       contains up to 4 sizes of icon. You can use
+       /Developer/Applications/Utilities/Icon Composer.app to import
+       artwork and create the file. >
+  <data dest="${bundle}/Contents/Resources">
+    ${project}/Giggle.icns
+  </data -->
+
+  <!-- This is where theme commands go. You can copy them in from your
+       theme of choice if they provide and example, or you can just
+       change the source path. -->
+<!--
+  <data dest="${bundle}/Contents/Resources/etc/${gtk}/gtkrc">
+    ${project}/gtkrc
+  </data>
+-->
+  <!-- Icon themes to copy. The "icons" property can be either of
+       "auto", "all", or "none". All or none should be
+       self-explanatory, while auto means that the script will try to
+       figure out which icons are needed. This is done by getting all
+       the strings from all copied binaries, and matching them against
+       icon names. To be safe, you should use "all". "none" is useful
+       if you want just the index.theme file but no icons, mostly
+       needed for the "hicolor" base theme.
+  >
+  <icon-theme icons="auto">
+    Tango
+  </icon-theme -->
+
+</app-bundle>
 \ No newline at end of file
@@ -5,7 +5,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-31 04:17-0300\n"
+"POT-Creation-Date: 2012-09-01 05:19-0300\n"
 "PO-Revision-Date: 2012-08-27 09:01-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Português do Brasil <>\n"
@@ -18,32 +18,32 @@ msgstr &quot;&quot;
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
  
-#: kybd.c:2638
+#: kybd.c:2644
 #, c-format
 msgid "%s: Bell not supported"
 msgstr "%s: Alerta sonoro não suportado"
  
-#: kybd.c:2797
+#: kybd.c:2803
 #, c-format
 msgid "%s: Missing hex digits after \\x"
 msgstr "%s: Faltando dígitos hexadecimais após \\x"
  
-#: kybd.c:2737
+#: kybd.c:2743
 #, c-format
 msgid "%s: Unknown character after \\p"
 msgstr "%s: Unknown character after \\p"
  
-#: kybd.c:2773
+#: kybd.c:2779
 #, c-format
 msgid "%s: Unknown character after \\pa"
 msgstr "%s: Unknown character after \\pa"
  
-#: kybd.c:2751
+#: kybd.c:2757
 #, c-format
 msgid "%s: Unknown character after \\pf"
 msgstr "%s: Unknown character after \\pf"
  
-#: kybd.c:2689
+#: kybd.c:2695
 #, c-format
 msgid "%s: Vertical tab not supported"
 msgstr "%s: Tabulação verticao não suportada"
@@ -58,15 +58,15 @@ msgstr &quot;%s: Familia %d é inválida&quot;
 msgid "%s:%d"
 msgstr "%s:%d"
  
-#: screen.c:639 screen.c:641 screen.c:671 screen.c:685 screen.c:796
+#: screen.c:656 screen.c:658 screen.c:688 screen.c:702 screen.c:813
 msgid "3270 Error"
 msgstr "Erro 3270"
  
-#: screen.c:656
+#: screen.c:673
 msgid "3270 Warning"
 msgstr "Alerta 3270"
  
-#: telnet.c:3178
+#: telnet.c:3181
 #, c-format
 msgid ""
 "<b>Connection state:</b> %s\n"
@@ -107,7 +107,7 @@ msgstr &quot;Cursor piscante&quot;
 msgid "Bold"
 msgstr "Negrito"
  
-#: telnet.c:2053
+#: telnet.c:2056
 msgid "Broken pipe"
 msgstr "Broken pipe"
  
@@ -145,7 +145,7 @@ msgstr &quot;Cancelado pelo usuário&quot;
 msgid "Cannot create socket handle"
 msgstr "Não foi possível criar um manipulador de socket"
  
-#: session.c:315
+#: session.c:317
 #, c-format
 msgid "Cannot find charset \"%s\", using defaults"
 msgstr "Não encontrei codificação \"%s\", usando defaults"
@@ -184,7 +184,7 @@ msgstr &quot;Conectar ao iniciar&quot;
 msgid "Connection failed"
 msgstr "Conexão falhou"
  
-#: telnet.c:2057
+#: telnet.c:2060
 msgid "Connection reset by peer"
 msgstr "Conexão foi cancelada pelo servidor"
  
@@ -220,7 +220,7 @@ msgstr &quot;Debug&quot;
 msgid "Debug window updates"
 msgstr "Mostrar atualizações de janela"
  
-#: telnet.c:1729
+#: telnet.c:1731
 msgid "Device type rejected"
 msgstr "Tipo de dispositivo rejeitado"
  
@@ -228,7 +228,7 @@ msgstr &quot;Tipo de dispositivo rejeitado&quot;
 msgid "Disconnected from host"
 msgstr "Desconectado do servidor"
  
-#: telnet.c:1304
+#: telnet.c:1306
 msgid "EOR received when not in 3270 mode, ignored."
 msgstr "EOR recebido fora do modo 3270, ignorado."
  
@@ -329,15 +329,15 @@ msgstr &quot;Ajuda&quot;
 msgid "Host disconnected, transfer cancelled"
 msgstr "Servidor desconectou, transferência cancelada"
  
-#: telnet.c:1787
+#: telnet.c:1789
 msgid "Host illegally added function(s)"
 msgstr "Host illegally added function(s)"
  
-#: telnet.c:1712
+#: telnet.c:1714
 msgid "Host rejected device type or request type"
 msgstr "Servidor rejeitou o tipo de dispositivo ou requisição"
  
-#: telnet.c:1725
+#: telnet.c:1727
 msgid "Host rejected resource(s)"
 msgstr "Servidor rejeitou recurso(s)"
  
@@ -673,7 +673,7 @@ msgstr &quot;SOCKS5 Proxy: xmit version 5 nmethods 1 (no auth)\n&quot;
 msgid "SOCKS5 proxy: %s/%u: %s"
 msgstr "SOCKS5 proxy: %s/%u: %s"
  
-#: telnet.c:3176
+#: telnet.c:3179
 msgid "SSL Connect error"
 msgstr "Erro na conexão SSL"
  
@@ -693,7 +693,7 @@ msgstr &quot;Erro SSL&quot;
 msgid "SSL negotiation failed"
 msgstr "Negociação SSL falhou"
  
-#: telnet.c:2043
+#: telnet.c:2046
 #, c-format
 msgid ""
 "SSL_write:\n"
@@ -770,7 +770,7 @@ msgstr &quot;Colar inteligente&quot;
 msgid "Socket read error"
 msgstr "Erro ao ler dados da rede"
  
-#: telnet.c:2064
+#: telnet.c:2067
 msgid "Socket write error"
 msgstr "Erro ao enviar dados para a rede"
  
@@ -782,7 +782,7 @@ msgstr &quot;Espaço no nome da LU&quot;
 msgid "TELNET Proxy: send error"
 msgstr "TELNET Proxy: send error"
  
-#: telnet.c:3227
+#: telnet.c:3230
 msgid "TLS negotiation failure"
 msgstr "Negociação TLS falhou"
  
@@ -844,12 +844,12 @@ msgstr &quot;Não foi possível enviar a requisição de transferência de arquivo&quot;
 msgid "Unexpected error"
 msgstr "Erro inesperado"
  
-#: kybd.c:336
+#: kybd.c:338
 #, c-format
 msgid "Unexpected type %d in typeahead queue"
 msgstr "Tipo inesperado %d na fila de teclado"
  
-#: ctlr.c:498
+#: ctlr.c:505
 #, c-format
 msgid "Unknown 3270 Data Stream command: 0x%X"
 msgstr "Unknown 3270 Data Stream command: 0x%X"
@@ -858,12 +858,12 @@ msgstr &quot;Unknown 3270 Data Stream command: 0x%X&quot;
 msgid "Unknown FT control code from host"
 msgstr "Servidor enviou código de controle FT desconhecido"
  
-#: kybd.c:2387
+#: kybd.c:2393
 #, c-format
 msgid "Unknown PA key %d"
 msgstr "PA %d desconhecida"
  
-#: kybd.c:2402
+#: kybd.c:2408
 #, c-format
 msgid "Unknown PF key %d"
 msgstr "PF %d desconhecida"
@@ -959,12 +959,12 @@ msgstr &quot;Opções&quot;
 msgid "_View"
 msgstr "_Exibir"
  
-#: telnet.c:3041 telnet.c:3052
+#: telnet.c:3044 telnet.c:3055
 #, c-format
 msgid "fcntl(%s)"
 msgstr "fcntl(%s)"
  
-#: telnet.c:3031
+#: telnet.c:3034
 #, c-format
 msgid "ioctl(%s)"
 msgstr "ioctl(%s)"
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Komodo Project File - DO NOT EDIT -->
+<project id="835c3792-90af-274e-8705-405cacf376e1" kpf_version="5" name="pw3270.komodoproject">
+</project>
@@ -62,11 +62,10 @@
  LIB3270_EXPORT void		  pw3270_restore_window_state(GtkWidget *widget, const gchar *name);
  
 #ifdef HAVE_GTKMAC
- LIB3270_EXPORT				  GtkMacBundle * pw3270_get_bundle(void);
+ #include <gtk-mac-bundle.h>
+ LIB3270_EXPORT GtkMacBundle	* pw3270_get_bundle(void);
 #endif
  
-
-
  G_END_DECLS
  
 #endif // PW3270_H_INCLUDED
@@ -32,6 +32,11 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include "globals.h"
+
+#ifdef HAVE_GTKMAC
+ #include <gtkosxapplication.h>
+#endif // HAVE_GTKMAC
+
 #include <v3270.h>
 #include "v3270/accessible.h"
 #include <stdlib.h>
@@ -259,4 +264,3 @@ int main(int argc, char *argv[])
  
 	return rc;
 }
-
...	...	@@ -0,0 +1,160 @@
	1	+<?xml version="1.0" standalone="no"?> <!--- mode: xml --->
	2	+<app-bundle>
	3	+
	4	+ <meta>
	5	+ <!-- Where to pick up the GTK+ installation, icon themes,
	6	+ etc. Note that "${env:JHBUILD_PREFIX}" is evaluated to the
	7	+ value of the environment variable JHBUILD_PREFIX. You can
	8	+ define additional prefixes and refer to them in paths
	9	+ throughout this file on the form "${prefix:name}". This is
	10	+ useful for installing certain libraries or even the
	11	+ application itself separately. Note that JHBUILD_PREFIX is
	12	+ defined by jhbuild, so it you are not using jhbuild you can
	13	+ either define your own or just hardcode the path here.
	14	+ -->
	15	+ <prefix name="default">${env:JHBUILD_PREFIX}</prefix>
	16	+ <prefix name="bin">${project}/../.bin/Release</prefix>
	17	+
	18	+ <!-- The project directory is the default location of the created
	19	+ app. If you leave out the path, the current directory is
	20	+ used. Note the usage of an environment variable here again.
	21	+ -->
	22	+ <destination overwrite="yes">${project}/../.bin</destination>
	23	+
	24	+ <image>
	25	+ <!-- Not implemented yet (DMG image). -->
	26	+ </image>
	27	+
	28	+ <!-- Comment this out to keep the install names in binaries -->
	29	+ <run-install-name-tool/>
	30	+
	31	+ <!-- Optionally specify a launcher script to use. If the
	32	+ application sets up everything needed itself, like
	33	+ environment variable, linker paths, etc, a launcher script is
	34	+ not needed. If the source path is left out, the default
	35	+ script will be used.
	36	+ -->
	37	+ <launcher-script>${project}/launcher.sh</launcher-script >
	38	+
	39	+ <!-- Not implemented: Optional runtime, could be python or mono
	40	+ for example.
	41	+ -->
	42	+ <!-- runtime copy="yes">/usr/bin/python</runtime -->
	43	+ <!-- Indicate the active gtk version to use. This is needed only
	44	+ for gtk+-3.0 projects. -->
	45	+ <gtk>gtk+-3.0</gtk>
	46	+ </meta>
	47	+
	48	+ <!-- The special macro "${project}" refers to the directory where
	49	+ this bundle file is located. The application name and bundle
	50	+ identifier are taken from the plist file.
	51	+ -->
	52	+ <plist>${project}/Info.plist</plist>
	53	+
	54	+ <main-binary>${prefix:bin}/pw3270</main-binary>
	55	+ <binary>
	56	+ ${prefix:bin}/lib/*.so.5.0
	57	+ </binary>
	58	+
	59	+ <!-- Copy in GTK+ modules. Note the ${gtkdir} macro, which expands
	60	+ to the correct library subdirectory for the specified gtk
	61	+ version.
	62	+ -->
	63	+ <!--
	64	+ <binary>
	65	+ ${prefix}/lib/${gtkdir}/modules/*.so
	66	+ </binary>
	67	+-->
	68	+ <!-- Copy in GTK+ theme engines and print backends. Note the use of the
	69	+ "${pkg:module:variable}" macro, which evaluates to a pkg-config
	70	+ variable in the specified module. Note that any libraries that
	71	+ binaries link to are also copied in automatically. Note also
	72	+ the included ${gtk} macro, which gets the correct package name
	73	+ to get. -->
	74	+ <!---
	75	+ <binary>
	76	+ ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/engines/*.so
	77	+ </binary>
	78	+ -->
	79	+ <binary>
	80	+ ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so
	81	+ </binary>
	82	+
	83	+<!-- Starting with 2.24, gdk-pixbuf installs into its own directory. -->
	84	+<!--
	85	+ <binary>
	86	+ ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/*.so
	87	+ </binary>
	88	+-->
	89	+
	90	+ <!-- Translation filenames, one for each program or library that you
	91	+ want to copy in to the bundle. The "dest" attribute is
	92	+ optional, as usual. Bundler will find all translations of that
	93	+ library/program under the indicated directory and copy them.-->
	94	+ <translations name="gtk30">
	95	+ ${prefix}/share/locale
	96	+ </translations>
	97	+
	98	+
	99	+ <!-- Data to copy in, usually Glade/UI files, images, sounds files
	100	+ etc. The destination inside the bundle can be specified if the
	101	+ files should end up at a different location, by using the
	102	+ "dest" property. The destination must then start with the macro
	103	+ "${bundle}", which refers to the bundle root directory.
	104	+ -->
	105	+ <data dest="${bundle}/Contents/Resources/share/ui/00default.xml">
	106	+ ${project}/../ui/00default.xml
	107	+ </data>
	108	+
	109	+ <data dest="${bundle}/Contents/Resources/share/colors.conf">
	110	+ ${project}/../colors.conf
	111	+ </data>
	112	+
	113	+ <data dest="${bundle}/Contents/LICENCA">
	114	+ ${project}/../LICENCA
	115	+ </data>
	116	+
	117	+ <data dest="${bundle}/Contents/LICENSE">
	118	+ ${project}/../LICENSE
	119	+ </data>
	120	+
	121	+ <data dest="${bundle}/Contents/AUTHORS">
	122	+ ${project}/../AUTHORS
	123	+ </data>
	124	+
	125	+ <!-- Copy in the themes data. You may want to trim this to save space
	126	+ in your bundle. -->
	127	+ <data>
	128	+ ${prefix}/share/themes
	129	+ </data>
	130	+
	131	+ <!-- Copy icons. Note that the .icns file is an Apple format which
	132	+ contains up to 4 sizes of icon. You can use
	133	+ /Developer/Applications/Utilities/Icon Composer.app to import
	134	+ artwork and create the file. >
	135	+ <data dest="${bundle}/Contents/Resources">
	136	+ ${project}/Giggle.icns
	137	+ </data -->
	138	+
	139	+ <!-- This is where theme commands go. You can copy them in from your
	140	+ theme of choice if they provide and example, or you can just
	141	+ change the source path. -->
	142	+<!--
	143	+ <data dest="${bundle}/Contents/Resources/etc/${gtk}/gtkrc">
	144	+ ${project}/gtkrc
	145	+ </data>
	146	+-->
	147	+ <!-- Icon themes to copy. The "icons" property can be either of
	148	+ "auto", "all", or "none". All or none should be
	149	+ self-explanatory, while auto means that the script will try to
	150	+ figure out which icons are needed. This is done by getting all
	151	+ the strings from all copied binaries, and matching them against
	152	+ icon names. To be safe, you should use "all". "none" is useful
	153	+ if you want just the index.theme file but no icons, mostly
	154	+ needed for the "hicolor" base theme.
	155	+ >
	156	+ <icon-theme icons="auto">
	157	+ Tango
	158	+ </icon-theme -->
	159	+
	160	+</app-bundle>
0	161	\ No newline at end of file
...	...
...	...	@@ -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: 2012-08-31 04:17-0300\n"
	8	+"POT-Creation-Date: 2012-09-01 05:19-0300\n"
9	9	"PO-Revision-Date: 2012-08-27 09:01-0300\n"
10	10	"Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11	11	"Language-Team: Português do Brasil <>\n"
...	...	@@ -18,32 +18,32 @@ msgstr ""
18	18	"X-Poedit-SourceCharset: utf-8\n"
19	19	"Plural-Forms: nplurals=2; plural=(n!=1);\n"
20	20
21		-#: kybd.c:2638
	21	+#: kybd.c:2644
22	22	#, c-format
23	23	msgid "%s: Bell not supported"
24	24	msgstr "%s: Alerta sonoro não suportado"
25	25
26		-#: kybd.c:2797
	26	+#: kybd.c:2803
27	27	#, c-format
28	28	msgid "%s: Missing hex digits after \\x"
29	29	msgstr "%s: Faltando dígitos hexadecimais após \\x"
30	30
31		-#: kybd.c:2737
	31	+#: kybd.c:2743
32	32	#, c-format
33	33	msgid "%s: Unknown character after \\p"
34	34	msgstr "%s: Unknown character after \\p"
35	35
36		-#: kybd.c:2773
	36	+#: kybd.c:2779
37	37	#, c-format
38	38	msgid "%s: Unknown character after \\pa"
39	39	msgstr "%s: Unknown character after \\pa"
40	40
41		-#: kybd.c:2751
	41	+#: kybd.c:2757
42	42	#, c-format
43	43	msgid "%s: Unknown character after \\pf"
44	44	msgstr "%s: Unknown character after \\pf"
45	45
46		-#: kybd.c:2689
	46	+#: kybd.c:2695
47	47	#, c-format
48	48	msgid "%s: Vertical tab not supported"
49	49	msgstr "%s: Tabulação verticao não suportada"
...	...	@@ -58,15 +58,15 @@ msgstr "%s: Familia %d é inválida"
58	58	msgid "%s:%d"
59	59	msgstr "%s:%d"
60	60
61		-#: screen.c:639 screen.c:641 screen.c:671 screen.c:685 screen.c:796
	61	+#: screen.c:656 screen.c:658 screen.c:688 screen.c:702 screen.c:813
62	62	msgid "3270 Error"
63	63	msgstr "Erro 3270"
64	64
65		-#: screen.c:656
	65	+#: screen.c:673
66	66	msgid "3270 Warning"
67	67	msgstr "Alerta 3270"
68	68
69		-#: telnet.c:3178
	69	+#: telnet.c:3181
70	70	#, c-format
71	71	msgid ""
72	72	"<b>Connection state:</b> %s\n"
...	...	@@ -107,7 +107,7 @@ msgstr "Cursor piscante"
107	107	msgid "Bold"
108	108	msgstr "Negrito"
109	109
110		-#: telnet.c:2053
	110	+#: telnet.c:2056
111	111	msgid "Broken pipe"
112	112	msgstr "Broken pipe"
113	113
...	...	@@ -145,7 +145,7 @@ msgstr "Cancelado pelo usuário"
145	145	msgid "Cannot create socket handle"
146	146	msgstr "Não foi possível criar um manipulador de socket"
147	147
148		-#: session.c:315
	148	+#: session.c:317
149	149	#, c-format
150	150	msgid "Cannot find charset \"%s\", using defaults"
151	151	msgstr "Não encontrei codificação \"%s\", usando defaults"
...	...	@@ -184,7 +184,7 @@ msgstr "Conectar ao iniciar"
184	184	msgid "Connection failed"
185	185	msgstr "Conexão falhou"
186	186
187		-#: telnet.c:2057
	187	+#: telnet.c:2060
188	188	msgid "Connection reset by peer"
189	189	msgstr "Conexão foi cancelada pelo servidor"
190	190
...	...	@@ -220,7 +220,7 @@ msgstr "Debug"
220	220	msgid "Debug window updates"
221	221	msgstr "Mostrar atualizações de janela"
222	222
223		-#: telnet.c:1729
	223	+#: telnet.c:1731
224	224	msgid "Device type rejected"
225	225	msgstr "Tipo de dispositivo rejeitado"
226	226
...	...	@@ -228,7 +228,7 @@ msgstr "Tipo de dispositivo rejeitado"
228	228	msgid "Disconnected from host"
229	229	msgstr "Desconectado do servidor"
230	230
231		-#: telnet.c:1304
	231	+#: telnet.c:1306
232	232	msgid "EOR received when not in 3270 mode, ignored."
233	233	msgstr "EOR recebido fora do modo 3270, ignorado."
234	234
...	...	@@ -329,15 +329,15 @@ msgstr "Ajuda"
329	329	msgid "Host disconnected, transfer cancelled"
330	330	msgstr "Servidor desconectou, transferência cancelada"
331	331
332		-#: telnet.c:1787
	332	+#: telnet.c:1789
333	333	msgid "Host illegally added function(s)"
334	334	msgstr "Host illegally added function(s)"
335	335
336		-#: telnet.c:1712
	336	+#: telnet.c:1714
337	337	msgid "Host rejected device type or request type"
338	338	msgstr "Servidor rejeitou o tipo de dispositivo ou requisição"
339	339
340		-#: telnet.c:1725
	340	+#: telnet.c:1727
341	341	msgid "Host rejected resource(s)"
342	342	msgstr "Servidor rejeitou recurso(s)"
343	343
...	...	@@ -673,7 +673,7 @@ msgstr "SOCKS5 Proxy: xmit version 5 nmethods 1 (no auth)\n"
673	673	msgid "SOCKS5 proxy: %s/%u: %s"
674	674	msgstr "SOCKS5 proxy: %s/%u: %s"
675	675
676		-#: telnet.c:3176
	676	+#: telnet.c:3179
677	677	msgid "SSL Connect error"
678	678	msgstr "Erro na conexão SSL"
679	679
...	...	@@ -693,7 +693,7 @@ msgstr "Erro SSL"
693	693	msgid "SSL negotiation failed"
694	694	msgstr "Negociação SSL falhou"
695	695
696		-#: telnet.c:2043
	696	+#: telnet.c:2046
697	697	#, c-format
698	698	msgid ""
699	699	"SSL_write:\n"
...	...	@@ -770,7 +770,7 @@ msgstr "Colar inteligente"
770	770	msgid "Socket read error"
771	771	msgstr "Erro ao ler dados da rede"
772	772
773		-#: telnet.c:2064
	773	+#: telnet.c:2067
774	774	msgid "Socket write error"
775	775	msgstr "Erro ao enviar dados para a rede"
776	776
...	...	@@ -782,7 +782,7 @@ msgstr "Espaço no nome da LU"
782	782	msgid "TELNET Proxy: send error"
783	783	msgstr "TELNET Proxy: send error"
784	784
785		-#: telnet.c:3227
	785	+#: telnet.c:3230
786	786	msgid "TLS negotiation failure"
787	787	msgstr "Negociação TLS falhou"
788	788
...	...	@@ -844,12 +844,12 @@ msgstr "Não foi possível enviar a requisição de transferência de arquivo"
844	844	msgid "Unexpected error"
845	845	msgstr "Erro inesperado"
846	846
847		-#: kybd.c:336
	847	+#: kybd.c:338
848	848	#, c-format
849	849	msgid "Unexpected type %d in typeahead queue"
850	850	msgstr "Tipo inesperado %d na fila de teclado"
851	851
852		-#: ctlr.c:498
	852	+#: ctlr.c:505
853	853	#, c-format
854	854	msgid "Unknown 3270 Data Stream command: 0x%X"
855	855	msgstr "Unknown 3270 Data Stream command: 0x%X"
...	...	@@ -858,12 +858,12 @@ msgstr "Unknown 3270 Data Stream command: 0x%X"
858	858	msgid "Unknown FT control code from host"
859	859	msgstr "Servidor enviou código de controle FT desconhecido"
860	860
861		-#: kybd.c:2387
	861	+#: kybd.c:2393
862	862	#, c-format
863	863	msgid "Unknown PA key %d"
864	864	msgstr "PA %d desconhecida"
865	865
866		-#: kybd.c:2402
	866	+#: kybd.c:2408
867	867	#, c-format
868	868	msgid "Unknown PF key %d"
869	869	msgstr "PF %d desconhecida"
...	...	@@ -959,12 +959,12 @@ msgstr "Opções"
959	959	msgid "_View"
960	960	msgstr "_Exibir"
961	961
962		-#: telnet.c:3041 telnet.c:3052
	962	+#: telnet.c:3044 telnet.c:3055
963	963	#, c-format
964	964	msgid "fcntl(%s)"
965	965	msgstr "fcntl(%s)"
966	966
967		-#: telnet.c:3031
	967	+#: telnet.c:3034
968	968	#, c-format
969	969	msgid "ioctl(%s)"
970	970	msgstr "ioctl(%s)"
...	...
...	...	@@ -0,0 +1,4 @@
	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<!-- Komodo Project File - DO NOT EDIT -->
	3	+<project id="835c3792-90af-274e-8705-405cacf376e1" kpf_version="5" name="pw3270.komodoproject">
	4	+</project>
...	...
...	...	@@ -62,11 +62,10 @@
62	62	LIB3270_EXPORT void pw3270_restore_window_state(GtkWidget widget, const gchar name);
63	63
64	64	#ifdef HAVE_GTKMAC
65		- LIB3270_EXPORT GtkMacBundle * pw3270_get_bundle(void);
	65	+ #include <gtk-mac-bundle.h>
	66	+ LIB3270_EXPORT GtkMacBundle * pw3270_get_bundle(void);
66	67	#endif
67	68
68		-
69		-
70	69	G_END_DECLS
71	70
72	71	#endif // PW3270_H_INCLUDED
...	...
...	...	@@ -32,6 +32,11 @@
32	32	#include <glib.h>
33	33	#include <glib/gstdio.h>
34	34	#include "globals.h"
	35	+
	36	+#ifdef HAVE_GTKMAC
	37	+ #include <gtkosxapplication.h>
	38	+#endif // HAVE_GTKMAC
	39	+
35	40	#include <v3270.h>
36	41	#include "v3270/accessible.h"
37	42	#include <stdlib.h>
...	...	@@ -259,4 +264,3 @@ int main(int argc, char *argv[])
259	264
260	265	return rc;
261	266	}
262		-
...	...