General cleanup:

  Indentation: Use 4 spaces;
  parens;
  unneeded initializers;
  whitespace.

svn path=/trunk/; revision=47137

1 files changed, 1130 insertions, 1129 deletions

diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c
index 6adee90540..fe2b569259 100644
--- a/ui/gtk/wlan_stat_dlg.c
+++ b/ui/gtk/wlan_stat_dlg.c
@@ -14,7 +14,7 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
@@ -52,692 +52,691 @@
 #include "ui/gtk/old-gtk-compat.h"
 
 enum {
-	BSSID_COLUMN,
-	CHANNEL_COLUMN,
-	SSID_COLUMN,
-	PERCENT_COLUMN,
-	BEACONS_COLUMN,
-	DATA_COLUMN,
-	PROBE_REQ_COLUMN,
-	PROBE_RESP_COLUMN,
-	AUTH_COLUMN,
-	DEAUTH_COLUMN,
-	OTHER_COLUMN,
-	PROTECTION_COLUMN,
-	PERCENT_VALUE_COLUMN,
-	TABLE_COLUMN,
-	NUM_COLUMNS
+    BSSID_COLUMN,
+    CHANNEL_COLUMN,
+    SSID_COLUMN,
+    PERCENT_COLUMN,
+    BEACONS_COLUMN,
+    DATA_COLUMN,
+    PROBE_REQ_COLUMN,
+    PROBE_RESP_COLUMN,
+    AUTH_COLUMN,
+    DEAUTH_COLUMN,
+    OTHER_COLUMN,
+    PROTECTION_COLUMN,
+    PERCENT_VALUE_COLUMN,
+    TABLE_COLUMN,
+    NUM_COLUMNS
 };
 
 static const gchar *titles[] = { "BSSID", "Ch.", "SSID", "% Packets", "Beacons", "Data Packets",
-				 "Probe Req", "Probe Resp", "Auth", "Deauth", "Other", "Protection" };
+                                 "Probe Req", "Probe Resp", "Auth", "Deauth", "Other", "Protection" };
 
 enum {
-	ADDRESS_COLUMN,
-	PERCENT_2_COLUMN,
-	DATA_SENT_COLUMN,
-	DATA_REC_COLUMN,
-	PROBE_REQ_2_COLUMN,
-	PROBE_RESP_2_COLUMN,
-	AUTH_2_COLUMN,
-	DEAUTH_2_COLUMN,
-	OTHER_2_COLUMN,
-	COMMENT_COLUMN,
-	PERCENT_VALUE_2_COLUMN,
-	DETAILS_COLUMN,
-	NUM_DETAIL_COLUMNS
+    ADDRESS_COLUMN,
+    PERCENT_2_COLUMN,
+    DATA_SENT_COLUMN,
+    DATA_REC_COLUMN,
+    PROBE_REQ_2_COLUMN,
+    PROBE_RESP_2_COLUMN,
+    AUTH_2_COLUMN,
+    DEAUTH_2_COLUMN,
+    OTHER_2_COLUMN,
+    COMMENT_COLUMN,
+    PERCENT_VALUE_2_COLUMN,
+    DETAILS_COLUMN,
+    NUM_DETAIL_COLUMNS
 };
 
 static const gchar *detail_titles[] = { "Address", "% Packets", "Data Sent", "Data Received",
-					"Probe Req", "Probe Resp", "Auth", "Deauth", "Other", "Comment" };
+                                        "Probe Req", "Probe Resp", "Auth", "Deauth", "Other", "Comment" };
 
 typedef struct wlan_details_ep {
-	struct wlan_details_ep *next;
-	address addr;
-	guint32 probe_req;
-	guint32 probe_rsp;
-	guint32 auth;
-	guint32 deauth;
-	guint32 data_sent;
-	guint32 data_received;
-	guint32 other;
-	guint32 number_of_packets;
-	GtkTreeIter iter;
-	gboolean iter_valid;
+    struct wlan_details_ep *next;
+    address     addr;
+    guint32     probe_req;
+    guint32     probe_rsp;
+    guint32     auth;
+    guint32     deauth;
+    guint32     data_sent;
+    guint32     data_received;
+    guint32     other;
+    guint32     number_of_packets;
+    GtkTreeIter iter;
+    gboolean    iter_valid;
 } wlan_details_ep_t;
 
 typedef struct wlan_ep {
-	struct wlan_ep* next;
-	address bssid;
-	struct _wlan_stats stats;
-	guint32 type[256];
-	guint32 number_of_packets;
-	GtkTreeIter iter;
-	gboolean iter_valid;
-	gboolean probe_req_searched;
-	gboolean is_broadcast;
-	struct wlan_details_ep *details;
+    struct wlan_ep     *next;
+    address             bssid;
+    struct _wlan_stats  stats;
+    guint32             type[256];
+    guint32             number_of_packets;
+    GtkTreeIter         iter;
+    gboolean            iter_valid;
+    gboolean            probe_req_searched;
+    gboolean            is_broadcast;
+    struct wlan_details_ep *details;
 } wlan_ep_t;
 
-static GtkWidget  *wlanstat_dlg_w = NULL;
-static GtkWidget  *wlanstat_pane = NULL;
-static GtkWidget  *wlanstat_name_lb = NULL;
+static GtkWidget *wlanstat_dlg_w   = NULL;
+static GtkWidget *wlanstat_pane    = NULL;
+static GtkWidget *wlanstat_name_lb = NULL;
 static address    broadcast;
 
 /* used to keep track of the statistics for an entire program interface */
 typedef struct _wlan_stat_t {
-	GtkTreeView  *table;
-	GtkTreeView  *details;
-	GtkWidget  *menu;
-	GtkWidget  *details_menu;
-	guint32    number_of_packets;
-	guint32    num_entries;
-	guint32    num_details;
-	gboolean   resolve_names;
-	gboolean   use_dfilter;
-	gboolean   show_only_existing;
-	wlan_ep_t* ep_list;
+    GtkTreeView *table;
+    GtkTreeView *details;
+    GtkWidget   *menu;
+    GtkWidget   *details_menu;
+    guint32      number_of_packets;
+    guint32      num_entries;
+    guint32      num_details;
+    gboolean     resolve_names;
+    gboolean     use_dfilter;
+    gboolean     show_only_existing;
+    wlan_ep_t   *ep_list;
 } wlanstat_t;
 
 static void
 dealloc_wlan_details_ep (wlan_details_ep_t *details)
 {
-	wlan_details_ep_t *tmp;
+    wlan_details_ep_t *tmp;
 
-	while (details) {
-		tmp = details;
-		details = details->next;
-		g_free (tmp);
-	}
+    while (details) {
+        tmp = details;
+        details = details->next;
+        g_free (tmp);
+    }
 }
 
 static void
 wlanstat_reset (void *phs)
 {
-	wlanstat_t* wlan_stat = (wlanstat_t *)phs;
-	wlan_ep_t* list = wlan_stat->ep_list;
-	wlan_ep_t* tmp = NULL;
-	char *display_name;
-	char title[256];
-	GString *error_string;
-	GtkListStore *store;
-	const char *filter = NULL;
-
-	if (wlanstat_dlg_w != NULL) {
-		display_name = cf_get_display_name(&cfile);
-		g_snprintf (title, sizeof(title), "Wireshark: WLAN Traffic Statistics: %s",
-			    display_name);
-		g_free(display_name);
-		gtk_window_set_title(GTK_WINDOW(wlanstat_dlg_w), title);
-	}
-
-	if (wlan_stat->use_dfilter) {
-		filter = gtk_entry_get_text(GTK_ENTRY(main_display_filter_widget));
-	}
-
-	error_string = set_tap_dfilter (wlan_stat, filter);
-	if (error_string) {
-		simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str);
-		g_string_free(error_string, TRUE);
-		return;
-	}
-
-	if (wlan_stat->use_dfilter) {
-		if (filter && strlen(filter)) {
-                    g_snprintf(title, sizeof(title), "Network Overview - Filter: %s", filter);
-		} else {
-                    g_snprintf(title, sizeof(title), "Network Overview - No Filter");
-		}
-	} else {
-		g_snprintf(title, sizeof(title), "Network Overview");
-	}
-	gtk_frame_set_label(GTK_FRAME(wlanstat_name_lb), title);
-
-	/* remove all entries from the list */
-	store = GTK_LIST_STORE(gtk_tree_view_get_model(wlan_stat->table));
-	gtk_list_store_clear(store);
-	store = GTK_LIST_STORE(gtk_tree_view_get_model(wlan_stat->details));
-	gtk_list_store_clear(store);
-
-	if (!list)
-		return;
-
-	while (list) {
-		tmp = list;
-		dealloc_wlan_details_ep (tmp->details);
-		list = tmp->next;
-		g_free (tmp);
-	}
-
-	wlan_stat->ep_list = NULL;
-	wlan_stat->number_of_packets = 0;
+    wlanstat_t   *wlan_stat = (wlanstat_t *)phs;
+    wlan_ep_t    *list      = wlan_stat->ep_list;
+    char         *display_name;
+    char          title[256];
+    GString      *error_string;
+    GtkListStore *store;
+    const char   *filter    = NULL;
+
+    if (wlanstat_dlg_w != NULL) {
+        display_name = cf_get_display_name(&cfile);
+        g_snprintf (title, sizeof(title), "Wireshark: WLAN Traffic Statistics: %s",
+                display_name);
+        g_free(display_name);
+        gtk_window_set_title(GTK_WINDOW(wlanstat_dlg_w), title);
+    }
+
+    if (wlan_stat->use_dfilter) {
+        filter = gtk_entry_get_text(GTK_ENTRY(main_display_filter_widget));
+    }
+
+    error_string = set_tap_dfilter (wlan_stat, filter);
+    if (error_string) {
+        simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str);
+        g_string_free(error_string, TRUE);
+        return;
+    }
+
+    if (wlan_stat->use_dfilter) {
+        if (filter && strlen(filter)) {
+                g_snprintf(title, sizeof(title), "Network Overview - Filter: %s", filter);
+        } else {
+                g_snprintf(title, sizeof(title), "Network Overview - No Filter");
+        }
+    } else {
+        g_snprintf(title, sizeof(title), "Network Overview");
+    }
+    gtk_frame_set_label(GTK_FRAME(wlanstat_name_lb), title);
+
+    /* remove all entries from the list */
+    store = GTK_LIST_STORE(gtk_tree_view_get_model(wlan_stat->table));
+    gtk_list_store_clear(store);
+    store = GTK_LIST_STORE(gtk_tree_view_get_model(wlan_stat->details));
+    gtk_list_store_clear(store);
+
+    if (!list)
+        return;
+
+    while (list) {
+        wlan_ep_t *tmp;
+        tmp  = list;
+        dealloc_wlan_details_ep(tmp->details);
+        list = tmp->next;
+        g_free(tmp);
+    }
+
+    wlan_stat->ep_list = NULL;
+    wlan_stat->number_of_packets = 0;
 }
 
 static void
 invalidate_detail_iters (wlanstat_t *hs)
 {
-	wlan_ep_t *ep = hs->ep_list;
-	wlan_details_ep_t *d_ep;
+    wlan_ep_t         *ep = hs->ep_list;
+    wlan_details_ep_t *d_ep;
 
-	while (ep) {
-		d_ep = ep->details;
-		while (d_ep) {
-			d_ep->iter_valid = FALSE;
-			d_ep = d_ep->next;
-		}
-		ep = ep->next;
-	}
+    while (ep) {
+        d_ep = ep->details;
+        while (d_ep) {
+            d_ep->iter_valid = FALSE;
+            d_ep = d_ep->next;
+        }
+        ep = ep->next;
+    }
 }
 
 static wlan_ep_t*
 alloc_wlan_ep (struct _wlan_hdr *si, packet_info *pinfo _U_)
 {
-	wlan_ep_t* ep;
+    wlan_ep_t *ep;
 
-	if (!si)
-		return NULL;
+    if (!si)
+        return NULL;
 
-	ep = g_malloc (sizeof(wlan_ep_t));
+    ep = g_malloc (sizeof(wlan_ep_t));
 
-	SE_COPY_ADDRESS (&ep->bssid, &si->bssid);
-	ep->stats.channel = si->stats.channel;
-	memcpy (ep->stats.ssid, si->stats.ssid, MAX_SSID_LEN);
-	ep->stats.ssid_len = si->stats.ssid_len;
-	g_strlcpy (ep->stats.protection, si->stats.protection, MAX_PROTECT_LEN);
-	memset(&ep->type, 0, sizeof (int) * 256);
-	ep->number_of_packets = 0;
-	ep->details = NULL;
-	ep->iter_valid = FALSE;
-	ep->probe_req_searched = FALSE;
-	ep->is_broadcast = FALSE;
-	ep->next = NULL;
+    SE_COPY_ADDRESS (&ep->bssid, &si->bssid);
+    ep->stats.channel      = si->stats.channel;
+    memcpy (ep->stats.ssid, si->stats.ssid, MAX_SSID_LEN);
+    ep->stats.ssid_len     = si->stats.ssid_len;
+    g_strlcpy (ep->stats.protection, si->stats.protection, MAX_PROTECT_LEN);
+    memset(&ep->type, 0, sizeof (int) * 256);
+    ep->number_of_packets  = 0;
+    ep->details            = NULL;
+    ep->iter_valid         = FALSE;
+    ep->probe_req_searched = FALSE;
+    ep->is_broadcast       = FALSE;
+    ep->next               = NULL;
 
-	return ep;
+    return ep;
 }
 
