DeforaOS/Surfer
DeforaOS/Surfer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support about: in the WebKit-based HTML renderer

Browse Source
This commit is contained in:
Pierre Pronchery 2011-03-11 11:44:17 +00:00
parent 2ab1ac3fbd
commit fb75e65109
5 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
po/de.po
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: 2011-03-11 12:19+0100\n" "POT-Creation-Date: 2011-03-11 12:43+0100\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"
@ -72,8 +72,8 @@ msgid "Connected"
msgstr "" msgstr ""
#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:961 #: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:961
#: ../src/ghtml-webkit.c:574 ../src/ghtml-webkit.c:715 #: ../src/ghtml-webkit.c:594 ../src/ghtml-webkit.c:735
#: ../src/ghtml-webkit.c:727 #: ../src/ghtml-webkit.c:747
msgid "Downloading..." msgid "Downloading..."
msgstr "" msgstr ""
@ -185,7 +185,7 @@ msgstr ""
msgid "Code " msgid "Code "
msgstr "" msgstr ""
#: ../src/download.c:626 ../src/ghtml-webkit.c:673 ../src/surfer.c:949 #: ../src/download.c:626 ../src/ghtml-webkit.c:693 ../src/surfer.c:949
msgid "Unknown error" msgid "Unknown error"
msgstr "" msgstr ""
@ -212,8 +212,8 @@ msgstr ""
msgid "Redirecting to " msgid "Redirecting to "
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:1073 ../src/ghtml-webkit.c:431 #: ../src/ghtml-gtkhtml.c:1073 ../src/ghtml-webkit.c:451
#: ../src/ghtml-webkit.c:572 #: ../src/ghtml-webkit.c:592
msgid "Connecting..." msgid "Connecting..."
msgstr "" msgstr ""

12
po/es.po
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: 2011-03-11 12:19+0100\n" "POT-Creation-Date: 2011-03-11 12:43+0100\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"
@ -72,8 +72,8 @@ msgid "Connected"
msgstr "" msgstr ""
#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:961 #: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:961
#: ../src/ghtml-webkit.c:574 ../src/ghtml-webkit.c:715 #: ../src/ghtml-webkit.c:594 ../src/ghtml-webkit.c:735
#: ../src/ghtml-webkit.c:727 #: ../src/ghtml-webkit.c:747
msgid "Downloading..." msgid "Downloading..."
msgstr "" msgstr ""
@ -185,7 +185,7 @@ msgstr ""
msgid "Code " msgid "Code "
msgstr "" msgstr ""
#: ../src/download.c:626 ../src/ghtml-webkit.c:673 ../src/surfer.c:949 #: ../src/download.c:626 ../src/ghtml-webkit.c:693 ../src/surfer.c:949
msgid "Unknown error" msgid "Unknown error"
msgstr "" msgstr ""
@ -212,8 +212,8 @@ msgstr ""
msgid "Redirecting to " msgid "Redirecting to "
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:1073 ../src/ghtml-webkit.c:431 #: ../src/ghtml-gtkhtml.c:1073 ../src/ghtml-webkit.c:451
#: ../src/ghtml-webkit.c:572 #: ../src/ghtml-webkit.c:592
msgid "Connecting..." msgid "Connecting..."
msgstr "" msgstr ""

12
po/fr.po
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: 2011-03-11 12:19+0100\n" "POT-Creation-Date: 2011-03-11 12:43+0100\n"
"PO-Revision-Date: 2010-04-01 19:40+0200\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n"
"Last-Translator: Calimero <calimeroteknik@free.fr>\n" "Last-Translator: Calimero <calimeroteknik@free.fr>\n"
"Language-Team: French\n" "Language-Team: French\n"
@ -74,8 +74,8 @@ msgid "Connected"
msgstr "Connecté" msgstr "Connecté"
#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:961 #: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:961
#: ../src/ghtml-webkit.c:574 ../src/ghtml-webkit.c:715 #: ../src/ghtml-webkit.c:594 ../src/ghtml-webkit.c:735
#: ../src/ghtml-webkit.c:727 #: ../src/ghtml-webkit.c:747
msgid "Downloading..." msgid "Downloading..."
msgstr "Téléchargement..." msgstr "Téléchargement..."
@ -187,7 +187,7 @@ msgstr "Résolu"
msgid "Code " msgid "Code "
msgstr "Code " msgstr "Code "
#: ../src/download.c:626 ../src/ghtml-webkit.c:673 ../src/surfer.c:949 #: ../src/download.c:626 ../src/ghtml-webkit.c:693 ../src/surfer.c:949
msgid "Unknown error" msgid "Unknown error"
msgstr "Erreur inconnue" msgstr "Erreur inconnue"
@ -217,8 +217,8 @@ msgstr "Redirection..."
msgid "Redirecting to " msgid "Redirecting to "
msgstr "Redirection vers " msgstr "Redirection vers "
#: ../src/ghtml-gtkhtml.c:1073 ../src/ghtml-webkit.c:431 #: ../src/ghtml-gtkhtml.c:1073 ../src/ghtml-webkit.c:451
#: ../src/ghtml-webkit.c:572 #: ../src/ghtml-webkit.c:592
msgid "Connecting..." msgid "Connecting..."
msgstr "Connexion..." msgstr "Connexion..."

