diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-19 11:01:56 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-19 10:47:10 +0000 |
| commit | a383e692c8774c2451a55d8b3f8ef9db5d037329 (patch) | |
| tree | ab6223527915ab1127a50563981816adc18b971f /ui/gtk/wlan_stat_dlg.c | |
| parent | ff845123f1f1ecef0d8e0d8980e6e9d7267e5f6b (diff) | |
| download | wireshark-a383e692c8774c2451a55d8b3f8ef9db5d037329.tar.gz | |
Revert "tap: change glib functions to wmem."
This reverts commit 2e9f3c5d366eaa7139fc877b5301392166b3f985.
It breaks the registration of codec, dissector and libwiretap plugins.
Change-Id: I4ef91dd192f765adf87ea9fe9f3693e25dbd24de
Reviewed-on: https://code.wireshark.org/review/16012
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'ui/gtk/wlan_stat_dlg.c')
| -rw-r--r-- | ui/gtk/wlan_stat_dlg.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c index ec23d36cd4..9cd9b86181 100644 --- a/ui/gtk/wlan_stat_dlg.c +++ b/ui/gtk/wlan_stat_dlg.c @@ -158,7 +158,7 @@ wlanstat_reset (void *phs) wlan_ep_t *list = wlan_stat->ep_list; char *display_name; char title[256]; - gchar *error_string; + GString *error_string; GtkListStore *store; const char *filter = NULL; @@ -176,8 +176,8 @@ wlanstat_reset (void *phs) error_string = set_tap_dfilter (wlan_stat, filter); if (error_string) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string); - wmem_free(NULL, error_string); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); + g_string_free(error_string, TRUE); return; } @@ -1745,7 +1745,7 @@ static void wlanstat_dlg_create (void) { wlanstat_t *hs; - gchar *error_string; + GString *error_string; GtkWidget *scrolled_window; GtkWidget *bbox; GtkWidget *vbox; @@ -1918,8 +1918,8 @@ wlanstat_dlg_create (void) wlanstat_reset, wlanstat_packet, wlanstat_draw); if (error_string) { - simple_dialog (ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string); - wmem_free(NULL, error_string); + simple_dialog (ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); + g_string_free (error_string, TRUE); g_free (hs); return; } |