[Xfce4-commits] <midori:master> There's no user-stylesheet-uri in WebKit2

[Christian Dywan]

Updating branch refs/heads/master
         to 13d67c47ae8a1adb3c98737daa3a65ce91a84245 (commit)
       from b92a0df29f90dafa342832def455976d732531cc (commit)

commit 13d67c47ae8a1adb3c98737daa3a65ce91a84245
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu Apr 4 23:54:12 2013 +0200

    There's no user-stylesheet-uri in WebKit2

 midori/midori-websettings.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index cd80bec..38aefeb 100644
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -1222,8 +1222,12 @@ midori_web_settings_get_property (GObject*    object,
             WEB_SETTINGS_STRING ("enable-fullscreen")));
         break;
     case PROP_USER_STYLESHEET_URI:
+#ifdef HAVE_WEBKIT2
+        g_value_set_string (value, web_settings->user_stylesheet_uri);
+#else
         g_value_take_string (value, katze_object_get_string (web_settings,
             WEB_SETTINGS_STRING ("user-stylesheet-uri")));
+#endif
         break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1278,7 +1282,11 @@ midori_web_settings_process_stylesheets (MidoriWebSettings* settings,
 
     /* data: uri prefix from Source/WebCore/page/Page.cpp:700 in WebKit */
     encoded = g_strconcat ("data:text/css;charset=utf-8;base64,", css->str, NULL);
+    #ifdef HAVE_WEBKIT2
+    /* TODO: webkit_web_view_group_add_user_style_sheet */
+    #else
     g_object_set (settings, WEB_SETTINGS_STRING ("user-stylesheet-uri"), encoded, NULL);
+    #endif
     g_free (encoded);
     g_string_free (css, TRUE);
 }