[epiphany] CookiesDialog: Call response_cb from the UI file.



commit 6d2d44680450c6ea294e81e06157ba32ceb02cb1
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Sat Oct 31 06:04:06 2015 +0100

    CookiesDialog: Call response_cb from the UI file.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=757401

 src/cookies-dialog.c            |   31 +++++++++++++++----------------
 src/resources/cookies-dialog.ui |    1 +
 2 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/src/cookies-dialog.c b/src/cookies-dialog.c
index 4a16dbe..678cd17 100644
--- a/src/cookies-dialog.c
+++ b/src/cookies-dialog.c
@@ -250,6 +250,20 @@ on_search_entry_changed (GtkSearchEntry *entry,
 }
 
 static void
+cookies_dialog_response_cb (GtkDialog *widget,
+                           int response,
+                           CookiesDialog *dialog)
+{
+       if (response == GTK_RESPONSE_REJECT) {
+               webkit_cookie_manager_delete_all_cookies (dialog->priv->cookie_manager);
+               reload_model (dialog);
+               return;
+       }
+
+       gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+static void
 cookies_dialog_class_init (CookiesDialogClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -272,20 +286,8 @@ cookies_dialog_class_init (CookiesDialogClass *klass)
        gtk_widget_class_bind_template_callback (widget_class, on_treeview_selection_changed);
        gtk_widget_class_bind_template_callback (widget_class, on_remove_toolbutton_clicked);
        gtk_widget_class_bind_template_callback (widget_class, on_search_entry_changed);
-}
-
-static void
-cookies_dialog_response_cb (GtkDialog *widget,
-                           int response,
-                           CookiesDialog *dialog)
-{
-       if (response == GTK_RESPONSE_REJECT) {
-               webkit_cookie_manager_delete_all_cookies (dialog->priv->cookie_manager);
-               reload_model (dialog);
-               return;
-       }
 
-       gtk_widget_destroy (GTK_WIDGET (dialog));
+       gtk_widget_class_bind_template_callback (widget_class, cookies_dialog_response_cb);
 }
 
 static gboolean
@@ -461,7 +463,4 @@ cookies_dialog_init (CookiesDialog *dialog)
        dialog->priv->cookie_manager = webkit_web_context_get_cookie_manager (web_context);
 
        setup_page (dialog);
-
-       g_signal_connect (dialog, "response",
-                         G_CALLBACK (cookies_dialog_response_cb), dialog);
 }
diff --git a/src/resources/cookies-dialog.ui b/src/resources/cookies-dialog.ui
index 0145c00..d338fe7 100644
--- a/src/resources/cookies-dialog.ui
+++ b/src/resources/cookies-dialog.ui
@@ -25,6 +25,7 @@
     <property name="default_height">600</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
+    <signal name="response" handler="cookies_dialog_response_cb"/>
     <child internal-child="headerbar">
       <object class="GtkHeaderBar">
         <property name="title" translatable="yes">Cookies</property>


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