liferea: Updated to version 1.4.13. Updated webkit.c with

fixes for small font size from upstream.  Removed
incorporated webkitgtk.patch.

7 files changed, 26 insertions, 72 deletions

diff --git a/news/liferea/DETAILS b/news/liferea/DETAILS
index a40f171c9a..748edb0b19 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 8b01ee8418..c5544cc0c4 100644
--- a/news/liferea/HISTORY
+++ b/news/liferea/HISTORY
@@ -1,3 +1,9 @@
+2008-02-25 George Sherwood <george@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@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 8d6d6f656d..ca7430e785 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 45512bdb8b..0000000000
--- a/news/liferea/liferea-1.4.12.tar.gz.sig
+++ /dev/null
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 0000000000..32addf59d4
--- /dev/null
+++ b/news/liferea/liferea-1.4.13.tar.gz.sig
diff --git a/news/liferea/webkit.c b/news/liferea/webkit.c
index caf6e0b418..71633f2391 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
 
 	htmlview    = g_object_get_data (G_OBJECT (view), "htmlview");
 	selectedURL = g_object_get_data (G_OBJECT (view), "selectedURL");
-	
+
 	selectedURL = url ? g_strdup (url) : g_strdup ("");
-	
+
 	/* overwrite or clear last status line text */
 	liferea_htmlview_on_url (htmlview, selectedURL);
-	
+
 	g_object_set_data (G_OBJECT (view), "selectedURL", selectedURL);
 	g_free (selectedURL);
 }
@@ -124,13 +124,6 @@ webkit_link_clicked (WebKitWebView *view, WebKitWebFrame *frame, WebKitNetworkRe
 
 		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);
 
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollpane), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollpane), GTK_SHADOW_IN);
-	
+
 	/** Create HTML widget and pack it into the scrolled window */
 	view = webkit_web_view_new ();
-	
-/*	// empty functions in current webkit code...
-	settings = webkit_web_settings_copy (webkit_web_settings_get_global ());
-	settings->is_java_script_enabled = !conf_get_bool_value (DISABLE_JAVASCRIPT);
-	settings->java_script_can_open_windows_automatically = FALSE;
-	webkit_page_set_settings (WEBKIT_WEB_VIEW (htmlwidget), settings);
-*/
+
+	settings = webkit_web_settings_new ();
+	g_object_set (settings, "default-font-size", 11, NULL);
+	g_object_set (settings, "minimum-font-size", 7, NULL);
+	/**
+	 * FIXME: JavaScript might be disabled
+	 * g_object_set (settings, "javascript-enabled", !conf_get_bool_value (DISABLE_JAVASCRIPT), NULL);
+	 */
+	webkit_web_view_set_settings (view, settings);
+
 	gtk_container_add (GTK_CONTAINER (scrollpane), GTK_WIDGET (view));
 
 	/** Pass LifereaHtmlView into the WebKitWebView object */
diff --git a/news/liferea/webkitgtk.patch b/news/liferea/webkitgtk.patch
deleted file mode 100644
index 45cc6076b7..0000000000
--- a/news/liferea/webkitgtk.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- configure.orig	2008-02-09 23:23:06.000000000 +0400
-+++ configure	2008-02-09 23:24:52.000000000 +0400
-@@ -24571,12 +24571,12 @@
-         pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"WebKitGtk\"") >&5
--  ($PKG_CONFIG --exists --print-errors "WebKitGtk") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"webkit-1.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "webkit-1.0") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "WebKitGtk" 2>/dev/null`
-+  pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "webkit-1.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -24589,12 +24589,12 @@
-         pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"WebKitGtk\"") >&5
--  ($PKG_CONFIG --exists --print-errors "WebKitGtk") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"webkit-1.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "webkit-1.0") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "WebKitGtk" 2>/dev/null`
-+  pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "webkit-1.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -24613,9 +24613,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "WebKitGtk"`
-+	        WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "webkit-1.0"`
-         else
--	        WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "WebKitGtk"`
-+	        WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "webkit-1.0"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$WEBKIT_PKG_ERRORS" >&5