[epiphany] EphyHistoryWindow: Use GAction for cleaning history.



commit a15037d14743f82a61aeb41ad47ec55cdd8ef2eb
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Thu Oct 29 01:00:37 2015 +0100

    EphyHistoryWindow: Use GAction for cleaning history.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=757228#c25

 src/ephy-history-window.c       |   22 +++++-----------------
 src/resources/history-dialog.ui |    7 ++-----
 2 files changed, 7 insertions(+), 22 deletions(-)
---
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index ef4dbb1..a93493e 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -271,7 +271,9 @@ confirmation_dialog_construct (EphyHistoryWindow *self)
 }
 
 static void
-clear_all_history (EphyHistoryWindow *self)
+forget_all (GSimpleAction     *action,
+            GVariant          *parameter,
+            EphyHistoryWindow *self)
 {
        if (self->priv->confirmation_dialog == NULL)
        {
@@ -684,19 +686,6 @@ ephy_history_window_finalize (GObject *object)
 }
 
 static void
-response_cb (GtkDialog *widget,
-            int response,
-            EphyHistoryWindow *self)
-{
-       if (response == GTK_RESPONSE_REJECT) {
-               clear_all_history (self);
-               return;
-       }
-
-       gtk_widget_destroy (GTK_WIDGET (self));
-}
-
-static void
 ephy_history_window_class_init (EphyHistoryWindowClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -734,8 +723,6 @@ ephy_history_window_class_init (EphyHistoryWindowClass *klass)
        gtk_widget_class_bind_template_callback (widget_class, on_treeview_selection_changed);
        gtk_widget_class_bind_template_callback (widget_class, on_treeview_column_clicked_event);
        gtk_widget_class_bind_template_callback (widget_class, on_search_entry_changed);
-
-       gtk_widget_class_bind_template_callback (widget_class, response_cb);
 }
 
 static void
@@ -828,7 +815,8 @@ create_action_group (EphyHistoryWindow *self)
                { "open-selection", open_selection },
                { "copy-url",       copy_url },
                { "bookmark",       bookmark },
-               { "forget",         forget }
+               { "forget",         forget },
+               { "forget-all",     forget_all }
        };
        GSimpleActionGroup *group;
 
diff --git a/src/resources/history-dialog.ui b/src/resources/history-dialog.ui
index f9900f6..73e2fa2 100644
--- a/src/resources/history-dialog.ui
+++ b/src/resources/history-dialog.ui
@@ -19,18 +19,18 @@
     <property name="default_height">600</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
-    <signal name="response" handler="response_cb"/>
     <child internal-child="headerbar">
       <object class="GtkHeaderBar">
         <property name="title" translatable="yes">History</property>
         <property name="visible">True</property>
         <property name="show-close-button">True</property>
         <child>
-          <object class="GtkButton" id="clear_button">
+          <object class="GtkButton">
             <property name="label" translatable="yes">C_lear All</property>
             <property name="visible">True</property>
             <property name="use_underline">True</property>
             <property name="valign">center</property>
+            <property name="action-name">history.forget-all</property>
             <style>
               <class name="destructive-action"/>
               <class name="text-button"/>
@@ -210,9 +210,6 @@
         </child>
       </object>
     </child>
-    <action-widgets>
-      <action-widget response="-2">clear_button</action-widget>
-    </action-widgets>
   </template>
   <object class="GtkMenu" id="treeview_popup_menu">
     <property name="visible">True</property>


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