pidgin/pidgin

The SOCKS4 DNS stuff was removed when we ported to GResolver but the preference was missed.

20 months ago, Gary Kramlich
c68748c1f42e
Parents da54a3c1e468
Children eef0cabd6340
The SOCKS4 DNS stuff was removed when we ported to GResolver but the preference was missed.

Testing Done:
Opened the preferences dialog, didn't see any warnings and the dialog opened fine.

Reviewed at https://reviews.imfreedom.org/r/1732/
3 files changed, 0 insertions(+), 22 deletions(-)
  • +0 -1
    libpurple/proxy.c
  • +0 -8
    pidgin/prefs/pidginproxyprefs.c
  • +0 -13
    pidgin/resources/Prefs/proxy.ui
    • --- a/libpurple/proxy.c Tue Sep 06 02:28:55 2022 -0500
    +++ b/libpurple/proxy.c Fri Sep 09 01:11:21 2022 -0500
    @@ -284,7 +284,6 @@
    purple_prefs_add_int("/purple/proxy/port", 0);
    purple_prefs_add_string("/purple/proxy/username", "");
    purple_prefs_add_string("/purple/proxy/password", "");
    - purple_prefs_add_bool("/purple/proxy/socks4_remotedns", FALSE);
    /* Setup callbacks for the preferences. */
    handle = purple_proxy_get_handle();
    --- a/pidgin/prefs/pidginproxyprefs.c Tue Sep 06 02:28:55 2022 -0500
    +++ b/pidgin/prefs/pidginproxyprefs.c Fri Sep 09 01:11:21 2022 -0500
    @@ -40,7 +40,6 @@
    /* Non-GNOME version */
    GtkWidget *nongnome;
    - GtkWidget *socks4_remotedns;
    GtkWidget *type;
    GtkWidget *options;
    GtkWidget *host;
    @@ -163,8 +162,6 @@
    gtk_widget_class_bind_template_child(
    widget_class, PidginProxyPrefs, nongnome);
    gtk_widget_class_bind_template_child(
    - widget_class, PidginProxyPrefs, socks4_remotedns);
    - gtk_widget_class_bind_template_child(
    widget_class, PidginProxyPrefs, type);
    gtk_widget_class_bind_template_child(
    widget_class, PidginProxyPrefs, options);
    @@ -218,11 +215,6 @@
    gtk_widget_set_visible(prefs->gnome, FALSE);
    gtk_widget_set_visible(prefs->nongnome, TRUE);
    - /* This is a global option that affects SOCKS4 usage even with
    - * account-specific proxy settings */
    - pidgin_prefs_bind_switch("/purple/proxy/socks4_remotedns",
    - prefs->socks4_remotedns);
    -
    pidgin_prefs_bind_combo_row("/purple/proxy/type", prefs->type);
    proxy_info = purple_global_proxy_get_info();
    --- a/pidgin/resources/Prefs/proxy.ui Tue Sep 06 02:28:55 2022 -0500
    +++ b/pidgin/resources/Prefs/proxy.ui Fri Sep 09 01:11:21 2022 -0500
    @@ -54,19 +54,6 @@
    <object class="AdwPreferencesGroup" id="nongnome">
    <property name="title" translatable="1">Proxy Server</property>
    <child>
    - <object class="AdwActionRow">
    - <property name="activatable-widget">socks4_remotedns</property>
    - <property name="title" translatable="1">Use remote _DNS with SOCKS4 proxies</property>
    - <property name="use-underline">1</property>
    - <child>
    - <object class="GtkSwitch" id="socks4_remotedns">
    - <property name="focusable">1</property>
    - <property name="valign">center</property>
    - </object>
    - </child>
    - </object>
    - </child>
    - <child>
    <object class="AdwComboRow" id="type">
    <property name="title" translatable="1">Proxy t_ype</property>
    <property name="use-subtitle">1</property>