remove checks for libsoup and libsoup-gnome, and remove the proxy pref from the fancy...
authorPaul <paul@claws-mail.org>
Fri, 24 Feb 2023 15:21:52 +0000 (15:21 +0000)
committerPaul <paul@claws-mail.org>
Fri, 24 Feb 2023 15:21:52 +0000 (15:21 +0000)
thanks to Páder Rezsõ for the hint

configure.ac
src/plugins/fancy/Makefile.am
src/plugins/fancy/fancy_prefs.c
src/plugins/fancy/fancy_prefs.h
src/plugins/fancy/fancy_viewer.c
src/plugins/fancy/fancy_viewer.h

index 03a87b4d28015266e3c9f3128d3e1ae27faa9879..760e1b9eec2f652b351458787de7dc94fd059398 100644 (file)
@@ -1281,25 +1281,6 @@ fi
 AC_SUBST(WEBKIT_LIBS)
 AC_SUBST(WEBKIT_CFLAGS)
 
-dnl libsoup ********************************************************************
-PKG_CHECK_MODULES(LIBSOUP, libsoup-3.0, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
-if test x"$HAVE_LIBSOUP" = xno; then
-       PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
-fi
-if test x"$HAVE_LIBSOUP" = xyes; then
-       AC_DEFINE(HAVE_LIBSOUP, 1, [Define if libsoup is available])
-fi
-AC_SUBST(LIBSOUP_CFLAGS)
-AC_SUBST(LIBSOUP_LIBS)
-
-dnl libsoup-gnome **************************************************************
-PKG_CHECK_MODULES(LIBSOUP_GNOME, libsoup-gnome-2.4 >= 2.26, HAVE_LIBSOUP_GNOME=yes, HAVE_LIBSOUP_GNOME=no)
-if test x"$HAVE_LIBSOUP_GNOME" = xyes; then
-       AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [Define if libsoup_gnome is available])
-fi
-AC_SUBST(LIBSOUP_GNOME_CFLAGS)
-AC_SUBST(LIBSOUP_GNOME_LIBS)
-
 dnl libarchive *****************************************************************
 PKG_CHECK_MODULES(LIBARCHIVE, libarchive, HAVE_ARCHIVE=yes, HAVE_ARCHIVE=no)
 AC_SUBST(ARCHIVE_LIBS)
index 0d559f0898c3c7e90287b62fa55fb14de8666448..b8e4d3bbae080e85f102444aa24a2a562aa73f38 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 the Claws Mail team.
+# Copyright 1999-2023 the Claws Mail team.
 # This file is part of Claws Mail package, and distributed under the
 # terms of the General Public License version 3 (or later).
 # See COPYING file for license details.
@@ -28,7 +28,6 @@ EXTRA_fancy_la_DEPENDENCIES = $(plugin_extra_deps)
 fancy_la_LIBADD = $(plugin_libadd) \
        $(GTK_LIBS) \
        $(WEBKIT_LIBS) \
-       $(LIBSOUP_GNOME_LIBS) \
        $(CURL_LIBS)
 
 fancy_la_CPPFLAGS = \
@@ -37,7 +36,6 @@ fancy_la_CPPFLAGS = \
        $(GTK_CFLAGS) \
        $(ENCHANT_CFLAGS) \
        $(WEBKIT_CFLAGS) \
-       $(LIBSOUP_GNOME_CFLAGS) \
        $(CURL_CFLAGS) \
        -DFANCY_WEB_EXTENSIONS_DIR=\""$(pkglibdir)/web_extensions"\" \
        -DFANCY_WEB_EXTENSION_FILE=\""fancywebextension"\"
index 5bc07fe0a51957986fc8d205aca937c09e91a34a..31f694e7cd024ab0e93dc669f73e0708804da331 100644 (file)
 
 FancyPrefs fancy_prefs;
 
-static void prefs_set_proxy_entry_sens(GtkWidget *button, GtkEntry *entry_str);
+// static void prefs_set_proxy_entry_sens(GtkWidget *button, GtkEntry *entry_str);
 
