[gssdp] sniffer: Simplify setting an address filter

[Jens Georg <jensgeorg src gnome org>]

commit 7c3f13add641d350eee808f91fbc9283838081b7
Author: Jens Georg <mail jensge org>
Date:   Sat Oct 27 00:17:55 2018 +0200

    sniffer: Simplify setting an address filter

 tools/gssdp-device-sniffer.c  | 50 +++++++++++++++++++++++++++++++++++++------
 tools/gssdp-device-sniffer.ui |  1 +
 tools/window-menu.ui          |  8 +++++++
 3 files changed, 53 insertions(+), 6 deletions(-)
---
diff --git a/tools/gssdp-device-sniffer.c b/tools/gssdp-device-sniffer.c
index 966c132..1ffcbfa 100644
--- a/tools/gssdp-device-sniffer.c
+++ b/tools/gssdp-device-sniffer.c
@@ -99,9 +99,6 @@ on_details_activate (GSimpleAction *action,
                      gpointer user_data)
 {
         GtkWidget *scrolled_window = NULL;
-        GtkBuilder *builder = NULL;
-
-        builder = GTK_BUILDER (user_data);
 
         scrolled_window = GTK_WIDGET (gtk_builder_get_object (builder,
                                                               "packet-details-scrolledwindow"));
@@ -525,6 +522,16 @@ setup_treeview (GtkWidget *treeview,
                         model);
 }
 
+static gboolean
+on_treeview_popup_menu (GtkWidget *tv, GdkEventButton *event, gpointer user_data)
+{
+        if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
+                gtk_menu_popup_at_pointer (GTK_MENU (user_data), (GdkEvent *)event);
+        }
+
+        return FALSE;
+}
+
 static void
 setup_treeviews (void)
 {
@@ -540,6 +547,7 @@ setup_treeviews (void)
                 "Location",
                 NULL } }; 
         GtkTreeSelection *selection;
+        GtkWidget *menu = NULL;
         int i;
 
         treeviews[0] = GTK_WIDGET(gtk_builder_get_object (builder,
@@ -563,6 +571,12 @@ setup_treeviews (void)
                         "changed",
                         G_CALLBACK (on_packet_selected),
                         (gpointer *) treeviews[0]);
+        menu = gtk_menu_new_from_model (G_MENU_MODEL (gtk_builder_get_object (builder,
+                                                                              "sniffer-context-menu")));
+        gtk_menu_attach_to_widget (GTK_MENU (menu), treeviews[0], NULL);
+        g_signal_connect (G_OBJECT (treeviews[0]),
+                          "button-press-event",
+                          G_CALLBACK (on_treeview_popup_menu), menu);
 }
 
 G_MODULE_EXPORT
@@ -583,17 +597,40 @@ on_show_address_filter (GSimpleAction *action,
 {
         GtkWidget *dialog = NULL;
 
-        dialog = GTK_WIDGET (gtk_builder_get_object (GTK_BUILDER (user_data),
+        dialog = GTK_WIDGET (gtk_builder_get_object (builder,
                                                      "address-filter-dialog"));
         gtk_widget_show (dialog);
 }
 
+static void
+on_set_address_filter (GSimpleAction *action,
+                       GVariant      *parameter,
+                       gpointer       user_data)
+{
+        GtkWidget *treeview = NULL;
+        GtkTreeSelection *selection = NULL;
+        GtkTreeModel *model = NULL;
+        GtkTreeIter iter;
+        GtkWidget *use_filter_radio;
+
+        treeview = GTK_WIDGET (gtk_builder_get_object (builder, "packet-treeview"));
+        use_filter_radio = GTK_WIDGET(gtk_builder_get_object (builder, "use-filter-radiobutton"));
+
+        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
+        gtk_tree_selection_get_selected (selection, &model, &iter);
+        g_free (ip_filter);
+        gtk_tree_model_get (model, &iter,
+                        1, &ip_filter, -1);
+
+        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (use_filter_radio), TRUE);
+}
+
 static void
 on_about (GSimpleAction *action, GVariant *parameter, gpointer user_data)
 {
         GtkWidget *dialog = NULL;
 
-        dialog = GTK_WIDGET (gtk_builder_get_object (GTK_BUILDER (user_data),
+        dialog = GTK_WIDGET (gtk_builder_get_object (builder,
                                                      "about-dialog"));
         gtk_widget_show (dialog);
 }
@@ -608,6 +645,7 @@ on_clear_packet_capture_activate (G_GNUC_UNUSED GtkMenuItem *menuitem,
 }
 
 static GActionEntry actions[] = {
+        { "set-address-filter", on_set_address_filter },
         { "show-packet-details", NULL, NULL, "true", on_details_activate },
         { "show-address-filter", on_show_address_filter },
         { "about", on_about }
@@ -648,7 +686,7 @@ init_ui (gint *argc, gchar **argv[])
 
         group = g_simple_action_group_new ();
         gtk_widget_insert_action_group (GTK_WIDGET (main_window), "win", G_ACTION_GROUP (group));
-        g_action_map_add_action_entries (G_ACTION_MAP (group), actions, G_N_ELEMENTS (actions), builder);
+        g_action_map_add_action_entries (G_ACTION_MAP (group), actions, G_N_ELEMENTS (actions), NULL);
 
 
 #if GTK_CHECK_VERSION(3,22,0)
diff --git a/tools/gssdp-device-sniffer.ui b/tools/gssdp-device-sniffer.ui
index fe3a97c..308c7ae 100644
--- a/tools/gssdp-device-sniffer.ui
+++ b/tools/gssdp-device-sniffer.ui
@@ -218,6 +218,7 @@ Inspired by Intel Tools for UPnP.</property>
     <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <property name="transient_for">main-window</property>
+    <signal name="delete-event" handler="gtk_widget_hide_on_delete" swapped="no"/>
     <signal name="response" handler="on_address_filter_dialog_response" swapped="no"/>
     <child type="titlebar">
       <placeholder/>
diff --git a/tools/window-menu.ui b/tools/window-menu.ui
index 05c0a04..eae5745 100644
--- a/tools/window-menu.ui
+++ b/tools/window-menu.ui
@@ -20,5 +20,13 @@
       </item>
     </section>
   </menu>
+  <menu id="sniffer-context-menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Set as filter</attribute>
+        <attribute name="action">win.set-address-filter</attribute>
+      </item>
+    </section>
+  </menu>
 </interface>