[evolution-rss] add gconf option to disable playing embeded objects in rss browser



commit 39f31215029a3dd7c28faedbbaba804fa3f660e3
Author: Lucian Langa <lucilanga gnome org>
Date:   Wed Apr 28 14:18:42 2010 +0300

    add gconf option to disable playing embeded objects in rss browser

 src/rss-config-factory.c |    3 ++-
 src/rss.c                |    3 +++
 src/rss.h                |    1 +
 3 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index eb3d903..e975cf5 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -3689,7 +3689,8 @@ rss_config_control_new (void)
 		installed and evolution-rss should be recompiled to see those packages."));
 	gtk_widget_show(label_webkit);
 #endif
-	g_signal_connect (combo, "changed", G_CALLBACK (render_engine_changed), NULL);
+	g_signal_connect (combo, "changed",
+		G_CALLBACK (render_engine_changed), NULL);
 	gtk_widget_show(combo);
 	gtk_box_pack_start(GTK_BOX(sf->combo_hbox), combo, FALSE, FALSE, 0);
 #endif
diff --git a/src/rss.c b/src/rss.c
index dae3b57..e5e14ae 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -1680,6 +1680,9 @@ webkit_set_preferences(void)
 #if (WEBKIT_VERSION >= 1001022)
 	g_object_set (settings, "enable-page-cache", TRUE, NULL);
 	//g_object_set (settings, "auto-resize-window", TRUE, NULL);
+	g_object_set (settings, "enable-plugins",
+		gconf_client_get_bool(rss_gconf, GCONF_KEY_EMBED_PLUGIN, NULL),
+		NULL);
 #endif
 	webkit_web_view_set_full_content_zoom((WebKitWebView *)rf->mozembed, TRUE);
 	g_free(agstr);
diff --git a/src/rss.h b/src/rss.h
index 1da759b..cad9714 100644
--- a/src/rss.h
+++ b/src/rss.h
@@ -195,6 +195,7 @@ typedef struct _rssfeed {
 #define GCONF_KEY_HTML_RENDER "/apps/evolution/evolution-rss/html_render"
 #define GCONF_KEY_HTML_JS "/apps/evolution/evolution-rss/html_js"
 #define GCONF_KEY_HTML_JAVA "/apps/evolution/evolution-rss/html_java"
+#define GCONF_KEY_EMBED_PLUGIN "/apps/evolution/evolution-rss/embed_plugin"
 #define GCONF_KEY_STATUS_ICON "/apps/evolution/evolution-rss/status_icon"
 #define GCONF_KEY_BLINK_ICON "/apps/evolution/evolution-rss/blink_icon"
 #define GCONF_KEY_FEED_ICON "/apps/evolution/evolution-rss/feed_icon"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]