Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (25a6357b74c34d690e55dc194f9cbf244b38a457)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (25a6357b74c34d690e55dc194f9cbf244b38a457)
  • Date: Sat, 26 Apr 2008 06:13:56 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

dev/null |binary
news/liferea/DETAILS | 6
news/liferea/HISTORY | 5
news/liferea/PRE_BUILD | 5
news/liferea/liferea-1.4.14.tar.gz.sig | 0
news/liferea/liferea-1.4.15.tar.gz.sig |binary
news/liferea/liferea-1.5.1.tar.gz.sig | 0
news/liferea/liferea-1.5.2b.tar.gz.sig |binary
news/liferea/webkit.c | 265
---------------------------------
9 files changed, 8 insertions(+), 273 deletions(-)

New commits:
commit 25a6357b74c34d690e55dc194f9cbf244b38a457
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

liferea: Updated stable to 1.4.15 and devel to 1.5.2b.
Removed webkit.c that was incorporated upstream.

diff --git a/news/liferea/DETAILS b/news/liferea/DETAILS
index 1d81030..c691c69 100755
--- a/news/liferea/DETAILS
+++ b/news/liferea/DETAILS
@@ -1,9 +1,9 @@
SPELL=liferea
if [ "$LIFEREA_DEVEL" == "y" ]; then
- VERSION=1.5.1
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ VERSION=1.5.2b
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-1.5.2
else
- VERSION=1.4.14
+ VERSION=1.4.15
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
fi
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/news/liferea/HISTORY b/news/liferea/HISTORY
index 45e5157..8e9c58e 100644
--- a/news/liferea/HISTORY
+++ b/news/liferea/HISTORY
@@ -1,3 +1,8 @@
+2008-04-26 George Sherwood <geroge AT beernabeer.com>
+ * DETAILS: Updated stabel to 1.4.15 and devel to 1.5.2b
+ * PRE_BUILD: Removed. Not Needed.
+ * webkit.c: Removed. Incorportated upstream.
+
2008-03-30 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated devel to version 1.5.1

