Fixed compilation for the GtkHtml implementation

This commit is contained in:
Pierre Pronchery 2010-04-11 13:08:17 +00:00
parent 777cd5b5c4
commit 4b4f504010
5 changed files with 70 additions and 69 deletions

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Surfer 0.1.0\n" "Project-Id-Version: Surfer 0.1.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-04-11 13:04+0200\n" "POT-Creation-Date: 2010-04-11 15:07+0200\n"
"PO-Revision-Date: 2010-04-01 19:40+0200\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: German\n" "Language-Team: German\n"
@ -52,32 +52,32 @@ msgstr ""
msgid "General" msgid "General"
msgstr "" msgstr ""
#: ../src/common/conn.c:163 ../src/download.c:165 ../src/ghtml-gtkhtml.c:758 #: ../src/common/conn.c:163 ../src/download.c:165 ../src/ghtml-gtkhtml.c:760
msgid "Resolving..." msgid "Resolving..."
msgstr "" msgstr ""
#: ../src/common/conn.c:212 ../src/download.c:430 ../src/ghtml-gtkhtml.c:808 #: ../src/common/conn.c:212 ../src/download.c:430 ../src/ghtml-gtkhtml.c:810
msgid "Connected" msgid "Connected"
msgstr "" msgstr ""
#: ../src/common/conn.c:237 ../src/ghtml-gtkhtml.c:843 #: ../src/common/conn.c:237 ../src/ghtml-gtkhtml.c:845
#: ../src/ghtml-webkit.c:434 #: ../src/ghtml-webkit.c:436
msgid "Downloading..." msgid "Downloading..."
msgstr "" msgstr ""
#: ../src/common/conn.c:262 ../src/ghtml-gtkhtml.c:889 #: ../src/common/conn.c:262 ../src/ghtml-gtkhtml.c:891
msgid "Unsupported protocol" msgid "Unsupported protocol"
msgstr "" msgstr ""
#: ../src/common/conn.c:266 ../src/ghtml-gtkhtml.c:893 #: ../src/common/conn.c:266 ../src/ghtml-gtkhtml.c:895
msgid "Unknown host" msgid "Unknown host"
msgstr "" msgstr ""
#: ../src/common/conn.c:271 ../src/ghtml-gtkhtml.c:898 #: ../src/common/conn.c:271 ../src/ghtml-gtkhtml.c:900
msgid "Unspecified error" msgid "Unspecified error"
msgstr "" msgstr ""
#: ../src/common/conn.c:305 ../src/download.c:507 ../src/ghtml-gtkhtml.c:993 #: ../src/common/conn.c:305 ../src/download.c:507 ../src/ghtml-gtkhtml.c:995
msgid "Timeout" msgid "Timeout"
msgstr "" msgstr ""
@ -157,7 +157,7 @@ msgstr ""
msgid "Code " msgid "Code "
msgstr "" msgstr ""
#: ../src/download.c:546 ../src/ghtml-webkit.c:385 ../src/surfer.c:508 #: ../src/download.c:546 ../src/ghtml-webkit.c:387 ../src/surfer.c:508
msgid "Unknown error" msgid "Unknown error"
msgstr "" msgstr ""
@ -168,31 +168,31 @@ msgid ""
" -U\tuser agent string to send\n" " -U\tuser agent string to send\n"
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:634 #: ../src/ghtml-gtkhtml.c:636
msgid "Unknown protocol" msgid "Unknown protocol"
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:700 #: ../src/ghtml-gtkhtml.c:702
msgid "Reading file..." msgid "Reading file..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:910 #: ../src/ghtml-gtkhtml.c:912
msgid "Redirecting..." msgid "Redirecting..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:920 #: ../src/ghtml-gtkhtml.c:922
msgid "Redirecting to " msgid "Redirecting to "
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:954 #: ../src/ghtml-gtkhtml.c:956
msgid "Connecting..." msgid "Connecting..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:957 #: ../src/ghtml-gtkhtml.c:959
msgid "Connecting to " msgid "Connecting to "
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:1115 #: ../src/ghtml-gtkhtml.c:1117
msgid "Unsupported method" msgid "Unsupported method"
msgstr "" msgstr ""

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Surfer 0.1.0\n" "Project-Id-Version: Surfer 0.1.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-04-11 13:04+0200\n" "POT-Creation-Date: 2010-04-11 15:07+0200\n"
"PO-Revision-Date: 2010-04-01 19:40+0200\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: Spanish\n" "Language-Team: Spanish\n"
@ -52,32 +52,32 @@ msgstr ""
msgid "General" msgid "General"
msgstr "" msgstr ""
#: ../src/common/conn.c:163 ../src/download.c:165 ../src/ghtml-gtkhtml.c:758 #: ../src/common/conn.c:163 ../src/download.c:165 ../src/ghtml-gtkhtml.c:760
msgid "Resolving..." msgid "Resolving..."
msgstr "" msgstr ""
#: ../src/common/conn.c:212 ../src/download.c:430 ../src/ghtml-gtkhtml.c:808 #: ../src/common/conn.c:212 ../src/download.c:430 ../src/ghtml-gtkhtml.c:810
msgid "Connected" msgid "Connected"
msgstr "" msgstr ""
#: ../src/common/conn.c:237 ../src/ghtml-gtkhtml.c:843 #: ../src/common/conn.c:237 ../src/ghtml-gtkhtml.c:845
#: ../src/ghtml-webkit.c:434 #: ../src/ghtml-webkit.c:436
msgid "Downloading..." msgid "Downloading..."
msgstr "" msgstr ""
#: ../src/common/conn.c:262 ../src/ghtml-gtkhtml.c:889 #: ../src/common/conn.c:262 ../src/ghtml-gtkhtml.c:891
msgid "Unsupported protocol" msgid "Unsupported protocol"
msgstr "" msgstr ""
#: ../src/common/conn.c:266 ../src/ghtml-gtkhtml.c:893 #: ../src/common/conn.c:266 ../src/ghtml-gtkhtml.c:895
msgid "Unknown host" msgid "Unknown host"
msgstr "" msgstr ""
#: ../src/common/conn.c:271 ../src/ghtml-gtkhtml.c:898 #: ../src/common/conn.c:271 ../src/ghtml-gtkhtml.c:900
msgid "Unspecified error" msgid "Unspecified error"
msgstr "" msgstr ""
#: ../src/common/conn.c:305 ../src/download.c:507 ../src/ghtml-gtkhtml.c:993 #: ../src/common/conn.c:305 ../src/download.c:507 ../src/ghtml-gtkhtml.c:995
msgid "Timeout" msgid "Timeout"
msgstr "" msgstr ""
@ -157,7 +157,7 @@ msgstr ""
msgid "Code " msgid "Code "
msgstr "" msgstr ""
#: ../src/download.c:546 ../src/ghtml-webkit.c:385 ../src/surfer.c:508 #: ../src/download.c:546 ../src/ghtml-webkit.c:387 ../src/surfer.c:508
msgid "Unknown error" msgid "Unknown error"
msgstr "" msgstr ""
@ -168,31 +168,31 @@ msgid ""
" -U\tuser agent string to send\n" " -U\tuser agent string to send\n"
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:634 #: ../src/ghtml-gtkhtml.c:636
msgid "Unknown protocol" msgid "Unknown protocol"
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:700 #: ../src/ghtml-gtkhtml.c:702
msgid "Reading file..." msgid "Reading file..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:910 #: ../src/ghtml-gtkhtml.c:912
msgid "Redirecting..." msgid "Redirecting..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:920 #: ../src/ghtml-gtkhtml.c:922
msgid "Redirecting to " msgid "Redirecting to "
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:954 #: ../src/ghtml-gtkhtml.c:956
msgid "Connecting..." msgid "Connecting..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:957 #: ../src/ghtml-gtkhtml.c:959
msgid "Connecting to " msgid "Connecting to "
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:1115 #: ../src/ghtml-gtkhtml.c:1117
msgid "Unsupported method" msgid "Unsupported method"
msgstr "" msgstr ""

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Surfer 0.1.0\n" "Project-Id-Version: Surfer 0.1.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-04-11 13:04+0200\n" "POT-Creation-Date: 2010-04-11 15:07+0200\n"
"PO-Revision-Date: 2010-04-01 19:40+0200\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: French\n" "Language-Team: French\n"
@ -52,32 +52,32 @@ msgstr "Page d'accueil:"
msgid "General" msgid "General"
msgstr "Général" msgstr "Général"
#: ../src/common/conn.c:163 ../src/download.c:165 ../src/ghtml-gtkhtml.c:758 #: ../src/common/conn.c:163 ../src/download.c:165 ../src/ghtml-gtkhtml.c:760
msgid "Resolving..." msgid "Resolving..."
msgstr "Résolution du nom..." msgstr "Résolution du nom..."
#: ../src/common/conn.c:212 ../src/download.c:430 ../src/ghtml-gtkhtml.c:808 #: ../src/common/conn.c:212 ../src/download.c:430 ../src/ghtml-gtkhtml.c:810
msgid "Connected" msgid "Connected"
msgstr "Connecté" msgstr "Connecté"
#: ../src/common/conn.c:237 ../src/ghtml-gtkhtml.c:843 #: ../src/common/conn.c:237 ../src/ghtml-gtkhtml.c:845
#: ../src/ghtml-webkit.c:434 #: ../src/ghtml-webkit.c:436
msgid "Downloading..." msgid "Downloading..."
msgstr "Téléchargement..." msgstr "Téléchargement..."
#: ../src/common/conn.c:262 ../src/ghtml-gtkhtml.c:889 #: ../src/common/conn.c:262 ../src/ghtml-gtkhtml.c:891
msgid "Unsupported protocol" msgid "Unsupported protocol"
msgstr "" msgstr ""
#: ../src/common/conn.c:266 ../src/ghtml-gtkhtml.c:893 #: ../src/common/conn.c:266 ../src/ghtml-gtkhtml.c:895
msgid "Unknown host" msgid "Unknown host"
msgstr "Hôte inconnu" msgstr "Hôte inconnu"
#: ../src/common/conn.c:271 ../src/ghtml-gtkhtml.c:898 #: ../src/common/conn.c:271 ../src/ghtml-gtkhtml.c:900
msgid "Unspecified error" msgid "Unspecified error"
msgstr "Erreur non spécifiée" msgstr "Erreur non spécifiée"
#: ../src/common/conn.c:305 ../src/download.c:507 ../src/ghtml-gtkhtml.c:993 #: ../src/common/conn.c:305 ../src/download.c:507 ../src/ghtml-gtkhtml.c:995
msgid "Timeout" msgid "Timeout"
msgstr "" msgstr ""
@ -157,7 +157,7 @@ msgstr ""
msgid "Code " msgid "Code "
msgstr "" msgstr ""
#: ../src/download.c:546 ../src/ghtml-webkit.c:385 ../src/surfer.c:508 #: ../src/download.c:546 ../src/ghtml-webkit.c:387 ../src/surfer.c:508
msgid "Unknown error" msgid "Unknown error"
msgstr "Erreur inconnue" msgstr "Erreur inconnue"
@ -168,31 +168,31 @@ msgid ""
" -U\tuser agent string to send\n" " -U\tuser agent string to send\n"
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:634 #: ../src/ghtml-gtkhtml.c:636
msgid "Unknown protocol" msgid "Unknown protocol"
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:700 #: ../src/ghtml-gtkhtml.c:702
msgid "Reading file..." msgid "Reading file..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:910 #: ../src/ghtml-gtkhtml.c:912
msgid "Redirecting..." msgid "Redirecting..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:920 #: ../src/ghtml-gtkhtml.c:922
msgid "Redirecting to " msgid "Redirecting to "
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:954 #: ../src/ghtml-gtkhtml.c:956
msgid "Connecting..." msgid "Connecting..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:957 #: ../src/ghtml-gtkhtml.c:959
msgid "Connecting to " msgid "Connecting to "
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:1115 #: ../src/ghtml-gtkhtml.c:1117
msgid "Unsupported method" msgid "Unsupported method"
msgstr "" msgstr ""

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Surfer 0.1.0\n" "Project-Id-Version: Surfer 0.1.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-04-11 13:04+0200\n" "POT-Creation-Date: 2010-04-11 15:07+0200\n"
"PO-Revision-Date: 2010-04-11 12:06+0200\n" "PO-Revision-Date: 2010-04-11 12:06+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: Italian\n" "Language-Team: Italian\n"
@ -52,32 +52,32 @@ msgstr ""
msgid "General" msgid "General"
msgstr "" msgstr ""
#: ../src/common/conn.c:163 ../src/download.c:165 ../src/ghtml-gtkhtml.c:758 #: ../src/common/conn.c:163 ../src/download.c:165 ../src/ghtml-gtkhtml.c:760
msgid "Resolving..." msgid "Resolving..."
msgstr "" msgstr ""
#: ../src/common/conn.c:212 ../src/download.c:430 ../src/ghtml-gtkhtml.c:808 #: ../src/common/conn.c:212 ../src/download.c:430 ../src/ghtml-gtkhtml.c:810
msgid "Connected" msgid "Connected"
msgstr "" msgstr ""
#: ../src/common/conn.c:237 ../src/ghtml-gtkhtml.c:843 #: ../src/common/conn.c:237 ../src/ghtml-gtkhtml.c:845
#: ../src/ghtml-webkit.c:434 #: ../src/ghtml-webkit.c:436
msgid "Downloading..." msgid "Downloading..."
msgstr "" msgstr ""
#: ../src/common/conn.c:262 ../src/ghtml-gtkhtml.c:889 #: ../src/common/conn.c:262 ../src/ghtml-gtkhtml.c:891
msgid "Unsupported protocol" msgid "Unsupported protocol"
msgstr "" msgstr ""
#: ../src/common/conn.c:266 ../src/ghtml-gtkhtml.c:893 #: ../src/common/conn.c:266 ../src/ghtml-gtkhtml.c:895
msgid "Unknown host" msgid "Unknown host"
msgstr "" msgstr ""
#: ../src/common/conn.c:271 ../src/ghtml-gtkhtml.c:898 #: ../src/common/conn.c:271 ../src/ghtml-gtkhtml.c:900
msgid "Unspecified error" msgid "Unspecified error"
msgstr "" msgstr ""
#: ../src/common/conn.c:305 ../src/download.c:507 ../src/ghtml-gtkhtml.c:993 #: ../src/common/conn.c:305 ../src/download.c:507 ../src/ghtml-gtkhtml.c:995
msgid "Timeout" msgid "Timeout"
msgstr "" msgstr ""
@ -157,7 +157,7 @@ msgstr ""
msgid "Code " msgid "Code "
msgstr "" msgstr ""
#: ../src/download.c:546 ../src/ghtml-webkit.c:385 ../src/surfer.c:508 #: ../src/download.c:546 ../src/ghtml-webkit.c:387 ../src/surfer.c:508
msgid "Unknown error" msgid "Unknown error"
msgstr "" msgstr ""
@ -168,31 +168,31 @@ msgid ""
" -U\tuser agent string to send\n" " -U\tuser agent string to send\n"
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:634 #: ../src/ghtml-gtkhtml.c:636
msgid "Unknown protocol" msgid "Unknown protocol"
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:700 #: ../src/ghtml-gtkhtml.c:702
msgid "Reading file..." msgid "Reading file..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:910 #: ../src/ghtml-gtkhtml.c:912
msgid "Redirecting..." msgid "Redirecting..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:920 #: ../src/ghtml-gtkhtml.c:922
msgid "Redirecting to " msgid "Redirecting to "
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:954 #: ../src/ghtml-gtkhtml.c:956
msgid "Connecting..." msgid "Connecting..."
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:957 #: ../src/ghtml-gtkhtml.c:959
msgid "Connecting to " msgid "Connecting to "
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:1115 #: ../src/ghtml-gtkhtml.c:1117
msgid "Unsupported method" msgid "Unsupported method"
msgstr "" msgstr ""

View File

@ -33,6 +33,7 @@
#include <string.h> #include <string.h>
#include <strings.h> #include <strings.h>
#include <errno.h> #include <errno.h>
#include <libintl.h>
#include <libgtkhtml/gtkhtml.h> #include <libgtkhtml/gtkhtml.h>
#include <libgtkhtml/view/htmlselection.h> #include <libgtkhtml/view/htmlselection.h>
#define GNET_EXPERIMENTAL #define GNET_EXPERIMENTAL
@ -43,7 +44,7 @@
#include "../config.h" #include "../config.h"
#include "common/history.c" #include "common/history.c"
#include "common/url.c" #include "common/url.c"
#define _(string) gettext(string)
#define max(a, b) ((a) > (b) ? (a) : (b)) #define max(a, b) ((a) > (b) ? (a) : (b))