GNOME.org
 

[epiphany] Remove Cookies view

commit 6cb8782becf37ef7ae2e8eb16fe5bf44ed0166fa
Author: Yetizone <andreii lisita gmail com>
Date:   Mon Jun 29 12:40:37 2020 +0300

    Remove Cookies view
    
    Closes https://gitlab.gnome.org/GNOME/epiphany/-/issues/821

 src/meson.build                         |   1 -
 src/preferences/ephy-cookies-view.c     | 237 --------------------------------
 src/preferences/ephy-cookies-view.h     |  30 ----
 src/preferences/ephy-prefs-dialog.c     |  10 --
 src/preferences/prefs-privacy-page.c    |  16 ---
 src/resources/epiphany.gresource.xml    |   1 -
 src/resources/gtk/cookies-view.ui       |  43 ------
 src/resources/gtk/prefs-dialog.ui       |   7 -
 src/resources/gtk/prefs-privacy-page.ui |  15 --
 9 files changed, 360 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index 4593942a0..3dca82f25 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -45,7 +45,6 @@ libephymain_sources = [
   'ephy-window.c',
   'popup-commands.c',
   'preferences/clear-data-view.c',
-  'preferences/ephy-cookies-view.c',
   'preferences/ephy-data-dialog.c',
   'preferences/ephy-data-view.c',
   'preferences/ephy-prefs-dialog.c',
diff --git a/src/preferences/ephy-prefs-dialog.c b/src/preferences/ephy-prefs-dialog.c
index e43cac7cb..66e8eef26 100644
--- a/src/preferences/ephy-prefs-dialog.c
+++ b/src/preferences/ephy-prefs-dialog.c
@@ -41,7 +41,6 @@ struct _EphyPrefsDialog {
 
   GtkStack *data_views_stack;
   GtkWidget *active_data_view;
-  GtkWidget *clear_cookies_view;
   GtkWidget *passwords_view;
   GtkWidget *clear_data_view;
 };
@@ -79,13 +78,6 @@ present_data_view (EphyPrefsDialog *prefs_dialog,
   prefs_dialog->active_data_view = presented_view;
 }
 
-static void
-on_clear_cookies_row_activated (GtkWidget       *privacy_page,
-                                EphyPrefsDialog *prefs_dialog)
-{
-  present_data_view (prefs_dialog, prefs_dialog->clear_cookies_view);
-}
-
 static void
 on_passwords_row_activated (GtkWidget       *privacy_page,
                             EphyPrefsDialog *prefs_dialog)
@@ -122,14 +114,12 @@ ephy_prefs_dialog_class_init (EphyPrefsDialogClass *klass)
   gtk_widget_class_bind_template_child (widget_class, EphyPrefsDialog, general_page);
   gtk_widget_class_bind_template_child (widget_class, EphyPrefsDialog, sync_page);
   gtk_widget_class_bind_template_child (widget_class, EphyPrefsDialog, data_views_stack);
-  gtk_widget_class_bind_template_child (widget_class, EphyPrefsDialog, clear_cookies_view);
   gtk_widget_class_bind_template_child (widget_class, EphyPrefsDialog, passwords_view);
   gtk_widget_class_bind_template_child (widget_class, EphyPrefsDialog, clear_data_view);
 
   /* Template file callbacks */
   gtk_widget_class_bind_template_callback (widget_class, on_key_press_event);
   gtk_widget_class_bind_template_callback (widget_class, on_delete_event);
-  gtk_widget_class_bind_template_callback (widget_class, on_clear_cookies_row_activated);
   gtk_widget_class_bind_template_callback (widget_class, on_passwords_row_activated);
   gtk_widget_class_bind_template_callback (widget_class, on_clear_data_row_activated);
   gtk_widget_class_bind_template_callback (widget_class, on_any_data_view_back_button_clicked);
diff --git a/src/preferences/prefs-privacy-page.c b/src/preferences/prefs-privacy-page.c
index 997926579..fd2feba3b 100644
--- a/src/preferences/prefs-privacy-page.c
+++ b/src/preferences/prefs-privacy-page.c
@@ -26,7 +26,6 @@
 #include "ephy-shell.h"
 
 enum {
-  CLEAR_COOKIES_ROW_ACTIVATED,
   PASSWORDS_ROW_ACTIVATED,
   CLEAR_DATA_ROW_ACTIVATED,
 
@@ -54,13 +53,6 @@ static guint signals[LAST_SIGNAL];
 
 G_DEFINE_TYPE (PrefsPrivacyPage, prefs_privacy_page, HDY_TYPE_PREFERENCES_PAGE)
 
-static void
-on_clear_cookies_row_activated (GtkWidget        *row,
-                                PrefsPrivacyPage *privacy_page)
-{
-  g_signal_emit (privacy_page, signals[CLEAR_COOKIES_ROW_ACTIVATED], 0);
-}
-
 static void
 on_passwords_row_activated (GtkWidget        *row,
                             PrefsPrivacyPage *privacy_page)
@@ -194,13 +186,6 @@ prefs_privacy_page_class_init (PrefsPrivacyPageClass *klass)
   gtk_widget_class_set_template_from_resource (widget_class,
                                                "/org/gnome/epiphany/gtk/prefs-privacy-page.ui");
 
-  signals[CLEAR_COOKIES_ROW_ACTIVATED] =
-    g_signal_new ("clear-cookies-row-activated",
-                  EPHY_TYPE_PREFS_PRIVACY_PAGE,
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL, NULL,
-                  G_TYPE_NONE, 0);
-
   signals[PASSWORDS_ROW_ACTIVATED] =
     g_signal_new ("passwords-row-activated",
                   EPHY_TYPE_PREFS_PRIVACY_PAGE,
@@ -229,7 +214,6 @@ prefs_privacy_page_class_init (PrefsPrivacyPageClass *klass)
   gtk_widget_class_bind_template_child (widget_class, PrefsPrivacyPage, remember_passwords_switch);
 
   /* Template file callbacks */
-  gtk_widget_class_bind_template_callback (widget_class, on_clear_cookies_row_activated);
   gtk_widget_class_bind_template_callback (widget_class, on_passwords_row_activated);
   gtk_widget_class_bind_template_callback (widget_class, on_clear_data_row_activated);
 }
diff --git a/src/resources/epiphany.gresource.xml b/src/resources/epiphany.gresource.xml
index e050fbfed..c9d040558 100644
--- a/src/resources/epiphany.gresource.xml
+++ b/src/resources/epiphany.gresource.xml
@@ -19,7 +19,6 @@
     <file preprocess="xml-stripblanks" compressed="true">gtk/bookmark-row.ui</file>
     <file preprocess="xml-stripblanks" compressed="true">gtk/bookmarks-popover.ui</file>
     <file preprocess="xml-stripblanks" compressed="true">gtk/clear-data-view.ui</file>
-    <file preprocess="xml-stripblanks" compressed="true">gtk/cookies-view.ui</file>
     <file preprocess="xml-stripblanks" compressed="true">gtk/data-dialog.ui</file>
     <file preprocess="xml-stripblanks" compressed="true">gtk/data-view.ui</file>
     <file preprocess="xml-stripblanks" compressed="true">gtk/encoding-dialog.ui</file>
diff --git a/src/resources/gtk/prefs-dialog.ui b/src/resources/gtk/prefs-dialog.ui
index 4428943b0..ec3c947d0 100644
--- a/src/resources/gtk/prefs-dialog.ui
+++ b/src/resources/gtk/prefs-dialog.ui
@@ -47,7 +47,6 @@
                 </child>
                 <child>
                   <object class="PrefsPrivacyPage">
-                    <signal name="clear-cookies-row-activated" handler="on_clear_cookies_row_activated"/>
                     <signal name="passwords-row-activated" handler="on_passwords_row_activated"/>
                     <signal name="clear-data-row-activated" handler="on_clear_data_row_activated"/>
                   </object>
@@ -106,12 +105,6 @@
           <object class="GtkStack" id="data_views_stack">
             <property name="transition-type">GTK_STACK_TRANSITION_TYPE_NONE</property>
             <property name="visible">True</property>
-            <child>
-              <object class="EphyCookiesView" id="clear_cookies_view">
-                <property name="visible">True</property>
-                <signal name="back-button-clicked" handler="on_any_data_view_back_button_clicked"/>
-              </object>
-            </child>
             <child>
               <object class="EphyPasswordsView" id="passwords_view">
                 <property name="visible">True</property>
diff --git a/src/resources/gtk/prefs-privacy-page.ui b/src/resources/gtk/prefs-privacy-page.ui
index 721b57fdb..919e9c4c1 100644
--- a/src/resources/gtk/prefs-privacy-page.ui
+++ b/src/resources/gtk/prefs-privacy-page.ui
@@ -60,21 +60,6 @@
       <object class="HdyPreferencesGroup">
         <property name="title" translatable="yes">Cookies</property>
         <property name="visible">True</property>
-        <child>
-          <object class="HdyActionRow">
-            <property name="activatable">True</property>
-            <property name="title" translatable="yes">Clear _Cookies</property>
-            <property name="use_underline">True</property>
-            <property name="visible">True</property>
-            <signal name="activated" handler="on_clear_cookies_row_activated"/>
-            <child>
-              <object class="GtkImage">
-                <property name="icon_name">go-next-symbolic</property>
-                <property name="visible">True</property>
-              </object>
-            </child>
-          </object>
-        </child>
         <child>
           <object class="HdyActionRow">
             <property name="activatable_widget">always</property>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]