-#ifdef HAVE_LIBSOUP_GNOME
-static void prefs_disable_fancy_proxy(GtkWidget *checkbox, GtkWidget *block);
-#endif
 typedef struct _FancyPrefsPage FancyPrefsPage;
 
 struct _FancyPrefsPage {
@@ -61,11 +58,8 @@ struct _FancyPrefsPage {
        GtkWidget *enable_plugins;
        GtkWidget *enable_java;
        GtkWidget *open_external;
-#ifdef HAVE_LIBSOUP_GNOME
-       GtkWidget *gnome_proxy_checkbox;
-#endif
-       GtkWidget *proxy_checkbox;
-       GtkWidget *proxy_str;
+/*     GtkWidget *proxy_checkbox;
+       GtkWidget *proxy_str; */
        GtkWidget *stylesheet;
 };
 
@@ -84,14 +78,10 @@ static PrefParam param[] = {
                NULL, NULL, NULL},
                {"enable_java", "FALSE", &fancy_prefs.enable_java, P_BOOL,
                NULL, NULL, NULL},
-#ifdef HAVE_LIBSOUP_GNOME
-               {"enable_gnome_proxy","FALSE", &fancy_prefs.enable_gnome_proxy, P_BOOL,
-               NULL, NULL, NULL},
-#endif
-               {"enable_proxy", "FALSE", &fancy_prefs.enable_proxy, P_BOOL,
+/*             {"enable_proxy", "FALSE", &fancy_prefs.enable_proxy, P_BOOL,
                NULL, NULL, NULL},
                {"proxy_server", "http://SERVERNAME:PORT", &fancy_prefs.proxy_str, P_STRING,
-               NULL, NULL, NULL},
+               NULL, NULL, NULL}, */
                {"stylesheet", "", &fancy_prefs.stylesheet, P_STRING, NULL, NULL, NULL},
                {0,0,0,0,0,0,0}
 };
@@ -180,14 +170,11 @@ static void create_fancy_prefs_page(PrefsPage *page, GtkWindow *window,
        FancyPrefsPage *prefs_page = (FancyPrefsPage *) page;
 
        GtkWidget *vbox;
-#ifdef HAVE_LIBSOUP_GNOME
-       GtkWidget *gnome_proxy_checkbox;
-#endif
-       GtkWidget *proxy_checkbox;
+/*     GtkWidget *proxy_checkbox;
        GtkWidget *proxy_str;
        GtkWidget *vbox_proxy;
        GtkWidget *frame_proxy;
-
+*/
        GtkWidget *frame_remote;
        GtkWidget *vbox_remote;
        GtkWidget *remote_label;
@@ -204,25 +191,12 @@ static void create_fancy_prefs_page(PrefsPage *page, GtkWindow *window,
        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 3);
        gtk_container_set_border_width(GTK_CONTAINER(vbox), VBOX_BORDER);
        gtk_widget_show(vbox);
-
+/*
        GtkWidget *block = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
 
        vbox_proxy = gtkut_get_options_frame(vbox, &frame_proxy, _("Proxy"));
-#ifdef HAVE_LIBSOUP_GNOME
-       gnome_proxy_checkbox = gtk_check_button_new_with_label(_("Use GNOME's proxy settings"));        
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gnome_proxy_checkbox),
-                                    fancy_prefs.enable_gnome_proxy);
-       gtk_box_pack_start(GTK_BOX(vbox_proxy), gnome_proxy_checkbox, FALSE, FALSE, 0);
-       gtk_widget_show(gnome_proxy_checkbox);
-       g_signal_connect(G_OBJECT(gnome_proxy_checkbox), "toggled",
-                        G_CALLBACK(prefs_disable_fancy_proxy), block);
-#endif
        proxy_checkbox = gtk_check_button_new_with_label(_("Use proxy"));
        proxy_str = gtk_entry_new();
-#ifdef HAVE_LIBSOUP_GNOME
-       if (fancy_prefs.enable_gnome_proxy)
-               gtk_widget_set_sensitive(proxy_checkbox, FALSE);
-#endif
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(proxy_checkbox),
                                     fancy_prefs.enable_proxy);
        prefs_set_proxy_entry_sens(proxy_checkbox, GTK_ENTRY(proxy_str));
@@ -234,7 +208,7 @@ static void create_fancy_prefs_page(PrefsPage *page, GtkWindow *window,
        gtk_box_pack_start(GTK_BOX(block), proxy_str, TRUE, TRUE, 0);
        gtk_box_pack_start(GTK_BOX(vbox_proxy), block, FALSE, FALSE, 0);
        gtk_widget_show_all(vbox_proxy);
-
+*/
        vbox_remote = gtkut_get_options_frame(vbox, &frame_remote, _("Remote resources"));
        remote_label = gtk_label_new(_("Loading remote resources can lead to some privacy issues.\n"
                                        "When remote content loading is disabled, nothing will be requested\n"
@@ -323,12 +297,8 @@ static void create_fancy_prefs_page(PrefsPage *page, GtkWindow *window,
        pref_set_entry_from_pref(GTK_ENTRY(stylesheet), fancy_prefs.stylesheet);
        g_signal_emit_by_name(G_OBJECT(stylesheet), "changed", stylesheet_edit_button);
 
-
-#ifdef HAVE_LIBSOUP_GNOME
-       prefs_page->gnome_proxy_checkbox = gnome_proxy_checkbox;
-#endif
-       prefs_page->proxy_checkbox = proxy_checkbox;
-       prefs_page->proxy_str = proxy_str;
+/*     prefs_page->proxy_checkbox = proxy_checkbox;
+       prefs_page->proxy_str = proxy_str; */
        prefs_page->enable_remote_content = enable_remote_content;
        prefs_page->enable_images = enable_images;
        prefs_page->enable_scripts = enable_scripts;
@@ -374,25 +344,12 @@ static void fancy_prefs_stylesheet_changed_cb(GtkWidget *widget, gpointer data)
        const gchar *stylesheet = gtk_entry_get_text(GTK_ENTRY(widget));
        gtk_widget_set_sensitive(GTK_WIDGET(data), (*stylesheet)? TRUE: FALSE);
 }
-
+/*
 static void prefs_set_proxy_entry_sens(GtkWidget *button, GtkEntry *entry_str) {
        gtk_widget_set_sensitive(GTK_WIDGET(entry_str),
                                 gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
 }
-
-#ifdef HAVE_LIBSOUP_GNOME
-static void prefs_disable_fancy_proxy(GtkWidget *checkbox, GtkWidget *block) {
-       gboolean toggle = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox));
-       gtk_widget_set_sensitive(block, !toggle);
-       GList *list = g_list_first(gtk_container_get_children(GTK_CONTAINER(block)));
-       if (toggle) {
-               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(list->data), FALSE);
-       }
-       else {
-               gtk_widget_set_sensitive(GTK_WIDGET(list->data), TRUE);
-       }
-}
-#endif
+*/
 static void destroy_fancy_prefs_page(PrefsPage *page)
 {
        /* Do nothing! */
@@ -425,10 +382,6 @@ static void save_fancy_prefs_page(PrefsPage *page)
 {
                FancyPrefsPage *prefs_page = (FancyPrefsPage *) page;
        
-#ifdef HAVE_LIBSOUP_GNOME
-               fancy_prefs.enable_gnome_proxy = gtk_toggle_button_get_active
-                               (GTK_TOGGLE_BUTTON(prefs_page->gnome_proxy_checkbox));
-#endif
                fancy_prefs.enable_images = gtk_toggle_button_get_active
                                (GTK_TOGGLE_BUTTON(prefs_page->enable_images));
                fancy_prefs.enable_remote_content = gtk_toggle_button_get_active
@@ -441,9 +394,9 @@ static void save_fancy_prefs_page(PrefsPage *page)
                                (GTK_TOGGLE_BUTTON(prefs_page->enable_java));
                fancy_prefs.open_external = combobox_get_active_data
                                (GTK_COMBO_BOX(prefs_page->open_external));
-               fancy_prefs.enable_proxy = gtk_toggle_button_get_active
+/*             fancy_prefs.enable_proxy = gtk_toggle_button_get_active
                                (GTK_TOGGLE_BUTTON(prefs_page->proxy_checkbox));
-               fancy_prefs.proxy_str = pref_get_pref_from_entry(GTK_ENTRY(prefs_page->proxy_str));
+               fancy_prefs.proxy_str = pref_get_pref_from_entry(GTK_ENTRY(prefs_page->proxy_str)); */
 #ifdef G_OS_WIN32
                /* pref_get_pref_from_entry() escapes the backslashes in strings,
                 * we do not want that, since this entry contains a Windows path.
index 9b505c5cffc4c34a9d7a682d3e70982220025807..e0a400df16bef01cd5ac022b9971678bbc0c4557 100644 (file)
@@ -1,6 +1,6 @@
 /* 
  * Claws Mail -- A GTK based, lightweight, and fast e-mail client
- * Copyright(C) 1999-2014 the Claws Mail Team
+ * Copyright(C) 1999-2023 the Claws Mail Team
  * == Fancy Plugin ==
  * This file Copyright (C) 2009 -2014 Salvatore De Paolis
  * <iwkse@claws-mail.org> and the Claws Mail Team
@@ -35,11 +35,8 @@ struct _FancyPrefs
        gboolean enable_java;
        gboolean open_external;
        gint zoom_level;
-#ifdef HAVE_LIBSOUP_GNOME
-       gboolean enable_gnome_proxy;
-#endif
-       gboolean enable_proxy;
-       gchar *proxy_str;
+       // gboolean enable_proxy;
+       // gchar *proxy_str;
        gchar *stylesheet;
 };
 
index 48f312ec78f1945d7aa4de281df59a89945d0761..ba51867d6d2fb8b8811318812ed0235fa035c4c6 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * Claws Mail -- A GTK based, lightweight, and fast e-mail client
  * == Fancy Plugin ==
- * Copyright(C) 1999-2022 the Claws Mail Team
+ * Copyright(C) 1999-2023 the Claws Mail Team
  * This file Copyright (C) 2009-2014 Salvatore De Paolis
  * <iwkse@claws-mail.org> and the Claws Mail Team
  *
@@ -1106,23 +1106,6 @@ static MimeViewer *fancy_viewer_create(void)
        viewer->mimeviewer.scroll_one_line = fancy_scroll_one_line;
        viewer->view = WEBKIT_WEB_VIEW(webkit_web_view_new());
 
-/*#ifdef HAVE_LIBSOUP_GNOME
-  TODO webkit_get_default_session() missing 
-   *     enum WebKitNetworkProxySettings
-   * */
- /* Use GNOME proxy settings through libproxy */
-/*     if (fancy_prefs.enable_gnome_proxy) {
-               SoupSession *session = webkit_get_default_session();
-               soup_session_add_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
-       }
-#endif
-       
-       if (fancy_prefs.enable_proxy) {
-               SoupSession *session = webkit_get_default_session();
-               SoupURI* pURI = soup_uri_new(fancy_prefs.proxy_str);
-               g_object_set(session, "proxy-uri", pURI, NULL);
-       }
-*/
        viewer->settings = webkit_settings_new();
        g_object_set(viewer->settings, "user-agent", "Fancy Viewer", NULL);
        viewer->scrollwin = gtk_scrolled_window_new(NULL, NULL);
index 0dc7da8f36b4ec4766973c038eee3a579e20c29f..a52c46c627a236907d82fbcb6fa230a0addc0267 100644 (file)
@@ -1,8 +1,8 @@
 /*
  * Claws Mail -- a GTK based, lightweight, and fast e-mail client
  * == Fancy Plugin ==
- * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail Team
- * This file Copyright (C) 2009-2013 Salvatore De Paolis <iwkse@claws-mail.org>
+ * Copyright (C) 1999-2023 the Claws Mail Team
+ * This file Copyright (C) 2009-2023 Salvatore De Paolis <iwkse@claws-mail.org>
  *  and the Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
 #include <curl/curlver.h>
 #include "filesel.h"
 
-#ifdef HAVE_LIBSOUP_GNOME
-#include <libsoup/soup-gnome.h>
-#endif
-
 typedef enum _NavigationMode {
        NAV_DEFAULT,
        NAV_INNER,