[easytag/wip/libsoup-cddb: 5/8] Remove custom proxy settings



commit 4bd2d37faa4a7a7f5f046f402ceccef85ec7491f
Author: David King <amigadave amigadave com>
Date:   Wed Mar 9 16:57:16 2016 +0000

    Remove custom proxy settings
    
    Now that libsoup is used for CDDB requests, it uses the default proxy resolver.

 TODO                               |    1 -
 data/org.gnome.EasyTAG.gschema.xml |   31 ----------
 data/preferences_dialog.ui         |  117 ------------------------------------
 src/preferences_dialog.c           |   43 -------------
 4 files changed, 0 insertions(+), 192 deletions(-)
---
diff --git a/TODO b/TODO
index 38b47d6..9667345 100644
--- a/TODO
+++ b/TODO
@@ -4,7 +4,6 @@ TODO List
 General tidying
 ---------------
 
-* Use GProxyResolver for proxy settings
 * Port file I/O to use GFile from GIO
 ** Additionally, make I/O asynchronous
 * Avoid using gtk_events_pending(), use asynchronous operations instead
diff --git a/data/org.gnome.EasyTAG.gschema.xml b/data/org.gnome.EasyTAG.gschema.xml
index f8a1e76..609eead 100644
--- a/data/org.gnome.EasyTAG.gschema.xml
+++ b/data/org.gnome.EasyTAG.gschema.xml
@@ -101,37 +101,6 @@
       <default>true</default>
     </key>
 
-    <key name="cddb-proxy-enabled" type="b">
-      <summary>Enable proxy for remote CDDB</summary>
-      <description>Whether to access remote CDDB through a proxy</description>
-      <default>false</default>
-    </key>
-
-    <key name="cddb-proxy-hostname" type="s">
-      <summary>CDDB proxy hostname</summary>
-      <description>Hostname for a proxy to access remote CDDB</description>
-      <default>''</default>
-    </key>
-
-    <key name="cddb-proxy-port" type="u">
-      <summary>CDDB proxy port</summary>
-      <description>Port for a proxy to access remote CDDB</description>
-      <default>8080</default>
-      <range min="0" max="65535" />
-    </key>
-
-    <key name="cddb-proxy-username" type="s">
-      <summary>CDDB proxy username</summary>
-      <description>Username for a proxy to access remote CDDB</description>
-      <default>''</default>
-    </key>
-
-    <key name="cddb-proxy-password" type="s">
-      <summary>CDDB proxy password</summary>
-      <description>Password for a proxy to access remote CDDB</description>
-      <default>''</default>
-    </key>
-
     <key name="cddb-run-scanner" type="b">
       <summary>Run the scanner on CDDB results</summary>
       <description>Whether to run the tag scanner, with the current settings, on the CDDB 
results</description>
diff --git a/data/preferences_dialog.ui b/data/preferences_dialog.ui
index 8f0b68a..b510e76 100644
--- a/data/preferences_dialog.ui
+++ b/data/preferences_dialog.ui
@@ -15,11 +15,6 @@
         <property name="step-increment">1.0</property>
         <property name="upper">65535.0</property>
     </object>
-    <object class="GtkAdjustment" id="cddb_proxy_adjustment">
-        <property name="lower">0.0</property>
-        <property name="step-increment">1.0</property>
-        <property name="upper">65535.0</property>
-    </object>
     <object class="GtkAdjustment" id="tags_disc_adjustment">
         <property name="lower">1.0</property>
         <property name="step-increment">1.0</property>
@@ -1303,118 +1298,6 @@
                                     </object>
                                 </child>
                                 <child>
