From 2f50545891f7d8607c8e0718041042001a91a0a8 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@igalia.com>
Date: Sun, 6 Aug 2017 18:01:08 -0500
Subject: prefs-dialog: Remove sync with Firefox option

This is pretty confusing. Most users are going to want to sync with
Firefox. For the few users who really want to sync only with Epiphany
instances, it can be toggled with GSettings.
---
 src/prefs-dialog.c                | 24 ------------------------
 src/resources/gtk/prefs-dialog.ui |  7 -------
 2 files changed, 31 deletions(-)

diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 6bd9abb9c..580292f21 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -123,7 +123,6 @@ struct _PrefsDialog {
   GtkWidget *sync_firefox_account_label;
   GtkWidget *sync_sign_out_button;
   GtkWidget *sync_options_box;
-  GtkWidget *sync_with_firefox_checkbutton;
   GtkWidget *sync_bookmarks_checkbutton;
   GtkWidget *sync_passwords_checkbutton;
   GtkWidget *sync_history_checkbutton;
@@ -209,20 +208,6 @@ sync_collection_toggled_cb (GtkToggleButton *button,
   }
 }
 
-static void
-sync_with_firefox_toggled_cb (GtkToggleButton *button,
-                              PrefsDialog     *dialog)
-{
-  gboolean button_is_active = gtk_toggle_button_get_active (button);
-
-  /* Make sure this is called only when the button was toggled by the user. */
-  g_assert (button_is_active != ephy_sync_utils_sync_with_firefox ());
-
-  ephy_sync_utils_set_bookmarks_sync_is_initial (TRUE);
-  ephy_sync_utils_set_passwords_sync_is_initial (TRUE);
-  ephy_sync_utils_set_history_sync_is_initial (TRUE);
-}
-
 static void
 sync_set_last_sync_time (PrefsDialog *dialog)
 {
@@ -784,7 +769,6 @@ prefs_dialog_class_init (PrefsDialogClass *klass)
   gtk_widget_class_bind_template_child (widget_class, PrefsDialog, sync_firefox_account_label);
   gtk_widget_class_bind_template_child (widget_class, PrefsDialog, sync_sign_out_button);
   gtk_widget_class_bind_template_child (widget_class, PrefsDialog, sync_options_box);
-  gtk_widget_class_bind_template_child (widget_class, PrefsDialog, sync_with_firefox_checkbutton);
   gtk_widget_class_bind_template_child (widget_class, PrefsDialog, sync_bookmarks_checkbutton);
   gtk_widget_class_bind_template_child (widget_class, PrefsDialog, sync_passwords_checkbutton);
   gtk_widget_class_bind_template_child (widget_class, PrefsDialog, sync_history_checkbutton);
@@ -1869,11 +1853,6 @@ setup_sync_page (PrefsDialog *dialog)
     g_free (text);
   }
 
-  g_settings_bind (sync_settings,
-                   EPHY_PREFS_SYNC_WITH_FIREFOX,
-                   dialog->sync_with_firefox_checkbutton,
-                   "active",
-                   G_SETTINGS_BIND_DEFAULT);
   g_settings_bind (sync_settings,
                    EPHY_PREFS_SYNC_BOOKMARKS_ENABLED,
                    dialog->sync_bookmarks_checkbutton,
@@ -1944,9 +1923,6 @@ setup_sync_page (PrefsDialog *dialog)
   g_signal_connect_object (service, "sync-finished",
                            G_CALLBACK (sync_finished_cb),
                            dialog, 0);
-  g_signal_connect_object (dialog->sync_with_firefox_checkbutton, "toggled",
-                           G_CALLBACK (sync_with_firefox_toggled_cb),
-                           dialog, 0);
   g_signal_connect_object (dialog->sync_bookmarks_checkbutton, "toggled",
                            G_CALLBACK (sync_collection_toggled_cb),
                            dialog, 0);
diff --git a/src/resources/gtk/prefs-dialog.ui b/src/resources/gtk/prefs-dialog.ui
index ad606ea1d..1742a1d52 100644
--- a/src/resources/gtk/prefs-dialog.ui
+++ b/src/resources/gtk/prefs-dialog.ui
@@ -890,13 +890,6 @@
                         <property name="orientation">vertical</property>
                         <property name="spacing">4</property>
                         <property name="margin-start">12</property>
-                        <child>
-                          <object class="GtkCheckButton" id="sync_with_firefox_checkbutton">
-                            <property name="label" translatable="yes">Sync with _Firefox</property>
-                            <property name="visible">True</property>
-                            <property name="use-underline">True</property>
-                          </object>
-                        </child>
                         <child>
                           <object class="GtkBox">
                             <property name="visible">True</property>
-- 
cgit v1.2.1