[Pkg-cli-apps-commits] r5335 - in /packages/blam/trunk/debian: changelog patches/WebKit.patch
cmartin-guest at users.alioth.debian.org
cmartin-guest at users.alioth.debian.org
Fri Jun 4 15:57:26 UTC 2010
Author: cmartin-guest
Date: Fri Jun 4 15:56:44 2010
New Revision: 5335
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=5335
Log:
Add patches/WebKit.patch which displays the post rather than open nautilus
Added:
packages/blam/trunk/debian/patches/WebKit.patch
Modified:
packages/blam/trunk/debian/changelog
Modified: packages/blam/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/blam/trunk/debian/changelog?rev=5335&op=diff
==============================================================================
--- packages/blam/trunk/debian/changelog (original)
+++ packages/blam/trunk/debian/changelog Fri Jun 4 15:56:44 2010
@@ -1,3 +1,11 @@
+blam (1.8.7-2) unstable; urgency=low
+
+ * debian/patches:
+ + Add WebKit.patch, which displays the post rather than open
+ nautilus (Closes: #576940)
+
+ -- Carlos MartÃn Nieto <carlos at cmartin.tk> Fri, 04 Jun 2010 17:53:39 +0200
+
blam (1.8.7-1) unstable; urgency=low
[ Jo Shields ]
Added: packages/blam/trunk/debian/patches/WebKit.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/blam/trunk/debian/patches/WebKit.patch?rev=5335&op=file
==============================================================================
--- packages/blam/trunk/debian/patches/WebKit.patch (added)
+++ packages/blam/trunk/debian/patches/WebKit.patch Fri Jun 4 15:56:44 2010
@@ -1,0 +1,98 @@
+commit 4a5c831d181661640c3421685997da1349c36946
+Author: Carlos MartÃn Nieto <carlos at cmartin.tk>
+Date: Wed Nov 11 15:43:11 2009 +0100
+
+ Adapt to some new WebKit changes
+
+diff --git a/src/ItemView.cs b/src/ItemView.cs
+index a7b007a..8097f64 100644
+--- a/src/ItemView.cs
++++ b/src/ItemView.cs
+@@ -25,6 +25,7 @@ namespace Imendio.Blam {
+ private WebSettings webSettings;
+ #endif
+ private Imendio.Blam.Item currentItem;
++ private string baseDir = null;
+
+ public bool PageLoaded;
+
+@@ -67,7 +68,13 @@ namespace Imendio.Blam {
+
+ webView.NavigationRequested += delegate (object sender, NavigationRequestedArgs args) {
+ try {
++ /* Allow our local files to be downloaded. Needed to load the theme */
++ if(args.Request.Uri.StartsWith(baseDir)){
++ args.RetVal = NavigationResponse.Accept;
++ return;
++ }
+ Gnome.Url.Show(args.Request.Uri);
++ args.RetVal = NavigationResponse.Ignore;
+ }
+ catch (Exception e) {
+ Console.Error.WriteLine("Couldn't show URL: " + args.Request.Uri + e.Message);
+@@ -119,6 +126,7 @@ namespace Imendio.Blam {
+ string text = HtmlUtils.EncodeUnicode(HtmlUtils.FixMarkup(currentItem.Text));
+ string title = HtmlUtils.Escape(currentItem.Title);
+ string url = currentItem.Link;
++ baseDir = "file://" + theme.Path;
+
+ string[] replaces = {
+ "author", author,
+@@ -126,10 +134,11 @@ namespace Imendio.Blam {
+ "pubdate", pubdate,
+ "text", text,
+ "title", title,
+- "url", url
++ "url", url,
++ "localbase", baseDir
+ };
+
+- webView.LoadString (theme.Render(replaces), "text/html", "utf8", "file://" + theme.Path + "/");
++ webView.LoadString(theme.Render(replaces), null, null, baseDir);
+ }
+
+ private void SetFonts ()
+diff --git a/themes/blam/theme.html b/themes/blam/theme.html
+index 2a41912..2dbc50f 100644
+--- a/themes/blam/theme.html
++++ b/themes/blam/theme.html
+@@ -1,7 +1,7 @@
+ <html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+- <link rel="stylesheet" href="blam.css" type="text/css">
++ <link rel="stylesheet" href="${localbase}/blam.css" type="text/css">
+ <title>${title}</title>
+ <base href="${url}" />
+ </head>
+diff --git a/themes/pimped/theme.html b/themes/pimped/theme.html
+index 4e5e29a..681bdad 100644
+--- a/themes/pimped/theme.html
++++ b/themes/pimped/theme.html
+@@ -1,12 +1,11 @@
+ <html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+- <link rel="stylesheet" href="pimped.css" type="text/css">
+ <title>${title}</title>
++ <link rel="stylesheet" href="${localbase}/pimped.css" type="text/css">
+ <base href="${url}" />
+ </head>
+ <body>
+-
+ <div id="body">
+ ${text}
+ </div>
+diff --git a/themes/planet/theme.html b/themes/planet/theme.html
+index bf936f8..849e6da 100644
+--- a/themes/planet/theme.html
++++ b/themes/planet/theme.html
+@@ -2,7 +2,7 @@
+ <html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+- <link rel="stylesheet" href="planet.css" type="text/css">
++ <link rel="stylesheet" href="${localbase}/planet.css" type="text/css">
+ <base href="${url}" />
+ </head>
+ <body>
More information about the Pkg-cli-apps-commits
mailing list