beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

linux: Re-enable WebKit

Browse source
This commit is contained in:
Hylke Bons 2016-04-13 07:55:18 -07:00
parent 8d582b2bc3
commit 55b8618d14
3 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
SparkleShare/Linux/EventLog.cs
View file

@ -19,7 +19,7 @@ using System;
using IO = System.IO;
using Gtk;
// using WebKit;
using WebKit2;
namespace SparkleShare {
@ -36,7 +36,7 @@ namespace SparkleShare {
private ScrolledWindow scrolled_window;
private VBox spinner_wrapper;
private Spinner spinner;
// private WebView web_view;
private WebView web_view;
int pos_x, pos_y;
@ -75,9 +75,9 @@ namespace SparkleShare {
css_provider.LoadFromData ("GtkEventBox { background-color: #ffffff; }");
this.content_wrapper.StyleContext.AddProvider (css_provider, 800);
// this.web_view = new WebView () { Editable = false };
// this.web_view.Settings.EnablePresets = false;
// this.web_view.NavigationRequested += WebViewNavigationRequested;
this.web_view = new WebView () { Editable = false };
this.web_view.Settings.EnablePresets = false;
this.web_view.NavigationRequested += WebViewNavigationRequested;
this.scrolled_window.Add (new Button ("WebView"));
@ -272,21 +272,21 @@ namespace SparkleShare {
html = html.Replace ("<!-- $document-moved-background-image -->", "file://" + IO.Path.Combine (icons_path, "document-moved.png"));
this.spinner.Stop ();
// this.scrolled_window.Remove (this.web_view);
// this.web_view.Dispose ();
this.scrolled_window.Remove (this.web_view);
this.web_view.Dispose ();
// this.web_view = new WebView () { Editable = false };
// this.web_view.LoadString (html, "text/html", "UTF-8", "file://");
// this.web_view.NavigationRequested += WebViewNavigationRequested;
// this.scrolled_window.Add (this.web_view);
this.web_view = new WebView () { Editable = false };
this.web_view.LoadString (html, "text/html", "UTF-8", "file://");
//this.web_view.NavigationRequested += WebViewNavigationRequested;
this.scrolled_window.Add (this.web_view);
this.content_wrapper.Remove (this.content_wrapper.Child);
this.content_wrapper.Add (this.scrolled_window);
//this.content_wrapper.Add (this.scrolled_window);
this.scrolled_window.ShowAll ();
}
/*
private void WebViewNavigationRequested (object o, WebKit.NavigationRequestedArgs args) {
/*
private void WebViewNavigationRequested (object o, WebKit2.NavigationRequestedArgs args) {
Controller.LinkClicked (args.Request.Uri);
// Don't follow HREFs (as this would cause a page refresh)

2
build/build.environment.mk
View file

@ -11,7 +11,7 @@ LINK_MONO_POSIX = -r:Mono.Posix
LINK_GLIB = $(GLIB_SHARP_LIBS)
LINK_GTK = $(GTK_SHARP_LIBS)
LINK_WEBKIT = $(WEBKITGTK_SHARP_LIBS)
LINK_WEBKIT = $(WEBKIT2_SHARP_LIBS)
LINK_APP_INDICATOR = $(APP_INDICATOR_LIBS)
REF_SPARKLES = $(LINK_SYSTEM) $(LINK_MONO_POSIX)

12
configure.ac
View file

@ -65,12 +65,12 @@ if test "$OSNAME" = "Linux" ; then
SPARKLESHARE_CHECK_GTK_SHARP
PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp-3.0)
# dnl check for webkitgtk-sharp
# PKG_CHECK_MODULES(WEBKITGTK_SHARP, webkitgtk-sharp-3.0, have_webkitgtk_sharp=yes, have_webkitgtk_sharp=no)
# if test "x$have_webkitgtk_sharp" = "xno" ; then
# AC_ERROR("webkitgtk-sharp is a required dependency: you need to install the appropriate devel package before you can compile")
# fi
# AC_SUBST(WEBKITGTK_SHARP_LIBS)
dnl check for webkit2-sharp
PKG_CHECK_MODULES(WEBKIT2_SHARP, webkit2-sharp-4.0, have_webkit2_sharp=yes, have_webkit2_sharp=no)
if test "x$have_webkit2_sharp" = "xno" ; then
AC_ERROR("webkit2-sharp is a required dependency: you need to install the appropriate devel package before you can compile")
fi
AC_SUBST(WEBKIT2_SHARP_LIBS)
APPINDICATOR_REQUIRED=0.1