summaryrefslogtreecommitdiff
path: root/epan/prefs.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-07-25 23:49:47 +0000
committerGerald Combs <gerald@wireshark.org>2013-07-25 23:49:47 +0000
commita05f55bffc2bc7d52d3f35370a7ae1eea2b75839 (patch)
tree94644ff0a3cc6cf339a165087ddbfb0c1e553760 /epan/prefs.c
parent7d73903af6209ef1b013c6ed61c866291bfb3785 (diff)
downloadwireshark-a05f55bffc2bc7d52d3f35370a7ae1eea2b75839.tar.gz
Add a UAT dialog. Make UAT preferences uat_t * instead of void *.
C++-ize the UAT headers. Add an ElidedLabel widget. Use it in the File Set, Profile, and UAT dialogs. Update the Qt README. svn path=/trunk/; revision=50896
Diffstat (limited to 'epan/prefs.c')
-rw-r--r--epan/prefs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/prefs.c b/epan/prefs.c
index 05e69af418..cb39e50256 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -1077,7 +1077,7 @@ prefs_register_static_text_preference(module_t *module, const char *name,
extern void
prefs_register_uat_preference(module_t *module, const char *name,
const char *title, const char *description,
- void* uat)
+ uat_t* uat)
{
pref_t* preference = register_preference(module, name, title, description, PREF_UAT);
@@ -4407,7 +4407,7 @@ prefs_pref_to_str(pref_t *pref, pref_source_t source) {
case PREF_UAT:
{
- uat_t *uat = (uat_t *) pref->varp.uat;
+ uat_t *uat = pref->varp.uat;
if (uat && uat->filename)
return g_strdup_printf("[Managed in the file \"%s\"]", uat->filename);
else