diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2007-05-04 11:28:01 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2007-05-04 11:28:01 +0000 |
| commit | 639b32aeee5a82e083f38b768e0d6c7b615bd5f6 (patch) | |
| tree | 1a14f6b067839da1b4b609e39cdb46d97171875d /gtk/main.c | |
| parent | 742a43f941a594839a914f40a576f6237b79cda8 (diff) | |
Spare the filter compilation and filter list handling on clear display filter.
svn path=/trunk/; revision=21681
Diffstat (limited to 'gtk/main.c')
| -rw-r--r-- | gtk/main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk/main.c b/gtk/main.c index 96560cd45c..bb28615f62 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -603,15 +603,15 @@ main_filter_packets(capture_file *cf, const gchar *dftext, gboolean force) char *s; cf_status_t cf_status; - /* we'll crash later on if dftext is NULL */ - g_assert(dftext != NULL); - s = g_strdup(dftext); + cf_status = cf_filter_packets(cf, s, force); + if (!s) + return (cf_status == CF_OK); + /* GtkCombos don't let us get at their list contents easily, so we maintain our own filter list, and feed it to gtk_combo_set_popdown_strings when a new filter is added. */ - cf_status = cf_filter_packets(cf, s, force); if (cf_status == CF_OK) { li = g_list_first(dfilter_list); while (li) { @@ -661,7 +661,7 @@ filter_reset_cb(GtkWidget *w, gpointer data _U_) if ((filter_te = OBJECT_GET_DATA(w, E_DFILTER_TE_KEY))) { gtk_entry_set_text(GTK_ENTRY(filter_te), ""); } - main_filter_packets(&cfile, "", FALSE); + main_filter_packets(&cfile, NULL, FALSE); } /* mark as reference time frame */ |