Skip to Content.
Sympa Menu

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

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 (06bf512e98a42076c2a98c65e8f52d33596c6d8d)
  • Date: Fri, 28 Dec 2007 10:19:58 -0600

GIT changes to master grimoire by George Sherwood <george AT beernabeer.com>:

news/liferea/DEPENDS | 13 +
news/liferea/HISTORY | 5
news/liferea/PRE_BUILD | 3
news/liferea/webkit-current-api-update.diff | 190
++++++++++++++++++++++++++++
4 files changed, 207 insertions(+), 4 deletions(-)

New commits:
commit e0657c38326d8fe5ac6c628476b8474e3aec69c9
Author: George Sherwood <george AT beernabeer.com>
Commit: George Sherwood <george AT beernabeer.com>

liferea: Added patch to work with latest webkitgtk api. Added optional
depends on webkitgtk. depends libglade2.

diff --git a/news/liferea/DEPENDS b/news/liferea/DEPENDS
index 70e1ac3..65fecd1 100755
--- a/news/liferea/DEPENDS
+++ b/news/liferea/DEPENDS
@@ -1,7 +1,8 @@
-depends gtk+2 &&
-depends gconf2 &&
-depends libxml2 &&
-depends sqlite &&
+depends gtk+2 &&
+depends gconf2 &&
+depends libxml2 &&
+depends sqlite &&
+depends libglade2 &&
optional_depends libgtkhtml \
"--enable-gtkhtml2" \
"" \
@@ -18,6 +19,10 @@ optional_depends GECKO \
"" \
"--disable-gecko --disable-xulrunner" \
"for Mozilla (gecko) html display" &&
+optional_depends webkitgtk \
+ "" \
+ "--disable-webkit" \
+ "for WebKitGtk html display" &&
optional_depends lua \
"" \
"--disable-lua" \
diff --git a/news/liferea/HISTORY b/news/liferea/HISTORY
index e6794c0..d919e46 100644
--- a/news/liferea/HISTORY
+++ b/news/liferea/HISTORY
@@ -1,3 +1,8 @@
+2007-12-28 George Sherwood <george AT beernabeer.com>
+ * DEPENDS: depends libglade2. optional_depends webkitgtk
+ * PRE_BUILD: Added to apply patch
+ * webkit-current-api-update.diff: Patch to work with new webkitgtk api
+
2007-12-20 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 1.4.10

