2010-02-09 [colin] 3.7.5cvs11

[claws.git] / src / prefs_fonts.c

diff --git a/src/prefs_fonts.c b/src/prefs_fonts.c
index e08dec78c43f58726e53dd48f400a8fa534ad880..263d344069b703b5d850f76983754ea484c40abe 100644 (file)
--- a/src/prefs_fonts.c
+++ b/src/prefs_fonts.c
@@ -47,10 +47,8 @@ typedef struct _FontsPage
        GtkWidget *entry_folderview_boldfont;
        GtkWidget *entry_messageviewfont;
        GtkWidget *derive_from_normalfont_checkbutton;
-#if defined(USE_GNOMEPRINT) || GTK_CHECK_VERSION(2,10,0)
        GtkWidget *print_checkbutton;
        GtkWidget *entry_messageprintfont;
-#endif
 } FontsPage;
 
 static void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window, 
@@ -64,10 +62,8 @@ static void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *entry_folderview_boldfont;
        GtkWidget *entry_messageviewfont;
        GtkWidget *tmplabel;
-#if defined(USE_GNOMEPRINT) || GTK_CHECK_VERSION(2,10,0)
        GtkWidget *entry_messageprintfont;
        GtkWidget *print_checkbutton;
-#endif
        GtkWidget *derive_from_normalfont_checkbutton;
        GtkWidget *vbox;
        gint      row = 0;
@@ -179,7 +175,6 @@ static void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
        SET_TOGGLE_SENSITIVITY_REVERSE (derive_from_normalfont_checkbutton, entry_folderview_boldfont);
        row++;
 
-#if defined(USE_GNOMEPRINT) || GTK_CHECK_VERSION(2,10,0)
        /* print check button */
        print_checkbutton = gtk_check_button_new_with_label(_("Use different font for printing"));
        gtk_widget_show(print_checkbutton);
@@ -211,7 +206,6 @@ static void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
                         (GtkAttachOptions) (0), 0, 0);
        SET_TOGGLE_SENSITIVITY (print_checkbutton, entry_messageprintfont);
        row++;
-#endif
 
        prefs_fonts->window                     = GTK_WIDGET(window);
        prefs_fonts->entry_folderview_smallfont = entry_folderview_smallfont;
@@ -219,10 +213,8 @@ static void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
        prefs_fonts->entry_folderview_boldfont   = entry_folderview_boldfont;
        prefs_fonts->entry_messageviewfont      = entry_messageviewfont;
        prefs_fonts->derive_from_normalfont_checkbutton = derive_from_normalfont_checkbutton;
-#if defined(USE_GNOMEPRINT) || GTK_CHECK_VERSION(2,10,0)
        prefs_fonts->entry_messageprintfont     = entry_messageprintfont;
        prefs_fonts->print_checkbutton          = print_checkbutton;
-#endif
 
        prefs_fonts->page.widget = table;
 }
@@ -250,13 +242,11 @@ static void prefs_fonts_save(PrefsPage *_page)
        prefs_common.derive_from_normal_font = gtk_toggle_button_get_active
                        (GTK_TOGGLE_BUTTON(fonts->derive_from_normalfont_checkbutton));
 
-#if defined(USE_GNOMEPRINT) || GTK_CHECK_VERSION(2,10,0)
        g_free(prefs_common.printfont);         
        prefs_common.printfont   = g_strdup(gtk_font_button_get_font_name
                (GTK_FONT_BUTTON(fonts->entry_messageprintfont)));
        prefs_common.use_different_print_font = gtk_toggle_button_get_active
                        (GTK_TOGGLE_BUTTON(fonts->print_checkbutton));
-#endif
 
        main_window_reflect_prefs_all();
 }