|
 |
b761dbb |
--- cairo-dock-plugins-3.4.1/CMakeLists.txt.wk2 2017-04-01 03:09:09.171381809 +0900
|
|
|
b761dbb |
+++ cairo-dock-plugins-3.4.1/CMakeLists.txt 2017-04-01 03:09:09.172381805 +0900
|
|
|
b761dbb |
@@ -1391,7 +1391,7 @@
|
|
|
b761dbb |
set (with_weblets no)
|
|
|
b761dbb |
enable_if_not_defined (enable-weblets)
|
|
|
b761dbb |
if (enable-weblets)
|
|
|
b761dbb |
- set (WEBKIT_MODULE webkitgtk-3.0)
|
|
|
b761dbb |
+ set (WEBKIT_MODULE webkit2gtk-4.0)
|
|
|
b761dbb |
pkg_check_modules (WEBKIT ${WEBKIT_MODULE})
|
|
|
b761dbb |
if (NOT WEBKIT_FOUND)
|
|
|
b761dbb |
message (STATUS "Could not find ${WEBKIT_MODULE}; Cairo-Dock won't be built with Weblets applet.")
|
|
|
b761dbb |
--- cairo-dock-plugins-3.4.1/weblets/src/applet-struct.h.wk2 2015-02-20 01:13:47.000000000 +0900
|
|
|
b761dbb |
+++ cairo-dock-plugins-3.4.1/weblets/src/applet-struct.h 2017-04-01 03:09:09.172381805 +0900
|
|
|
b761dbb |
@@ -28,7 +28,7 @@
|
|
|
b761dbb |
#include "config.h"
|
|
|
b761dbb |
#endif
|
|
|
b761dbb |
|
|
|
b761dbb |
-#include <webkit/webkit.h>
|
|
|
b761dbb |
+#include <webkit2/webkit2.h>
|
|
|
b761dbb |
|
|
|
b761dbb |
//\___________ structure containing the applet's configuration parameters.
|
|
|
b761dbb |
struct _AppletConfig {
|
|
|
b761dbb |
--- cairo-dock-plugins-3.4.1/weblets/src/applet-widget.c.wk2 2015-02-20 01:13:47.000000000 +0900
|
|
|
b761dbb |
+++ cairo-dock-plugins-3.4.1/weblets/src/applet-widget.c 2017-04-01 03:14:59.380001735 +0900
|
|
|
b761dbb |
@@ -62,13 +62,19 @@
|
|
|
b761dbb |
return gldi_dialog_new (&attr);
|
|
|
b761dbb |
}
|
|
|
b761dbb |
|
|
|
b761dbb |
-/* Will be called when loading of the page is finished*/
|
|
|
b761dbb |
-void load_finished_cb(WebKitWebView *pWebKitView, WebKitWebFrame* widget
|
|
|
b761dbb |
+/* Will be called when loading of the page is changed*/
|
|
|
b761dbb |
+void load_changed_cb(WebKitWebView *pWebKitView, WebKitLoadEvent load_event
|
|
|
b761dbb |
, GldiModuleInstance *myApplet)
|
|
|
b761dbb |
{
|
|
|
b761dbb |
- cd_debug ("weblets : (re)load finished\n");
|
|
|
b761dbb |
- // update scrollbars status
|
|
|
b761dbb |
- show_hide_scrollbars(myApplet);
|
|
|
b761dbb |
+ switch (load_event) {
|
|
|
b761dbb |
+ case WEBKIT_LOAD_FINISHED:
|
|
|
b761dbb |
+ cd_debug ("weblets : (re)load finished\n");
|
|
|
b761dbb |
+ // update scrollbars status
|
|
|
b761dbb |
+ show_hide_scrollbars(myApplet);
|
|
|
b761dbb |
+ break;
|
|
|
b761dbb |
+ default:
|
|
|
b761dbb |
+ break;
|
|
|
b761dbb |
+ }
|
|
|
b761dbb |
}
|
|
|
b761dbb |
|
|
|
b761dbb |
/* Build the embedded widget */
|
|
|
b761dbb |
@@ -80,8 +86,8 @@
|
|
|
b761dbb |
myData.pWebKitView = WEBKIT_WEB_VIEW (webkit_web_view_new ());
|
|
|
b761dbb |
gtk_container_add (GTK_CONTAINER (myData.pGtkMozEmbed), GTK_WIDGET (myData.pWebKitView));
|
|
|
b761dbb |
g_signal_connect(G_OBJECT(myData.pWebKitView),
|
|
|
b761dbb |
- "load_finished",
|
|
|
b761dbb |
- G_CALLBACK (load_finished_cb),
|
|
|
b761dbb |
+ "load-changed",
|
|
|
b761dbb |
+ G_CALLBACK (load_changed_cb),
|
|
|
b761dbb |
myApplet);
|
|
|
b761dbb |
gtk_widget_show_all (myData.pGtkMozEmbed);
|
|
|
b761dbb |
|
|
|
b761dbb |
@@ -120,10 +126,14 @@
|
|
|
b761dbb |
}
|
|
|
b761dbb |
}
|
|
|
b761dbb |
|
|
|
b761dbb |
- webkit_web_view_open(WEBKIT_WEB_VIEW(myData.pWebKitView), myConfig.cURI_to_load?myConfig.cURI_to_load:"http://www.google.com");
|
|
|
b761dbb |
+ webkit_web_view_load_uri(WEBKIT_WEB_VIEW(myData.pWebKitView), myConfig.cURI_to_load?myConfig.cURI_to_load:"http://www.google.com");
|
|
|
b761dbb |
}
|
|
|
b761dbb |
/* available since rev. 30985, from fev. 2008 */
|
|
|
b761dbb |
- webkit_web_view_set_transparent(myData.pWebKitView, myConfig.bIsTransparent);
|
|
|
b761dbb |
+ {
|
|
|
b761dbb |
+ GdkRGBA rgba = {0};
|
|
|
b761dbb |
+ if (myConfig.bIsTransparent) rgba.alpha = 0.5;
|
|
|
b761dbb |
+ webkit_web_view_set_background_color(myData.pWebKitView, &rgba);
|
|
|
b761dbb |
+ }
|
|
|
b761dbb |
|
|
|
b761dbb |
return TRUE;
|
|
|
b761dbb |
}
|