-static wlan_details_ep_t*
+static wlan_details_ep_t *
 alloc_wlan_details_ep (address *addr)
 {
-	wlan_details_ep_t* d_ep;
+    wlan_details_ep_t *d_ep;
 
-	if (!addr)
-		return NULL;
+    if (!addr)
+        return NULL;
 
-	if (!(d_ep = g_malloc (sizeof(wlan_details_ep_t))))
-		return NULL;
+    if (!(d_ep = g_malloc (sizeof(wlan_details_ep_t))))
+        return NULL;
 
-	SE_COPY_ADDRESS (&d_ep->addr, addr);
-	d_ep->probe_req = 0;
-	d_ep->probe_rsp = 0;
-	d_ep->auth = 0;
-	d_ep->deauth = 0;
-	d_ep->data_sent = 0;
-	d_ep->data_received = 0;
-	d_ep->other = 0;
-	d_ep->number_of_packets = 0;
-	d_ep->iter_valid = FALSE;
-	d_ep->next = NULL;
+    SE_COPY_ADDRESS (&d_ep->addr, addr);
+    d_ep->probe_req         = 0;
+    d_ep->probe_rsp         = 0;
+    d_ep->auth              = 0;
+    d_ep->deauth            = 0;
+    d_ep->data_sent         = 0;
+    d_ep->data_received     = 0;
+    d_ep->other             = 0;
+    d_ep->number_of_packets = 0;
+    d_ep->iter_valid        = FALSE;
+    d_ep->next              = NULL;
 
-	return d_ep;
+    return d_ep;
 }
 
 static wlan_details_ep_t *
 get_details_ep (wlan_ep_t *te, address *addr)
 {
-	wlan_details_ep_t *tmp, *d_te = NULL;
-
-	if (!te->details) {
-		te->details = alloc_wlan_details_ep (addr);
-		d_te = te->details;
-	} else {
-		for (tmp = te->details; tmp; tmp = tmp->next) {
-			if (!CMP_ADDRESS (&tmp->addr, addr)) {
-				d_te = tmp;
-				break;
-			}
-		}
-
-		if (!d_te) {
-			if ((d_te = alloc_wlan_details_ep (addr)) != NULL) {
-				d_te->next = te->details;
-				te->details = d_te;
-			}
-		}
-	}
+    wlan_details_ep_t *tmp, *d_te = NULL;
+
+    if (!te->details) {
+        te->details = alloc_wlan_details_ep (addr);
+        d_te = te->details;
+    } else {
+        for (tmp = te->details; tmp; tmp = tmp->next) {
+            if (!CMP_ADDRESS (&tmp->addr, addr)) {
+                d_te = tmp;
+                break;
+            }
+        }
+
+        if (!d_te) {
+            if ((d_te = alloc_wlan_details_ep (addr)) != NULL) {
+                d_te->next = te->details;
+                te->details = d_te;
+            }
+        }
+    }
 
-	g_assert (d_te != NULL);
+    g_assert(d_te != NULL);
 
-	return d_te;
+    return d_te;
 }
 
 static void
 wlanstat_packet_details (wlan_ep_t *te, guint32 type, address *addr, gboolean src)
 {
-	wlan_details_ep_t *d_te = get_details_ep (te, addr);
-
-	switch (type) {
-	case 0x04:
-		d_te->probe_req++;
-		break;
-	case 0x05:
-		d_te->probe_rsp++;
-		break;
-	case 0x08:
-		/* No counting for beacons */
-		break;
-	case 0x0B:
-		d_te->auth++;
-		break;
-	case 0x0C:
-		d_te->deauth++;
-		break;
-	case 0x20:
-	case 0x21:
-	case 0x22:
-	case 0x23:
-	case 0x28:
-	case 0x29:
-	case 0x2A:
-	case 0x2B:
-		if (src) {
-			d_te->data_sent++;
-		} else {
-			d_te->data_received++;
-		}
-		break;
-	default:
-		d_te->other++;
-		break;
-	}
-
-	if (type != 0x08) {
-		/* Do not count beacons in details */
-		d_te->number_of_packets++;
-	}
+    wlan_details_ep_t *d_te = get_details_ep (te, addr);
+
+    switch (type) {
+    case 0x04:
+        d_te->probe_req++;
+        break;
+    case 0x05:
+        d_te->probe_rsp++;
+        break;
+    case 0x08:
+        /* No counting for beacons */
+        break;
+    case 0x0B:
+        d_te->auth++;
+        break;
+    case 0x0C:
+        d_te->deauth++;
+        break;
+    case 0x20:
+    case 0x21:
+    case 0x22:
+    case 0x23:
+    case 0x28:
+    case 0x29:
+    case 0x2A:
+    case 0x2B:
+        if (src) {
+            d_te->data_sent++;
+        } else {
+            d_te->data_received++;
+        }
+        break;
+    default:
+        d_te->other++;
+        break;
+    }
+
+    if (type != 0x08) {
+        /* Do not count beacons in details */
+        d_te->number_of_packets++;
+    }
 }
 
 static gboolean
 is_broadcast(address *addr)
 {
 #if 0
-	/* doesn't work if MAC resolution is disable */
-	return strcmp(get_addr_name(addr), "Broadcast") == 0;
+    /* doesn't work if MAC resolution is disable */
+    return strcmp(get_addr_name(addr), "Broadcast") == 0;
 #endif
-	return ADDRESSES_EQUAL(&broadcast, addr);
+    return ADDRESSES_EQUAL(&broadcast, addr);
 }
 
 static gboolean
 ssid_equal(struct _wlan_stats *st1, struct _wlan_stats *st2 )
 {
-	return st1->ssid_len == st2->ssid_len && memcmp (st1->ssid, st2->ssid, st1->ssid_len) == 0;
+    return (st1->ssid_len == st2->ssid_len) && (memcmp(st1->ssid, st2->ssid, st1->ssid_len) == 0);
 }
 
 static int
 wlanstat_packet (void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, const void *phi)
 {
+    wlanstat_t       *hs  = (wlanstat_t *)phs;
+    wlan_ep_t        *tmp, *te = NULL;
+    struct _wlan_hdr *si  = (struct _wlan_hdr *) phi;
+
+    if (!hs)
+        return (0);
+
+    hs->number_of_packets++;
+    if (!hs->ep_list) {
+        hs->ep_list = alloc_wlan_ep (si, pinfo);
+        te = hs->ep_list;
+        te->is_broadcast = is_broadcast(&si->bssid);
+    } else {
+        for (tmp = hs->ep_list; tmp; tmp = tmp->next) {
+            if ((((si->type == 0x04) && (
+                      ((tmp->stats.ssid_len == 0) && (si->stats.ssid_len == 0) && tmp->is_broadcast)
+                      || ((si->stats.ssid_len != 0) && (ssid_equal(&tmp->stats, &si->stats)))
+                      )))
+                ||
+                ((si->type != 0x04) && !CMP_ADDRESS(&tmp->bssid, &si->bssid))) {
+                te = tmp;
+                break;
+            }
+        }
+
+        if (!te) {
+            te = alloc_wlan_ep (si, pinfo);
+            te->is_broadcast = is_broadcast(&si->bssid);
+            te->next = hs->ep_list;
+            hs->ep_list = te;
+        }
+
+        if (!te->probe_req_searched && (si->type != 0x04) && (te->type[0x04] == 0) &&
+            (si->stats.ssid_len > 1 || si->stats.ssid[0] != 0)) {
+            /*
+             * We have found a matching entry without Probe Requests.
+             * Search the rest of the entries for a corresponding entry
+             * matching the SSID and BSSID == Broadcast.
+             *
+             * This is because we can have a hidden SSID or Probe Request
+             * before we have a Beacon, Association Request, etc.
+             */
+            wlan_ep_t *prev = NULL;
+            GtkListStore *store = GTK_LIST_STORE(gtk_tree_view_get_model(hs->table));
+            te->probe_req_searched = TRUE;
+            for (tmp = hs->ep_list; tmp; tmp = tmp->next) {
+                if (tmp != te && tmp->is_broadcast && ssid_equal (&si->stats, &tmp->stats)) {
+                    /*
+                     * Found a matching entry. Merge with the previous
+                     * found entry and remove from list.
+                     */
+                    te->type[0x04] += tmp->type[0x04];
+                    te->number_of_packets += tmp->number_of_packets;
+
+                    if (tmp->details && tmp->details->next) {
+                        /* Adjust received probe requests */
+                        wlan_details_ep_t *d_te;
+                        d_te = get_details_ep (te, &tmp->details->addr);
+                        d_te->probe_req += tmp->type[0x04];
+                        d_te->number_of_packets += tmp->type[0x04];
+                        d_te = get_details_ep (te, &tmp->details->next->addr);
+                        d_te->probe_req += tmp->type[0x04];
+                        d_te->number_of_packets += tmp->type[0x04];
+                    }
+                    if (prev) {
+                        prev->next = tmp->next;
+                    } else {
+                        hs->ep_list = tmp->next;
+                    }
+                    dealloc_wlan_details_ep (tmp->details);
+                    if (tmp->iter_valid) {
+                        gtk_list_store_remove(store, &tmp->iter);
+                    }
+                    g_free (tmp);
+                    break;
+                }
+                prev = tmp;
+            }
+        }
+    }
+
+    if (te->stats.channel == 0 && si->stats.channel != 0) {
+        te->stats.channel = si->stats.channel;
+    }
+    if (te->stats.ssid[0] == 0 && si->stats.ssid_len != 0) {
+        memcpy (te->stats.ssid, si->stats.ssid, MAX_SSID_LEN);
+        te->stats.ssid_len = si->stats.ssid_len;
+    }
+    if (te->stats.protection[0] == 0 && si->stats.protection[0] != 0) {
+        g_strlcpy (te->stats.protection, si->stats.protection, MAX_PROTECT_LEN);
+    }
+    te->type[si->type]++;
+    te->number_of_packets++;
 
-	wlanstat_t *hs = (wlanstat_t *)phs;
-	wlan_ep_t *tmp = NULL, *te = NULL;
-	struct _wlan_hdr *si = (struct _wlan_hdr *) phi;
-
-	if (!hs)
-		return (0);
-
-	hs->number_of_packets++;
-	if (!hs->ep_list) {
-		hs->ep_list = alloc_wlan_ep (si, pinfo);
-		te = hs->ep_list;
-		te->is_broadcast = is_broadcast(&si->bssid);
-	} else {
-		for (tmp = hs->ep_list; tmp; tmp = tmp->next) {
-			if (((si->type == 0x04 && (
-			      (tmp->stats.ssid_len == 0 && si->stats.ssid_len == 0 && tmp->is_broadcast)
-			      || (si->stats.ssid_len != 0 && ssid_equal(&tmp->stats, &si->stats))
-			     )))
-			    ||
-			    (si->type != 0x04 && !CMP_ADDRESS (&tmp->bssid, &si->bssid))) {
-				te = tmp;
-				break;
-			}
-		}
-
-		if (!te) {
-			te = alloc_wlan_ep (si, pinfo);
-			te->is_broadcast = is_broadcast(&si->bssid);
-			te->next = hs->ep_list;
-			hs->ep_list = te;
-		}
-
-		if (!te->probe_req_searched && (si->type != 0x04) && (te->type[0x04] == 0) &&
-		    (si->stats.ssid_len > 1 || si->stats.ssid[0] != 0)) {
-			/*
-			 * We have found a matching entry without Probe Requests.
-			 * Search the rest of the entries for a corresponding entry
-			 * matching the SSID and BSSID == Broadcast.
-			 *
-			 * This is because we can have a hidden SSID or Probe Request
-			 * before we have a Beacon, Association Request, etc.
-			 */
-		 	wlan_ep_t *prev = NULL;
-			GtkListStore *store = GTK_LIST_STORE(gtk_tree_view_get_model(hs->table));
-			te->probe_req_searched = TRUE;
-			for (tmp = hs->ep_list; tmp; tmp = tmp->next) {
-				if (tmp != te && tmp->is_broadcast && ssid_equal (&si->stats, &tmp->stats)) {
-					/*
-					 * Found a matching entry. Merge with the previous
-					 * found entry and remove from list.
-					 */
-					te->type[0x04] += tmp->type[0x04];
-					te->number_of_packets += tmp->number_of_packets;
-
-					if (tmp->details && tmp->details->next) {
-						/* Adjust received probe requests */
-						wlan_details_ep_t *d_te;
-						d_te = get_details_ep (te, &tmp->details->addr);
-						d_te->probe_req += tmp->type[0x04];
-						d_te->number_of_packets += tmp->type[0x04];
-						d_te = get_details_ep (te, &tmp->details->next->addr);
-						d_te->probe_req += tmp->type[0x04];
-						d_te->number_of_packets += tmp->type[0x04];
-					}
-					if (prev) {
-						prev->next = tmp->next;
-					} else {
-						hs->ep_list = tmp->next;
-					}
-					dealloc_wlan_details_ep (tmp->details);
-					if (tmp->iter_valid) {
-						gtk_list_store_remove(store, &tmp->iter);
-					}
-					g_free (tmp);
-					break;
-				}
-				prev = tmp;
-			}
-		}
-	}
-
-	if (te->stats.channel == 0 && si->stats.channel != 0) {
-		te->stats.channel = si->stats.channel;
-	}
-	if (te->stats.ssid[0] == 0 && si->stats.ssid_len != 0) {
-		memcpy (te->stats.ssid, si->stats.ssid, MAX_SSID_LEN);
-		te->stats.ssid_len = si->stats.ssid_len;
-	}
-	if (te->stats.protection[0] == 0 && si->stats.protection[0] != 0) {
-		g_strlcpy (te->stats.protection, si->stats.protection, MAX_PROTECT_LEN);
-	}
-	te->type[si->type]++;
-	te->number_of_packets++;
-
-	wlanstat_packet_details (te, si->type, &si->src, TRUE);  /* Register source */
-	wlanstat_packet_details (te, si->type, &si->dst, FALSE); /* Register destination */
-
-	return (1);
+    wlanstat_packet_details (te, si->type, &si->src, TRUE);  /* Register source */
+    wlanstat_packet_details (te, si->type, &si->dst, FALSE); /* Register destination */
+
+    return (1);
 }
 
 static void
 wlanstat_draw_details(wlanstat_t *hs, wlan_ep_t *wlan_ep, gboolean clear)
 {
-	wlan_details_ep_t *tmp = NULL;
-	char addr[256], comment[256], percent[256];
-	gboolean broadcast_flag, basestation_flag;
-	float f;
-	GtkListStore *store;
-
-	store = GTK_LIST_STORE(gtk_tree_view_get_model(hs->details));
-	if (clear) {
-		gtk_list_store_clear(store);
-		invalidate_detail_iters(hs);
-	}
- 	hs->num_details = 0;
-
-	for(tmp = wlan_ep->details; tmp; tmp=tmp->next) {
-		broadcast_flag = is_broadcast(&tmp->addr);
-		basestation_flag = !broadcast_flag && !CMP_ADDRESS(&tmp->addr, &wlan_ep->bssid);
-
-		if ((wlan_ep->number_of_packets - wlan_ep->type[0x08]) > 0) {
-			f = (float)(((float)tmp->number_of_packets * 100.0) / (wlan_ep->number_of_packets - wlan_ep->type[0x08]));
-		} else {
-			f = 0.0f;
-		}
-
-		if (hs->resolve_names) {
-			g_strlcpy (addr, get_addr_name(&tmp->addr), sizeof(addr));
-		} else {
-			g_strlcpy (addr, ep_address_to_str(&tmp->addr), sizeof(addr));
-		}
-		if (basestation_flag) {
-			g_strlcpy (comment, "Base station", sizeof(comment));
-		} else {
-			g_strlcpy (comment, " ", sizeof(comment));
-		}
-		g_snprintf (percent, sizeof(percent), "%.2f %%", f);
-
-		if (!tmp->iter_valid) {
-			gtk_list_store_append(store, &tmp->iter);
-			tmp->iter_valid = TRUE;
-		}
-		gtk_list_store_set(store, &tmp->iter,
-				   ADDRESS_COLUMN, addr,
-				   PERCENT_2_COLUMN, percent,
-				   DATA_SENT_COLUMN, tmp->data_sent,
-				   DATA_REC_COLUMN, tmp->data_received,
-				   PROBE_REQ_2_COLUMN, tmp->probe_req,
-				   PROBE_RESP_2_COLUMN, tmp->probe_rsp,
-				   AUTH_2_COLUMN, tmp->auth,
-				   DEAUTH_2_COLUMN, tmp->deauth,
-				   OTHER_2_COLUMN, tmp->other,
-				   COMMENT_COLUMN, comment,
-				   PERCENT_VALUE_2_COLUMN, f,
-				   DETAILS_COLUMN, tmp,
-				   -1);
-
-		hs->num_details++;
-	}
+    wlan_details_ep_t *tmp;
+    char               addr[256], comment[256], percent[256];
+    gboolean           broadcast_flag, basestation_flag;
+    float              f;
+    GtkListStore      *store;
+
+    store = GTK_LIST_STORE(gtk_tree_view_get_model(hs->details));
+    if (clear) {
+        gtk_list_store_clear(store);
+        invalidate_detail_iters(hs);
+    }
+    hs->num_details = 0;
+
+    for (tmp = wlan_ep->details; tmp; tmp=tmp->next) {
+        broadcast_flag = is_broadcast(&tmp->addr);
+        basestation_flag = !broadcast_flag && !CMP_ADDRESS(&tmp->addr, &wlan_ep->bssid);
+
+        if ((wlan_ep->number_of_packets - wlan_ep->type[0x08]) > 0) {
+            f = (float)(((float)tmp->number_of_packets * 100.0) / (wlan_ep->number_of_packets - wlan_ep->type[0x08]));
+        } else {
+            f = 0.0f;
+        }
+
+        if (hs->resolve_names) {
+            g_strlcpy (addr, get_addr_name(&tmp->addr), sizeof(addr));
+        } else {
+            g_strlcpy (addr, ep_address_to_str(&tmp->addr), sizeof(addr));
+        }
+        if (basestation_flag) {
+            g_strlcpy (comment, "Base station", sizeof(comment));
+        } else {
+            g_strlcpy (comment, " ", sizeof(comment));
+        }
+        g_snprintf (percent, sizeof(percent), "%.2f %%", f);
+
+        if (!tmp->iter_valid) {
+            gtk_list_store_append(store, &tmp->iter);
+            tmp->iter_valid = TRUE;
+        }
+        gtk_list_store_set(store, &tmp->iter,
+                           ADDRESS_COLUMN, addr,
+                           PERCENT_2_COLUMN, percent,
+                           DATA_SENT_COLUMN, tmp->data_sent,
+                           DATA_REC_COLUMN, tmp->data_received,
+                           PROBE_REQ_2_COLUMN, tmp->probe_req,
+                           PROBE_RESP_2_COLUMN, tmp->probe_rsp,
+                           AUTH_2_COLUMN, tmp->auth,
+                           DEAUTH_2_COLUMN, tmp->deauth,
+                           OTHER_2_COLUMN, tmp->other,
+                           COMMENT_COLUMN, comment,
+                           PERCENT_VALUE_2_COLUMN, f,
+                           DETAILS_COLUMN, tmp,
+                           -1);
+
+        hs->num_details++;
+    }
 }
 
 static void
 wlanstat_draw(void *phs)
 {
-	wlanstat_t *hs = (wlanstat_t *)phs;
-	wlan_ep_t* list = hs->ep_list, *tmp = 0;
-	guint32 data = 0, other = 0;
-	char bssid[256], channel[256], ssid[256], percent[256];
-	float f;
-	GtkListStore *store;
-	GtkTreeSelection *sel;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-
-	store = GTK_LIST_STORE(gtk_tree_view_get_model(hs->table));
-	hs->num_entries = 0;
-
-	for(tmp = list; tmp; tmp=tmp->next) {
-
-		if (hs->show_only_existing && tmp->is_broadcast) {
-			if (tmp->iter_valid) {
-				gtk_list_store_remove(store, &tmp->iter);
-				tmp->iter_valid = FALSE;
-			}
-			continue;
-		}
-
-		data = tmp->type[0x20] + tmp->type[0x21] + tmp->type[0x22] + tmp->type[0x23] +
-		  tmp->type[0x28] + tmp->type[0x29] + tmp->type[0x2A] + tmp->type[0x2B];
-		other = tmp->number_of_packets - data - tmp->type[0x08] - tmp->type[0x04] -
-		  tmp->type[0x05] - tmp->type[0x0B] - tmp->type[0x0C];
-		f = (float)(((float)tmp->number_of_packets * 100.0) / hs->number_of_packets);
-
-		if (hs->resolve_names) {
-			g_strlcpy (bssid, get_addr_name(&tmp->bssid), sizeof(bssid));
-		} else {
-			g_strlcpy (bssid, ep_address_to_str(&tmp->bssid), sizeof(bssid));
-		}
-		if (tmp->stats.channel) {
-			g_snprintf (channel, sizeof(channel), "%u", tmp->stats.channel);
-		} else {
-			channel[0] = '\0';
-		}
-		if (tmp->stats.ssid_len == 0) {
-			g_strlcpy (ssid, "<Broadcast>", sizeof(ssid));
-		} else if (tmp->stats.ssid_len == 1 && tmp->stats.ssid[0] == 0) {
-			g_strlcpy (ssid, "<Hidden>", sizeof(ssid));
-		} else {
-			g_strlcpy (ssid, format_text(tmp->stats.ssid, tmp->stats.ssid_len), sizeof(ssid));
-		}
-		g_snprintf (percent, sizeof(percent), "%.2f %%", f);
-
-		if (!tmp->iter_valid) {
-			gtk_list_store_append(store, &tmp->iter);
-			tmp->iter_valid = TRUE;
-		}
-		gtk_list_store_set (store, &tmp->iter,
-				    BSSID_COLUMN, bssid,
-				    CHANNEL_COLUMN, channel,
-				    SSID_COLUMN, ssid,
-				    PERCENT_COLUMN, percent,
-				    BEACONS_COLUMN, tmp->type[0x08],
-				    DATA_COLUMN, data,
-				    PROBE_REQ_COLUMN, tmp->type[0x04],
-				    PROBE_RESP_COLUMN, tmp->type[0x05],
-				    AUTH_COLUMN, tmp->type[0x0B],
-				    DEAUTH_COLUMN, tmp->type[0x0C],
-				    OTHER_COLUMN, other,
-				    PROTECTION_COLUMN, tmp->stats.protection,
-				    PERCENT_VALUE_COLUMN, f,
-				    TABLE_COLUMN, tmp,
-				    -1);
-
-		hs->num_entries++;
-	}
-
-	sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(hs->table));
-	if (gtk_tree_selection_get_selected (sel, &model, &iter)) {
-		wlan_ep_t *ep;
-
-		gtk_tree_model_get (model, &iter, TABLE_COLUMN, &ep, -1);
-		wlanstat_draw_details (hs, ep, FALSE);
-	}
+    wlanstat_t       *hs   = (wlanstat_t *)phs;
+    wlan_ep_t        *list = hs->ep_list, *tmp;
+    guint32           data = 0, other = 0;
+    char              bssid[256], channel[256], ssid[256], percent[256];
+    float             f;
+    GtkListStore     *store;
+    GtkTreeSelection *sel;
+    GtkTreeModel     *model;
+    GtkTreeIter       iter;
+
+    store = GTK_LIST_STORE(gtk_tree_view_get_model(hs->table));
+    hs->num_entries = 0;
+
+    for (tmp = list; tmp; tmp=tmp->next) {
+
+        if (hs->show_only_existing && tmp->is_broadcast) {
+            if (tmp->iter_valid) {
+                gtk_list_store_remove(store, &tmp->iter);
+                tmp->iter_valid = FALSE;
+            }
+            continue;
+        }
+
+        data = tmp->type[0x20] + tmp->type[0x21] + tmp->type[0x22] + tmp->type[0x23] +
+          tmp->type[0x28] + tmp->type[0x29] + tmp->type[0x2A] + tmp->type[0x2B];
+        other = tmp->number_of_packets - data - tmp->type[0x08] - tmp->type[0x04] -
+          tmp->type[0x05] - tmp->type[0x0B] - tmp->type[0x0C];
+        f = (float)(((float)tmp->number_of_packets * 100.0) / hs->number_of_packets);
+
+        if (hs->resolve_names) {
+            g_strlcpy (bssid, get_addr_name(&tmp->bssid), sizeof(bssid));
+        } else {
+            g_strlcpy (bssid, ep_address_to_str(&tmp->bssid), sizeof(bssid));
+        }
+        if (tmp->stats.channel) {
+            g_snprintf (channel, sizeof(channel), "%u", tmp->stats.channel);
+        } else {
+            channel[0] = '\0';
+        }
+        if (tmp->stats.ssid_len == 0) {
+            g_strlcpy (ssid, "<Broadcast>", sizeof(ssid));
+        } else if (tmp->stats.ssid_len == 1 && tmp->stats.ssid[0] == 0) {
+            g_strlcpy (ssid, "<Hidden>", sizeof(ssid));
+        } else {
+            g_strlcpy (ssid, format_text(tmp->stats.ssid, tmp->stats.ssid_len), sizeof(ssid));
+        }
+        g_snprintf (percent, sizeof(percent), "%.2f %%", f);
+
+        if (!tmp->iter_valid) {
+            gtk_list_store_append(store, &tmp->iter);
+            tmp->iter_valid = TRUE;
+        }
+        gtk_list_store_set (store, &tmp->iter,
+                    BSSID_COLUMN, bssid,
+                    CHANNEL_COLUMN, channel,
+                    SSID_COLUMN, ssid,
+                    PERCENT_COLUMN, percent,
+                    BEACONS_COLUMN, tmp->type[0x08],
+                    DATA_COLUMN, data,
+                    PROBE_REQ_COLUMN, tmp->type[0x04],
+                    PROBE_RESP_COLUMN, tmp->type[0x05],
+                    AUTH_COLUMN, tmp->type[0x0B],
+                    DEAUTH_COLUMN, tmp->type[0x0C],
+                    OTHER_COLUMN, other,
+                    PROTECTION_COLUMN, tmp->stats.protection,
+                    PERCENT_VALUE_COLUMN, f,
+                    TABLE_COLUMN, tmp,
+                    -1);
+
+        hs->num_entries++;
+    }
+
+    sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(hs->table));
+    if (gtk_tree_selection_get_selected (sel, &model, &iter)) {
+        wlan_ep_t *ep;
+
+        gtk_tree_model_get (model, &iter, TABLE_COLUMN, &ep, -1);
+        wlanstat_draw_details (hs, ep, FALSE);
+    }
 }
 
 /* What to do when a list item is selected/unselected */
 static void
 wlan_select_cb(GtkTreeSelection *sel, gpointer data)
 {
-	wlanstat_t *hs = (wlanstat_t *)data;
-	wlan_ep_t *ep;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
+    wlanstat_t   *hs = (wlanstat_t *)data;
+    wlan_ep_t    *ep;
+    GtkTreeModel *model;
+    GtkTreeIter   iter;
 
-	if (gtk_tree_selection_get_selected (sel, &model, &iter)) {
-		gtk_tree_model_get (model, &iter, TABLE_COLUMN, &ep, -1);
-		wlanstat_draw_details (hs, ep, TRUE);
-	}
+    if (gtk_tree_selection_get_selected (sel, &model, &iter)) {
+        gtk_tree_model_get (model, &iter, TABLE_COLUMN, &ep, -1);
+        wlanstat_draw_details (hs, ep, TRUE);
+    }
 }
 
 
 static void
 wlan_resolve_toggle_dest(GtkWidget *widget, gpointer data)
 {
-	wlanstat_t *hs = (wlanstat_t *)data;
+    wlanstat_t *hs = (wlanstat_t *)data;
 
-	hs->resolve_names = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (widget));
+    hs->resolve_names = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (widget));
 
