diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2006-02-11 23:35:31 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2006-02-11 23:35:31 +0000 |
| commit | 6bb67a351066b4be18f44e63c4c1c231402c0114 (patch) | |
| tree | be8d9735ac370464715aac3aa1c5e57d8a24cde8 /gtk/font_utils.c | |
| parent | cf94760fa4a1de9fdb1aa5a3152516699bceaf45 (diff) | |
| download | wireshark-6bb67a351066b4be18f44e63c4c1c231402c0114.tar.gz wireshark-6bb67a351066b4be18f44e63c4c1c231402c0114.tar.bz2 wireshark-6bb67a351066b4be18f44e63c4c1c231402c0114.zip | |
font_init don't need to know if running as a capture_child, this will simply no longer happen.
svn path=/trunk/; revision=17257
Diffstat (limited to 'gtk/font_utils.c')
| -rw-r--r-- | gtk/font_utils.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/gtk/font_utils.c b/gtk/font_utils.c index 6954d53415..9aeda13b90 100644 --- a/gtk/font_utils.c +++ b/gtk/font_utils.c @@ -711,11 +711,7 @@ static void try_to_get_windows_font_gtk2(void) #endif /* _WIN32 */ -void font_init(gboolean capture_child -#ifndef HAVE_LIBPCAP - _U_ -#endif -) +void font_init(void) { #if GTK_MAJOR_VERSION < 2 gchar *bold_font_name; @@ -736,18 +732,12 @@ void font_init(gboolean capture_child if (m_r_font == NULL || m_b_font == NULL) { /* XXX - pop this up as a dialog box? no */ if (m_r_font == NULL) { -#ifdef HAVE_LIBPCAP - if (!capture_child) -#endif fprintf(stderr, "ethereal: Warning: font %s not found - defaulting to 6x13 and 6x13bold\n", prefs.gui_font_name1); } else { gdk_font_unref(m_r_font); } if (m_b_font == NULL) { -#ifdef HAVE_LIBPCAP - if (!capture_child) -#endif fprintf(stderr, "ethereal: Warning: font %s not found - defaulting to 6x13 and 6x13bold\n", bold_font_name); } else { @@ -772,18 +762,12 @@ void font_init(gboolean capture_child if (m_r_font == NULL || m_b_font == NULL) { /* XXX - pop this up as a dialog box? no */ if (m_r_font == NULL) { -#ifdef HAVE_LIBPCAP - if (!capture_child) -#endif fprintf(stderr, "ethereal: Warning: font %s not found - defaulting to Monospace 9\n", prefs.gui_font_name2); } else { pango_font_description_free(m_r_font); } if (m_b_font == NULL) { -#ifdef HAVE_LIBPCAP - if (!capture_child) -#endif fprintf(stderr, "ethereal: Warning: bold font %s not found - defaulting" " to Monospace 9\n", prefs.gui_font_name2); } else { |