[yelp/webkit: 137/137] Merge branch 'master' into webkit
- From: Frederic Peters <fpeters src gnome org>
- To: svn-commits-list gnome org
- Subject: [yelp/webkit: 137/137] Merge branch 'master' into webkit
- Date: Wed, 22 Jul 2009 13:07:24 +0000 (UTC)
commit 099830165482a583e66852956830d4751642136e
Merge: 6e5edaa... 796c2bc...
Author: Frédéric Péters <fpeters 0d be>
Date: Wed Jul 22 14:09:22 2009 +0200
Merge branch 'master' into webkit
Conflicts:
ChangeLog
configure.in
m4/gecko.m4
src/yelp-html.c
src/yelp-window.c
ChangeLog | 286 +++-
NEWS | 97 +
configure.in | 14 +-
data/ui/Makefile.am | 2 +-
data/ui/yelp-bookmarks-add.ui | 105 ++
data/ui/yelp-bookmarks.ui | 160 ++
data/ui/yelp-open-location.ui | 100 +
data/ui/yelp-preferences.ui | 222 +++
data/ui/yelp.glade | 1080 -----------
po/ChangeLog | 187 ++
po/LINGUAS | 10 +-
po/POTFILES.in | 6 +-
po/ar.po | 672 +++----
po/as.po | 432 +++---
po/ast.po | 1605 ++++++++++++++++
po/bn_IN.po | 199 +-
po/de.po | 8 +-
po/el.po | 149 +-
po/es.po | 330 ++--
po/et.po | 434 +----
po/eu.po | 132 +-
po/fi.po | 296 ++--
po/fr.po | 329 ++--
po/gl.po | 298 ++--
po/gu.po | 662 ++++++--
po/he.po | 725 +++-----
po/hi.po | 1101 ++++++++----
po/hr.po | 1814 ++++++++++++-------
po/hu.po | 16 +-
po/it.po | 71 +-
po/kn.po | 1766 +++++++++++++------
po/ko.po | 9 +-
po/la.po | 1494 +++++++++++++++
po/mai.po | 1505 +++++++++++++++
po/ml.po | 1156 ++++++++----
po/oc.po | 15 +-
po/or.po | 1093 ++++++++----
po/pa.po | 349 ++--
po/ps.po | 1500 +++++++++++++++
po/pt.po | 82 +-
po/pt_BR.po | 269 ++--
po/ro.po | 1598 ++++++++++++-----
po/sq.po | 746 ++++++--
po/sr.po | 909 +++++++---
po/{sr Latn po => sr latin po} | 909 +++++++---
po/sv.po | 352 ++--
po/ta.po | 349 ++--
po/te.po | 1091 ++++++++----
po/th.po | 94 +-
po/uk.po | 301 ++--
po/uz.po | 1498 +++++++++++++++
po/uz cyrillic po | 1498 +++++++++++++++
po/vi.po | 231 +--
po/zh_HK.po | 114 +-
po/zh_TW.po | 114 +-
src/Makefile.am | 12 +
src/gtkentryaction.c | 5 +-
src/gtkentryaction.h | 2 +-
src/info2html/Makefile.am | 9 -
src/info2html/html.c | 925 ---------
src/info2html/html.h | 27 -
src/info2html/main.c | 325 ----
src/info2html/utils.c | 398 ----
src/info2html/utils.h | 21 -
src/man2html/Makefile.am | 16 -
src/man2html/README | 284 ---
src/test-pager.c | 149 --
src/test-uri.c | 165 +-
src/yelp-base.c | 2 +-
src/yelp-bookmarks.c | 197 ++-
src/yelp-bookmarks.h | 2 +-
src/yelp-db-pager.c | 605 ------
src/yelp-db-pager.h | 55 -
src/yelp-db-print-pager.c | 287 ---
src/yelp-db-print-pager.h | 55 -
src/yelp-db-print.c | 1 +
src/yelp-docbook.c | 3 +-
src/yelp-document.c | 8 +
src/yelp-html.c | 34 +
src/yelp-html.h | 8 +-
src/yelp-info-pager.c | 304 ---
src/yelp-info-pager.h | 55 -
src/yelp-info-parser.c | 164 ++-
src/yelp-info.c | 1 +
src/yelp-main.c | 3 +-
src/yelp-mallard.c | 655 +++++++
src/yelp-mallard.h | 53 +
src/yelp-man-pager.c | 476 -----
src/yelp-man-pager.h | 55 -
src/yelp-man-parser.c | 101 +-
src/yelp-man.c | 1 +
src/yelp-pager.c | 449 -----
src/yelp-pager.h | 121 --
src/yelp-print.h | 2 +-
src/yelp-search-pager.c | 2044 --------------------
src/yelp-search-pager.h | 56 -
src/yelp-search-parser.c | 10 +-
src/yelp-settings.c | 84 +-
src/yelp-settings.h | 2 +-
src/yelp-toc-pager.c | 2473 -------------------------
src/yelp-toc-pager.h | 59 -
src/yelp-toc.c | 7 +-
src/yelp-transform.c | 42 +-
src/yelp-transform.h | 5 +
src/yelp-uri.c | 580 ++++++
src/yelp-uri.h | 78 +
src/yelp-utils.c | 96 +-
src/yelp-utils.h | 2 +
src/yelp-window.c | 420 +++--
src/yelp-window.h | 10 +-
src/yelp-xslt-pager.c | 575 ------
src/yelp-xslt-pager.h | 59 -
stylesheets/ChangeLog | 2 +
stylesheets/Makefile.am | 3 +-
stylesheets/info2html.xsl | 10 +
stylesheets/mal2html.xsl.in | 74 +
stylesheets/{toc2html.xsl => toc2html.xsl.in} | 70 +-
yelp.desktop.in.in | 2 +-
yelp.doap | 36 +
119 files changed, 24697 insertions(+), 18721 deletions(-)
---
diff --cc configure.in
index a7f5df5,82302e4..41b18cb
--- a/configure.in
+++ b/configure.in
@@@ -207,22 -226,44 +212,21 @@@ dnl <= Check for bzip2 > 1.0.
dnl =>
AC_SUBST(BZ_LIBS)
-
# *****
-# Gecko
+# Webkit
# *****
+ PKG_CHECK_MODULES(YELP_WEBKIT, "webkit-1.0")
+ AC_SUBST(YELP_WEBKIT_CFLAGS)
+ AC_SUBST(YELP_WEBKIT_LIBS)
+ AC_DEFINE(WEBKIT_BACKEND, 1, [Webkit Backend])
-
-GECKO_INIT([MOZILLA])
-GECKO_DEFINES
-
-AC_SUBST([MOZILLA])
-AC_SUBST([MOZILLA_FLAVOUR])
-AC_SUBST([MOZILLA_INCLUDE_ROOT])
-AC_SUBST([MOZILLA_HOME])
-AC_SUBST([MOZILLA_PREFIX])
-AC_SUBST([MOZILLA_EXTRA_LIBS])
-AC_SUBST([MOZILLA_GLUE_LIBS])
-
-case "$MOZILLA" in
-xulrunner) gecko_min_version=1.8 ;;
-libxul*) gecko_min_version=1.9 ;;
-*firefox) gecko_min_version=1.5 ;;
-*) AC_MSG_ERROR([$gecko_cv_gecko is not supported])
-esac
-
-if test "$MOZILLA" = "libxul-embedding" -o "$MOZILLA" = "libxul"; then
- PKG_CHECK_MODULES([MOZILLA_COMPONENT],[$MOZILLA $gecko_cv_extra_pkg_dependencies])
- MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS `$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --define-variable=includetype=unstable --cflags ${gecko_cv_gecko}`"
-else
- PKG_CHECK_MODULES([MOZILLA_COMPONENT],[${gecko_cv_gecko}-xpcom >= $gecko_min_version $gecko_cv_extra_pkg_dependencies])
-fi
-
-# Set flags
-
+# More flags
AM_CPPFLAGS="$AM_CPPFLAGS $DEPRECATION_FLAGS"
AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS $MORE_WARN_FLAGS"
-AM_CXXFLAGS="$AM_CXXFLAGS $WARN_CXXFLAGS $MOZILLA_WARN_CXXFLAGS"
+
+
AC_SUBST([AM_CPPFLAGS])
AC_SUBST([AM_CFLAGS])
-AC_SUBST([AM_CXXFLAGS])
AC_SUBST([AM_LDFLAGS])
AC_CONFIG_FILES([
diff --cc src/yelp-html.c
index 744182d,e0e2e6a..d11d669
--- a/src/yelp-html.c
+++ b/src/yelp-html.c
@@@ -77,19 -97,27 +77,31 @@@ html_open_uri (WebKitWebView *view, Web
debug_print (DB_FUNCTION, "entering\n");
debug_print (DB_ARG, " uri = \"%s\"\n", uri);
+ real_uri = g_strdup (uri);
+
if (!html->priv->frames_enabled) {
- g_signal_emit (html, signals[URI_SELECTED], 0, uri, FALSE);
- block_load = TRUE;
+ g_signal_emit (html, signals[URI_SELECTED], 0, real_uri, FALSE);
+ resp = WEBKIT_NAVIGATION_RESPONSE_IGNORE;
} else {
- g_signal_emit (html, signals[FRAME_SELECTED], 0, uri, FALSE, &block_load);
+ g_signal_emit (html, signals[FRAME_SELECTED], 0, real_uri, FALSE, &block_load);
}
- return block_load;
+
+ g_free (real_uri);
+ return resp;
}
+ #ifdef HAVE_GECKO_1_9
+ static void
+ html_reset_accessible_parent (GtkWidget *widget)
+ {
+ AtkObject * html_acc = gtk_widget_get_accessible (widget);
+ AtkObject * parent_acc = gtk_widget_get_accessible (widget->parent);
+ if (html_acc && parent_acc) {
+ atk_object_set_parent (html_acc, parent_acc);
+ }
+ }
+ #endif
+
static void
html_realize (GtkWidget *widget)
{
diff --cc src/yelp-window.c
index 8781549,b5aff6c..ed7d501
--- a/src/yelp-window.c
+++ b/src/yelp-window.c
@@@ -43,7 -40,9 +40,8 @@@
#include "yelp-toc.h"
#include "yelp-docbook.h"
#include "yelp-db-print.h"
+ #include "yelp-mallard.h"
#include "yelp-window.h"
-#include "yelp-print.h"
#include "yelp-debug.h"
@@@ -878,6 -920,8 +908,7 @@@ page_request_cb (YelpDocument *do
window->priv->current_request = -1;
yelp_page_free ((YelpPage *) func_data);
gdk_window_set_cursor (GTK_WIDGET (window)->window, NULL);
+
- g_free (data);
break;
case YELP_DOCUMENT_SIGNAL_TITLE:
/* We don't need to actually handle title signals as gecko
@@@ -2027,19 -2147,19 +2115,19 @@@ window_print_page_cb (GtkAction *action
GFile *file;
GFileInputStream *stream;
gsize n;
- gchar buffer[BUFFER_SIZE];
+ gchar buffer[BUFFER_SIZE];
-
- file = g_file_new_for_uri (priv->uri);
- stream = g_file_read (file, NULL, NULL);
-
+
+ file = g_file_new_for_uri (priv->uri);
+ stream = g_file_read (file, NULL, NULL);
+
if (stream == NULL) {
/*GError *error = NULL;
- g_set_error (&error, YELP_ERROR, YELP_ERROR_IO,
- _("The file â??%sâ?? could not be read. This file might "
- "be missing, or you might not have permissions to "
- "read it."),
- uri);
- window_error (window, error, TRUE);*/
+ g_set_error (&error, YELP_ERROR, YELP_ERROR_IO,
+ _("The file â??%sâ?? could not be read. This file might "
+ "be missing, or you might not have permissions to "
+ "read it."),
+ uri);
+ window_error (window, error, TRUE);*/
/* TODO: Proper errors */
if (file)
@@@ -2062,22 -2185,21 +2153,21 @@@
default:
g_assert_not_reached ();
}
-
+
while ((g_input_stream_read_all
- ((GInputStream *)stream, buffer, BUFFER_SIZE, &n, NULL, NULL))) {
+ ((GInputStream *)stream, buffer, BUFFER_SIZE, &n, NULL, NULL))) {
yelp_html_write (html, buffer, n);
}
-
- if (file)
- g_object_unref (file);
- if (stream)
- g_object_unref (stream);
+ yelp_html_print (html);
+ if (file)
+ g_object_unref (file);
+ if (stream)
+ g_object_unref (stream);
+
yelp_html_close (html);
-
- yelp_print_run (window, html, gtk_win, vbox);
-
+
}
}
@@@ -2731,8 -2849,26 +2819,8 @@@ window_write_html (YelpWindow *window,
yelp_html_set_base_uri (html, uri);
g_free (uri);
yelp_html_open_stream (html, "application/xhtml+xml");
-
+
do {
- yelp_page_read (data->page, contents, BUFFER_SIZE, &read, NULL);
- yelp_html_write (html, contents, read);
- } while (read == BUFFER_SIZE);
- yelp_html_close (html);
- return FALSE;
-}
-
-static void
-window_write_print_html (YelpHtml *html, YelpPage * page)
-{
- gsize read;
- gchar contents[BUFFER_SIZE];
-
- /* Use a silly fake URI to stop gecko doing silly things */
- yelp_html_set_base_uri (html, "file:///foobar");
- yelp_html_open_stream (html, "application/xhtml+xml");
-
- do {
yelp_page_read (page, contents, BUFFER_SIZE, &read, NULL);
yelp_html_write (html, contents, read);
} while (read == BUFFER_SIZE);
diff --cc stylesheets/toc2html.xsl.in
index 8f7a685,f630e62..129cf6e
--- a/stylesheets/toc2html.xsl.in
+++ b/stylesheets/toc2html.xsl.in
@@@ -40,10 -55,10 +55,10 @@@
margin-top: 12px;
margin-left: 12px;
margin-right: 12px;
- padding-left: 204px;
+ padding-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 204px;
padding-top: 0.2em;
padding-bottom: 0.2em;
- -moz-border-radius: 6px;
+ -webkit-border-radius: 6px;
border: solid 1px </xsl:text>
<xsl:value-of select="$theme.color.blue_border"/><xsl:text>;
background-color: </xsl:text>
@@@ -93,15 -107,12 +107,12 @@@
opacity: .1;
}
div[class~="rightbar"] {
- margin-left: 216px;
- padding-bottom: 1em;
- padding-top: 1em;
- padding-left: 1em;
- padding-right: 1em;
- margin-right: 12px;
+ margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 216px;
+ margin-</xsl:text><xsl:value-of select="$right"/><xsl:text>: 12px;
+ padding: 1em;
background-color: </xsl:text><xsl:value-of select="$theme.color.background"/><xsl:text>;
color: </xsl:text><xsl:value-of select="$theme.color.text"/><xsl:text>;
- -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
}
ul { margin-left: 0em; padding-left: 0em; }
li[class~="toclist"] {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