-	wlanstat_draw(hs);
+    wlanstat_draw(hs);
 }
 
 static void
 wlan_filter_toggle_dest(GtkWidget *widget, gpointer data)
 {
-	wlanstat_t *hs = (wlanstat_t *)data;
+    wlanstat_t *hs = (wlanstat_t *)data;
 
-	hs->use_dfilter = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (widget));
+    hs->use_dfilter = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (widget));
 
-	cf_retap_packets(&cfile);
-	gdk_window_raise(gtk_widget_get_window(wlanstat_dlg_w));
+    cf_retap_packets(&cfile);
+    gdk_window_raise(gtk_widget_get_window(wlanstat_dlg_w));
 }
 
 static void
 wlan_existing_toggle_dest(GtkWidget *widget, gpointer data)
 {
-	wlanstat_t *hs = (wlanstat_t *)data;
+    wlanstat_t *hs = (wlanstat_t *)data;
 
-	hs->show_only_existing = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (widget));
+    hs->show_only_existing = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (widget));
 
-	wlanstat_draw(hs);
+    wlanstat_draw(hs);
 }
 
 static gboolean
 csv_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter,
-              gpointer data)
-{
-	GString *CSV_str = (GString *)data;
-	gchar   *table_text;
-	gint     table_value;
-	int      i;
-
-	for (i=0; i<=PROTECTION_COLUMN; i++) {
-		if (i == BSSID_COLUMN || i == CHANNEL_COLUMN || i == SSID_COLUMN ||
-		    i == PERCENT_COLUMN || i == PROTECTION_COLUMN) {
-			gtk_tree_model_get(model, iter, i, &table_text, -1);
-			g_string_append_printf(CSV_str, "\"%s\"", table_text);
-                        g_free(table_text);
-		} else {
-			gtk_tree_model_get(model, iter, i, &table_value, -1);
-			g_string_append_printf(CSV_str, "\"%u\"", table_value);
-		}
-		if (i != PROTECTION_COLUMN)
-			g_string_append(CSV_str,",");
-	}
-	g_string_append(CSV_str,"\n");
+           gpointer data)
+{
+    GString *CSV_str = (GString *)data;
+    gchar   *table_text;
+    gint     table_value;
+    int      i;
+
+    for (i=0; i<=PROTECTION_COLUMN; i++) {
+        if (i == BSSID_COLUMN || i == CHANNEL_COLUMN || i == SSID_COLUMN ||
+            i == PERCENT_COLUMN || i == PROTECTION_COLUMN) {
+            gtk_tree_model_get(model, iter, i, &table_text, -1);
+            g_string_append_printf(CSV_str, "\"%s\"", table_text);
+            g_free(table_text);
+        } else {
+            gtk_tree_model_get(model, iter, i, &table_value, -1);
+            g_string_append_printf(CSV_str, "\"%u\"", table_value);
+        }
+        if (i != PROTECTION_COLUMN)
+            g_string_append(CSV_str,",");
+    }
+    g_string_append(CSV_str,"\n");
 
-	return FALSE;
+    return FALSE;
 }
 
 static void
 wlan_copy_as_csv(GtkWindow *win _U_, gpointer data)
 {
-	int             i;
-	GString         *CSV_str = g_string_new("");
-	GtkClipboard    *cb;
-	GtkTreeView     *tree_view = GTK_TREE_VIEW(data);
-	GtkListStore    *store;
-
-	/* Add the column headers to the CSV data */
-	for (i=0; i<=PROTECTION_COLUMN; i++) {
-		g_string_append_printf(CSV_str, "\"%s\"", titles[i]);
-		if (i != PROTECTION_COLUMN)
-			g_string_append(CSV_str, ",");
-	}
-	g_string_append(CSV_str,"\n");
+    int           i;
+    GString      *CSV_str   = g_string_new("");
+    GtkClipboard *cb;
+    GtkTreeView  *tree_view = GTK_TREE_VIEW(data);
+    GtkListStore *store;
+
+    /* Add the column headers to the CSV data */
+    for (i=0; i<=PROTECTION_COLUMN; i++) {
+        g_string_append_printf(CSV_str, "\"%s\"", titles[i]);
+        if (i != PROTECTION_COLUMN)
+            g_string_append(CSV_str, ",");
+    }
+    g_string_append(CSV_str,"\n");
 
-	/* Add the column values to the CSV data */
-	store = GTK_LIST_STORE(gtk_tree_view_get_model(tree_view));
-	gtk_tree_model_foreach(GTK_TREE_MODEL(store), csv_handle, CSV_str);
+    /* Add the column values to the CSV data */
+    store = GTK_LIST_STORE(gtk_tree_view_get_model(tree_view));
+    gtk_tree_model_foreach(GTK_TREE_MODEL(store), csv_handle, CSV_str);
 
-	/* Now that we have the CSV data, copy it into the default clipboard */
-	cb = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
-	gtk_clipboard_set_text(cb, CSV_str->str, -1);
-	g_string_free(CSV_str, TRUE);
+    /* Now that we have the CSV data, copy it into the default clipboard */
+    cb = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+    gtk_clipboard_set_text(cb, CSV_str->str, -1);
+    g_string_free(CSV_str, TRUE);
 }
 
 static void
 win_destroy_cb (GtkWindow *win _U_, gpointer data)
 {
-	wlanstat_t *hs = (wlanstat_t *)data;
+    wlanstat_t *hs = (wlanstat_t *)data;
 
-	remove_tap_listener (hs);
+    remove_tap_listener (hs);
 
-	if (wlanstat_dlg_w != NULL) {
-		window_destroy(wlanstat_dlg_w);
-		wlanstat_dlg_w = NULL;
-	}
-	wlanstat_reset (hs);
-	g_free (hs);
+    if (wlanstat_dlg_w != NULL) {
+        window_destroy(wlanstat_dlg_w);
+        wlanstat_dlg_w = NULL;
+    }
+    wlanstat_reset(hs);
+    g_free(hs);
 
-	recent.gui_geometry_wlan_stats_pane =
-	  gtk_paned_get_position(GTK_PANED(wlanstat_pane));
+    recent.gui_geometry_wlan_stats_pane =
+      gtk_paned_get_position(GTK_PANED(wlanstat_pane));
 }
 
 /* Filter value */
@@ -749,233 +748,235 @@ win_destroy_cb (GtkWindow *win _U_, gpointer data)
 static void
 wlan_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callback_action)
 {
-	int value;
-	wlanstat_t *hs=(wlanstat_t *)callback_data;
-	char *str = NULL;
-	wlan_ep_t *ep;
-	GtkTreeSelection *sel;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-
-	sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(hs->table));
-	gtk_tree_selection_get_selected (sel, &model, &iter);
-	gtk_tree_model_get (model, &iter, TABLE_COLUMN, &ep, -1);
-
-	value = FILTER_EXTRA(callback_action);
-
-	switch (value) {
-	case VALUE_BSSID_ONLY:
-		str = g_strdup_printf("wlan.bssid==%s", ep_address_to_str(&ep->bssid));
-		break;
-	case VALUE_SSID_ONLY:
-		str = g_strdup_printf("wlan_mgt.ssid==\"%s\"", format_text(ep->stats.ssid, ep->stats.ssid_len));
-		break;
-	case VALUE_BSSID_AND_SSID:
-		str = g_strdup_printf("wlan.bssid==%s && wlan_mgt.ssid==\"%s\"",
-				      ep_address_to_str(&ep->bssid), format_text(ep->stats.ssid, ep->stats.ssid_len));
-		break;
-	case VALUE_BSSID_OR_SSID:
-		str = g_strdup_printf("wlan.bssid==%s || wlan_mgt.ssid==\"%s\"",
-				      ep_address_to_str(&ep->bssid), format_text(ep->stats.ssid, ep->stats.ssid_len));
-		break;
-	}
+    int               value;
+    wlanstat_t       *hs  = (wlanstat_t *)callback_data;
+    char             *str = NULL;
+    wlan_ep_t        *ep;
+    GtkTreeSelection *sel;
+    GtkTreeModel     *model;
+    GtkTreeIter       iter;
+
+    sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(hs->table));
+    gtk_tree_selection_get_selected (sel, &model, &iter);
+    gtk_tree_model_get (model, &iter, TABLE_COLUMN, &ep, -1);
+
+    value = FILTER_EXTRA(callback_action);
+
+    switch (value) {
+    case VALUE_BSSID_ONLY:
+        str = g_strdup_printf("wlan.bssid==%s", ep_address_to_str(&ep->bssid));
+        break;
+    case VALUE_SSID_ONLY:
+        str = g_strdup_printf("wlan_mgt.ssid==\"%s\"", format_text(ep->stats.ssid, ep->stats.ssid_len));
+        break;
+    case VALUE_BSSID_AND_SSID:
+        str = g_strdup_printf("wlan.bssid==%s && wlan_mgt.ssid==\"%s\"",
+                      ep_address_to_str(&ep->bssid), format_text(ep->stats.ssid, ep->stats.ssid_len));
+        break;
+    case VALUE_BSSID_OR_SSID:
+        str = g_strdup_printf("wlan.bssid==%s || wlan_mgt.ssid==\"%s\"",
+                      ep_address_to_str(&ep->bssid), format_text(ep->stats.ssid, ep->stats.ssid_len));
+        break;
+    default:
+        g_assert_not_reached();
+    }
 
