diff options
| -rw-r--r-- | epan/dissectors/packet-mbtcp.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-vlan.c | 2 | ||||
| -rw-r--r-- | epan/prefs.c | 4 | ||||
| -rw-r--r-- | ui/gtk/prefs_dlg.c | 7 |
4 files changed, 11 insertions, 4 deletions
diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c index df97f6b26d..4a71d352d7 100644 --- a/epan/dissectors/packet-mbtcp.c +++ b/epan/dissectors/packet-mbtcp.c @@ -2041,7 +2041,7 @@ proto_register_modbus(void) "Register Format", &global_mbus_register_format, mbus_register_format, - TRUE); + FALSE); /* Obsolete Preferences */ prefs_register_obsolete_preference(mbtcp_module, "mbus_register_addr_type"); diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c index 76aedfeaa9..e9c6b55119 100644 --- a/epan/dissectors/packet-vlan.c +++ b/epan/dissectors/packet-vlan.c @@ -421,7 +421,7 @@ proto_register_vlan(void) prefs_register_enum_preference(vlan_module, "priority_drop", "Priorities and drop eligibility", "Number of priorities supported, and number of those drop eligible (not used for 802.1Q-1998)", - &vlan_priority_drop, priority_drop_vals, TRUE); + &vlan_priority_drop, priority_drop_vals, FALSE); vlan_handle = create_dissector_handle(dissect_vlan, proto_vlan); } diff --git a/epan/prefs.c b/epan/prefs.c index d834601a6a..ed7bea648a 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -1207,6 +1207,10 @@ gboolean prefs_get_bool_value(pref_t *pref, pref_source_t source) /* * Register a preference with an enumerated value. */ +/* + * XXX Should we get rid of the radio_buttons parameter and make that + * behavior automatic depending on the number of items? + */ void prefs_register_enum_preference(module_t *module, const char *name, const char *title, const char *description, diff --git a/ui/gtk/prefs_dlg.c b/ui/gtk/prefs_dlg.c index f4dc581482..0437a2b4f8 100644 --- a/ui/gtk/prefs_dlg.c +++ b/ui/gtk/prefs_dlg.c @@ -898,10 +898,13 @@ create_preference_static_text(GtkWidget *main_grid, int grid_position, { GtkWidget *label; - if (label_text != NULL) + if (label_text != NULL) { label = gtk_label_new(label_text); - else + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); + gtk_label_set_width_chars (GTK_LABEL (label), 80); + } else { label = gtk_label_new(""); + } ws_gtk_grid_attach_defaults(GTK_GRID(main_grid), label, 0, grid_position, 2, 1); if (tooltip_text != NULL) gtk_widget_set_tooltip_text(label, tooltip_text); |