diff --git a/news/liferea/PRE_BUILD b/news/liferea/PRE_BUILD
new file mode 100755
index 0000000..32f7423
--- /dev/null
+++ b/news/liferea/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/webkit-current-api-update.diff
diff --git a/news/liferea/webkit-current-api-update.diff
b/news/liferea/webkit-current-api-update.diff
new file mode 100644
index 0000000..549e35b
--- /dev/null
+++ b/news/liferea/webkit-current-api-update.diff
@@ -0,0 +1,190 @@
+--- src/webkit/webkit.c.orig 2007-12-27 08:06:22.000000000 +0100
++++ src/webkit/webkit.c 2007-12-27 08:05:38.000000000 +0100
+@@ -18,10 +18,7 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+-
+-#include <webkitgtkpage.h>
+-#include <webkitgtkframe.h>
+-#include <webkitgtksettings.h>
++#include <webkit.h>
+
+ #include "conf.h"
+ #include "ui/ui_htmlview.h"
+@@ -29,98 +26,96 @@
+ static void
+ liferea_webkit_init (void)
+ {
+- webkit_init ();
+-
+ g_print ("Note: WebKit HTML rendering support is experimental and\n");
+ g_print ("not everything is working properly with WebKit right
now!!!\n");
+ }
+
+-static void liferea_webkit_deinit (void) { }
++static void
++liferea_webkit_deinit (void)
++{
++ g_print("Shutting down WebKit\n");
++}
+
+ static void
+-webkit_write_html (GtkWidget *scrollpane,
++webkit_write_html (GtkWidget *scrollpane,
+ const gchar *string,
+- guint length,
+- const gchar *base,
+- const gchar *contentType)
++ guint length,
++ const gchar *base,
++ const gchar *contentType)
+ {
+ GtkWidget *htmlwidget = gtk_bin_get_child (GTK_BIN (scrollpane));
+
+- webkit_page_load_string (WEBKIT_PAGE (htmlwidget), string,
"application/xhtml", "UTF-8", base);
++ webkit_web_view_load_string (WEBKIT_WEB_VIEW (htmlwidget), string,
"application/xhtml", "UTF-8", base);
+ }
+
+ static void
+-webkit_title_changed (WebKitPage *page, const gchar* title, const gchar*
url, gpointer user_data)
++webkit_title_changed (WebKitWebView *view, const gchar* title, const gchar*
url, gpointer user_data)
+ {
+- ui_tabs_set_title (GTK_WIDGET (page), title);
++ ui_tabs_set_title (GTK_WIDGET (view), title);
+ }
+
+ static void
+-webkit_progress_changed (WebKitPage *page, gint progress, gpointer
user_data)
++webkit_progress_changed (WebKitWebView *view, gint progress, gpointer
user_data)
+ {
+ }
+
+ static void
+-webkit_on_url (WebKitPage *page, const gchar *title, const gchar *url,
gpointer user_data)
++webkit_on_url (WebKitWebView *view, const gchar *title, const gchar *url,
gpointer user_data)
+ {
+ LifereaHtmlView *htmlview;
+- gchar *selectedURL;
++ gchar *selectedURL;
+
+- htmlview = g_object_get_data (G_OBJECT (page), "htmlview");
+- selectedURL = g_object_get_data (G_OBJECT (page), "selectedURL");
++ htmlview = g_object_get_data (G_OBJECT (view), "htmlview");
++ selectedURL = g_object_get_data (G_OBJECT (view), "selectedURL");
+ g_free (selectedURL);
+-
+- if (url)
+- selectedURL = g_strdup (url);
+- else
+- selectedURL = g_strdup ("");
++
++ 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 (page), "selectedURL", selectedURL);
++ g_object_set_data (G_OBJECT (view), "selectedURL", selectedURL);
+ }
+
+ static GtkWidget *
+ webkit_new (LifereaHtmlView *htmlview, gboolean forceInternalBrowsing)
+ {
+- gulong handler;
+- GtkWidget *page;
++ gulong handler;
++ GtkWidget *view;
+ GtkWidget *scrollpane;
+- WebKitSettings *settings;
+
+- scrollpane = gtk_scrolled_window_new(NULL, NULL);
++ 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 */
+- page = webkit_page_new ();
++ 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_PAGE (htmlwidget), settings);
++ webkit_page_set_settings (WEBKIT_WEB_VIEW (htmlwidget), settings);
+ */
+- gtk_container_add (GTK_CONTAINER (scrollpane), GTK_WIDGET (page));
++ gtk_container_add (GTK_CONTAINER (scrollpane), GTK_WIDGET (view));
+
+- g_object_set_data (G_OBJECT (page), "htmlview", htmlview);
+- g_object_set_data (G_OBJECT (page), "internal_browsing",
GINT_TO_POINTER (forceInternalBrowsing));
++ g_object_set_data (G_OBJECT (view), "htmlview", htmlview);
++ g_object_set_data (G_OBJECT (view), "internal_browsing",
GINT_TO_POINTER (forceInternalBrowsing));
+
+- g_signal_connect (page, "title-changed", G_CALLBACK
(webkit_title_changed), page);
+- g_signal_connect (page, "load-progress-changed", G_CALLBACK
(webkit_progress_changed), page);
+- g_signal_connect (page, "hovering-over-link", G_CALLBACK
(webkit_on_url), page);
++ 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);
+ /* FIXME: clicked callback */
+
+- gtk_widget_show (page);
++ gtk_widget_show (view);
+ return scrollpane;
+ }
+
+ static void
+ webkit_launch_url (GtkWidget *scrollpane, const gchar *url)
+ {
+- webkit_page_open (WEBKIT_PAGE (gtk_bin_get_child (GTK_BIN
(scrollpane))), url);
++ webkit_web_view_open (WEBKIT_WEB_VIEW (gtk_bin_get_child (GTK_BIN
(scrollpane))), url);
+ }
+
+ static gboolean
+@@ -149,21 +144,21 @@
+ }
+
+ 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,
++ .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
++ .zoomLevelGet = webkit_get_zoom_level,
++ .zoomLevelSet = webkit_change_zoom_level,
++ .scrollPagedown = webkit_scroll_pagedown,
++ .setProxy = NULL,
++ .setOffLine = NULL
+ };
+
+ static struct plugin pi = {
+@@ -173,5 +168,5 @@
+ &webkitInfo
+ };
+
+-DECLARE_PLUGIN(pi);
+-DECLARE_HTMLVIEW_PLUGIN(webkitInfo);
++DECLARE_PLUGIN (pi);
++DECLARE_HTMLVIEW_PLUGIN (webkitInfo);



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (06bf512e98a42076c2a98c65e8f52d33596c6d8d), George Sherwood, 12/28/2007

Archive powered by MHonArc 2.6.24.

Top of Page