-	apply_selected_filter (callback_action, str);
+    apply_selected_filter (callback_action, str);
 
-	g_free (str);
+    g_free (str);
 }
 
 static void
 wlan_details_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callback_action)
 {
-	wlanstat_t *hs=(wlanstat_t *)callback_data;
-	char *str = NULL;
-	wlan_details_ep_t *ep;
-	GtkTreeSelection *sel;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
+    wlanstat_t        *hs  = (wlanstat_t *)callback_data;
+    char              *str;
+    wlan_details_ep_t *ep;
+    GtkTreeSelection  *sel;
+    GtkTreeModel      *model;
+    GtkTreeIter        iter;
 
-	sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(hs->details));
-	gtk_tree_selection_get_selected (sel, &model, &iter);
-	gtk_tree_model_get (model, &iter, DETAILS_COLUMN, &ep, -1);
+    sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(hs->details));
+    gtk_tree_selection_get_selected (sel, &model, &iter);
+    gtk_tree_model_get (model, &iter, DETAILS_COLUMN, &ep, -1);
 
-	str = g_strdup_printf("wlan.addr==%s", ep_address_to_str(&ep->addr));
+    str = g_strdup_printf("wlan.addr==%s", ep_address_to_str(&ep->addr));
 
-	apply_selected_filter (callback_action, str);
+    apply_selected_filter (callback_action, str);
 
-	g_free (str);
+    g_free (str);
 }
 
 static gboolean
 wlan_show_popup_menu_cb(void *widg _U_, GdkEvent *event, wlanstat_t *et)
 {
-	GdkEventButton *bevent = (GdkEventButton *)event;
-	GtkTreeSelection *sel;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-
-	/* To qoute the "Gdk Event Structures" doc:
-	 * "Normally button 1 is the left mouse button, 2 is the middle button, and 3 is the right button" */
-	if(event->type==GDK_BUTTON_PRESS && bevent->button==3){
-		/* If this is a right click on one of our columns, popup the context menu */
-		sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(et->table));
-		if (gtk_tree_selection_get_selected (sel, &model, &iter)) {
-			gtk_menu_popup(GTK_MENU(et->menu), NULL, NULL, NULL, NULL,
-				       bevent->button, bevent->time);
-		}
-	}
+    GdkEventButton   *bevent = (GdkEventButton *)event;
+    GtkTreeSelection *sel;
+    GtkTreeModel     *model;
+    GtkTreeIter       iter;
+
+    /* To qoute the "Gdk Event Structures" doc:
+     * "Normally button 1 is the left mouse button, 2 is the middle button, and 3 is the right button" */
+    if ((event->type == GDK_BUTTON_PRESS) && (bevent->button == 3)) {
+        /* If this is a right click on one of our columns, popup the context menu */
+        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(et->table));
+        if (gtk_tree_selection_get_selected (sel, &model, &iter)) {
+            gtk_menu_popup(GTK_MENU(et->menu), NULL, NULL, NULL, NULL,
+                       bevent->button, bevent->time);
+        }
+    }
 
-	return FALSE;
+    return FALSE;
 }
 
 /* Apply as Filter/Selected */
 static void
 wlan_select_filter_as_selected_BSSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_SELECTED, VALUE_BSSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_SELECTED, VALUE_BSSID_ONLY));
 }
 
 static void
 wlan_select_filter_as_selected_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_SELECTED, VALUE_SSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_SELECTED, VALUE_SSID_ONLY));
 }
 
 static void
 wlan_select_filter_as_selected_BSSID_and_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_SELECTED, VALUE_BSSID_AND_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_SELECTED, VALUE_BSSID_AND_SSID));
 }
 
 static void
 wlan_select_filter_as_selected_BSSID_or_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_SELECTED, VALUE_BSSID_OR_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_SELECTED, VALUE_BSSID_OR_SSID));
 }
 
 /* Apply as Filter/Not Selected */
 static void
 wlan_select_filter_as_not_selected_BSSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, VALUE_BSSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, VALUE_BSSID_ONLY));
 }
 
 static void
 wlan_select_filter_as_not_selected_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, VALUE_SSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, VALUE_SSID_ONLY));
 }
 
 static void
 wlan_select_filter_as_not_selected_BSSID_and_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, VALUE_BSSID_AND_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, VALUE_BSSID_AND_SSID));
 }
 
 static void
 wlan_select_filter_as_not_selected_BSSID_or_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, VALUE_BSSID_OR_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, VALUE_BSSID_OR_SSID));
 }
 
 /* /Apply as Filter/... and Selected */
 static void
 wlan_select_filter_and_selected_BSSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_SELECTED, VALUE_BSSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_SELECTED, VALUE_BSSID_ONLY));
 }
 
 static void
 wlan_select_filter_and_selected_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_SELECTED, VALUE_SSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_SELECTED, VALUE_SSID_ONLY));
 }
 
 static void
 wlan_select_filter_and_selected_BSSID_and_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_SELECTED, VALUE_BSSID_AND_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_SELECTED, VALUE_BSSID_AND_SSID));
 }
 
 static void
 wlan_select_filter_and_selected_BSSID_or_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_SELECTED, VALUE_BSSID_OR_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_SELECTED, VALUE_BSSID_OR_SSID));
 }
 
 /* /Apply as Filter/... or Selected */
 static void
 wlan_select_filter_or_selected_BSSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_SELECTED, VALUE_BSSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_SELECTED, VALUE_BSSID_ONLY));
 }
 
 static void
 wlan_select_filter_or_selected_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_SELECTED, VALUE_SSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_SELECTED, VALUE_SSID_ONLY));
 }
 
 static void
 wlan_select_filter_or_selected_BSSID_and_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_SELECTED, VALUE_BSSID_AND_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_SELECTED, VALUE_BSSID_AND_SSID));
 }
 
 static void
 wlan_select_filter_or_selected_BSSID_or_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_SELECTED, VALUE_BSSID_OR_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_SELECTED, VALUE_BSSID_OR_SSID));
 }
 
 /* /Apply as Filter/... and not Selected */
 static void
 wlan_select_filter_and_not_selected_BSSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, VALUE_BSSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, VALUE_BSSID_ONLY));
 }
 
 static void
 wlan_select_filter_and_not_selected_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, VALUE_SSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, VALUE_SSID_ONLY));
 }
 
 static void
 wlan_select_filter_and_not_selected_BSSID_and_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, VALUE_BSSID_AND_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, VALUE_BSSID_AND_SSID));
 }
 
 static void
 wlan_select_filter_and_not_selected_BSSID_or_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, VALUE_BSSID_OR_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, VALUE_BSSID_OR_SSID));
 }
 
 /* /Apply as Filter/... or not Selected */
 static void
 wlan_select_filter_or_not_selected_BSSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, VALUE_BSSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, VALUE_BSSID_ONLY));
 }
 
 static void
 wlan_select_filter_or_not_selected_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, VALUE_SSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, VALUE_SSID_ONLY));
 }
 
 static void
 wlan_select_filter_or_not_selected_BSSID_and_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, VALUE_BSSID_AND_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, VALUE_BSSID_AND_SSID));
 }
 
 static void
 wlan_select_filter_or_not_selected_BSSID_or_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, VALUE_BSSID_OR_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, VALUE_BSSID_OR_SSID));
 }
 
 /* Prepare */
@@ -983,236 +984,236 @@ wlan_select_filter_or_not_selected_BSSID_or_SSID_cb(GtkWidget *widget, gpointer
 static void
 wlan_prepare_filter_as_selected_BSSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_SELECTED, VALUE_BSSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_SELECTED, VALUE_BSSID_ONLY));
 }
 
 static void
 wlan_prepare_filter_as_selected_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_SELECTED, VALUE_SSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_SELECTED, VALUE_SSID_ONLY));
 }
 
 static void
 wlan_prepare_filter_as_selected_BSSID_and_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_SELECTED, VALUE_BSSID_AND_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_SELECTED, VALUE_BSSID_AND_SSID));
 }
 
 static void
 wlan_prepare_filter_as_selected_BSSID_or_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_SELECTED, VALUE_BSSID_OR_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_SELECTED, VALUE_BSSID_OR_SSID));
 }
 
 /* Prepare a Filter/Not Selected */
 static void
 wlan_prepare_filter_as_not_selected_BSSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, VALUE_BSSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, VALUE_BSSID_ONLY));
 }
 
 static void
 wlan_prepare_filter_as_not_selected_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, VALUE_SSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, VALUE_SSID_ONLY));
 }
 
 static void
 wlan_prepare_filter_as_not_selected_BSSID_and_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, VALUE_BSSID_AND_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, VALUE_BSSID_AND_SSID));
 }
 
 static void
 wlan_prepare_filter_as_not_selected_BSSID_or_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, VALUE_BSSID_OR_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, VALUE_BSSID_OR_SSID));
 }
 
 /* /Prepare a Filter/... and Selected */
 static void
 wlan_prepare_filter_and_selected_BSSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, VALUE_BSSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, VALUE_BSSID_ONLY));
 }
 
 static void
 wlan_prepare_filter_and_selected_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, VALUE_SSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, VALUE_SSID_ONLY));
 }
 
 static void
 wlan_prepare_filter_and_selected_BSSID_and_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, VALUE_BSSID_AND_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, VALUE_BSSID_AND_SSID));
 }
 
 static void
 wlan_prepare_filter_and_selected_BSSID_or_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, VALUE_BSSID_OR_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, VALUE_BSSID_OR_SSID));
 }
 
 /* /Prepare a Filter/... or Selected */
 static void
 wlan_prepare_filter_or_selected_BSSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, VALUE_BSSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, VALUE_BSSID_ONLY));
 }
 
 static void
 wlan_prepare_filter_or_selected_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, VALUE_SSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, VALUE_SSID_ONLY));
 }
 
 static void
 wlan_prepare_filter_or_selected_BSSID_and_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, VALUE_BSSID_AND_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, VALUE_BSSID_AND_SSID));
 }
 
 static void
 wlan_prepare_filter_or_selected_BSSID_or_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, VALUE_BSSID_OR_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, VALUE_BSSID_OR_SSID));
 }
 
 /* /Prepare a Filter/... and not Selected */
 static void
 wlan_prepare_filter_and_not_selected_BSSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, VALUE_BSSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, VALUE_BSSID_ONLY));
 }
 
 static void
 wlan_prepare_filter_and_not_selected_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, VALUE_SSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, VALUE_SSID_ONLY));
 }
 
 static void
 wlan_prepare_filter_and_not_selected_BSSID_and_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, VALUE_BSSID_AND_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, VALUE_BSSID_AND_SSID));
 }
 
 static void
 wlan_prepare_filter_and_not_selected_BSSID_or_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, VALUE_BSSID_OR_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, VALUE_BSSID_OR_SSID));
 }
 
 /* /Prepare a Filter/... or not Selected */
 static void
 wlan_prepare_filter_or_not_selected_BSSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, VALUE_BSSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, VALUE_BSSID_ONLY));
 }
 
 static void
 wlan_prepare_filter_or_not_selected_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, VALUE_SSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, VALUE_SSID_ONLY));
 }
 
 static void
 wlan_prepare_filter_or_not_selected_BSSID_and_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, VALUE_BSSID_AND_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, VALUE_BSSID_AND_SSID));
 }
 static void
 wlan_prepare_filter_or_not_selected_BSSID_or_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, VALUE_BSSID_OR_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, VALUE_BSSID_OR_SSID));
 }
 
 /* /Find frame/Find Frame/ */
 static void
 wlan_find_frame_BSSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, VALUE_BSSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, VALUE_BSSID_ONLY));
 }
 static void
 wlan_find_frame_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, VALUE_SSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, VALUE_SSID_ONLY));
 }
 static void
 wlan_find_frame_BSSID_and_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, VALUE_BSSID_AND_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, VALUE_BSSID_AND_SSID));
 }
 static void
 wlan_find_frame_BSSID_or_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, VALUE_BSSID_OR_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, VALUE_BSSID_OR_SSID));
 }
 
 /* /Find frame/Find Next/ */
 static void
 wlan_find_frame_next_BSSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, VALUE_BSSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, VALUE_BSSID_ONLY));
 }
 static void
 wlan_find_frame_next_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, VALUE_SSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, VALUE_SSID_ONLY));
 }
 static void
 wlan_find_frame_next_BSSID_and_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, VALUE_BSSID_AND_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, VALUE_BSSID_AND_SSID));
 }
 static void
 wlan_find_frame_next_BSSID_or_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, VALUE_BSSID_OR_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_NEXT(ACTYPE_SELECTED, VALUE_BSSID_OR_SSID));
 }
 /* /Find frame/Find Previous/ */
 static void
 wlan_find_frame_previous_BSSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, VALUE_BSSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, VALUE_BSSID_ONLY));
 }
 static void
 wlan_find_frame_previous_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, VALUE_SSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, VALUE_SSID_ONLY));
 }
 static void
 wlan_find_frame_previous_BSSID_and_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, VALUE_BSSID_AND_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, VALUE_BSSID_AND_SSID));
 }
 static void
 wlan_find_frame_previous_BSSID_or_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, VALUE_BSSID_OR_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_FIND_PREVIOUS(ACTYPE_SELECTED, VALUE_BSSID_OR_SSID));
 }
 
 /* /Colorize/ */
 static void
 wlan_colorize_BSSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_COLORIZE(ACTYPE_SELECTED, VALUE_BSSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_COLORIZE(ACTYPE_SELECTED, VALUE_BSSID_ONLY));
 }
 static void
 wlan_colorize_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_COLORIZE(ACTYPE_SELECTED, VALUE_SSID_ONLY));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_COLORIZE(ACTYPE_SELECTED, VALUE_SSID_ONLY));
 }
 static void
 wlan_colorize_BSSID_and_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_COLORIZE(ACTYPE_SELECTED, VALUE_BSSID_AND_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_COLORIZE(ACTYPE_SELECTED, VALUE_BSSID_AND_SSID));
 }
 static void
 wlan_colorize_BSSID_or_SSID_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_select_filter_cb( widget , user_data, CALLBACK_COLORIZE(ACTYPE_SELECTED, VALUE_BSSID_OR_SSID));
+    wlan_select_filter_cb( widget , user_data, CALLBACK_COLORIZE(ACTYPE_SELECTED, VALUE_BSSID_OR_SSID));
 }
 
 
@@ -1334,191 +1335,191 @@ static const char *ui_desc_wlan_stat_filter_popup =
  *   const gchar     *tooltip;
  *   GCallback  callback;
  * } GtkActionEntry;
- * const gchar *name;			The name of the action.
- * const gchar *stock_id;		The stock id for the action, or the name of an icon from the icon theme.
- * const gchar *label;			The label for the action. This field should typically be marked for translation,
- *								see gtk_action_group_set_translation_domain().
- *								If label is NULL, the label of the stock item with id stock_id is used.
- * const gchar *accelerator;	The accelerator for the action, in the format understood by gtk_accelerator_parse().
- * const gchar *tooltip;		The tooltip for the action. This field should typically be marked for translation,
+ * const gchar *name;           The name of the action.
+ * const gchar *stock_id;       The stock id for the action, or the name of an icon from the icon theme.
+ * const gchar *label;          The label for the action. This field should typically be marked for translation,
+ *                              see gtk_action_group_set_translation_domain().
+ *                              If label is NULL, the label of the stock item with id stock_id is used.
+ * const gchar *accelerator;    The accelerator for the action, in the format understood by gtk_accelerator_parse().
+ * const gchar *tooltip;        The tooltip for the action. This field should typically be marked for translation,
  *                              see gtk_action_group_set_translation_domain().
