Merge lp:~mvo/software-center/webkit-debug into lp:software-center

[Michael Vogt]

Small branch that adds support for basic webkit debugging for url open (this was useful for Michael Nelson
the other day so I felt I should add it permanently).

[Michael Vogt (mvo)]

To followup from irc, the reason that its just using "*args" in the def _log_debug_output(self, *args) handler (and that those are not logged too) is that its just "object, GParamSpec" that is passed, but because we only use this function for the "notify::uri" we know the value of it already. I do not mind adding it to the log, but it will probably not add much additional information.

[Natalia Bidart (nataliabidart)]

(09:40:01 AM) nessita: mvo: Any reason not to log the args argument in the callback?
(09:47:37 AM) mvo: nessita: I followed up in the MP, I don't mind adding it to the MP, but AIUI it will mostly be reduandant
(09:48:29 AM) nessita: mvo: well, I would log only args instead of self.wk.webkit.get_property("uri"), but is a tiny detail. Will approve as is.

review: Approve

=== modified file 'README'
--- README	2012-03-08 18:08:49 +0000
+++ README	2012-05-21 12:31:22 +0000
@@ -44,6 +44,7 @@
 SOFTWARE_CENTER_AGENT_HOST - an alternative host to query for pay software
 SOFTWARE_CENTER_REVIEWS_HOST - an alternative host for the ratings&reviews
 SOFTWARE_CENTER_DEBUG_HTTP - enable httplib2 debuging
+SOFTWARE_CENTER_DEBUG_WEBKIT - enable webkit debuging
 SOFTWARE_CENTER_IPSUM_REVIEWS - generate random reviews
 SOFTWARE_CENTER_FAKE_REVIEW_API - use a fake server for all review network operations
 SOFTWARE_CENTER_GWIBBER_MOCK_USERS=2 - use mock gwibber service

=== modified file 'softwarecenter/ui/gtk3/views/purchaseview.py'
--- softwarecenter/ui/gtk3/views/purchaseview.py	2012-04-02 18:23:20 +0000
+++ softwarecenter/ui/gtk3/views/purchaseview.py	2012-05-21 12:31:22 +0000
@@ -109,6 +109,10 @@
         self._oauth_token = None
         self.config = get_config()
 
+    def _log_debug_output(self, *args):
+        LOG.info("uri changed: '%s'", self.wk.webkit.get_property("uri"))
+        
+
     def init_view(self):
         if self.wk is None:
             self.wk = ScrolledWebkitWindow()
@@ -118,6 +122,10 @@
             self.wk.webkit.connect("close-web-view", self._on_close_web_view)
             self.wk.webkit.connect("console-message", self._on_console_message)
 
+            # check if the user wants url debugging
+            if os.environ.get("SOFTWARE_CENTER_DEBUG_WEBKIT"):
+                self.wk.webkit.connect("notify::uri", self._log_debug_output)
+
             # a possible way to do IPC (script or title change)
             self.wk.webkit.connect("script-alert", self._on_script_alert)
             self.wk.webkit.connect("title-changed", self._on_title_changed)