diff --git a/news/liferea/PRE_BUILD b/news/liferea/PRE_BUILD
deleted file mode 100755
index 311a5c2..0000000
--- a/news/liferea/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if [ "$LIFEREA_DEVEL" == "n" ]; then
-cp -v $SCRIPT_DIRECTORY/webkit.c src/webkit
-fi
diff --git a/news/liferea/liferea-1.4.14.tar.gz.sig
b/news/liferea/liferea-1.4.14.tar.gz.sig
deleted file mode 100644
index 2d73b57..0000000
Binary files a/news/liferea/liferea-1.4.14.tar.gz.sig and /dev/null differ
diff --git a/news/liferea/liferea-1.4.15.tar.gz.sig
b/news/liferea/liferea-1.4.15.tar.gz.sig
new file mode 100644
index 0000000..75ca99b
Binary files /dev/null and b/news/liferea/liferea-1.4.15.tar.gz.sig differ
diff --git a/news/liferea/liferea-1.5.1.tar.gz.sig
b/news/liferea/liferea-1.5.1.tar.gz.sig
deleted file mode 100644
index 8a3b03a..0000000
Binary files a/news/liferea/liferea-1.5.1.tar.gz.sig and /dev/null differ
diff --git a/news/liferea/liferea-1.5.2b.tar.gz.sig
b/news/liferea/liferea-1.5.2b.tar.gz.sig
new file mode 100644
index 0000000..f47b13a
Binary files /dev/null and b/news/liferea/liferea-1.5.2b.tar.gz.sig differ
diff --git a/news/liferea/webkit.c b/news/liferea/webkit.c
deleted file mode 100644
index 71633f2..0000000
--- a/news/liferea/webkit.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/**
- * @file webkit.c WebKit browser module for Liferea
- *
- * Copyright (C) 2007 Lars Lindner <lars.lindner AT gmail.com>
- * Copyright (C) 2008 Lars Strojny <larsml AT strojny.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include <webkit/webkit.h>
-
-#include "conf.h"
-#include "common.h"
-#include "ui/ui_htmlview.h"
-
-/**
- * HTML plugin init callback
- */
-static void
-liferea_webkit_init (void)
-{
- g_print ("Note: WebKit HTML rendering support is experimental and\n");
- g_print ("not everything is working properly with WebKit right
now!!!\n");
-}
-
-/**
- * HTML plugin de-init callback
- */
-static void
-liferea_webkit_deinit (void)
-{
- g_print ("Shutting down WebKit\n");
-}
-
-/**
- * Load HTML string
- *
- * Load an HTML string into the view frame. This is used to render newsfeed
entries.
- */
-static void
-webkit_write_html (GtkWidget *scrollpane,
- const gchar *string,
- guint length,
- const gchar *base,
- const gchar *content_type)
-{
- GtkWidget *htmlwidget = gtk_bin_get_child (GTK_BIN (scrollpane));
- /**
- * WebKit does not like content type application/xhtml+xml. See
- * http://bugs.webkit.org/show_bug.cgi?id=9677 for details.
- */
- content_type =
- g_ascii_strcasecmp (content_type, "application/xhtml+xml") == 0
- ? "application/xhtml"
- : content_type;
- webkit_web_view_load_string (WEBKIT_WEB_VIEW (htmlwidget), string,
content_type, "UTF-8", base);
-}
-
-static void
-webkit_title_changed (
- WebKitWebView *view,
- const gchar* title,
- const gchar* url,
- gpointer user_data
-)
-{
- ui_tabs_set_title (GTK_WIDGET (view), title);
-}
-
-static void
-webkit_progress_changed (WebKitWebView *view, gint progress, gpointer
user_data)
-{
-}
-
-/**
- * Action executed when user hovers over a link
- */
-static void
-webkit_on_url (WebKitWebView *view, const gchar *title, const gchar *url,
gpointer user_data)
-{
- LifereaHtmlView *htmlview;
- gchar *selectedURL;
-
- 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);
-}
-
-/**
- * A link has been clicked
- *
- * When a link has been clicked the the link management is dispatched to
Liferea core in
- * order to manage the different filetypes, remote URLs.
- */
-static gboolean
-webkit_link_clicked (WebKitWebView *view, WebKitWebFrame *frame,
WebKitNetworkRequest *request)
-{
- const gchar *uri;
-
- g_return_if_fail (WEBKIT_IS_WEB_VIEW (view));
- g_return_if_fail (WEBKIT_IS_NETWORK_REQUEST (request));
-
-
- if (!conf_get_bool_value (BROWSE_INSIDE_APPLICATION)) {
-
- uri = webkit_network_request_get_uri (WEBKIT_NETWORK_REQUEST
(request));
- liferea_htmlview_launch_in_external_browser (uri);
- return TRUE;
- }
-
- return FALSE;
-}
-
-/**
- * Initializes WebKit
- *
- * Initializes the WebKit HTML rendering engine. Creates a GTK scrollpane
widget
- * and embeds WebKitWebView into it.
- */
-static GtkWidget *
-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 ();
-
- 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 */
- g_object_set_data (G_OBJECT (view), "htmlview", htmlview);
- /** Pass internal browsing param */
- g_object_set_data (G_OBJECT (view), "internal_browsing",
GINT_TO_POINTER (forceInternalBrowsing));
-
- /** Connect signal callbacks */
- g_signal_connect (view, "title-changed", G_CALLBACK
(webkit_title_changed), view);
- g_signal_connect (view, "load-progress-changed", G_CALLBACK
(webkit_progress_changed), view);
- g_signal_connect (view, "hovering-over-link", G_CALLBACK
(webkit_on_url), view);
- g_signal_connect (view, "navigation-requested", G_CALLBACK
(webkit_link_clicked), view);
-
- gtk_widget_show (view);
- return scrollpane;
-}
-
-/**
- * Launch URL
- */
-static void
-webkit_launch_url (GtkWidget *scrollpane, const gchar *url)
-{
- webkit_web_view_open (WEBKIT_WEB_VIEW (gtk_bin_get_child (GTK_BIN
(scrollpane))), url);
-}
-
-static gboolean
-webkit_launch_inside_possible (void)
-{
- return TRUE;
-}
-
-/**
- * FIXME: No API, see http://bugs.webkit.org/show_bug.cgi?id=14998
- */
-static void
-webkit_change_zoom_level (GtkWidget *scrollpane, gfloat zoomLevel)
-{}
-
-/**
- * FIXME: No API, see http://bugs.webkit.org/show_bug.cgi?id=14998
- */
-static gfloat
-webkit_get_zoom_level (GtkWidget *scrollpane)
-{
- return 1.0;
-}
-
-/**
- * Scroll page down (via shortcut key)
- *
- * Copied from gtkhtml/gtkhtml.c
- */
-static gboolean
-webkit_scroll_pagedown (GtkWidget *scrollpane)
-{
- GtkScrolledWindow *itemview;
- GtkAdjustment *vertical_adjustment;
- gdouble old_value;
- gdouble new_value;
- gdouble limit;
-
- itemview = GTK_SCROLLED_WINDOW (scrollpane);
- g_assert (NULL != itemview);
- vertical_adjustment = gtk_scrolled_window_get_vadjustment (itemview);
- old_value = gtk_adjustment_get_value (vertical_adjustment);
- new_value = old_value + vertical_adjustment->page_increment;
- limit = vertical_adjustment->upper - vertical_adjustment->page_size;
- if (new_value > limit)
- new_value = limit;
- gtk_adjustment_set_value (vertical_adjustment, new_value);
- gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (itemview),
vertical_adjustment);
- return (new_value > old_value);
-}
-
-static struct htmlviewPlugin webkitInfo = {
- .api_version = HTMLVIEW_PLUGIN_API_VERSION,
- .name = "WebKit",
- .priority = 100,
- .externalCss = FALSE,
- .plugin_init = liferea_webkit_init,
- .plugin_deinit = liferea_webkit_deinit,
- .create = webkit_new,
- .write = webkit_write_html,
- .launch = webkit_launch_url,
- .launchInsidePossible = webkit_launch_inside_possible,
- .zoomLevelGet = webkit_get_zoom_level,
- .zoomLevelSet = webkit_change_zoom_level,
- .scrollPagedown = webkit_scroll_pagedown,
- .setProxy = NULL,
- .setOffLine = NULL
-};
-
-static struct plugin pi = {
- PLUGIN_API_VERSION,
- "WebKit Rendering Plugin",
- PLUGIN_TYPE_HTML_RENDERER,
- &webkitInfo
-};
-
-DECLARE_PLUGIN (pi);
-DECLARE_HTMLVIEW_PLUGIN (webkitInfo);



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (25a6357b74c34d690e55dc194f9cbf244b38a457), George Sherwood, 04/26/2008

Archive powered by MHonArc 2.6.24.

Top of Page