- * GCallback callback;			The function to call when the action is activated.
+ * GCallback callback;          The function to call when the action is activated.
  *
  */
 static const GtkActionEntry wlans_stat_popup_entries[] = {
-  /* Top level */
-  { "/Apply as Filter",				NULL, "Apply as Filter", NULL, NULL, NULL },
-  { "/Prepare a Filter",			NULL, "Prepare a Filter", NULL, NULL, NULL },
-  { "/Find Frame",					NULL, "Find Frame", NULL, NULL, NULL },
-  { "/Colorize",					NULL, "Colorize", NULL, NULL, NULL },
-
-  /* Apply as */
-  { "/Apply as Filter/Selected",				NULL, "Selected" , NULL, NULL, NULL },
-  { "/Apply as Filter/Not Selected",			NULL, "Not Selected", NULL, NULL, NULL },
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected",		NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, NULL, NULL },
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected",			NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, NULL, NULL },
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected",	NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, NULL, NULL },
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected",		NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, NULL, NULL },
-
-  /* Apply as Selected */
-  { "/Apply as Filter/Selected/BSSID",			NULL, "BSSID",			NULL, "BSSID",				G_CALLBACK(wlan_select_filter_as_selected_BSSID_cb)},
-  { "/Apply as Filter/Selected/SSID",			NULL, "SSID",			NULL, "SSID",				G_CALLBACK(wlan_select_filter_as_selected_SSID_cb)},
-  { "/Apply as Filter/Selected/BSSID and SSID",	NULL, "BSSID and SSID",	NULL, "BSSID and SSID",		G_CALLBACK(wlan_select_filter_as_selected_BSSID_and_SSID_cb)},
-  { "/Apply as Filter/Selected/BSSID or SSID",	NULL, "BSSID or SSID",	NULL, "BSSID or SSID",		G_CALLBACK(wlan_select_filter_as_selected_BSSID_or_SSID_cb)},
-
-  /* Apply as Not Selected */
-  { "/Apply as Filter/Not Selected/BSSID",			NULL, "BSSID",			NULL, "BSSID",				G_CALLBACK(wlan_select_filter_as_not_selected_BSSID_cb)},
-  { "/Apply as Filter/Not Selected/SSID",			NULL, "SSID",			NULL, "SSID",				G_CALLBACK(wlan_select_filter_as_not_selected_SSID_cb)},
-  { "/Apply as Filter/Not Selected/BSSID and SSID",	NULL, "BSSID and SSID",	NULL, "BSSID and SSID",		G_CALLBACK(wlan_select_filter_as_not_selected_BSSID_and_SSID_cb)},
-  { "/Apply as Filter/Not Selected/BSSID or SSID",	NULL, "BSSID or SSID",	NULL, "BSSID or SSID",		G_CALLBACK(wlan_select_filter_as_not_selected_BSSID_or_SSID_cb)},
-
-  /* Apply as and Selected */
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected/BSSID",			NULL, "BSSID",			NULL, "BSSID",				G_CALLBACK(wlan_select_filter_and_selected_BSSID_cb)},
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected/SSID",			NULL, "SSID",			NULL, "SSID",				G_CALLBACK(wlan_select_filter_and_selected_SSID_cb)},
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected/BSSID and SSID",	NULL, "BSSID and SSID",	NULL, "BSSID and SSID",		G_CALLBACK(wlan_select_filter_and_selected_BSSID_and_SSID_cb)},
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected/BSSID or SSID",	NULL, "BSSID or SSID",	NULL, "BSSID or SSID",		G_CALLBACK(wlan_select_filter_and_selected_BSSID_or_SSID_cb)},
-
-  /* Apply as or Selected */
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected/BSSID",			NULL, "BSSID",			NULL, "BSSID",				G_CALLBACK(wlan_select_filter_or_selected_BSSID_cb)},
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected/SSID",			NULL, "SSID",			NULL, "SSID",				G_CALLBACK(wlan_select_filter_or_selected_SSID_cb)},
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected/BSSID and SSID",	NULL, "BSSID and SSID",	NULL, "BSSID and SSID",		G_CALLBACK(wlan_select_filter_or_selected_BSSID_and_SSID_cb)},
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected/BSSID or SSID",	NULL, "BSSID or SSID",	NULL, "BSSID or SSID",		G_CALLBACK(wlan_select_filter_or_selected_BSSID_or_SSID_cb)},
-
-  /* /Apply as Filter/... and not Selected */
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected/BSSID",			NULL, "BSSID",			NULL, "BSSID",				G_CALLBACK(wlan_select_filter_and_not_selected_BSSID_cb)},
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected/SSID",			NULL, "SSID",			NULL, "SSID",				G_CALLBACK(wlan_select_filter_and_not_selected_SSID_cb)},
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected/BSSID and SSID",	NULL, "BSSID and SSID",	NULL, "BSSID and SSID",		G_CALLBACK(wlan_select_filter_and_not_selected_BSSID_and_SSID_cb)},
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected/BSSID or SSID",	NULL, "BSSID or SSID",	NULL, "BSSID or SSID",		G_CALLBACK(wlan_select_filter_and_not_selected_BSSID_or_SSID_cb)},
-
-  /* /Apply as Filter/... or not Selected */
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected/BSSID",			NULL, "BSSID",			NULL, "BSSID",				G_CALLBACK(wlan_select_filter_or_not_selected_BSSID_cb)},
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected/SSID",			NULL, "SSID",			NULL, "SSID",				G_CALLBACK(wlan_select_filter_or_not_selected_SSID_cb)},
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected/BSSID and SSID",	NULL, "BSSID and SSID",	NULL, "BSSID and SSID",		G_CALLBACK(wlan_select_filter_or_not_selected_BSSID_and_SSID_cb)},
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected/BSSID or SSID",	NULL, "BSSID or SSID",	NULL, "BSSID or SSID",		G_CALLBACK(wlan_select_filter_or_not_selected_BSSID_or_SSID_cb)},
-
-  /* Prepare a */
-  { "/Prepare a Filter/Selected",				NULL, "Selected" , NULL, NULL, NULL },
-  { "/Prepare a Filter/Not Selected",			NULL, "Not Selected", NULL, NULL, NULL },
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected",		NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, NULL, NULL },
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected",		NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, NULL, NULL },
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected",	NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, NULL, NULL },
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected",	NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, NULL, NULL },
-
-  /* Prepare a Selected */
-  { "/Prepare a Filter/Selected/BSSID",			NULL, "BSSID",			NULL, "BSSID",				G_CALLBACK(wlan_prepare_filter_as_selected_BSSID_cb)},
-  { "/Prepare a Filter/Selected/SSID",			NULL, "SSID",			NULL, "SSID",				G_CALLBACK(wlan_prepare_filter_as_selected_SSID_cb)},
-  { "/Prepare a Filter/Selected/BSSID and SSID",NULL, "BSSID and SSID",	NULL, "BSSID and SSID",		G_CALLBACK(wlan_prepare_filter_as_selected_BSSID_and_SSID_cb)},
-  { "/Prepare a Filter/Selected/BSSID or SSID",	NULL, "BSSID or SSID",	NULL, "BSSID or SSID",		G_CALLBACK(wlan_prepare_filter_as_selected_BSSID_or_SSID_cb)},
-
-  /* Prepare a Not Selected */
-  { "/Prepare a Filter/Not Selected/BSSID",			NULL, "BSSID",			NULL, "BSSID",				G_CALLBACK(wlan_prepare_filter_as_not_selected_BSSID_cb)},
-  { "/Prepare a Filter/Not Selected/SSID",			NULL, "SSID",			NULL, "SSID",				G_CALLBACK(wlan_prepare_filter_as_not_selected_SSID_cb)},
-  { "/Prepare a Filter/Not Selected/BSSID and SSID",NULL, "BSSID and SSID",	NULL, "BSSID and SSID",		G_CALLBACK(wlan_prepare_filter_as_not_selected_BSSID_and_SSID_cb)},
-  { "/Prepare a Filter/Not Selected/BSSID or SSID",	NULL, "BSSID or SSID",	NULL, "BSSID or SSID",		G_CALLBACK(wlan_prepare_filter_as_not_selected_BSSID_or_SSID_cb)},
-
-  /* Prepare a and Selected */
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected/BSSID",				NULL, "BSSID",			NULL, "BSSID",				G_CALLBACK(wlan_prepare_filter_and_selected_BSSID_cb)},
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected/SSID",				NULL, "SSID",			NULL, "SSID",				G_CALLBACK(wlan_prepare_filter_and_selected_SSID_cb)},
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected/BSSID and SSID",	NULL, "BSSID and SSID",	NULL, "BSSID and SSID",		G_CALLBACK(wlan_prepare_filter_and_selected_BSSID_and_SSID_cb)},
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected/BSSID or SSID",		NULL, "BSSID or SSID",	NULL, "BSSID or SSID",		G_CALLBACK(wlan_prepare_filter_and_selected_BSSID_or_SSID_cb)},
-
-  /* Prepare a or Selected */
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected/BSSID",				NULL, "BSSID",			NULL, "BSSID",				G_CALLBACK(wlan_prepare_filter_or_selected_BSSID_cb)},
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected/SSID",				NULL, "SSID",			NULL, "SSID",				G_CALLBACK(wlan_prepare_filter_or_selected_SSID_cb)},
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected/BSSID and SSID",		NULL, "BSSID and SSID",	NULL, "BSSID and SSID",		G_CALLBACK(wlan_prepare_filter_or_selected_BSSID_and_SSID_cb)},
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected/BSSID or SSID",		NULL, "BSSID or SSID",	NULL, "BSSID or SSID",		G_CALLBACK(wlan_prepare_filter_or_selected_BSSID_or_SSID_cb)},
-
-  /* /Prepare a Filter/... and not Selected */
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected/BSSID",			NULL, "BSSID",			NULL, "BSSID",				G_CALLBACK(wlan_prepare_filter_and_not_selected_BSSID_cb)},
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected/SSID",			NULL, "SSID",			NULL, "SSID",				G_CALLBACK(wlan_prepare_filter_and_not_selected_SSID_cb)},
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected/BSSID and SSID",NULL, "BSSID and SSID",	NULL, "BSSID and SSID",		G_CALLBACK(wlan_prepare_filter_and_not_selected_BSSID_and_SSID_cb)},
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected/BSSID or SSID",	NULL, "BSSID or SSID",	NULL, "BSSID or SSID",		G_CALLBACK(wlan_prepare_filter_and_not_selected_BSSID_or_SSID_cb)},
-
-  /* /Prepare a Filter/... or not Selected */
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected/BSSID",			NULL, "BSSID",			NULL, "BSSID",				G_CALLBACK(wlan_prepare_filter_or_not_selected_BSSID_cb)},
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected/SSID",			NULL, "SSID",			NULL, "SSID",				G_CALLBACK(wlan_prepare_filter_or_not_selected_SSID_cb)},
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected/BSSID and SSID",	NULL, "BSSID and SSID",	NULL, "BSSID and SSID",		G_CALLBACK(wlan_prepare_filter_or_not_selected_BSSID_and_SSID_cb)},
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected/BSSID or SSID",	NULL, "BSSID or SSID",	NULL, "BSSID or SSID",		G_CALLBACK(wlan_prepare_filter_or_not_selected_BSSID_or_SSID_cb)},
-
-  /* Find Frame*/
-  { "/Find Frame/Find Frame",					NULL, "Find Frame",		NULL, NULL, NULL },
-  { "/Find Frame/Find Next",					NULL, "Find Next",		NULL, NULL, NULL },
-  { "/Find Frame/Find Previous",				NULL, "Find Previous",	NULL, NULL, NULL },
-
-  /* Find Frame/Find Frame*/
-  { "/Find Frame/Find Frame/BSSID",				NULL, "BSSID",			NULL, "BSSID",				G_CALLBACK(wlan_find_frame_BSSID_cb)},
-  { "/Find Frame/Find Frame/SSID",				NULL, "SSID",			NULL, "SSID",				G_CALLBACK(wlan_find_frame_SSID_cb)},
-  { "/Find Frame/Find Frame/BSSID and SSID",	NULL, "SSID and SSID",	NULL, "SSID and SSID",		G_CALLBACK(wlan_find_frame_BSSID_and_SSID_cb)},
-  { "/Find Frame/Find Frame/BSSID or SSID",		NULL, "BSSID",			NULL, "BSSID",				G_CALLBACK(wlan_find_frame_BSSID_or_SSID_cb)},
-
-  /* Find Frame/Find Next*/
-  { "/Find Frame/Find Next/BSSID",				NULL, "BSSID",			NULL, "BSSID",				G_CALLBACK(wlan_find_frame_next_BSSID_cb)},
-  { "/Find Frame/Find Next/SSID",				NULL, "SSID",			NULL, "SSID",				G_CALLBACK(wlan_find_frame_next_SSID_cb)},
-  { "/Find Frame/Find Next/BSSID and SSID",		NULL, "SSID and SSID",	NULL, "SSID and SSID",		G_CALLBACK(wlan_find_frame_next_BSSID_and_SSID_cb)},
-  { "/Find Frame/Find Next/BSSID or SSID",		NULL, "BSSID",			NULL, "BSSID",				G_CALLBACK(wlan_find_frame_next_BSSID_or_SSID_cb)},
-
-  /* Find Frame/Find Previous*/
-  { "/Find Frame/Find Previous/BSSID",				NULL, "BSSID",			NULL, "BSSID",				G_CALLBACK(wlan_find_frame_previous_BSSID_cb)},
-  { "/Find Frame/Find Previous/SSID",				NULL, "SSID",			NULL, "SSID",				G_CALLBACK(wlan_find_frame_previous_SSID_cb)},
-  { "/Find Frame/Find Previous/BSSID and SSID",		NULL, "SSID and SSID",	NULL, "SSID and SSID",		G_CALLBACK(wlan_find_frame_previous_BSSID_and_SSID_cb)},
-  { "/Find Frame/Find Previous/BSSID or SSID",		NULL, "BSSID",			NULL, "BSSID",				G_CALLBACK(wlan_find_frame_previous_BSSID_or_SSID_cb)},
-
-  /* Colorize */
-  { "/Colorize/BSSID",				NULL, "BSSID",			NULL, "BSSID",				G_CALLBACK(wlan_colorize_BSSID_cb)},
-  { "/Colorize/SSID",				NULL, "SSID",			NULL, "SSID",				G_CALLBACK(wlan_colorize_SSID_cb)},
-  { "/Colorize/BSSID and SSID",		NULL, "BSSID and SSID",	NULL, "BSSID and SSID",		G_CALLBACK(wlan_colorize_BSSID_and_SSID_cb)},
-  { "/Colorize/BSSID or SSID",		NULL, "BSSID or SSID",	NULL, "BSSID or SSID",		G_CALLBACK(wlan_colorize_BSSID_or_SSID_cb)},
+    /* Top level */
+    { "/Apply as Filter",             NULL, "Apply as Filter",  NULL, NULL, NULL },
+    { "/Prepare a Filter",            NULL, "Prepare a Filter", NULL, NULL, NULL },
+    { "/Find Frame",                  NULL, "Find Frame",       NULL, NULL, NULL },
+    { "/Colorize",                    NULL, "Colorize",         NULL, NULL, NULL },
+
+    /* Apply as */
+    { "/Apply as Filter/Selected",                NULL, "Selected" ,      NULL, NULL, NULL },
+    { "/Apply as Filter/Not Selected",            NULL, "Not Selected",   NULL, NULL, NULL },
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected",       NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, NULL, NULL },
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected",        NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, NULL, NULL },
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected",   NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, NULL, NULL },
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected",    NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, NULL, NULL },
+
+    /* Apply as Selected */
+    { "/Apply as Filter/Selected/BSSID",          NULL, "BSSID",          NULL, "BSSID",              G_CALLBACK(wlan_select_filter_as_selected_BSSID_cb)},
+    { "/Apply as Filter/Selected/SSID",           NULL, "SSID",           NULL, "SSID",               G_CALLBACK(wlan_select_filter_as_selected_SSID_cb)},
+    { "/Apply as Filter/Selected/BSSID and SSID", NULL, "BSSID and SSID", NULL, "BSSID and SSID",     G_CALLBACK(wlan_select_filter_as_selected_BSSID_and_SSID_cb)},
+    { "/Apply as Filter/Selected/BSSID or SSID",  NULL, "BSSID or SSID",  NULL, "BSSID or SSID",      G_CALLBACK(wlan_select_filter_as_selected_BSSID_or_SSID_cb)},
+
+    /* Apply as Not Selected */
+    { "/Apply as Filter/Not Selected/BSSID",          NULL, "BSSID",          NULL, "BSSID",              G_CALLBACK(wlan_select_filter_as_not_selected_BSSID_cb)},
+    { "/Apply as Filter/Not Selected/SSID",           NULL, "SSID",           NULL, "SSID",               G_CALLBACK(wlan_select_filter_as_not_selected_SSID_cb)},
+    { "/Apply as Filter/Not Selected/BSSID and SSID", NULL, "BSSID and SSID", NULL, "BSSID and SSID",     G_CALLBACK(wlan_select_filter_as_not_selected_BSSID_and_SSID_cb)},
+    { "/Apply as Filter/Not Selected/BSSID or SSID",  NULL, "BSSID or SSID",  NULL, "BSSID or SSID",      G_CALLBACK(wlan_select_filter_as_not_selected_BSSID_or_SSID_cb)},
+
+    /* Apply as and Selected */
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected/BSSID",     NULL, "BSSID",          NULL, "BSSID",              G_CALLBACK(wlan_select_filter_and_selected_BSSID_cb)},
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected/SSID",      NULL, "SSID",           NULL, "SSID",               G_CALLBACK(wlan_select_filter_and_selected_SSID_cb)},
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected/BSSID and SSID",    NULL, "BSSID and SSID", NULL, "BSSID and SSID",     G_CALLBACK(wlan_select_filter_and_selected_BSSID_and_SSID_cb)},
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected/BSSID or SSID", NULL, "BSSID or SSID",  NULL, "BSSID or SSID",      G_CALLBACK(wlan_select_filter_and_selected_BSSID_or_SSID_cb)},
+
+    /* Apply as or Selected */
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected/BSSID",          NULL, "BSSID",          NULL, "BSSID",              G_CALLBACK(wlan_select_filter_or_selected_BSSID_cb)},
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected/SSID",           NULL, "SSID",           NULL, "SSID",               G_CALLBACK(wlan_select_filter_or_selected_SSID_cb)},
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected/BSSID and SSID", NULL, "BSSID and SSID", NULL, "BSSID and SSID",     G_CALLBACK(wlan_select_filter_or_selected_BSSID_and_SSID_cb)},
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected/BSSID or SSID",  NULL, "BSSID or SSID",  NULL, "BSSID or SSID",      G_CALLBACK(wlan_select_filter_or_selected_BSSID_or_SSID_cb)},
+
+    /* /Apply as Filter/... and not Selected */
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected/BSSID",         NULL, "BSSID",          NULL, "BSSID",              G_CALLBACK(wlan_select_filter_and_not_selected_BSSID_cb)},
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected/SSID",          NULL, "SSID",           NULL, "SSID",               G_CALLBACK(wlan_select_filter_and_not_selected_SSID_cb)},
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected/BSSID and SSID",    NULL, "BSSID and SSID", NULL, "BSSID and SSID",     G_CALLBACK(wlan_select_filter_and_not_selected_BSSID_and_SSID_cb)},
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected/BSSID or SSID", NULL, "BSSID or SSID",  NULL, "BSSID or SSID",      G_CALLBACK(wlan_select_filter_and_not_selected_BSSID_or_SSID_cb)},
+
+    /* /Apply as Filter/... or not Selected */
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected/BSSID",          NULL, "BSSID",          NULL, "BSSID",              G_CALLBACK(wlan_select_filter_or_not_selected_BSSID_cb)},
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected/SSID",           NULL, "SSID",           NULL, "SSID",               G_CALLBACK(wlan_select_filter_or_not_selected_SSID_cb)},
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected/BSSID and SSID", NULL, "BSSID and SSID", NULL, "BSSID and SSID",     G_CALLBACK(wlan_select_filter_or_not_selected_BSSID_and_SSID_cb)},
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected/BSSID or SSID",  NULL, "BSSID or SSID",  NULL, "BSSID or SSID",      G_CALLBACK(wlan_select_filter_or_not_selected_BSSID_or_SSID_cb)},
+
+    /* Prepare a */
+    { "/Prepare a Filter/Selected",               NULL, "Selected" ,      NULL, NULL, NULL },
+    { "/Prepare a Filter/Not Selected",           NULL, "Not Selected",   NULL, NULL, NULL },
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected",      NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected", NULL, NULL, NULL },
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected",       NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected", NULL, NULL, NULL },
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected",  NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, NULL, NULL },
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected",   NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected", NULL, NULL, NULL },
+
+    /* Prepare a Selected */
+    { "/Prepare a Filter/Selected/BSSID",         NULL, "BSSID",          NULL, "BSSID",              G_CALLBACK(wlan_prepare_filter_as_selected_BSSID_cb)},
+    { "/Prepare a Filter/Selected/SSID",          NULL, "SSID",           NULL, "SSID",               G_CALLBACK(wlan_prepare_filter_as_selected_SSID_cb)},
+    { "/Prepare a Filter/Selected/BSSID and SSID",NULL, "BSSID and SSID", NULL, "BSSID and SSID",     G_CALLBACK(wlan_prepare_filter_as_selected_BSSID_and_SSID_cb)},
+    { "/Prepare a Filter/Selected/BSSID or SSID", NULL, "BSSID or SSID",  NULL, "BSSID or SSID",      G_CALLBACK(wlan_prepare_filter_as_selected_BSSID_or_SSID_cb)},
+
+    /* Prepare a Not Selected */
+    { "/Prepare a Filter/Not Selected/BSSID",         NULL, "BSSID",          NULL, "BSSID",              G_CALLBACK(wlan_prepare_filter_as_not_selected_BSSID_cb)},
+    { "/Prepare a Filter/Not Selected/SSID",          NULL, "SSID",           NULL, "SSID",               G_CALLBACK(wlan_prepare_filter_as_not_selected_SSID_cb)},
+    { "/Prepare a Filter/Not Selected/BSSID and SSID",NULL, "BSSID and SSID", NULL, "BSSID and SSID",     G_CALLBACK(wlan_prepare_filter_as_not_selected_BSSID_and_SSID_cb)},
+    { "/Prepare a Filter/Not Selected/BSSID or SSID", NULL, "BSSID or SSID",  NULL, "BSSID or SSID",      G_CALLBACK(wlan_prepare_filter_as_not_selected_BSSID_or_SSID_cb)},
+
+    /* Prepare a and Selected */
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected/BSSID",          NULL, "BSSID",          NULL, "BSSID",              G_CALLBACK(wlan_prepare_filter_and_selected_BSSID_cb)},
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected/SSID",           NULL, "SSID",           NULL, "SSID",               G_CALLBACK(wlan_prepare_filter_and_selected_SSID_cb)},
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected/BSSID and SSID", NULL, "BSSID and SSID", NULL, "BSSID and SSID",     G_CALLBACK(wlan_prepare_filter_and_selected_BSSID_and_SSID_cb)},
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected/BSSID or SSID",  NULL, "BSSID or SSID",  NULL, "BSSID or SSID",      G_CALLBACK(wlan_prepare_filter_and_selected_BSSID_or_SSID_cb)},
+
+    /* Prepare a or Selected */
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected/BSSID",           NULL, "BSSID",          NULL, "BSSID",              G_CALLBACK(wlan_prepare_filter_or_selected_BSSID_cb)},
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected/SSID",            NULL, "SSID",           NULL, "SSID",               G_CALLBACK(wlan_prepare_filter_or_selected_SSID_cb)},
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected/BSSID and SSID",  NULL, "BSSID and SSID", NULL, "BSSID and SSID",     G_CALLBACK(wlan_prepare_filter_or_selected_BSSID_and_SSID_cb)},
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected/BSSID or SSID",   NULL, "BSSID or SSID",  NULL, "BSSID or SSID",      G_CALLBACK(wlan_prepare_filter_or_selected_BSSID_or_SSID_cb)},
+
+    /* /Prepare a Filter/... and not Selected */
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected/BSSID",      NULL, "BSSID",          NULL, "BSSID",              G_CALLBACK(wlan_prepare_filter_and_not_selected_BSSID_cb)},
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected/SSID",       NULL, "SSID",           NULL, "SSID",               G_CALLBACK(wlan_prepare_filter_and_not_selected_SSID_cb)},
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected/BSSID and SSID", NULL, "BSSID and SSID",    NULL, "BSSID and SSID",     G_CALLBACK(wlan_prepare_filter_and_not_selected_BSSID_and_SSID_cb)},
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected/BSSID or SSID",  NULL, "BSSID or SSID",  NULL, "BSSID or SSID",      G_CALLBACK(wlan_prepare_filter_and_not_selected_BSSID_or_SSID_cb)},
+
+    /* /Prepare a Filter/... or not Selected */
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected/BSSID",         NULL, "BSSID",          NULL, "BSSID",              G_CALLBACK(wlan_prepare_filter_or_not_selected_BSSID_cb)},
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected/SSID",          NULL, "SSID",           NULL, "SSID",               G_CALLBACK(wlan_prepare_filter_or_not_selected_SSID_cb)},
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected/BSSID and SSID",    NULL, "BSSID and SSID", NULL, "BSSID and SSID",     G_CALLBACK(wlan_prepare_filter_or_not_selected_BSSID_and_SSID_cb)},
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected/BSSID or SSID", NULL, "BSSID or SSID",  NULL, "BSSID or SSID",      G_CALLBACK(wlan_prepare_filter_or_not_selected_BSSID_or_SSID_cb)},
+
+    /* Find Frame*/
+    { "/Find Frame/Find Frame",                   NULL, "Find Frame",     NULL, NULL, NULL },
+    { "/Find Frame/Find Next",                    NULL, "Find Next",      NULL, NULL, NULL },
+    { "/Find Frame/Find Previous",                NULL, "Find Previous",  NULL, NULL, NULL },
+
+    /* Find Frame/Find Frame*/
+    { "/Find Frame/Find Frame/BSSID",             NULL, "BSSID",          NULL, "BSSID",              G_CALLBACK(wlan_find_frame_BSSID_cb)},
+    { "/Find Frame/Find Frame/SSID",              NULL, "SSID",           NULL, "SSID",               G_CALLBACK(wlan_find_frame_SSID_cb)},
+    { "/Find Frame/Find Frame/BSSID and SSID",    NULL, "SSID and SSID",  NULL, "SSID and SSID",      G_CALLBACK(wlan_find_frame_BSSID_and_SSID_cb)},
+    { "/Find Frame/Find Frame/BSSID or SSID",     NULL, "BSSID",          NULL, "BSSID",              G_CALLBACK(wlan_find_frame_BSSID_or_SSID_cb)},
+
+    /* Find Frame/Find Next*/
+    { "/Find Frame/Find Next/BSSID",              NULL, "BSSID",          NULL, "BSSID",              G_CALLBACK(wlan_find_frame_next_BSSID_cb)},
+    { "/Find Frame/Find Next/SSID",               NULL, "SSID",           NULL, "SSID",               G_CALLBACK(wlan_find_frame_next_SSID_cb)},
+    { "/Find Frame/Find Next/BSSID and SSID",     NULL, "SSID and SSID",  NULL, "SSID and SSID",      G_CALLBACK(wlan_find_frame_next_BSSID_and_SSID_cb)},
+    { "/Find Frame/Find Next/BSSID or SSID",      NULL, "BSSID",          NULL, "BSSID",              G_CALLBACK(wlan_find_frame_next_BSSID_or_SSID_cb)},
+
+    /* Find Frame/Find Previous*/
+    { "/Find Frame/Find Previous/BSSID",              NULL, "BSSID",          NULL, "BSSID",              G_CALLBACK(wlan_find_frame_previous_BSSID_cb)},
+    { "/Find Frame/Find Previous/SSID",               NULL, "SSID",           NULL, "SSID",               G_CALLBACK(wlan_find_frame_previous_SSID_cb)},
+    { "/Find Frame/Find Previous/BSSID and SSID",     NULL, "SSID and SSID",  NULL, "SSID and SSID",      G_CALLBACK(wlan_find_frame_previous_BSSID_and_SSID_cb)},
+    { "/Find Frame/Find Previous/BSSID or SSID",      NULL, "BSSID",          NULL, "BSSID",              G_CALLBACK(wlan_find_frame_previous_BSSID_or_SSID_cb)},
+
+    /* Colorize */
+    { "/Colorize/BSSID",              NULL, "BSSID",          NULL, "BSSID",              G_CALLBACK(wlan_colorize_BSSID_cb)},
+    { "/Colorize/SSID",               NULL, "SSID",           NULL, "SSID",               G_CALLBACK(wlan_colorize_SSID_cb)},
+    { "/Colorize/BSSID and SSID",     NULL, "BSSID and SSID", NULL, "BSSID and SSID",     G_CALLBACK(wlan_colorize_BSSID_and_SSID_cb)},
+    { "/Colorize/BSSID or SSID",      NULL, "BSSID or SSID",  NULL, "BSSID or SSID",      G_CALLBACK(wlan_colorize_BSSID_or_SSID_cb)},
 
 };
 
 static void
 wlan_create_popup_menu(wlanstat_t *hs)
 {
-	GtkUIManager *ui_manager;
-	GtkActionGroup *action_group;
-	GError *error = NULL;
+    GtkUIManager   *ui_manager;
+    GtkActionGroup *action_group;
+    GError         *error = NULL;
 
-	action_group = gtk_action_group_new ("WlanFilterPopupActionGroup");
-	gtk_action_group_add_actions (action_group,								/* the action group */
-								(gpointer)wlans_stat_popup_entries,			/* an array of action descriptions */
-								G_N_ELEMENTS(wlans_stat_popup_entries),		/* the number of entries */
-								hs);										/* data to pass to the action callbacks */
+    action_group = gtk_action_group_new ("WlanFilterPopupActionGroup");
+    gtk_action_group_add_actions (action_group,                             /* the action group */
+                                  (gpointer)wlans_stat_popup_entries,       /* an array of action descriptions */
+                                  G_N_ELEMENTS(wlans_stat_popup_entries),   /* the number of entries */
+                                  hs);                                      /* data to pass to the action callbacks */
 
-	ui_manager = gtk_ui_manager_new ();
-	gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
-	gtk_ui_manager_add_ui_from_string (ui_manager,ui_desc_wlan_stat_filter_popup, -1, &error);
-	if (error != NULL)
+    ui_manager = gtk_ui_manager_new ();
+    gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
+    gtk_ui_manager_add_ui_from_string (ui_manager,ui_desc_wlan_stat_filter_popup, -1, &error);
+    if (error != NULL)
     {
-        fprintf (stderr, "Warning: building Wlan Stat Filter popup failed: %s\n",
-                error->message);
-        g_error_free (error);
-        error = NULL;
+            fprintf (stderr, "Warning: building Wlan Stat Filter popup failed: %s\n",
+                     error->message);
+            g_error_free (error);
+            error = NULL;
     }
-	hs->menu = gtk_ui_manager_get_widget(ui_manager, "/WlanStatFilterPopup");
-	g_signal_connect(hs->table, "button_press_event", G_CALLBACK(wlan_show_popup_menu_cb), hs);
+    hs->menu = gtk_ui_manager_get_widget(ui_manager, "/WlanStatFilterPopup");
+    g_signal_connect(hs->table, "button_press_event", G_CALLBACK(wlan_show_popup_menu_cb), hs);
 
 }
 
 static gboolean
 wlan_details_show_popup_menu_cb(void *widg _U_, GdkEvent *event, wlanstat_t *et)
 {
-	GdkEventButton *bevent = (GdkEventButton *)event;
-	GtkTreeSelection *sel;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-
-	/* To qoute the "Gdk Event Structures" doc:
-	 * "Normally button 1 is the left mouse button, 2 is the middle button, and 3 is the right button" */
-	if(event->type==GDK_BUTTON_PRESS && bevent->button==3){
-		/* if this is a right click on one of our columns, popup the context menu */
-		sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(et->details));
-		if (gtk_tree_selection_get_selected (sel, &model, &iter)) {
-			gtk_menu_popup(GTK_MENU(et->details_menu), NULL, NULL, NULL, NULL,
-				       bevent->button, bevent->time);
-		}
-	}
+    GdkEventButton   *bevent = (GdkEventButton *)event;
+    GtkTreeSelection *sel;
+    GtkTreeModel     *model;
+    GtkTreeIter       iter;
+
+    /* To qoute the "Gdk Event Structures" doc:
+     * "Normally button 1 is the left mouse button, 2 is the middle button, and 3 is the right button" */
+    if ((event->type == GDK_BUTTON_PRESS) && (bevent->button == 3)) {
+        /* if this is a right click on one of our columns, popup the context menu */
+        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(et->details));
+        if (gtk_tree_selection_get_selected (sel, &model, &iter)) {
+            gtk_menu_popup(GTK_MENU(et->details_menu), NULL, NULL, NULL, NULL,
+                       bevent->button, bevent->time);
+        }
+    }
 
