osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Generate the filter using _ws.expert.message instead of expert.message 

Bug: 11073
Change-Id: Ie98d52561b7aebe6875392cf3efeb22adb2ac499
Reviewed-on: https://code.wireshark.org/review/7813
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Michael Mann 2015-03-24 21:27:31 -04:00 committed by Anders Broman
parent 083f6b6e6d
commit 9a9413f9f4
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui/gtk/expert_comp_table.c
View File

@ -217,7 +217,7 @@ error_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint call
case ACTYPE_SELECTED:
/* if no expert item was passed */
if (procedure->fvalue_value==NULL) {
g_snprintf(str, sizeof(str), "expert.message==%s", msg);
g_snprintf(str, sizeof(str), "_ws.expert.message==%s", msg);
}
else
{
@ -228,7 +228,7 @@ error_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint call
case ACTYPE_NOT_SELECTED:
/* if no expert item was passed */
if (procedure->fvalue_value==NULL) {
g_snprintf(str, sizeof(str), "!(expert.message==%s)", msg);
g_snprintf(str, sizeof(str), "!(_ws.expert.message==%s)", msg);
}
else
{
@ -239,27 +239,27 @@ error_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint call
/* the remaining cases will only exist if the expert item exists so no need to check */
case ACTYPE_AND_SELECTED:
if ((!current_filter) || (0 == strlen(current_filter)))
g_snprintf(str, sizeof(str), "expert.message==%s", msg);
g_snprintf(str, sizeof(str), "_ws.expert.message==%s", msg);
else
g_snprintf(str, sizeof(str), "(%s) && (expert.message==%s)", current_filter, msg);
g_snprintf(str, sizeof(str), "(%s) && (_ws.expert.message==%s)", current_filter, msg);
break;
case ACTYPE_OR_SELECTED:
if ((!current_filter) || (0 == strlen(current_filter)))
g_snprintf(str, sizeof(str), "expert.message==%s", msg);
g_snprintf(str, sizeof(str), "_ws.expert.message==%s", msg);
else
g_snprintf(str, sizeof(str), "(%s) || (expert.message==%s)", current_filter, msg);
g_snprintf(str, sizeof(str), "(%s) || (_ws.expert.message==%s)", current_filter, msg);
break;
case ACTYPE_AND_NOT_SELECTED:
if ((!current_filter) || (0 == strlen(current_filter)))
g_snprintf(str, sizeof(str), "!(expert.message==%s)", msg);
g_snprintf(str, sizeof(str), "!(_ws.expert.message==%s)", msg);
else
g_snprintf(str, sizeof(str), "(%s) && !(expert.message==%s)", current_filter, msg);
g_snprintf(str, sizeof(str), "(%s) && !(_ws.expert.message==%s)", current_filter, msg);
break;
case ACTYPE_OR_NOT_SELECTED:
if ((!current_filter) || (0 == strlen(current_filter)))
g_snprintf(str, sizeof(str), "!(expert.message==%s)", msg);
g_snprintf(str, sizeof(str), "!(_ws.expert.message==%s)", msg);
else
g_snprintf(str, sizeof(str), "(%s) || !(expert.message==%s)", current_filter, msg);
g_snprintf(str, sizeof(str), "(%s) || !(_ws.expert.message==%s)", current_filter, msg);
break;
default:
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Can't find menu type - %u", type);