diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-01-24 01:10:12 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-01-24 01:10:12 +0000 |
| commit | 2dff8d760594661114615366c7cb51133fec0c10 (patch) | |
| tree | d71608abb24be34d21cac0900d64a6ed01142af1 /ui/gtk/main.c | |
| parent | 70755ffa17fc454b4e32c5c586ebbddda0e482e4 (diff) | |
Add font and color preferences. Unfortunately Qt doesn't have a color
picker widget so we're back to popping up dialogs. Move the contents of
monospace_font.{cpp,h} to wireshark_application.{cpp,h}.
Pango and Qt use completely different string representations for fonts.
Add a separate gui.qt.font_name preference so that they don't clobber
each other.
svn path=/trunk/; revision=47240
Diffstat (limited to 'ui/gtk/main.c')
| -rw-r--r-- | ui/gtk/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gtk/main.c b/ui/gtk/main.c index f6608deb22..dd6214eb9f 100644 --- a/ui/gtk/main.c +++ b/ui/gtk/main.c @@ -2663,8 +2663,8 @@ main(int argc, char *argv[]) #endif break; case 'm': /* Fixed-width font for the display */ - g_free(prefs_p->gui_font_name); - prefs_p->gui_font_name = g_strdup(optarg); + g_free(prefs_p->gui_gtk2_font_name); + prefs_p->gui_gtk2_font_name = g_strdup(optarg); break; case 'n': /* No name resolution */ gbl_resolv_flags.mac_name = FALSE; |