-	return FALSE;
+    return FALSE;
 }
 
 /* Apply as Filter/ */
@@ -1526,89 +1527,89 @@ wlan_details_show_popup_menu_cb(void *widg _U_, GdkEvent *event, wlanstat_t *et)
 static void
 wlan_details_apply_selected_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_details_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_SELECTED, 0));
+    wlan_details_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_SELECTED, 0));
 }
 
 static void
 wlan_details_apply_not_selected_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_details_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, 0));
+    wlan_details_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_NOT_SELECTED, 0));
 }
 
 static void
 wlan_details_apply_and_selected_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_details_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_SELECTED, 0));
+    wlan_details_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_SELECTED, 0));
 }
 
 static void
 wlan_details_apply_or_selected_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_details_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_SELECTED, 0));
+    wlan_details_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_SELECTED, 0));
 }
 
 static void
 wlan_details_apply_and_not_selected_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_details_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, 0));
+    wlan_details_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_AND_NOT_SELECTED, 0));
 }
 
 static void
 wlan_details_apply_or_not_selected_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_details_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, 0));
+    wlan_details_select_filter_cb( widget , user_data, CALLBACK_MATCH(ACTYPE_OR_NOT_SELECTED, 0));
 }
 /* Prepare a filter */
 static void
 wlan_details_prepare_selected_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_details_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_SELECTED, 0));