-                                    <object class="GtkLabel" id="cddb_proxy_label">
-                                        <property name="halign">start</property>
-                                        <property name="label" translatable="yes">Proxy</property>
-                                        <property name="margin-top">12</property>
-                                        <property name="visible">True</property>
-                                        <attributes>
-                                            <attribute name="weight" value="bold"/>
-                                        </attributes>
-                                    </object>
-                                </child>
-                                <child>
-                                    <object class="GtkCheckButton" id="cddb_proxy_check">
-                                        <property name="label" translatable="yes">Use a proxy 
server</property>
-                                        <property name="margin-left">12</property>
-                                        <property name="tooltip-text" translatable="yes">Whether to access 
remote CDDB through a proxy</property>
-                                        <property name="visible">True</property>
-                                    </object>
-                                </child>
-                                <child>
-                                    <object class="GtkGrid" id="cddb_proxy_grid">
-                                        <property name="column-spacing">12</property>
-                                        <property name="row-spacing">6</property>
-                                        <property name="visible">True</property>
-                                        <child>
-                                            <object class="GtkLabel" id="cddb_host_label">
-                                                <property name="halign">start</property>
-                                                <property name="label" translatable="yes">Host:</property>
-                                                <property name="visible">True</property>
-                                            </object>
-                                            <packing>
-                                                <property name="left-attach">0</property>
-                                                <property name="top-attach">0</property>
-                                            </packing>
-                                        </child>
-                                        <child>
-                                            <object class="GtkEntry" id="cddb_host_entry">
-                                                <property name="tooltip-text" translatable="yes">Hostname 
for a proxy to access remote CDDB</property>
-                                                <property name="visible">True</property>
-                                            </object>
-                                            <packing>
-                                                <property name="left-attach">1</property>
-                                                <property name="top-attach">0</property>
-                                            </packing>
-                                        </child>
-                                        <child>
-                                            <object class="GtkLabel" id="cddb_port_label">
-                                                <property name="halign">start</property>
-                                                <property name="label" translatable="yes">Port:</property>
-                                                <property name="visible">True</property>
-                                            </object>
-                                            <packing>
-                                                <property name="left-attach">2</property>
-                                                <property name="top-attach">0</property>
-                                            </packing>
-                                        </child>
-                                        <child>
-                                            <object class="GtkSpinButton" id="cddb_port_button">
-                                                <property name="adjustment">cddb_proxy_adjustment</property>
-                                                <property name="tooltip-text" translatable="yes">Port for a 
proxy to access remote CDDB</property>
-                                                <property name="visible">True</property>
-                                            </object>
-                                            <packing>
-                                                <property name="left-attach">3</property>
-                                                <property name="top-attach">0</property>
-                                            </packing>
-                                        </child>
-                                        <child>
-                                            <object class="GtkLabel" id="cddb_user_label">
-                                                <property name="halign">start</property>
-                                                <property name="label" translatable="yes">User:</property>
-                                                <property name="visible">True</property>
-                                            </object>
-                                            <packing>
-                                                <property name="left-attach">0</property>
-                                                <property name="top-attach">1</property>
-                                            </packing>
-                                        </child>
-                                        <child>
-                                            <object class="GtkEntry" id="cddb_user_entry">
-                                                <property name="tooltip-text" translatable="yes">Username 
for a proxy to access remote CDDB</property>
-                                                <property name="visible">True</property>
-                                            </object>
-                                            <packing>
-                                                <property name="left-attach">1</property>
-                                                <property name="top-attach">1</property>
-                                            </packing>
-                                        </child>
-                                        <child>
-                                            <object class="GtkLabel" id="cddb_password_label">
-                                                <property name="halign">start</property>
-                                                <property name="label" 
translatable="yes">Password:</property>
-                                                <property name="visible">True</property>
-                                            </object>
-                                            <packing>
-                                                <property name="left-attach">2</property>
-                                                <property name="top-attach">1</property>
-                                            </packing>
-                                        </child>
-                                        <child>
-                                            <object class="GtkEntry" id="cddb_password_entry">
-                                                <property name="tooltip-text" translatable="yes">Password 
for a proxy to access remote CDDB</property>
-                                                <property name="visibility">False</property>
-                                                <property name="visible">True</property>
-                                            </object>
-                                            <packing>
-                                                <property name="left-attach">3</property>
-                                                <property name="top-attach">1</property>
-                                            </packing>
-                                        </child>
-                                    </object>
-                                </child>
-                                <child>
                                     <object class="GtkLabel" id="cddb_list_label">
                                         <property name="halign">start</property>
                                         <property name="label" translatable="yes">Results List</property>
diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c
index 467f5af..043b945 100644
--- a/src/preferences_dialog.c
+++ b/src/preferences_dialog.c
@@ -118,11 +118,6 @@ typedef struct
     GtkWidget *cddb_manual_host_combo;
     GtkWidget *cddb_manual_port_button;
     GtkWidget *cddb_manual_path_entry;
-    GtkWidget *cddb_proxy_check;
-    GtkWidget *cddb_host_entry;
-    GtkWidget *cddb_port_button;
-    GtkWidget *cddb_password_entry;
-    GtkWidget *cddb_user_entry;
     GtkWidget *cddb_follow_check;
     GtkWidget *cddb_dlm_check;
     GtkWidget *confirm_write_check;
@@ -702,29 +697,6 @@ create_preferences_dialog (EtPreferencesDialog *self)
                      priv->cddb_manual_path_entry, "text",
                      G_SETTINGS_BIND_DEFAULT);
 
-    /* CDDB Proxy Settings. */
-    g_settings_bind (MainSettings, "cddb-proxy-enabled",
-                     priv->cddb_proxy_check, "active",
-                     G_SETTINGS_BIND_DEFAULT);
-    g_settings_bind (MainSettings, "cddb-proxy-hostname",
-                     priv->cddb_host_entry, "text", G_SETTINGS_BIND_DEFAULT);
-    g_settings_bind (MainSettings, "cddb-proxy-enabled", priv->cddb_host_entry,
-                     "sensitive", G_SETTINGS_BIND_GET);
-    g_settings_bind (MainSettings, "cddb-proxy-port", priv->cddb_port_button,
-                     "value", G_SETTINGS_BIND_DEFAULT);
-    g_settings_bind (MainSettings, "cddb-proxy-enabled",
-                     priv->cddb_port_button, "sensitive", G_SETTINGS_BIND_GET);
-    g_settings_bind (MainSettings, "cddb-proxy-username",
-                     priv->cddb_user_entry, "text", G_SETTINGS_BIND_DEFAULT);
-    g_settings_bind (MainSettings, "cddb-proxy-enabled", priv->cddb_user_entry,
-                     "sensitive", G_SETTINGS_BIND_GET);
-    g_settings_bind (MainSettings, "cddb-proxy-password",
-                     priv->cddb_password_entry, "text",
-                     G_SETTINGS_BIND_DEFAULT);
-    g_settings_bind (MainSettings, "cddb-proxy-enabled",
-                     priv->cddb_password_entry, "sensitive",
-                     G_SETTINGS_BIND_GET);
-
     /* Track Name list (CDDB results). */
     g_settings_bind (MainSettings, "cddb-follow-file", priv->cddb_follow_check,
                      "active", G_SETTINGS_BIND_DEFAULT);
@@ -1222,21 +1194,6 @@ et_preferences_dialog_class_init (EtPreferencesDialogClass *klass)
                                                   cddb_manual_path_entry);
     gtk_widget_class_bind_template_child_private (widget_class,
                                                   EtPreferencesDialog,
-                                                  cddb_proxy_check);
-    gtk_widget_class_bind_template_child_private (widget_class,
-                                                  EtPreferencesDialog,
-                                                  cddb_host_entry);
-    gtk_widget_class_bind_template_child_private (widget_class,
-                                                  EtPreferencesDialog,
-                                                  cddb_port_button);
-    gtk_widget_class_bind_template_child_private (widget_class,
-                                                  EtPreferencesDialog,
-                                                  cddb_user_entry);
-    gtk_widget_class_bind_template_child_private (widget_class,
-                                                  EtPreferencesDialog,
-                                                  cddb_password_entry);
-    gtk_widget_class_bind_template_child_private (widget_class,
-                                                  EtPreferencesDialog,
                                                   cddb_follow_check);
     gtk_widget_class_bind_template_child_private (widget_class,
                                                   EtPreferencesDialog,


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