Merge lp:~laney/unity-control-center/wk2 into lp:unity-control-center

[Iain Lane]

Port the info WebView to WebKit 2

Port the info WebView to WebKit 2

[Sebastien Bacher (seb128)]

Thanks for the work!

There are some small issues though

* you deleted the gtk_scrolled_window_new () call but kept the sw variable and still use it as "user_data" in the callback which triggers a warning about user_data not being a valid GTK_WIDGET

* detail and was there before, but "gtk_widget_show_all(" lacks a space before the parenthesis, could you it while you are changing this line? ;-)

* the scrollbars have glitches/redraw issues here, do you see that as well? (it might be a webkit2 issue, doesn't do that with the current version though so it's an user experience regression and we should at least have a milestoned bug about it)

review: Needs Fixing

[Iain Lane (laney)]

Thanks for the review.

On Wed, Jan 13, 2016 at 06:21:07PM -0000, Sebastien Bacher wrote:
> Review: Needs Fixing
>
> Thanks for the work!
>
> There are some small issues though
>
> * you deleted the gtk_scrolled_window_new () call but kept the sw variable and still use it as "user_data" in the callback which triggers a warning about user_data not being a valid GTK_WIDGET

Ok, fixed, thanks.

>
> * detail and was there before, but "gtk_widget_show_all(" lacks a space before the parenthesis, could you it while you are changing this line? ;-)

Ok.

>
> * the scrollbars have glitches/redraw issues here, do you see that as well? (it might be a webkit2 issue, doesn't do that with the current version though so it's an user experience regression and we should at least have a milestoned bug about it)

It's a WebKit and theme problem. Trevinho was looking at it a while ago.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Sebastien Bacher (seb128)]

thanks, that looks fine, we should open a bug about the webkit issue but that's rather an item blocking the webkitgtk2 transition landing than one for that specific changeset

review: Approve

[lp:~laney/unity-control-center/wk2]

12844. By Iain Lane on 2016-01-19

Update the legal notice to fix a broken link and reflect dash search being off by default Fixes: #1534085
Approved by: Sebastien Bacher

12845. By CI Train Bot Account on 2016-01-19

Releasing 15.04.0+16.04.20160119-0ubuntu1

12846. By Iain Lane on 2016-02-09

Merge with trunk

=== modified file 'configure.ac'
--- configure.ac	2015-12-14 10:09:05 +0000
+++ configure.ac	2016-02-09 13:07:03 +0000
@@ -140,7 +140,7 @@
                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
 PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES libunity-settings-daemon x11)
 PKG_CHECK_MODULES(INFO_PANEL, $COMMON_MODULES libgtop-2.0 gl x11
-		  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION webkitgtk-3.0)
+		  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION webkit2gtk-4.0)
 PKG_CHECK_MODULES(KEYBOARD_PANEL, $COMMON_MODULES
                   gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
                   x11)

=== modified file 'debian/control'
--- debian/control	2015-12-14 10:09:05 +0000
+++ debian/control	2016-02-09 13:07:03 +0000
@@ -57,7 +57,7 @@
                network-manager-dev (>= 0.9.6.4) [linux-any],
                shared-mime-info,
                ttf-ubuntu-font-family,
-               libwebkitgtk-3.0-dev,
+               libwebkit2gtk-4.0-dev,
                libgl1-mesa-dev,
                valac (>= 0.20.0),
 Vcs-Bzr: https://code.launchpad.net/~unity-control-center-team/unity-control-center/trunk

=== modified file 'panels/info/cc-info-panel.c'
--- panels/info/cc-info-panel.c	2015-02-02 09:28:42 +0000
+++ panels/info/cc-info-panel.c	2016-02-09 13:07:03 +0000
@@ -40,7 +40,7 @@
 #include <GL/gl.h>
 #include <GL/glx.h>
 
-#include <webkit/webkit.h>
+#include <webkit2/webkit2.h>
 
 #include "hostname-helper.h"
 #include "gsd-disk-space-helper.h"
@@ -733,38 +733,51 @@
   gtk_tree_path_free (path);
 }
 
-static gboolean            
-url_nav_callback (WebKitWebView             *web_view,
-              WebKitWebFrame            *frame,
-              WebKitNetworkRequest      *request,
-              WebKitWebNavigationAction *navigation_action,
-              WebKitWebPolicyDecision   *decision,
-              gpointer                   user_data)
+static gboolean
+on_decide_policy (WebKitWebView             *web_view,
+                  WebKitPolicyDecision      *decision,
+                  WebKitPolicyDecisionType   decision_type,
+                  gpointer                   user_data)
 {
-    gtk_show_uri (gtk_widget_get_screen (user_data),
-                  webkit_network_request_get_uri (request),
-                  GDK_CURRENT_TIME, NULL);
-    return TRUE;
+    WebKitNavigationPolicyDecision *navigation_decision;
+    WebKitNavigationAction *navigation_action;
+    WebKitNavigationType navigation_type;
+    WebKitURIRequest *request;
+    const gchar *uri;
+
+    switch (decision_type)
+    {
+        case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION:
+            navigation_decision = WEBKIT_NAVIGATION_POLICY_DECISION(decision);
+            navigation_action = webkit_navigation_policy_decision_get_navigation_action (navigation_decision);
+            request = webkit_navigation_action_get_request (navigation_action);
+            navigation_type = webkit_navigation_action_get_navigation_type (navigation_action);
+
+            if (navigation_type == WEBKIT_NAVIGATION_TYPE_LINK_CLICKED)
+            {
+                uri = webkit_uri_request_get_uri (request);
+
+                webkit_policy_decision_ignore (decision);
+
+                gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (web_view)),
+                              uri, GDK_CURRENT_TIME, NULL);
+                return TRUE;
+            }
+        default:
+            return FALSE;
+    }
 }
 
 static void
 info_panel_setup_notice (CcInfoPanel  *self)
 {
-  GtkWidget *sw;
-  
-  sw = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                  GTK_POLICY_AUTOMATIC,
-                                  GTK_POLICY_AUTOMATIC);
-
-  WebKitWebView *webView = WEBKIT_WEB_VIEW(webkit_web_view_new());
+  WebKitWebView *webView = WEBKIT_WEB_VIEW (webkit_web_view_new());
   webkit_web_view_load_uri(webView, "file:///usr/share/unity-control-center/searchingthedashlegalnotice.html");
-  g_signal_connect (G_OBJECT (webView), "navigation-policy-decision-requested",
-                    G_CALLBACK (url_nav_callback), sw);
+  g_signal_connect (G_OBJECT (webView), "decide-policy",
+                    G_CALLBACK (on_decide_policy), NULL);
 
-  gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (webView));
-  gtk_notebook_append_page (GTK_NOTEBOOK (WID ("notebook")), sw, NULL);
-  gtk_widget_show_all(sw);
+  gtk_notebook_append_page (GTK_NOTEBOOK (WID ("notebook")), GTK_WIDGET (webView), NULL);
+  gtk_widget_show_all (GTK_WIDGET (webView));
 }
 
 static void