[Pkg-cli-apps-commits] [SCM] sparkleshare branch, master, updated. debian/0.8.2-1-6-g2661826

[Carlos Martín Nieto]

The following commit has been merged in the master branch:
commit 26618263c8d3908cfca3bb0b3b9caad1a03c6e22
Author: Carlos Martín Nieto <carlos at cmartin.tk>
Date:   Thu Jun 7 02:19:43 2012 +0200

    Add patch 0002-Fix-event-log-not-loading-on-Ubuntu.-Closes-729.patch

diff --git a/debian/patches/0002-Fix-event-log-not-loading-on-Ubuntu.-Closes-729.patch b/debian/patches/0002-Fix-event-log-not-loading-on-Ubuntu.-Closes-729.patch
new file mode 100644
index 0000000..ecacf11
--- /dev/null
+++ b/debian/patches/0002-Fix-event-log-not-loading-on-Ubuntu.-Closes-729.patch
@@ -0,0 +1,107 @@
+From: Hylke Bons <hbons at thinkpad.(none)>
+Date: Thu, 17 May 2012 23:09:18 +0100
+Subject: Fix event log not loading on Ubuntu. Closes #729
+
+---
+ SparkleShare/Linux/SparkleEventLog.cs     |   36 ++++++++++++++---------------
+ SparkleShare/SparkleEventLogController.cs |    3 +++
+ 2 files changed, 21 insertions(+), 18 deletions(-)
+
+diff --git a/SparkleShare/Linux/SparkleEventLog.cs b/SparkleShare/Linux/SparkleEventLog.cs
+index 12c76e5..e0da807 100755
+--- a/SparkleShare/Linux/SparkleEventLog.cs
++++ b/SparkleShare/Linux/SparkleEventLog.cs
+@@ -40,7 +40,6 @@ namespace SparkleShare {
+         private ScrolledWindow scrolled_window;
+         private WebView web_view;
+         private SparkleSpinner spinner;
+-        private string link_status;
+ 
+ 
+         // Short alias for the translations
+@@ -89,18 +88,8 @@ namespace SparkleShare {
+                 Editable = false
+             };
+ 
+-            this.web_view.HoveringOverLink += delegate (object o, WebKit.HoveringOverLinkArgs args) {
+-                this.link_status = args.Link;
+-            };
+-
+-            this.web_view.NavigationRequested += delegate (object o, WebKit.NavigationRequestedArgs args) {
+-                if (args.Request.Uri == this.link_status)
+-                    Controller.LinkClicked (args.Request.Uri);
+ 
+-                // Don't follow HREFs (as this would cause a page refresh)
+-                if (!args.Request.Uri.Equals ("file:"))
+-                    args.RetVal = 1;
+-            };
++            this.web_view.NavigationRequested += WebViewNavigationRequested;
+ 
+             this.scrolled_window.Add (this.web_view);
+             this.content_wrapper.Add (this.spinner);
+@@ -170,6 +159,15 @@ namespace SparkleShare {
+                 });
+             };
+         }
++        
++        
++        private void WebViewNavigationRequested (object o, WebKit.NavigationRequestedArgs args) {
++            Controller.LinkClicked (args.Request.Uri.Substring (7));
++
++            // Don't follow HREFs (as this would cause a page refresh)
++            if (!args.Request.Uri.Equals ("file:"))
++                args.RetVal = 1;
++        }
+ 
+ 
+         public void UpdateChooser (string [] folders)
+@@ -260,21 +258,23 @@ namespace SparkleShare {
+ 				html = html.Replace ("<!-- $pixmaps-path -->", pixmaps_path);
+                 
+ 				html = html.Replace ("<!-- $document-added-background-image -->", 
+-					"file://" + IO.Path.Combine (icons_path + "document-added.png"));
+-				
++					"file://" + IO.Path.Combine (icons_path, "document-added.png"));
++
+ 				html = html.Replace ("<!-- $document-edited-background-image -->", 
+-					"file://" + IO.Path.Combine (icons_path + "document-edited.png"));
++					"file://" + IO.Path.Combine (icons_path, "document-edited.png"));
+ 				
+ 				html = html.Replace ("<!-- $document-deleted-background-image -->", 
+-					"file://" + IO.Path.Combine (icons_path + "document-deleted.png"));
++					"file://" + IO.Path.Combine (icons_path, "document-deleted.png"));
+ 				
+ 				html = html.Replace ("<!-- $document-moved-background-image -->", 
+-					"file://" + IO.Path.Combine (icons_path + "document-moved.png"));
++					"file://" + IO.Path.Combine (icons_path, "document-moved.png"));
+                         
+                 
+                 Application.Invoke (delegate {
+                     this.spinner.Stop ();
+-                    this.web_view.LoadString (html, null, null, "file://");
++                                this.web_view.NavigationRequested -= WebViewNavigationRequested;
++                    this.web_view.LoadHtmlString (html, "file://");
++                                this.web_view.NavigationRequested += WebViewNavigationRequested;
+                     this.content_wrapper.Remove (this.content_wrapper.Child);
+                     this.content_wrapper.Add (this.scrolled_window);
+                     this.content_wrapper.ShowAll ();
+diff --git a/SparkleShare/SparkleEventLogController.cs b/SparkleShare/SparkleEventLogController.cs
+index ea8a248..53606a3 100755
+--- a/SparkleShare/SparkleEventLogController.cs
++++ b/SparkleShare/SparkleEventLogController.cs
+@@ -199,9 +199,12 @@ namespace SparkleShare {
+ 
+         public void LinkClicked (string url)
+         {
++            url = url.Replace ("%20", " ");
++        
+             if (url.StartsWith (Path.VolumeSeparatorChar.ToString ()) ||
+ 			    url.Substring (1, 1).Equals (":")) {
+ 				
++				Console.WriteLine ("opening " + url);
+                 Program.Controller.OpenFile (url);
+             }
+         }
+-- 
+1.7.10.2.1.g8c77c3c
+
diff --git a/debian/patches/series b/debian/patches/series
index 4c42ea5..4ac163b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Don-t-call-update-desktop-database-from-the-Makefile.patch
+0002-Fix-event-log-not-loading-on-Ubuntu.-Closes-729.patch

-- 
sparkleshare