commit e61294d9360620aaf830752a0e666425526e6ae6
parent fb3e030f844de08063fd2d4794b44a77f50f2fe4
Author: Colin Leroy <colin@colino.net>
Date: Wed, 13 Mar 2013 10:39:22 +0000
2013-03-13 [colin] 3.9.0cvs115
* src/plugins/fancy/fancy_prefs.c
* src/plugins/fancy/fancy_prefs.h
* src/plugins/fancy/fancy_viewer.c
* src/plugins/fancy/fancy_viewer.h
Untangle prefs handling, untangle open in browser
and move back to Enable remote content instead of
Enable inner navigation.
Diffstat:
7 files changed, 172 insertions(+), 193 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,13 @@
+2013-03-13 [colin] 3.9.0cvs115
+
+ * src/plugins/fancy/fancy_prefs.c
+ * src/plugins/fancy/fancy_prefs.h
+ * src/plugins/fancy/fancy_viewer.c
+ * src/plugins/fancy/fancy_viewer.h
+ Untangle prefs handling, untangle open in browser
+ and move back to Enable remote content instead of
+ Enable inner navigation.
+
2013-03-13 [mones] 3.9.0cvs114
* INSTALL
diff --git a/PATCHSETS b/PATCHSETS
@@ -4612,3 +4612,4 @@
( cvs diff -u -r 1.61.2.107 -r 1.61.2.108 src/account.c; ) > 3.9.0cvs112.patchset
( cvs diff -u -r 1.61.2.108 -r 1.61.2.109 src/account.c; ) > 3.9.0cvs113.patchset
( cvs diff -u -r 1.29.2.14 -r 1.29.2.15 INSTALL; cvs diff -u -r 1.8.2.68 -r 1.8.2.69 README; ) > 3.9.0cvs114.patchset
+( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/fancy/fancy_prefs.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/fancy/fancy_prefs.h; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/fancy/fancy_viewer.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/fancy/fancy_viewer.h; ) > 3.9.0cvs115.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=114
+EXTRA_VERSION=115
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
@@ -1077,7 +1077,7 @@ AC_SUBST(LIBXML_LIBS)
AC_SUBST(LIBXML_CFLAGS)
dnl webkit *********************************************************************
-PKG_CHECK_MODULES(WEBKIT, webkit-1.0, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
+PKG_CHECK_MODULES(WEBKIT, webkit-1.0 >= 1.1.14, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
AC_SUBST(WEBKIT_LIBS)
AC_SUBST(WEBKIT_CFLAGS)
diff --git a/src/plugins/fancy/fancy_prefs.c b/src/plugins/fancy/fancy_prefs.c
@@ -56,7 +56,7 @@ typedef struct _FancyPrefsPage FancyPrefsPage;
struct _FancyPrefsPage {
PrefsPage page;
GtkWidget *auto_load_images;
- GtkWidget *enable_inner_navigation;
+ GtkWidget *enable_remote_content;
GtkWidget *enable_scripts;
GtkWidget *enable_plugins;
GtkWidget *enable_java;
@@ -71,7 +71,7 @@ struct _FancyPrefsPage {
static PrefParam param[] = {
{"auto_load_images", "FALSE", &fancy_prefs.auto_load_images, P_BOOL,
NULL, NULL, NULL},
- {"enable_inner_navigation", "FALSE", &fancy_prefs.enable_inner_navigation, P_BOOL,
+ {"enable_remote_content", "FALSE", &fancy_prefs.enable_remote_content, P_BOOL,
NULL, NULL, NULL},
{"enable_scripts", "FALSE", &fancy_prefs.enable_scripts, P_BOOL,
NULL, NULL, NULL},
@@ -135,10 +135,10 @@ static void open_external_set_label_cb(GtkWidget *button, FancyPrefsPage *prefs_
GtkTreeModel *model = gtk_combo_box_get_model(GTK_COMBO_BOX(prefs_page->open_external));
GtkTreeIter iter;
if (gtk_tree_model_get_iter_first (model, &iter)) {
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_page->enable_inner_navigation)))
- gtk_list_store_set(model, &iter, COMBOBOX_TEXT, _("Open in viewer"), -1);
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_page->enable_remote_content)))
+ gtk_list_store_set(model, &iter, COMBOBOX_TEXT, _("Open in viewer (remote content is enabled)"), -1);
else
- gtk_list_store_set(model, &iter, COMBOBOX_TEXT, _("Do nothing"), -1);
+ gtk_list_store_set(model, &iter, COMBOBOX_TEXT, _("Do nothing (remote content is disabled)"), -1);
}
}
@@ -196,9 +196,9 @@ static void create_fancy_prefs_page(PrefsPage *page, GtkWindow *window,
gtk_box_pack_start(GTK_BOX(vbox), checkbox1, FALSE, FALSE, 0);
gtk_widget_show(checkbox1);
- checkbox2 = gtk_check_button_new_with_label(_("Enable inner navigation"));
+ checkbox2 = gtk_check_button_new_with_label(_("Enable remote content"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox2),
- fancy_prefs.enable_inner_navigation);
+ fancy_prefs.enable_remote_content);
gtk_box_pack_start(GTK_BOX(vbox), checkbox2, FALSE, FALSE, 0);
gtk_widget_show(checkbox2);
@@ -244,14 +244,14 @@ static void create_fancy_prefs_page(PrefsPage *page, GtkWindow *window,
prefs_page->proxy_checkbox = proxy_checkbox;
prefs_page->proxy_str = proxy_str;
prefs_page->auto_load_images = checkbox1;
- prefs_page->enable_inner_navigation = checkbox2;
+ prefs_page->enable_remote_content = checkbox2;
prefs_page->enable_scripts = checkbox3;
prefs_page->enable_plugins = checkbox4;
prefs_page->enable_java = checkbox6;
prefs_page->open_external = optmenu_open_external;
prefs_page->page.widget = vbox;
- g_signal_connect(G_OBJECT(prefs_page->enable_inner_navigation), "toggled",
+ g_signal_connect(G_OBJECT(prefs_page->enable_remote_content), "toggled",
G_CALLBACK(open_external_set_label_cb), prefs_page);
open_external_set_label_cb(NULL, prefs_page);
}
@@ -312,8 +312,8 @@ static void save_fancy_prefs_page(PrefsPage *page)
#endif
fancy_prefs.auto_load_images = gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON(prefs_page->auto_load_images));
- fancy_prefs.enable_inner_navigation = gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON(prefs_page->enable_inner_navigation));
+ fancy_prefs.enable_remote_content = gtk_toggle_button_get_active
+ (GTK_TOGGLE_BUTTON(prefs_page->enable_remote_content));
fancy_prefs.enable_scripts = gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON(prefs_page->enable_scripts));
fancy_prefs.enable_plugins = gtk_toggle_button_get_active
diff --git a/src/plugins/fancy/fancy_prefs.h b/src/plugins/fancy/fancy_prefs.h
@@ -29,7 +29,7 @@ struct _FancyPrefs
WebKitWebSettings *web_settings;
gboolean auto_load_images;
- gboolean enable_inner_navigation;
+ gboolean enable_remote_content;
gboolean enable_scripts;
gboolean enable_plugins;
gboolean enable_java;
diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
@@ -58,7 +58,7 @@ navigation_requested_cb (WebKitWebView *view, WebKitWebFrame *frame,
static MimeViewerFactory fancy_viewer_factory;
-static gboolean
+static gboolean
fancy_text_search(MimeViewer *_viewer, gboolean backward, const gchar *str,
gboolean case_sens);
@@ -93,24 +93,118 @@ static GtkWidget *fancy_get_widget(MimeViewer *_viewer)
{
FancyViewer *viewer = (FancyViewer *) _viewer;
debug_print("fancy_get_widget: %p\n", viewer->vbox);
- viewer->load_page = FALSE;
return GTK_WIDGET(viewer->vbox);
}
+static void fancy_apply_prefs(FancyViewer *viewer)
+{
+ g_object_set(viewer->settings, "auto-load-images",
+ viewer->override_prefs_images, NULL);
+ g_object_set(viewer->settings, "enable-scripts",
+ viewer->override_prefs_scripts, NULL);
+ g_object_set(viewer->settings, "enable-plugins",
+ viewer->override_prefs_plugins, NULL);
+ g_object_set(viewer->settings, "enable-java-applet",
+ viewer->override_prefs_java, NULL);
+
+ webkit_web_view_set_settings(viewer->view, viewer->settings);
+}
+
+static void fancy_auto_load_images_activated(GtkCheckMenuItem *item, FancyViewer *viewer) {
+ viewer->override_prefs_images = gtk_check_menu_item_get_active(item);
+ fancy_apply_prefs(viewer);
+ webkit_web_view_reload (viewer->view);
+}
+
+static void fancy_enable_remote_content_activated(GtkCheckMenuItem *item, FancyViewer *viewer) {
+ viewer->override_prefs_remote_content = gtk_check_menu_item_get_active(item);
+ fancy_apply_prefs(viewer);
+ webkit_web_view_reload (viewer->view);
+}
+
+static void fancy_enable_scripts_activated(GtkCheckMenuItem *item, FancyViewer *viewer) {
+ viewer->override_prefs_scripts = gtk_check_menu_item_get_active(item);
+ fancy_apply_prefs(viewer);
+ webkit_web_view_reload (viewer->view);
+}
+
+static void fancy_enable_plugins_activated(GtkCheckMenuItem *item, FancyViewer *viewer) {
+ viewer->override_prefs_plugins = gtk_check_menu_item_get_active(item);
+ fancy_apply_prefs(viewer);
+ webkit_web_view_reload (viewer->view);
+}
+
+static void fancy_enable_java_activated(GtkCheckMenuItem *item, FancyViewer *viewer) {
+ viewer->override_prefs_java = gtk_check_menu_item_get_active(item);
+ fancy_apply_prefs(viewer);
+ webkit_web_view_reload (viewer->view);
+}
+
+static void fancy_open_external_activated(GtkCheckMenuItem *item, FancyViewer *viewer) {
+ viewer->override_prefs_external = gtk_check_menu_item_get_active(item);
+ fancy_apply_prefs(viewer);
+}
+
static void fancy_set_defaults(FancyViewer *viewer)
{
- viewer->override_prefs_inner_navigation = fancy_prefs.enable_inner_navigation;
+ viewer->override_prefs_remote_content = fancy_prefs.enable_remote_content;
viewer->override_prefs_external = fancy_prefs.open_external;
viewer->override_prefs_images = fancy_prefs.auto_load_images;
viewer->override_prefs_scripts = fancy_prefs.enable_scripts;
viewer->override_prefs_plugins = fancy_prefs.enable_plugins;
viewer->override_prefs_java = fancy_prefs.enable_java;
+
+ g_signal_handlers_block_by_func(G_OBJECT(viewer->auto_load_images),
+ fancy_auto_load_images_activated, viewer);
+ g_signal_handlers_block_by_func(G_OBJECT(viewer->enable_remote_content),
+ fancy_enable_remote_content_activated, viewer);
+ g_signal_handlers_block_by_func(G_OBJECT(viewer->enable_scripts),
+ fancy_enable_scripts_activated, viewer);
+ g_signal_handlers_block_by_func(G_OBJECT(viewer->enable_plugins),
+ fancy_enable_plugins_activated, viewer);
+ g_signal_handlers_block_by_func(G_OBJECT(viewer->enable_java),
+ fancy_enable_java_activated, viewer);
+ g_signal_handlers_block_by_func(G_OBJECT(viewer->open_external),
+ fancy_open_external_activated, viewer);
+
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(viewer->auto_load_images),
+ viewer->override_prefs_images);
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(viewer->enable_scripts),
+ viewer->override_prefs_scripts);
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(viewer->enable_plugins),
+ viewer->override_prefs_plugins);
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(viewer->enable_java),
+ viewer->override_prefs_java);
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(viewer->enable_remote_content),
+ viewer->override_prefs_remote_content);
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(viewer->open_external),
+ viewer->override_prefs_external);
+
+ g_signal_handlers_unblock_by_func(G_OBJECT(viewer->auto_load_images),
+ fancy_auto_load_images_activated, viewer);
+ g_signal_handlers_unblock_by_func(G_OBJECT(viewer->enable_remote_content),
+ fancy_enable_remote_content_activated, viewer);
+ g_signal_handlers_unblock_by_func(G_OBJECT(viewer->enable_scripts),
+ fancy_enable_scripts_activated, viewer);
+ g_signal_handlers_unblock_by_func(G_OBJECT(viewer->enable_plugins),
+ fancy_enable_plugins_activated, viewer);
+ g_signal_handlers_unblock_by_func(G_OBJECT(viewer->enable_java),
+ fancy_enable_java_activated, viewer);
+ g_signal_handlers_unblock_by_func(G_OBJECT(viewer->open_external),
+ fancy_open_external_activated, viewer);
+
+ fancy_apply_prefs(viewer);
}
static void fancy_load_uri(FancyViewer *viewer, const gchar *uri)
{
- viewer->load_page = FALSE;
#if WEBKIT_CHECK_VERSION(1,1,1)
webkit_web_view_load_uri(viewer->view, uri);
#else
@@ -162,8 +256,8 @@ static gboolean fancy_show_mimepart_real(MimeViewer *_viewer)
gchar *tmp = g_filename_to_uri(viewer->filename, NULL, NULL);
debug_print("zoom_level: %i\n", fancy_prefs.zoom_level);
webkit_web_view_set_zoom_level(viewer->view, (fancy_prefs.zoom_level / 100.0));
- fancy_set_defaults(viewer);
+ fancy_set_defaults(viewer);
fancy_load_uri(viewer, tmp);
g_free(tmp);
@@ -345,7 +439,6 @@ static void fancy_clear_viewer(MimeViewer *_viewer)
{
FancyViewer *viewer = (FancyViewer *) _viewer;
GtkAdjustment *vadj;
- viewer->load_page = FALSE;
viewer->cur_link = NULL;
fancy_set_defaults(viewer);
@@ -368,72 +461,23 @@ static void fancy_destroy_viewer(MimeViewer *_viewer)
g_free(viewer);
}
-static WebKitNavigationResponse fancy_open_uri (FancyViewer *viewer) {
- if (viewer->load_page) {
- /* handle mailto scheme */
- if (!strncmp(viewer->cur_link,"mailto:", 7)) {
- compose_new(NULL, viewer->cur_link + 7, NULL);
- return WEBKIT_NAVIGATION_RESPONSE_IGNORE;
- }
- else {
- viewer->load_page = TRUE;
- return WEBKIT_NAVIGATION_RESPONSE_ACCEPT;
- }
- }
- else {
- viewer->load_page = TRUE;
- return WEBKIT_NAVIGATION_RESPONSE_ACCEPT;
- }
-}
-
static WebKitNavigationResponse
navigation_requested_cb(WebKitWebView *view, WebKitWebFrame *frame,
WebKitNetworkRequest *netreq, FancyViewer *viewer)
{
- debug_print("nav to %s\n", webkit_network_request_get_uri(netreq));
-
- g_object_set(viewer->settings, "auto-load-images",
- viewer->override_prefs_images, NULL);
- g_object_set(viewer->settings, "enable-scripts",
- viewer->override_prefs_scripts, NULL);
- g_object_set(viewer->settings, "enable-plugins",
- viewer->override_prefs_plugins, NULL);
- g_object_set(viewer->settings, "enable-java-applet",
- viewer->override_prefs_java, NULL);
-
- webkit_web_view_set_settings(viewer->view, viewer->settings);
-
- if (viewer->load_page) {
- switch(viewer->nav_mode) {
- case NAV_DEFAULT:
- debug_print("Open default\n");
- /* will be handled besides */
- break;
- case NAV_INNER:
- debug_print("Open inner\n");
- viewer->nav_mode = NAV_DEFAULT;
- return WEBKIT_NAVIGATION_RESPONSE_ACCEPT;
- break;
- case NAV_OUTER:
- debug_print("Open outer\n");
- viewer->nav_mode = NAV_DEFAULT;
- return WEBKIT_NAVIGATION_RESPONSE_IGNORE;
- break;
- }
- } else {
- viewer->load_page = TRUE;
- return WEBKIT_NAVIGATION_RESPONSE_ACCEPT;
- }
+ const gchar *uri = webkit_network_request_get_uri(netreq);
+ debug_print("navigation requested to %s\n", uri);
- if (viewer->override_prefs_external) {
- open_uri(webkit_network_request_get_uri(netreq),
- prefs_common_get_uri_cmd());
+ if (!strncmp(uri, "mailto:", 7)) {
+ compose_new(NULL, uri + 7, NULL);
return WEBKIT_NAVIGATION_RESPONSE_IGNORE;
- } else if (viewer->override_prefs_inner_navigation) {
+ } else if (!strncmp(uri, "file://", 7)) {
+ return WEBKIT_NAVIGATION_RESPONSE_ACCEPT;
+ } else if (viewer->override_prefs_remote_content)
return WEBKIT_NAVIGATION_RESPONSE_ACCEPT;
- } else {
- fancy_show_notice(viewer, _("Navigation is disabled."));
- return WEBKIT_NAVIGATION_RESPONSE_IGNORE;
+ else {
+ fancy_show_notice(viewer, _("Remote content loading is disabled."));
+ return WEBKIT_NAVIGATION_RESPONSE_IGNORE;
}
}
@@ -482,66 +526,9 @@ static gboolean fancy_text_search(MimeViewer *_viewer, gboolean backward,
case_sens, !backward, TRUE);
}
-static void fancy_auto_load_images_activated(GtkCheckMenuItem *item, FancyViewer *viewer) {
- viewer->load_page = FALSE;
- viewer->override_prefs_images = gtk_check_menu_item_get_active(item);
- webkit_web_view_reload (viewer->view);
-}
-
-static void fancy_enable_inner_navigation_activated(GtkCheckMenuItem *item, FancyViewer *viewer) {
- viewer->override_prefs_inner_navigation = gtk_check_menu_item_get_active(item);
-}
-
-static void fancy_enable_scripts_activated(GtkCheckMenuItem *item, FancyViewer *viewer) {
- viewer->load_page = FALSE;
- viewer->override_prefs_scripts = gtk_check_menu_item_get_active(item);
- webkit_web_view_reload (viewer->view);
-}
-
-static void fancy_enable_plugins_activated(GtkCheckMenuItem *item, FancyViewer *viewer) {
- viewer->load_page = FALSE;
- viewer->override_prefs_plugins = gtk_check_menu_item_get_active(item);
- webkit_web_view_reload (viewer->view);
-}
-
-static void fancy_enable_java_activated(GtkCheckMenuItem *item, FancyViewer *viewer) {
- viewer->load_page = FALSE;
- viewer->override_prefs_java = gtk_check_menu_item_get_active(item);
- webkit_web_view_reload (viewer->view);
-}
-
-static void fancy_open_external_activated(GtkCheckMenuItem *item, FancyViewer *viewer) {
- viewer->override_prefs_external = gtk_check_menu_item_get_active(item);
-}
-
static gboolean fancy_prefs_cb(GtkWidget *widget, GdkEventButton *ev, FancyViewer *viewer)
{
if ((ev->button == 1) && (ev->type == GDK_BUTTON_PRESS)) {
- /* Set sensitivity according to preferences and overrides */
- gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(viewer->auto_load_images),
- viewer->override_prefs_images);
-
- gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(viewer->enable_scripts),
- viewer->override_prefs_scripts);
-
- gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(viewer->enable_plugins),
- viewer->override_prefs_plugins);
-
- gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(viewer->enable_java),
- viewer->override_prefs_java);
-
- gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(viewer->enable_inner_navigation),
- viewer->override_prefs_inner_navigation);
-
- gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(viewer->open_external),
- viewer->override_prefs_external);
-
gtk_menu_popup(GTK_MENU(viewer->fancy_prefs_menu), NULL, NULL, NULL, NULL,
ev->button, ev->time);
return TRUE;
@@ -551,7 +538,7 @@ static gboolean fancy_prefs_cb(GtkWidget *widget, GdkEventButton *ev, FancyViewe
static void fancy_create_popup_prefs_menu(FancyViewer *viewer) {
GtkWidget *auto_load_images;
- GtkWidget *enable_inner_navigation;
+ GtkWidget *enable_remote_content;
GtkWidget *enable_scripts;
GtkWidget *enable_plugins;
GtkWidget *enable_java;
@@ -559,7 +546,7 @@ static void fancy_create_popup_prefs_menu(FancyViewer *viewer) {
auto_load_images = gtk_check_menu_item_new_with_label(_("Load images"));
- enable_inner_navigation = gtk_check_menu_item_new_with_label(_("Enable inner navigation"));
+ enable_remote_content = gtk_check_menu_item_new_with_label(_("Enable remote content"));
enable_scripts = gtk_check_menu_item_new_with_label(_("Enable Javascript"));
@@ -569,21 +556,8 @@ static void fancy_create_popup_prefs_menu(FancyViewer *viewer) {
open_external = gtk_check_menu_item_new_with_label(_("Open links with external browser"));
- g_signal_connect(G_OBJECT(auto_load_images), "toggled",
- G_CALLBACK (fancy_auto_load_images_activated), viewer);
- g_signal_connect(G_OBJECT(enable_inner_navigation), "toggled",
- G_CALLBACK (fancy_enable_inner_navigation_activated), viewer);
- g_signal_connect(G_OBJECT(enable_scripts), "toggled",
- G_CALLBACK (fancy_enable_scripts_activated), viewer);
- g_signal_connect(G_OBJECT(enable_plugins), "toggled",
- G_CALLBACK (fancy_enable_plugins_activated), viewer);
- g_signal_connect(G_OBJECT(enable_java), "toggled",
- G_CALLBACK (fancy_enable_java_activated), viewer);
- g_signal_connect(G_OBJECT(open_external), "toggled",
- G_CALLBACK (fancy_open_external_activated), viewer);
-
gtk_menu_shell_append(GTK_MENU_SHELL(viewer->fancy_prefs_menu), auto_load_images);
- gtk_menu_shell_append(GTK_MENU_SHELL(viewer->fancy_prefs_menu), enable_inner_navigation);
+ gtk_menu_shell_append(GTK_MENU_SHELL(viewer->fancy_prefs_menu), enable_remote_content);
gtk_menu_shell_append(GTK_MENU_SHELL(viewer->fancy_prefs_menu), enable_scripts);
gtk_menu_shell_append(GTK_MENU_SHELL(viewer->fancy_prefs_menu), enable_plugins);
gtk_menu_shell_append(GTK_MENU_SHELL(viewer->fancy_prefs_menu), enable_java);
@@ -596,9 +570,25 @@ static void fancy_create_popup_prefs_menu(FancyViewer *viewer) {
viewer->enable_scripts = enable_scripts;
viewer->enable_plugins = enable_plugins;
viewer->enable_java = enable_java;
- viewer->enable_inner_navigation = enable_inner_navigation;
+ viewer->enable_remote_content = enable_remote_content;
viewer->open_external = open_external;
+ /* Set sensitivity according to preferences and overrides */
+
+ g_signal_connect(G_OBJECT(auto_load_images), "toggled",
+ G_CALLBACK (fancy_auto_load_images_activated), viewer);
+ g_signal_connect(G_OBJECT(enable_remote_content), "toggled",
+ G_CALLBACK (fancy_enable_remote_content_activated), viewer);
+ g_signal_connect(G_OBJECT(enable_scripts), "toggled",
+ G_CALLBACK (fancy_enable_scripts_activated), viewer);
+ g_signal_connect(G_OBJECT(enable_plugins), "toggled",
+ G_CALLBACK (fancy_enable_plugins_activated), viewer);
+ g_signal_connect(G_OBJECT(enable_java), "toggled",
+ G_CALLBACK (fancy_enable_java_activated), viewer);
+ g_signal_connect(G_OBJECT(open_external), "toggled",
+ G_CALLBACK (fancy_open_external_activated), viewer);
+
+ fancy_apply_prefs(viewer);
}
static gboolean fancy_scroll_page(MimeViewer *_viewer, gboolean up)
@@ -646,9 +636,9 @@ static void over_link_cb(WebKitWebView *view, const gchar *wtf,
const gchar *link, FancyViewer *viewer, void *wtfa)
{
gtk_label_set_text(GTK_LABEL(viewer->l_link), link);
+ g_free(viewer->cur_link);
+ viewer->cur_link = NULL;
if(link) {
- if (viewer->cur_link)
- g_free(viewer->cur_link);
viewer->cur_link = g_strdup(link);
}
}
@@ -697,15 +687,6 @@ static void search_the_web_cb(GtkWidget *widget, FancyViewer *viewer)
}
}
-static void open_inner_cb(GtkWidget *widget, FancyViewer *viewer)
-{
- debug_print("open inner: %s\n", viewer->cur_link);
- if(viewer->cur_link) {
- viewer->nav_mode = NAV_INNER;
- fancy_load_uri(viewer, viewer->cur_link);
- }
-}
-
static void open_in_browser_cb(GtkWidget *widget, FancyViewer *viewer)
{
debug_print("open outer: %s\n", viewer->cur_link);
@@ -815,12 +796,13 @@ static void viewer_menu_handler(GtkWidget *menuitem, FancyViewer *viewer)
if (!g_ascii_strcasecmp(gtk_label_get_text(GTK_LABEL(menul)),
"Open Link" )) {
- gtk_label_set_text(GTK_LABEL(menul), _("Open in Viewer"));
+ if (viewer->override_prefs_remote_content)
+ gtk_label_set_text(GTK_LABEL(menul), _("Open in Viewer"));
+ else
+ gtk_label_set_text(GTK_LABEL(menul), _("Open in Viewer (enable remote content)"));
GtkImageMenuItem *m_new = GTK_IMAGE_MENU_ITEM(menuitem);
- g_signal_connect(G_OBJECT(m_new), "activate",
- G_CALLBACK(open_inner_cb),
- (gpointer *) viewer);
+ gtk_widget_set_sensitive(GTK_WIDGET(m_new), viewer->override_prefs_remote_content);
}
if (!g_ascii_strcasecmp(gtk_label_get_text(GTK_LABEL(menul)),
@@ -847,10 +829,8 @@ static void viewer_menu_handler(GtkWidget *menuitem, FancyViewer *viewer)
"Copy Link Location" )) {
gtk_label_set_text(GTK_LABEL(menul), _("Copy Link"));
}
-
if (!g_ascii_strcasecmp(gtk_label_get_text(GTK_LABEL(menul)),
"Download Linked File" )) {
-
gtk_label_set_text(GTK_LABEL(menul), _("Download Link"));
GtkImageMenuItem *m_dlink = GTK_IMAGE_MENU_ITEM(menuitem);
@@ -871,9 +851,7 @@ static void viewer_menu_handler(GtkWidget *menuitem, FancyViewer *viewer)
if (!g_ascii_strcasecmp(gtk_label_get_text(GTK_LABEL(menul)),
"Copy Image" )) {
-
gtk_label_set_text(GTK_LABEL(menul), _("Copy Image"));
-
GtkImageMenuItem *m_cimage = GTK_IMAGE_MENU_ITEM(menuitem);
g_signal_connect(G_OBJECT(m_cimage), "activate",
G_CALLBACK(copy_image_cb),
@@ -922,20 +900,16 @@ static gint keypress_events_cb (GtkWidget *widget, GdkEventKey *event,
}
return FALSE;
}
-#if !WEBKIT_CHECK_VERSION (1,1,12)
-static gboolean release_button_cb (WebKitWebView *view, GdkEvent *ev,
- gpointer data)
+
+static gboolean release_button_cb (WebKitWebView *view, GdkEvent *ev,
+ FancyViewer *viewer)
{
- /* Make the copy/paste works as usual */
- if (webkit_web_view_can_copy_clipboard(view)) {
- GtkClipboard *wv_clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
- const gchar *sel_text;
- sel_text = (const *gchar)webkit_web_view_get_selected_text(viewer->view);
- gtk_clipboard_set_text(wv_clipboard, sel_text, -1);
+ if (ev->button.button == 1 && viewer->cur_link && viewer->override_prefs_external) {
+ open_uri(viewer->cur_link, prefs_common_get_uri_cmd());
+ return TRUE;
}
return FALSE;
}
-#endif
static void zoom_100_cb(GtkWidget *widget, GdkEvent *ev, FancyViewer *viewer)
{
gtk_widget_grab_focus(widget);
@@ -1070,7 +1044,7 @@ static MimeViewer *fancy_viewer_create(void)
gtk_widget_show(viewer->vbox);
gtk_widget_show(hbox);
gtk_widget_show(GTK_WIDGET(viewer->view));
-
+
g_signal_connect(G_OBJECT(viewer->view), "load-started",
G_CALLBACK(load_start_cb), viewer);
g_signal_connect(G_OBJECT(viewer->view), "load-finished",
@@ -1081,16 +1055,12 @@ static MimeViewer *fancy_viewer_create(void)
G_CALLBACK(load_progress_cb), viewer);
g_signal_connect(G_OBJECT(viewer->view), "navigation-requested",
G_CALLBACK(navigation_requested_cb), viewer);
-#if WEBKIT_CHECK_VERSION (1,1,14)
g_signal_connect(G_OBJECT(viewer->view), "resource-request-starting",
G_CALLBACK(resource_request_starting_cb), viewer);
-#endif
g_signal_connect(G_OBJECT(viewer->view), "populate-popup",
G_CALLBACK(populate_popup_cb), viewer);
-#if !WEBKIT_CHECK_VERSION (1,1,12)
g_signal_connect(G_OBJECT(viewer->view), "button-release-event",
- G_CALLBACK(release_button_cb), viewer);
-#endif
+ G_CALLBACK(release_button_cb), viewer);
g_signal_connect(G_OBJECT(viewer->ev_zoom_100), "button-press-event",
G_CALLBACK(zoom_100_cb), (gpointer*)viewer);
g_signal_connect(G_OBJECT(viewer->ev_zoom_in), "button-press-event",
diff --git a/src/plugins/fancy/fancy_viewer.h b/src/plugins/fancy/fancy_viewer.h
@@ -93,15 +93,14 @@ struct _FancyViewer
GtkWidget *enable_scripts;
GtkWidget *enable_plugins;
GtkWidget *enable_java;
- GtkWidget *enable_inner_navigation;
+ GtkWidget *enable_remote_content;
GtkWidget *open_external;
GtkWidget *progress;
- WebKitWebSettings *settings;
- gboolean load_page;
+ WebKitWebSettings *settings;
gboolean printing;
gboolean override_prefs_images;
- gboolean override_prefs_inner_navigation;
+ gboolean override_prefs_remote_content;
gboolean override_prefs_scripts;
gboolean override_prefs_plugins;
gboolean override_prefs_external;
@@ -117,7 +116,6 @@ struct _FancyViewer
gint tag;
gint loading;
gint stop_previous;
- NavigationMode nav_mode;
/* DOM Objects */
#if WEBKIT_CHECK_VERSION(1,5,1)