12
po/it.po
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: 2011-03-11 12:19+0100\n" "POT-Creation-Date: 2011-03-11 12:43+0100\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"
@ -72,8 +72,8 @@ msgid "Connected"
msgstr "" msgstr ""
#: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:961 #: ../src/common/conn.c:280 ../src/ghtml-gtkhtml.c:961
#: ../src/ghtml-webkit.c:574 ../src/ghtml-webkit.c:715 #: ../src/ghtml-webkit.c:594 ../src/ghtml-webkit.c:735
#: ../src/ghtml-webkit.c:727 #: ../src/ghtml-webkit.c:747
msgid "Downloading..." msgid "Downloading..."
msgstr "" msgstr ""
@ -185,7 +185,7 @@ msgstr ""
msgid "Code " msgid "Code "
msgstr "" msgstr ""
#: ../src/download.c:626 ../src/ghtml-webkit.c:673 ../src/surfer.c:949 #: ../src/download.c:626 ../src/ghtml-webkit.c:693 ../src/surfer.c:949
msgid "Unknown error" msgid "Unknown error"
msgstr "" msgstr ""
@ -212,8 +212,8 @@ msgstr ""
msgid "Redirecting to " msgid "Redirecting to "
msgstr "" msgstr ""
#: ../src/ghtml-gtkhtml.c:1073 ../src/ghtml-webkit.c:431 #: ../src/ghtml-gtkhtml.c:1073 ../src/ghtml-webkit.c:451
#: ../src/ghtml-webkit.c:572 #: ../src/ghtml-webkit.c:592
msgid "Connecting..." msgid "Connecting..."
msgstr "" msgstr ""

19
src/ghtml-webkit.c
View File

@ -25,6 +25,7 @@
#include <webkit/webkit.h> #include <webkit/webkit.h>
#include "ghtml.h" #include "ghtml.h"
#include "common/url.c" #include "common/url.c"
#include "../config.h"
#define _(string) gettext(string) #define _(string) gettext(string)
@ -421,15 +422,29 @@ void ghtml_load_url(GtkWidget * widget, char const * url)
{ {
GHtml * ghtml; GHtml * ghtml;
gchar * p; gchar * p;
const char about[] = "<html>\n<head><title>About " PACKAGE "</title>"
"</head>\n<body>\n<h1>" PACKAGE " " VERSION "</h1>\n"
"<p>Copyright (c) 2011 <a href=\"http://www.defora.org/\">"
"DeforaOS Project</a></p>\n</body>\n</html>";
const char blank[] = "";
ghtml = g_object_get_data(G_OBJECT(widget), "ghtml"); ghtml = g_object_get_data(G_OBJECT(widget), "ghtml");
if((p = _ghtml_make_url(NULL, url)) != NULL) if((p = _ghtml_make_url(NULL, url)) != NULL)
url = p; url = p;
if(strcmp("about:blank", url) == 0)
webkit_web_view_load_string(WEBKIT_WEB_VIEW(ghtml->view),
blank, NULL, NULL, url);
else if(strncmp("about:", url, 6) == 0)
webkit_web_view_load_string(WEBKIT_WEB_VIEW(ghtml->view),
about, NULL, NULL, url);
else
{
#if WEBKIT_CHECK_VERSION(1, 1, 1) #if WEBKIT_CHECK_VERSION(1, 1, 1)
webkit_web_view_load_uri(WEBKIT_WEB_VIEW(ghtml->view), url); webkit_web_view_load_uri(WEBKIT_WEB_VIEW(ghtml->view), url);
#else #else
webkit_web_view_open(WEBKIT_WEB_VIEW(ghtml->view), url); webkit_web_view_open(WEBKIT_WEB_VIEW(ghtml->view), url);
#endif #endif
}
g_free(p); g_free(p);
surfer_set_progress(ghtml->surfer, 0.0); surfer_set_progress(ghtml->surfer, 0.0);
surfer_set_security(ghtml->surfer, SS_NONE); surfer_set_security(ghtml->surfer, SS_NONE);