Remove the preferences

diff --git a/libempathy-gtk/empathy-conf.h b/libempathy-gtk/empathy-conf.h
index d650f42244c4d209aa6c9071297ad21d1bfe081d..07026df5c9b1ff0ee6698a78807caaa03a14e82a 100644 (file)
--- a/libempathy-gtk/empathy-conf.h
+++ b/libempathy-gtk/empathy-conf.h
@@ -82,7 +82,6 @@ struct _EmpathyConfClass {
 #define EMPATHY_PREFS_LOCATION_RESOURCE_CELL       EMPATHY_PREFS_PATH "/location/resource_cell"
 #define EMPATHY_PREFS_LOCATION_RESOURCE_GPS        EMPATHY_PREFS_PATH "/location/resource_gps"
 #define EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY     EMPATHY_PREFS_PATH "/location/reduce_accuracy"
-#define EMPATHY_PREFS_FILE_TRANSFER_USE_HASH       EMPATHY_PREFS_PATH "/file_transfer/use_hash"
 
 typedef void (*EmpathyConfNotifyFunc) (EmpathyConf  *conf,
                                      const gchar *key,

diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index d2ac53bb35dc82caae5104efb73978ad536f3327..406db4c9f2ccd16a032fcc206031eb6eb4f314d5 100644 (file)
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -53,7 +53,6 @@ typedef struct {
        GtkWidget *checkbutton_autoconnect;
        GtkWidget *radiobutton_contact_list_sort_by_name;
        GtkWidget *radiobutton_contact_list_sort_by_state;
-       GtkWidget *checkbutton_use_hash;
 
        GtkWidget *checkbutton_sounds_enabled;
        GtkWidget *checkbutton_sounds_disabled_away;
@@ -285,9 +284,6 @@ preferences_setup_widgets (EmpathyPreferences *preferences)
        preferences_hookup_sensitivity (preferences,
                                        EMPATHY_PREFS_LOCATION_PUBLISH,
                                        preferences->checkbutton_location_reduce_accuracy);
-       preferences_hookup_toggle_button (preferences,
-                                         EMPATHY_PREFS_FILE_TRANSFER_USE_HASH,
-                                         preferences->checkbutton_use_hash);
 
        id = empathy_conf_notify_add (empathy_conf_get (),
                                      EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST,
@@ -1132,7 +1128,6 @@ empathy_preferences_show (GtkWindow *parent)
                "checkbutton_autoconnect", &preferences->checkbutton_autoconnect,
                "radiobutton_contact_list_sort_by_name", &preferences->radiobutton_contact_list_sort_by_name,
                "radiobutton_contact_list_sort_by_state", &preferences->radiobutton_contact_list_sort_by_state,
-               "checkbutton_use_hash", &preferences->checkbutton_use_hash,
                "checkbutton_notifications_enabled", &preferences->checkbutton_notifications_enabled,
                "checkbutton_notifications_disabled_away", &preferences->checkbutton_notifications_disabled_away,
                "checkbutton_notifications_focus", &preferences->checkbutton_notifications_focus,

diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui
index 4f45eeaf05e45d9c1b395dc10e85ba70b6e1c8aa..d92fc8f88458e25bef00a2e7d6a4e1c807e68173 100644 (file)
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -224,42 +224,6 @@
                     <property name="position">2</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkFrame" id="frame1">
-                    <property name="visible">True</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment2">
-                        <property name="visible">True</property>
-                        <property name="top_padding">6</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkCheckButton" id="checkbutton_use_hash">
-                            <property name="label" translatable="yes">Use chec_ksum to validate file transfers, if possible</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label2">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;File Transfer&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
               </object>
             </child>
             <child type="tab">