+    wlan_details_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_SELECTED, 0));
 }
 
 static void
 wlan_details_prepare_not_selected_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_details_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, 0));
+    wlan_details_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_NOT_SELECTED, 0));
 }
 
 static void
 wlan_details_prepare_and_selected_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_details_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, 0));
+    wlan_details_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_SELECTED, 0));
 }
 
 static void
 wlan_details_prepare_or_selected_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_details_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, 0));
+    wlan_details_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_SELECTED, 0));
 }
 
 static void
 wlan_details_prepare_and_not_selected_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_details_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, 0));
+    wlan_details_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_AND_NOT_SELECTED, 0));
 }
 
 static void
 wlan_details_prepare_or_not_selected_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_details_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, 0));
+    wlan_details_select_filter_cb( widget , user_data, CALLBACK_PREPARE(ACTYPE_OR_NOT_SELECTED, 0));
 }
 
 static void
 wlan_details_find_frame_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_details_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, 0));
+    wlan_details_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_SELECTED, 0));
 }
 static void
 wlan_details_find_next_frame_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_details_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_OR_NOT_SELECTED, 0));
+    wlan_details_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_OR_NOT_SELECTED, 0));
 }
 static void
 wlan_details_find_previous_frame_cb(GtkWidget *widget, gpointer user_data)
 {
-	wlan_details_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_OR_NOT_SELECTED, 0));
+    wlan_details_select_filter_cb( widget , user_data, CALLBACK_FIND_FRAME(ACTYPE_OR_NOT_SELECTED, 0));
 }
 
 
@@ -1649,321 +1650,321 @@ static const char *ui_desc_wlan_details_filter_popup =
  *   const gchar     *tooltip;
  *   GCallback  callback;
  * } GtkActionEntry;
- * const gchar *name;			The name of the action.
- * const gchar *stock_id;		The stock id for the action, or the name of an icon from the icon theme.
- * const gchar *label;			The label for the action. This field should typically be marked for translation,
- *								see gtk_action_group_set_translation_domain().
- *								If label is NULL, the label of the stock item with id stock_id is used.
- * const gchar *accelerator;	The accelerator for the action, in the format understood by gtk_accelerator_parse().
- * const gchar *tooltip;		The tooltip for the action. This field should typically be marked for translation,
+ * const gchar *name;           The name of the action.
+ * const gchar *stock_id;       The stock id for the action, or the name of an icon from the icon theme.
+ * const gchar *label;          The label for the action. This field should typically be marked for translation,
+ *                              see gtk_action_group_set_translation_domain().
+ *                              If label is NULL, the label of the stock item with id stock_id is used.
+ * const gchar *accelerator;    The accelerator for the action, in the format understood by gtk_accelerator_parse().
+ * const gchar *tooltip;        The tooltip for the action. This field should typically be marked for translation,
  *                              see gtk_action_group_set_translation_domain().
- * GCallback callback;			The function to call when the action is activated.
+ * GCallback callback;          The function to call when the action is activated.
  *
  */
 static const GtkActionEntry wlan_details_list_popup_entries[] = {
-  /* Top level */
-  { "/Apply as Filter",							NULL, "Apply as Filter", NULL, NULL, NULL },
-  { "/Prepare a Filter",						NULL, "Prepare a Filter", NULL, NULL, NULL },
-  { "/Find Frame",								NULL, "Find Frame", NULL, NULL, NULL },
+    /* Top level */
+    { "/Apply as Filter",                         NULL, "Apply as Filter",  NULL, NULL, NULL },
+    { "/Prepare a Filter",                        NULL, "Prepare a Filter", NULL, NULL, NULL },
+    { "/Find Frame",                              NULL, "Find Frame",       NULL, NULL, NULL },
 
     /* Apply as */
-  { "/Apply as Filter/Selected",				NULL, "Selected" ,				NULL, NULL, G_CALLBACK(wlan_details_apply_selected_cb) },
-  { "/Apply as Filter/Not Selected",			NULL, "Not Selected",			NULL, NULL, G_CALLBACK(wlan_details_apply_not_selected_cb) },
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected",		NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected",		NULL, NULL, G_CALLBACK(wlan_details_apply_and_selected_cb) },
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected",			NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected",		NULL, NULL, G_CALLBACK(wlan_details_apply_or_selected_cb) },
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected",	NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected",	NULL, NULL, G_CALLBACK(wlan_details_apply_and_not_selected_cb) },
-  { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected",		NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected",	NULL, NULL, G_CALLBACK(wlan_details_apply_or_not_selected_cb) },
-
-  { "/Prepare a Filter/Selected",				NULL, "Selected" ,				NULL, NULL, G_CALLBACK(wlan_details_prepare_selected_cb) },
-  { "/Prepare a Filter/Not Selected",			NULL, "Not Selected",			NULL, NULL, G_CALLBACK(wlan_details_prepare_not_selected_cb) },
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected",		NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected",		NULL, NULL, G_CALLBACK(wlan_details_prepare_and_selected_cb) },
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected",		NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected",		NULL, NULL, G_CALLBACK(wlan_details_prepare_or_selected_cb) },
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected",	NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected",	NULL, NULL, G_CALLBACK(wlan_details_prepare_and_not_selected_cb) },
-  { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected",	NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected",	NULL, NULL, G_CALLBACK(wlan_details_prepare_or_not_selected_cb) },
-
-  /* Find Frame*/
-  { "/Find Frame/Find Frame",					NULL, "Find Frame",				NULL, NULL, G_CALLBACK(wlan_details_find_frame_cb) },
-  { "/Find Frame/Find Next",					NULL, "Find Next",				NULL, NULL, G_CALLBACK(wlan_details_find_next_frame_cb) },
-  { "/Find Frame/Find Previous",				NULL, "Find Previous",			NULL, NULL, G_CALLBACK(wlan_details_find_previous_frame_cb) },
+    { "/Apply as Filter/Selected",                NULL, "Selected" ,      NULL, NULL, G_CALLBACK(wlan_details_apply_selected_cb) },
+    { "/Apply as Filter/Not Selected",            NULL, "Not Selected",   NULL, NULL, G_CALLBACK(wlan_details_apply_not_selected_cb) },
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected",       NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected",     NULL, NULL, G_CALLBACK(wlan_details_apply_and_selected_cb) },
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected",        NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected",      NULL, NULL, G_CALLBACK(wlan_details_apply_or_selected_cb) },
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected",   NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, NULL, G_CALLBACK(wlan_details_apply_and_not_selected_cb) },
+    { "/Apply as Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected",    NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected",  NULL, NULL, G_CALLBACK(wlan_details_apply_or_not_selected_cb) },
+
+    { "/Prepare a Filter/Selected",               NULL, "Selected" ,      NULL, NULL, G_CALLBACK(wlan_details_prepare_selected_cb) },
+    { "/Prepare a Filter/Not Selected",           NULL, "Not Selected",   NULL, NULL, G_CALLBACK(wlan_details_prepare_not_selected_cb) },
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and Selected",      NULL, UTF8_HORIZONTAL_ELLIPSIS " and Selected",     NULL, NULL, G_CALLBACK(wlan_details_prepare_and_selected_cb) },
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or Selected",       NULL, UTF8_HORIZONTAL_ELLIPSIS " or Selected",      NULL, NULL, G_CALLBACK(wlan_details_prepare_or_selected_cb) },
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " and not Selected",  NULL, UTF8_HORIZONTAL_ELLIPSIS " and not Selected", NULL, NULL, G_CALLBACK(wlan_details_prepare_and_not_selected_cb) },
+    { "/Prepare a Filter/" UTF8_HORIZONTAL_ELLIPSIS " or not Selected",   NULL, UTF8_HORIZONTAL_ELLIPSIS " or not Selected",  NULL, NULL, G_CALLBACK(wlan_details_prepare_or_not_selected_cb) },
+
+    /* Find Frame*/
+    { "/Find Frame/Find Frame",                   NULL, "Find Frame",     NULL, NULL, G_CALLBACK(wlan_details_find_frame_cb) },
+    { "/Find Frame/Find Next",                    NULL, "Find Next",      NULL, NULL, G_CALLBACK(wlan_details_find_next_frame_cb) },
+    { "/Find Frame/Find Previous",                NULL, "Find Previous",  NULL, NULL, G_CALLBACK(wlan_details_find_previous_frame_cb) },
 
 };
 
 static void
 wlan_details_create_popup_menu(wlanstat_t *hs)
 {
-	GtkUIManager *ui_manager;
-	GtkActionGroup *action_group;
-	GError *error = NULL;
+    GtkUIManager   *ui_manager;
+    GtkActionGroup *action_group;
+    GError         *error = NULL;
 
-	action_group = gtk_action_group_new ("WlanDetailsPopupActionGroup");
-	gtk_action_group_add_actions (action_group,									/* the action group */
-								(gpointer)wlan_details_list_popup_entries,		/* an array of action descriptions */
-								G_N_ELEMENTS(wlan_details_list_popup_entries),	/* the number of entries */
-								hs);											/* data to pass to the action callbacks */
+    action_group = gtk_action_group_new ("WlanDetailsPopupActionGroup");
+    gtk_action_group_add_actions (action_group,                                  /* the action group */
+                                  (gpointer)wlan_details_list_popup_entries,     /* an array of action descriptions */
+                                  G_N_ELEMENTS(wlan_details_list_popup_entries), /* the number of entries */
+                                  hs);                                           /* data to pass to the action callbacks */
 
-	ui_manager = gtk_ui_manager_new ();
-	gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
-	gtk_ui_manager_add_ui_from_string (ui_manager,ui_desc_wlan_details_filter_popup, -1, &error);
-	if (error != NULL)
+    ui_manager = gtk_ui_manager_new ();
+    gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
+    gtk_ui_manager_add_ui_from_string (ui_manager,ui_desc_wlan_details_filter_popup, -1, &error);
+    if (error != NULL)
     {
         fprintf (stderr, "Warning: building Wlan details list popup failed: %s\n",
-                error->message);
+                 error->message);
         g_error_free (error);
         error = NULL;
     }
