[Xfce4-commits] <midori:master> Return in adblock filter entry should Add the filter

[Christian Dywan]

Updating branch refs/heads/master
         to da8983b09fbd4626426621694002f3bf0f932e93 (commit)
       from 24310fd4e930a084317ba0123c531a9cba3f663a (commit)

commit da8983b09fbd4626426621694002f3bf0f932e93
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Nov 22 21:40:32 2011 +0100

    Return in adblock filter entry should Add the filter

 extensions/adblock.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/extensions/adblock.c b/extensions/adblock.c
index 1537e68..24b2523 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -344,7 +344,8 @@ static void
 adblock_preferences_add_clicked_cb (GtkWidget*    button,
                                     GtkTreeModel* model)
 {
-    GtkEntry* entry = g_object_get_data (G_OBJECT (button), "entry");
+    GtkEntry* entry = GTK_IS_ENTRY (button)
+        ? button : g_object_get_data (G_OBJECT (button), "entry");
     gtk_list_store_insert_with_values (GTK_LIST_STORE (model),
         NULL, 0, 0, gtk_entry_get_text (entry), -1);
     gtk_entry_set_text (entry, "");
@@ -534,6 +535,8 @@ adblock_get_preferences_dialog (MidoriExtension* extension)
     g_object_set_data (G_OBJECT (button), "entry", entry);
     g_signal_connect (button, "clicked",
         G_CALLBACK (adblock_preferences_add_clicked_cb), liststore);
+    g_signal_connect (entry, "activate",
+        G_CALLBACK (adblock_preferences_add_clicked_cb), liststore);
     gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
     button = gtk_button_new_from_stock (GTK_STOCK_EDIT);
     g_object_set_data (G_OBJECT (button), "treeview", treeview);