From Balint Reczey:

When saving preferences, wireshark saves the description of each preference in 
a one line comment. Unfortunately if the description consists of several lines,
wireshark comments out only the fist one.
The attached patch solves the problem by commenting out every lines in the
description.

svn path=/trunk/; revision=25756
This commit is contained in:
Jaap Keuter 2008-07-16 18:09:24 +00:00
parent 52deed8edc
commit 47c276da54
1 changed files with 16 additions and 1 deletions

View File

@ -2472,6 +2472,8 @@ write_pref(gpointer data, gpointer user_data)
write_pref_arg_t *arg = user_data;
const enum_val_t *enum_valp;
const char *val_string;
gchar **desc_lines;
int i;
if (pref->type == PREF_OBSOLETE) {
/*
@ -2483,7 +2485,20 @@ write_pref(gpointer data, gpointer user_data)
return;
}
fprintf(arg->pf, "\n# %s\n", pref->description);
/*
* Make multiple line descriptions appear as
* multiple commented lines in prefs file.
*/
if (g_ascii_strncasecmp(pref->description,"", 2) != 0) {
desc_lines = g_strsplit(pref->description,"\n",0);
for (i = 0; desc_lines[i] != NULL; ++i) {
fprintf(arg->pf, "\n# %s", desc_lines[i]);
}
fprintf(arg->pf, "\n");
g_strfreev(desc_lines);
} else {
fprintf(arg->pf, "\n# No description\n");
}
switch (pref->type) {