From 21128b92a9f1e8f8f5d200552843b2a61fbae973 Mon Sep 17 00:00:00 2001 From: Jens Georg Date: Mon, 1 Apr 2013 14:23:21 +0200 Subject: [PATCH] sniffer: Update to GTK+3 --- configure.ac | 4 +- tools/gssdp-device-sniffer.ui | 643 +++++++++++++++++++----------------------- 2 files changed, 292 insertions(+), 355 deletions(-) diff --git a/configure.ac b/configure.ac index 3019c0a..8f71ce2 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ PKG_CHECK_MODULES(LIBGSSDP, glib-2.0 >= 2.32 \ gio-2.0 >= 2.32 \ libsoup-2.4 >= 2.26.1) -LIBGTK_REQUIRED=2.12.0 +LIBGTK_REQUIRED=3.0 AC_ARG_WITH( gtk, AS_HELP_STRING([--without-gtk],[compile without gtk+ support]), @@ -36,7 +36,7 @@ AC_ARG_WITH( gtk, HAVE_LIBGTK=no if test x$try_gtk = xyes ; then dnl check for gtk+ - PKG_CHECK_MODULES(LIBGTK, gtk+-2.0 >= $LIBGTK_REQUIRED , + PKG_CHECK_MODULES(LIBGTK, gtk+-3.0 >= $LIBGTK_REQUIRED , [ HAVE_LIBGTK=yes AC_SUBST(LIBGTK_CFLAGS) diff --git a/tools/gssdp-device-sniffer.ui b/tools/gssdp-device-sniffer.ui index f16b3bc..2d95ced 100644 --- a/tools/gssdp-device-sniffer.ui +++ b/tools/gssdp-device-sniffer.ui @@ -1,520 +1,232 @@ - - + - - - - - - file_menuitem - _File - - - - - gtk-clear - clear_packet_capture - Clear Packet Capture - - - - - - True - show_packet_details - Show Packet Details - - - - - - True - show_device_tracking - Show Device Tracking - - - - - - gtk-quit - quit - - - - - - filter_menuitem - Filter - - - - - True - enable_packet_capture - Enable Packet Capture - - - - - - address_filter - Address Filter - - - - - - help_menuitem - _Help - - - - - gtk-about - about - - - - - - - - - - - - - - - - - - - - - - - - - - - GSSDP Device Sniffer - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - True - GTK_PACK_DIRECTION_LTR - GTK_PACK_DIRECTION_LTR + + + False + normal + Copyright (C) 2007 Zeeshan Ali (Khattak) + A Device Sniffer tool based on GSSDP framework. +Inspired by Intel Tools for UPnP. + Zeeshan Ali (Khattak) <zeeshanak@gnome.org> + translator-credits + lgpl-2-1 + + + + + False + vertical + + + False - 0 False - False - - - - - 6 - True - False - 6 - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - True - True - True - False - False - True - False - False - False - - - - - 0 - True - True - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - True - True - False - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - 0 - True - True - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - True - True - True - False - False - True - False - False - False - - - - - 0 - True - True - - - - - 0 - True True + end + 0 - - False - GSSDP Device Sniffer - Copyright (C) 2007 Zeeshan Ali (Khattak) - A Device Sniffer tool based on GSSDP framework. -Inspired by Intel Tools for UPnP. - LGPL - False - Zeeshan Ali (Khattak) <zeeshanak@gnome.org> - translator-credits - - - + False 7 Address Filter - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - False - + dialog + - + True - False + False 8 - + True - GTK_BUTTONBOX_END + False + end + gtk-close True - True True - gtk-close + True + False True - GTK_RELIEF_NORMAL - True + + False + True + 0 + - 0 False True - GTK_PACK_END + end + 0 - 5 True - False + False + 5 4 + No filter, capture all traffic True True - No filter, capture all traffic + False True - GTK_RELIEF_NORMAL - True + 0.5 True - False True - 0 False False + 0 + Use IP address filter True True - Use IP address filter + False True - GTK_RELIEF_NORMAL - True - False - False + 0.5 True dont-use-filter-radiobutton - + - 0 False False + 1 True - 0.5 - 0.5 - 1 - 1 - 0 - 0 + False 50 - 0 True False - False - 0 + False True True - True - True 3 - - True - * True 4 - 0 True True + 0 True + False . - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 False False + 1 True True - True - True 3 - - True - * True 4 - 0 True True + 2 True + False . - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 False False + 3 True True - True - True 3 - - True - * True 4 - 0 True True + 4 True + False . - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - 0 False False + 5 True True - True - True 3 - - True - * True 4 - 0 True True + 6 - 0 True True + 2 - 0 True True + 1 @@ -523,4 +235,229 @@ Inspired by Intel Tools for UPnP. closebutton1 + + True + False + gtk-clear + + + False + GSSDP Device Sniffer + + + + True + False + + + True + False + + + True + False + _File + True + + + True + False + + + Clear Packet Capture + True + False + image1 + False + + + + + + True + False + + + + + True + False + Show Packet Details + True + True + + + + + + True + False + Show Device Tracking + True + True + + + + + + True + False + + + + + gtk-quit + True + False + True + True + + + + + + + + + + + True + False + Filter + True + + + True + False + + + True + False + Enable Packet Capture + True + True + + + + + + True + False + Address Filter + True + + + + + + + + + + True + False + _Help + True + + + True + False + + + gtk-about + True + False + True + True + + + + + + + + + + False + False + 0 + + + + + True + False + 6 + 6 + + + True + True + in + + + True + True + + + + + + + + True + True + 0 + + + + + True + True + in + + + True + True + False + + + + + True + True + 1 + + + + + True + True + in + + + True + True + + + + + + + + True + True + 2 + + + + + True + True + 1 + + + + + -- 2.7.4