-	hs->details_menu = gtk_ui_manager_get_widget(ui_manager, "/WlanStatFilterPopup");
-	g_signal_connect(hs->details, "button_press_event", G_CALLBACK(wlan_details_show_popup_menu_cb), hs);
+    hs->details_menu = gtk_ui_manager_get_widget(ui_manager, "/WlanStatFilterPopup");
+    g_signal_connect(hs->details, "button_press_event", G_CALLBACK(wlan_details_show_popup_menu_cb), hs);
 
 }
 
 static void
 wlanstat_dlg_create (void)
 {
-	wlanstat_t    *hs;
-	GString       *error_string;
-	GtkWidget     *scrolled_window;
-	GtkWidget     *bbox;
-	GtkWidget     *vbox;
-	GtkWidget     *hbox;
-	GtkWidget     *frame;
-	GtkWidget     *selected_vb;
-	GtkWidget     *resolv_cb;
-	GtkWidget     *filter_cb;
-	GtkWidget     *existing_cb;
-	GtkWidget     *close_bt;
-	GtkWidget     *help_bt;
-	GtkWidget     *copy_bt;
-	GtkListStore  *store;
-	GtkTreeView       *tree_view;
-	GtkCellRenderer   *renderer;
-	GtkTreeViewColumn *column;
-	GtkTreeSelection  *sel;
-	char *display_name;
-	char title[256];
-	gint i;
-
-	hs=g_malloc (sizeof(wlanstat_t));
-	hs->num_entries = 0;
-	hs->ep_list = NULL;
-	hs->number_of_packets = 0;
-	hs->resolve_names = TRUE;
-	hs->use_dfilter = FALSE;
-	hs->show_only_existing = FALSE;
-
-	display_name = cf_get_display_name(&cfile);
-	g_snprintf (title, sizeof(title), "Wireshark: WLAN Traffic Statistics: %s",
-		    display_name);
-	g_free(display_name);
-	wlanstat_dlg_w = window_new_with_geom (GTK_WINDOW_TOPLEVEL, title, "WLAN Statistics");
-	gtk_window_set_default_size (GTK_WINDOW(wlanstat_dlg_w), 750, 400);
-
-	vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
-	gtk_container_add(GTK_CONTAINER(wlanstat_dlg_w), vbox);
-	gtk_container_set_border_width (GTK_CONTAINER(vbox), 6);
-
-	wlanstat_pane = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
-	gtk_box_pack_start (GTK_BOX (vbox), wlanstat_pane, TRUE, TRUE, 0);
-	gtk_paned_set_position(GTK_PANED(wlanstat_pane), recent.gui_geometry_wlan_stats_pane);
-	gtk_widget_show(wlanstat_pane);
-
-	/* init a scrolled window for overview */
-	wlanstat_name_lb = gtk_frame_new("Network Overview");
-	gtk_paned_pack1(GTK_PANED(wlanstat_pane), wlanstat_name_lb, FALSE, TRUE);
-	selected_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
-	gtk_container_add(GTK_CONTAINER(wlanstat_name_lb), selected_vb);
-	gtk_container_set_border_width(GTK_CONTAINER(selected_vb), 5);
-
-	scrolled_window = scrolled_window_new (NULL, NULL);
-	gtk_box_pack_start(GTK_BOX(selected_vb), scrolled_window, TRUE, TRUE, 0);
-	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window),
-					    GTK_SHADOW_IN);
-
-	store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
-				   G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT,
-				   G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT,
-				   G_TYPE_STRING, G_TYPE_FLOAT, G_TYPE_POINTER);
-	hs->table = GTK_TREE_VIEW(tree_view_new(GTK_TREE_MODEL(store)));
-	gtk_container_add(GTK_CONTAINER (scrolled_window), GTK_WIDGET(hs->table));
-	g_object_unref(G_OBJECT(store));
-
-	tree_view = hs->table;
-	gtk_tree_view_set_headers_visible(tree_view, TRUE);
-	gtk_tree_view_set_headers_clickable(tree_view, TRUE);
-
-	for (i = 0; i <= PROTECTION_COLUMN; i++) {
-		if (i == PERCENT_COLUMN) {
-			/* XXX: "progess" rendering doesn't seem to work for Gtk3 ?? */
-			renderer = gtk_cell_renderer_progress_new();
-			column = gtk_tree_view_column_new_with_attributes(titles[i], renderer,
-									  "text", i,
-									  "value", PERCENT_VALUE_COLUMN,
-									  NULL);
-			gtk_tree_view_column_set_expand(column, TRUE);
-			gtk_tree_view_column_set_sort_column_id(column, PERCENT_VALUE_COLUMN);
-		} else {
-			renderer = gtk_cell_renderer_text_new();
-			column = gtk_tree_view_column_new_with_attributes(titles[i], renderer,
-									  "text", i,
-									  NULL);
-			gtk_tree_view_column_set_sort_column_id(column, i);
-		}
-
-		if (i != BSSID_COLUMN && i != SSID_COLUMN && i != PROTECTION_COLUMN) {
-			/* Align all number columns */
-			g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL);
-		}
-		gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-		gtk_tree_view_column_set_resizable(column, TRUE);
-		gtk_tree_view_append_column(tree_view, column);
-
-		if (i == SSID_COLUMN) {
-			/* Sort the SSID column */
-			gtk_tree_view_column_clicked(column);
-		}
-	}
-
-	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(hs->table));
-	gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
-	g_signal_connect(sel, "changed", G_CALLBACK(wlan_select_cb), hs);
-
-	/* init a scrolled window for details */
-	frame = gtk_frame_new("Selected Network");
-	gtk_paned_pack2(GTK_PANED(wlanstat_pane), frame, FALSE, TRUE);
-	selected_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
-	gtk_container_add(GTK_CONTAINER(frame), selected_vb);
-	gtk_container_set_border_width(GTK_CONTAINER(selected_vb), 5);
-
-	scrolled_window = scrolled_window_new (NULL, NULL);
-	gtk_box_pack_start(GTK_BOX(selected_vb), scrolled_window, TRUE, TRUE, 0);
-	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window),
-					    GTK_SHADOW_IN);
-
-	store = gtk_list_store_new(NUM_DETAIL_COLUMNS, G_TYPE_STRING, G_TYPE_STRING,
-				   G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT,
-				   G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING,
-				   G_TYPE_FLOAT, G_TYPE_POINTER);
-	hs->details = GTK_TREE_VIEW(tree_view_new(GTK_TREE_MODEL(store)));
-	gtk_container_add(GTK_CONTAINER (scrolled_window), GTK_WIDGET(hs->details));
-	g_object_unref(G_OBJECT(store));
-
-	tree_view = hs->details;
-	gtk_tree_view_set_headers_visible(tree_view, TRUE);
-	gtk_tree_view_set_headers_clickable(tree_view, TRUE);
-
-	for (i = 0; i <= COMMENT_COLUMN; i++) {
-		if (i == PERCENT_2_COLUMN) {
-			/* XXX: "progess" rendering doesn't seem to work for Gtk3 ?? */
-			renderer = gtk_cell_renderer_progress_new();
-			column = gtk_tree_view_column_new_with_attributes(detail_titles[i], renderer,
-									  "text", i,
-									  "value", PERCENT_VALUE_2_COLUMN,
-									  NULL);
-			gtk_tree_view_column_set_expand(column, TRUE);
-			gtk_tree_view_column_set_sort_column_id(column, PERCENT_VALUE_2_COLUMN);
-		} else {
-			renderer = gtk_cell_renderer_text_new();
-			column = gtk_tree_view_column_new_with_attributes(detail_titles[i], renderer,
-									  "text", i,
-									  NULL);
-			gtk_tree_view_column_set_sort_column_id(column, i);
-		}
-
-		if (i != ADDRESS_COLUMN && i != COMMENT_COLUMN) {
-			/* Align all number columns */
-			g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL);
-		}
-		gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-		gtk_tree_view_column_set_resizable(column, TRUE);
-		gtk_tree_view_append_column(tree_view, column);
-
-		if (i == ADDRESS_COLUMN) {
-			/* Sort the Address column */
-			gtk_tree_view_column_clicked(column);
-		}
-	}
-
-	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(hs->table));
-	gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
-
-	/* create popup menu for this table */
-	wlan_create_popup_menu(hs);
-	wlan_details_create_popup_menu(hs);
-
-	error_string=register_tap_listener ("wlan", hs, NULL, 0,
-					    wlanstat_reset, wlanstat_packet,
-					    wlanstat_draw);
-	if (error_string) {
-		simple_dialog (ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str);
-		g_string_free (error_string, TRUE);
-		g_free (hs);
-		return;
-	}
-
-	hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-
-	resolv_cb = gtk_check_button_new_with_mnemonic("Name resolution");
-	gtk_box_pack_start(GTK_BOX(hbox), resolv_cb, FALSE, FALSE, 0);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(resolv_cb), TRUE);
-	gtk_widget_set_tooltip_text(resolv_cb, "Show results of name resolutions rather than the \"raw\" values. "
-			     "Please note: The corresponding name resolution must be enabled.");
-
-	g_signal_connect(resolv_cb, "toggled", G_CALLBACK(wlan_resolve_toggle_dest), hs);
-
-	filter_cb = gtk_check_button_new_with_mnemonic("Limit to display filter");
-	gtk_box_pack_start(GTK_BOX(hbox), filter_cb, FALSE, FALSE, 0);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(filter_cb), FALSE);
-	gtk_widget_set_tooltip_text(filter_cb, "Limit the list to entries matching the current display filter.");
-	g_signal_connect(filter_cb, "toggled", G_CALLBACK(wlan_filter_toggle_dest), hs);
-
-	existing_cb = gtk_check_button_new_with_mnemonic("Only show existing networks");
-	gtk_box_pack_start(GTK_BOX(hbox), existing_cb, FALSE, FALSE, 0);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(existing_cb), FALSE);
-	gtk_widget_set_tooltip_text(existing_cb, "This option disables probe requests for "
-			     "unknown networks.");
-	g_signal_connect(existing_cb, "toggled", G_CALLBACK(wlan_existing_toggle_dest), hs);
-
-	/* Button row. */
-	bbox = dlg_button_row_new (GTK_STOCK_CLOSE, GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
-
-	gtk_box_pack_end (GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
-
-	close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
-	window_set_cancel_button (wlanstat_dlg_w, close_bt, window_cancel_button_cb);
-
-	copy_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_COPY);
-/* 	gtk_button_set_label(GTK_BUTTON(copy_bt), "Copy Overview"); */
-	gtk_widget_set_tooltip_text(copy_bt,
-			     "Copy all statistical values of this page to the clipboard in CSV (Comma Separated Values) format.");
-	g_signal_connect(copy_bt, "clicked", G_CALLBACK(wlan_copy_as_csv), hs->table);
-
-	help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-	g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_WLAN_TRAFFIC_DIALOG);
-
-	g_signal_connect (wlanstat_dlg_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
-	g_signal_connect (wlanstat_dlg_w, "destroy", G_CALLBACK(win_destroy_cb), hs);
-
-	gtk_widget_show_all (wlanstat_dlg_w);
-	window_present (wlanstat_dlg_w);
-
-	cf_retap_packets (&cfile);
-	gdk_window_raise(gtk_widget_get_window(wlanstat_dlg_w));
+    wlanstat_t        *hs;
+    GString           *error_string;
+    GtkWidget         *scrolled_window;
+    GtkWidget         *bbox;
+    GtkWidget         *vbox;
+    GtkWidget         *hbox;
+    GtkWidget         *frame;
+    GtkWidget         *selected_vb;
+    GtkWidget         *resolv_cb;
+    GtkWidget         *filter_cb;
+    GtkWidget         *existing_cb;
+    GtkWidget         *close_bt;
+    GtkWidget         *help_bt;
+    GtkWidget         *copy_bt;
+    GtkListStore      *store;
+    GtkTreeView       *tree_view;
+    GtkCellRenderer   *renderer;
+    GtkTreeViewColumn *column;
+    GtkTreeSelection  *sel;
+    char *display_name;
+    char  title[256];
+    gint  i;
+
+    hs = g_malloc (sizeof(wlanstat_t));
+    hs->num_entries        = 0;
+    hs->ep_list            = NULL;
+    hs->number_of_packets  = 0;
+    hs->resolve_names      = TRUE;
+    hs->use_dfilter        = FALSE;
+    hs->show_only_existing = FALSE;
+
+    display_name = cf_get_display_name(&cfile);
+    g_snprintf (title, sizeof(title), "Wireshark: WLAN Traffic Statistics: %s",
+            display_name);
+    g_free(display_name);
+    wlanstat_dlg_w = window_new_with_geom (GTK_WINDOW_TOPLEVEL, title, "WLAN Statistics");
+    gtk_window_set_default_size (GTK_WINDOW(wlanstat_dlg_w), 750, 400);
+
+    vbox=ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 3, FALSE);
+    gtk_container_add(GTK_CONTAINER(wlanstat_dlg_w), vbox);
+    gtk_container_set_border_width (GTK_CONTAINER(vbox), 6);
+
+    wlanstat_pane = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
+    gtk_box_pack_start (GTK_BOX (vbox), wlanstat_pane, TRUE, TRUE, 0);
+    gtk_paned_set_position(GTK_PANED(wlanstat_pane), recent.gui_geometry_wlan_stats_pane);
+    gtk_widget_show(wlanstat_pane);
+
+    /* init a scrolled window for overview */
+    wlanstat_name_lb = gtk_frame_new("Network Overview");
+    gtk_paned_pack1(GTK_PANED(wlanstat_pane), wlanstat_name_lb, FALSE, TRUE);
+    selected_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
+    gtk_container_add(GTK_CONTAINER(wlanstat_name_lb), selected_vb);
+    gtk_container_set_border_width(GTK_CONTAINER(selected_vb), 5);
+
+    scrolled_window = scrolled_window_new (NULL, NULL);
+    gtk_box_pack_start(GTK_BOX(selected_vb), scrolled_window, TRUE, TRUE, 0);
+    gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window),
+                        GTK_SHADOW_IN);
+
+    store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
+                   G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT,
+                   G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT,
+                   G_TYPE_STRING, G_TYPE_FLOAT, G_TYPE_POINTER);
+    hs->table = GTK_TREE_VIEW(tree_view_new(GTK_TREE_MODEL(store)));
+    gtk_container_add(GTK_CONTAINER (scrolled_window), GTK_WIDGET(hs->table));
+    g_object_unref(G_OBJECT(store));
+
+    tree_view = hs->table;
+    gtk_tree_view_set_headers_visible(tree_view, TRUE);
+    gtk_tree_view_set_headers_clickable(tree_view, TRUE);
+
+    for (i = 0; i <= PROTECTION_COLUMN; i++) {
+        if (i == PERCENT_COLUMN) {
+            /* XXX: "progess" rendering doesn't seem to work for Gtk3 ?? */
+            renderer = gtk_cell_renderer_progress_new();
+            column = gtk_tree_view_column_new_with_attributes(titles[i], renderer,
+                                      "text", i,
+                                      "value", PERCENT_VALUE_COLUMN,
+                                      NULL);
+            gtk_tree_view_column_set_expand(column, TRUE);
+            gtk_tree_view_column_set_sort_column_id(column, PERCENT_VALUE_COLUMN);
+        } else {
+            renderer = gtk_cell_renderer_text_new();
+            column = gtk_tree_view_column_new_with_attributes(titles[i], renderer,
+                                      "text", i,
+                                      NULL);
+            gtk_tree_view_column_set_sort_column_id(column, i);
+        }
+
+        if (i != BSSID_COLUMN && i != SSID_COLUMN && i != PROTECTION_COLUMN) {
+            /* Align all number columns */
+            g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL);
+        }
+        gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+        gtk_tree_view_column_set_resizable(column, TRUE);
+        gtk_tree_view_append_column(tree_view, column);
+
+        if (i == SSID_COLUMN) {
+            /* Sort the SSID column */
+            gtk_tree_view_column_clicked(column);
+        }
+    }
+
+    sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(hs->table));
+    gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
+    g_signal_connect(sel, "changed", G_CALLBACK(wlan_select_cb), hs);
+
+    /* init a scrolled window for details */
+    frame = gtk_frame_new("Selected Network");
+    gtk_paned_pack2(GTK_PANED(wlanstat_pane), frame, FALSE, TRUE);
+    selected_vb = ws_gtk_box_new(GTK_ORIENTATION_VERTICAL, 0, FALSE);
+    gtk_container_add(GTK_CONTAINER(frame), selected_vb);
+    gtk_container_set_border_width(GTK_CONTAINER(selected_vb), 5);
+
+    scrolled_window = scrolled_window_new (NULL, NULL);
+    gtk_box_pack_start(GTK_BOX(selected_vb), scrolled_window, TRUE, TRUE, 0);
+    gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window),
+                        GTK_SHADOW_IN);
+
+    store = gtk_list_store_new(NUM_DETAIL_COLUMNS, G_TYPE_STRING, G_TYPE_STRING,
+                               G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT,
+                               G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING,
+                               G_TYPE_FLOAT, G_TYPE_POINTER);
+    hs->details = GTK_TREE_VIEW(tree_view_new(GTK_TREE_MODEL(store)));
+    gtk_container_add(GTK_CONTAINER (scrolled_window), GTK_WIDGET(hs->details));
+    g_object_unref(G_OBJECT(store));
+
+    tree_view = hs->details;
+    gtk_tree_view_set_headers_visible(tree_view, TRUE);
+    gtk_tree_view_set_headers_clickable(tree_view, TRUE);
+
+    for (i = 0; i <= COMMENT_COLUMN; i++) {
+        if (i == PERCENT_2_COLUMN) {
+            /* XXX: "progess" rendering doesn't seem to work for Gtk3 ?? */
+            renderer = gtk_cell_renderer_progress_new();
+            column = gtk_tree_view_column_new_with_attributes(detail_titles[i], renderer,
+                                      "text", i,
+                                      "value", PERCENT_VALUE_2_COLUMN,
+                                      NULL);
+            gtk_tree_view_column_set_expand(column, TRUE);
+            gtk_tree_view_column_set_sort_column_id(column, PERCENT_VALUE_2_COLUMN);
+        } else {
+            renderer = gtk_cell_renderer_text_new();
+            column = gtk_tree_view_column_new_with_attributes(detail_titles[i], renderer,
+                                      "text", i,
+                                      NULL);
+            gtk_tree_view_column_set_sort_column_id(column, i);
+        }
+
+        if (i != ADDRESS_COLUMN && i != COMMENT_COLUMN) {
+            /* Align all number columns */
+            g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL);
+        }
+        gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+        gtk_tree_view_column_set_resizable(column, TRUE);
+        gtk_tree_view_append_column(tree_view, column);
+
+        if (i == ADDRESS_COLUMN) {
+            /* Sort the Address column */
+            gtk_tree_view_column_clicked(column);
+        }
+    }
+
+    sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(hs->table));
+    gtk_tree_selection_set_mode(sel, GTK_SELECTION_SINGLE);
+
+    /* create popup menu for this table */
+    wlan_create_popup_menu(hs);
+    wlan_details_create_popup_menu(hs);
+
+    error_string=register_tap_listener ("wlan", hs, NULL, 0,
+                        wlanstat_reset, wlanstat_packet,
+                        wlanstat_draw);
+    if (error_string) {
+        simple_dialog (ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str);
+        g_string_free (error_string, TRUE);
+        g_free (hs);
+        return;
+    }
+
+    hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 3, FALSE);
+    gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+
+    resolv_cb = gtk_check_button_new_with_mnemonic("Name resolution");
+    gtk_box_pack_start(GTK_BOX(hbox), resolv_cb, FALSE, FALSE, 0);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(resolv_cb), TRUE);
+    gtk_widget_set_tooltip_text(resolv_cb, "Show results of name resolutions rather than the \"raw\" values. "
+                 "Please note: The corresponding name resolution must be enabled.");
+
+    g_signal_connect(resolv_cb, "toggled", G_CALLBACK(wlan_resolve_toggle_dest), hs);
+
+    filter_cb = gtk_check_button_new_with_mnemonic("Limit to display filter");
+    gtk_box_pack_start(GTK_BOX(hbox), filter_cb, FALSE, FALSE, 0);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(filter_cb), FALSE);
+    gtk_widget_set_tooltip_text(filter_cb, "Limit the list to entries matching the current display filter.");
+    g_signal_connect(filter_cb, "toggled", G_CALLBACK(wlan_filter_toggle_dest), hs);
+
+    existing_cb = gtk_check_button_new_with_mnemonic("Only show existing networks");
+    gtk_box_pack_start(GTK_BOX(hbox), existing_cb, FALSE, FALSE, 0);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(existing_cb), FALSE);
+    gtk_widget_set_tooltip_text(existing_cb, "This option disables probe requests for "
+                 "unknown networks.");
+    g_signal_connect(existing_cb, "toggled", G_CALLBACK(wlan_existing_toggle_dest), hs);
+
+    /* Button row. */
+    bbox = dlg_button_row_new (GTK_STOCK_CLOSE, GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
+
+    gtk_box_pack_end (GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
+
+    close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
+    window_set_cancel_button (wlanstat_dlg_w, close_bt, window_cancel_button_cb);
+
+    copy_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_COPY);
+/*  gtk_button_set_label(GTK_BUTTON(copy_bt), "Copy Overview"); */
+    gtk_widget_set_tooltip_text(copy_bt,
+                 "Copy all statistical values of this page to the clipboard in CSV (Comma Separated Values) format.");
+    g_signal_connect(copy_bt, "clicked", G_CALLBACK(wlan_copy_as_csv), hs->table);
+
+    help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+    g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_WLAN_TRAFFIC_DIALOG);
+
+    g_signal_connect (wlanstat_dlg_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
+    g_signal_connect (wlanstat_dlg_w, "destroy", G_CALLBACK(win_destroy_cb), hs);
+
+    gtk_widget_show_all (wlanstat_dlg_w);
+    window_present (wlanstat_dlg_w);
+
+    cf_retap_packets (&cfile);
+    gdk_window_raise(gtk_widget_get_window(wlanstat_dlg_w));
 }
 
 void
 wlanstat_launch (GtkAction *action _U_, gpointer user_data _U_)
 {
-	if (wlanstat_dlg_w) {
-		reactivate_window(wlanstat_dlg_w);
-	} else {
-		wlanstat_dlg_create ();
-	}
+    if (wlanstat_dlg_w) {
+        reactivate_window(wlanstat_dlg_w);
+    } else {
+        wlanstat_dlg_create ();
+    }
 }
 
 void
 register_tap_listener_wlanstat (void)
 {
-	static const unsigned char src[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+    static const unsigned char src[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
-	SET_ADDRESS(&broadcast, AT_ETHER, 6, src);
+    SET_ADDRESS(&broadcast, AT_ETHER, 6, src);
 }