diff options
| author | Dario Lombardo <lomato@gmail.com> | 2016-05-03 18:40:17 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-17 15:38:03 +0000 |
| commit | 2e9f3c5d366eaa7139fc877b5301392166b3f985 (patch) | |
| tree | ac2d04b7cc1b8d6c8962d437584e351fcf1bf450 /ui/gtk/conversations_table.c | |
| parent | 2aa55a387a87cd4f740aea661ca1ca535cd2e392 (diff) | |
tap: change glib functions to wmem.
Change-Id: I878ae6b121a669f9b7f4e1e57bc079f0cb44c0bf
Reviewed-on: https://code.wireshark.org/review/15270
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/gtk/conversations_table.c')
| -rw-r--r-- | ui/gtk/conversations_table.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c index 7fc02e2eb0..4927220aa5 100644 --- a/ui/gtk/conversations_table.c +++ b/ui/gtk/conversations_table.c @@ -70,7 +70,7 @@ reset_ct_table_data(conversations_table *ct) { char *display_name; char title[256]; - GString *error_string; + gchar *error_string; const char *filter; GtkListStore *store; @@ -82,8 +82,8 @@ reset_ct_table_data(conversations_table *ct) error_string = set_tap_dfilter (&ct->hash, filter); if (error_string) { - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); - g_string_free(error_string, TRUE); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string); + wmem_free(NULL, error_string); return; } @@ -1925,7 +1925,7 @@ init_ct_table_page(conversations_table *conversations, GtkWidget *vbox, gboolean tap_packet_cb packet_func) { int i; - GString *error_string; + gchar *error_string; char title[256]; GtkListStore *store; @@ -2059,8 +2059,8 @@ init_ct_table_page(conversations_table *conversations, GtkWidget *vbox, gboolean error_string=register_tap_listener(tap_name, &conversations->hash, filter, 0, reset_ct_table_data_cb, packet_func, draw_ct_table_data_cb); if(error_string){ - simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string->str); - g_string_free(error_string, TRUE); + simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "%s", error_string); + wmem_free(NULL, error_string); return FALSE; } |