New commits:
commit 66bc7cef568a01df461585d1a8257d1c7d40198d
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
liferea: Updated to version 1.4.13. Updated webkit.c with
fixes for small font size from upstream. Removed
incorporated webkitgtk.patch.
diff --git a/news/liferea/DETAILS b/news/liferea/DETAILS
index a40f171..748edb0 100755
--- a/news/liferea/DETAILS
+++ b/news/liferea/DETAILS
@@ -1,9 +1,9 @@
SPELL=liferea
if [ "$LIFEREA_DEVEL" == "y" ]; then
- VERSION=1.4.12
+ VERSION=1.4.13
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
else
- VERSION=1.4.12
+ VERSION=1.4.13
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/news/liferea/HISTORY b/news/liferea/HISTORY
index 8b01ee8..c5544cc 100644
--- a/news/liferea/HISTORY
+++ b/news/liferea/HISTORY
@@ -1,3 +1,9 @@
+2008-02-25 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 1.4.13
+ * PRE_BUILD: Removed webkitgtk.patch.
+ * webkit.c: Updated with fixes for font size
+ * webkitgtk.patch: Removed. Integrated Upstream.
+
2008-02-24 George Sherwood <george AT beernabeer.com>
* webkit.c: Updated closer to current liferea trunk. Trunk still
requires fix for location of webkit.h
diff --git a/news/liferea/PRE_BUILD b/news/liferea/PRE_BUILD
index 8d6d6f6..ca7430e 100755
--- a/news/liferea/PRE_BUILD
+++ b/news/liferea/PRE_BUILD
@@ -1,4 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/webkitgtk.patch &&
cp -v $SCRIPT_DIRECTORY/webkit.c src/webkit
diff --git a/news/liferea/liferea-1.4.12.tar.gz.sig
b/news/liferea/liferea-1.4.12.tar.gz.sig
deleted file mode 100644
index 45512bd..0000000
Binary files a/news/liferea/liferea-1.4.12.tar.gz.sig and /dev/null differ
diff --git a/news/liferea/liferea-1.4.13.tar.gz.sig
b/news/liferea/liferea-1.4.13.tar.gz.sig
new file mode 100644
index 0000000..32addf5
Binary files /dev/null and b/news/liferea/liferea-1.4.13.tar.gz.sig differ
diff --git a/news/liferea/webkit.c b/news/liferea/webkit.c
index caf6e0b..71633f2 100644
--- a/news/liferea/webkit.c
+++ b/news/liferea/webkit.c
@@ -61,7 +61,7 @@ webkit_write_html (GtkWidget *scrollpane,
* WebKit does not like content type application/xhtml+xml. See
* http://bugs.webkit.org/show_bug.cgi?id=9677 for details.
*/
- content_type =
+ content_type =
g_ascii_strcasecmp (content_type, "application/xhtml+xml") == 0
? "application/xhtml"
: content_type;
@@ -95,12 +95,12 @@ webkit_on_url (WebKitWebView *view, const gchar *title,
const gchar *url, gpoint
uri = webkit_network_request_get_uri (WEBKIT_NETWORK_REQUEST
(request));
liferea_htmlview_launch_in_external_browser (uri);
-
- /**
- * Bug in WebKit. Stop emitting signal when external browser
is called.
- * So the boolean return will not be respected. See
- * http://bugs.webkit.org/show_bug.cgi?id=16654 for details
- */
- g_signal_stop_emission_by_name (WEBKIT_WEB_VIEW (view),
"navigation-requested");
return TRUE;
}
@@ -142,30 +135,32 @@ webkit_link_clicked (WebKitWebView *view,
WebKitWebFrame *frame, WebKitNetworkRe
*
* Initializes the WebKit HTML rendering engine. Creates a GTK scrollpane
widget
* and embeds WebKitWebView into it.
- *
- * FIXME: there is currently no API for settings present
(http://bugs.webkit.org/show_bug.cgi?id=16219)
*/
static GtkWidget *
-webkit_new (LifereaHtmlView *htmlview, gboolean forceInternalBrowsing)
+webkit_new (LifereaHtmlView *htmlview, gboolean forceInternalBrowsing)
{
gulong handler;
GtkWidget *view;
GtkWidget *scrollpane;
-
+ WebKitWebSettings *settings;
+
scrollpane = gtk_scrolled_window_new (NULL, NULL);