From de20526d72a22a08eae910859567d991f49abf6b Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Wed, 26 Oct 2005 18:43:29 +0000 Subject: [PATCH] 2005-10-26 [paul] 1.9.15cvs112 * src/prefs_message.c give all display_xface stuff the #if HAVE_LIBCOMPFACE treatment, thus preventing a crash (Thanks to Wolfgang Enderlein) --- ChangeLog-gtk2.claws | 8 ++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/prefs_message.c | 18 +++++++++++++++--- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index f02efbc01..49cef9b8d 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,11 @@ +2005-10-26 [paul] 1.9.15cvs112 + + * src/prefs_message.c + give all display_xface stuff the + #if HAVE_LIBCOMPFACE treatment, thus + preventing a crash + (Thanks to Wolfgang Enderlein) + 2005-10-26 [colin] 1.9.15cvs111 * src/gedit-print.c diff --git a/PATCHSETS b/PATCHSETS index aa99b35df..fc1a4905a 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -948,3 +948,4 @@ ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/Makefile; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/faq.xml; diff -u /dev/null manual/dtd/manual.dsl; ) > 1.9.15cvs109.patchset ( cvs diff -u -r 1.213.2.66 -r 1.213.2.67 src/folder.c; cvs diff -u -r 1.11.2.2 -r 1.11.2.3 src/manual.c; cvs diff -u -r 1.395.2.141 -r 1.395.2.142 src/summaryview.c; ) > 1.9.15cvs110.patchset ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gedit-print.c; cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/imap_gtk.c; cvs diff -u -r 1.18.2.13 -r 1.18.2.14 src/jpilot.c; cvs diff -u -r 1.115.2.62 -r 1.115.2.63 src/main.c; cvs diff -u -r 1.274.2.76 -r 1.274.2.77 src/mainwindow.c; cvs diff -u -r 1.2.2.11 -r 1.2.2.12 src/news_gtk.c; ) > 1.9.15cvs111.patchset +( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_message.c; ) > 1.9.15cvs112.patchset diff --git a/configure.ac b/configure.ac index a210cc96a..57a076137 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=15 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=111 +EXTRA_VERSION=112 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_message.c b/src/prefs_message.c index 824ecf23c..91d5138fa 100644 --- a/src/prefs_message.c +++ b/src/prefs_message.c @@ -49,7 +49,9 @@ typedef struct _MessagePage GtkWidget *chkbtn_mbalnum; GtkWidget *chkbtn_disphdrpane; GtkWidget *chkbtn_disphdr; +#if HAVE_LIBCOMPFACE GtkWidget *chkbtn_dispxface; +#endif GtkWidget *chkbtn_html; GtkWidget *spinbtn_linespc; @@ -60,6 +62,7 @@ typedef struct _MessagePage GtkWidget *chkbtn_attach_desc; } MessagePage; +#if HAVE_LIBCOMPFACE static void disphdr_pane_toggled(GtkToggleButton *toggle_btn, GtkWidget *widget) { gboolean is_active; @@ -68,7 +71,7 @@ static void disphdr_pane_toggled(GtkToggleButton *toggle_btn, GtkWidget *widget) gtk_widget_set_sensitive(widget, !is_active); } - +#endif void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window, gpointer data) @@ -82,7 +85,9 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window, GtkWidget *chkbtn_mbalnum; GtkWidget *chkbtn_disphdrpane; GtkWidget *chkbtn_disphdr; +#if HAVE_LIBCOMPFACE GtkWidget *chkbtn_dispxface; +#endif GtkWidget *button_edit_disphdr; GtkWidget *chkbtn_html; GtkWidget *hbox_linespc; @@ -122,12 +127,13 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window, #if HAVE_LIBCOMPFACE PACK_CHECK_BUTTON(vbox2, chkbtn_dispxface, _("Display X-Face in message view")); -#endif + gtk_widget_set_sensitive(chkbtn_dispxface, !prefs_common.display_header_pane); - + g_signal_connect(G_OBJECT(chkbtn_disphdrpane), "toggled", G_CALLBACK(disphdr_pane_toggled), chkbtn_dispxface); +#endif hbox1 = gtk_hbox_new (FALSE, 8); gtk_widget_show (hbox1); @@ -228,8 +234,10 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window, prefs_common.conv_mb_alnum); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_disphdrpane), prefs_common.display_header_pane); +#if HAVE_LIBCOMPFACE gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_dispxface), prefs_common.display_xface); +#endif gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_disphdr), prefs_common.display_header); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_html), @@ -248,7 +256,9 @@ void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window, prefs_message->window = GTK_WIDGET(window); prefs_message->chkbtn_mbalnum = chkbtn_mbalnum; prefs_message->chkbtn_disphdrpane = chkbtn_disphdrpane; +#if HAVE_LIBCOMPFACE prefs_message->chkbtn_dispxface = chkbtn_dispxface; +#endif prefs_message->chkbtn_disphdr = chkbtn_disphdr; prefs_message->chkbtn_html = chkbtn_html; prefs_message->spinbtn_linespc = spinbtn_linespc; @@ -268,8 +278,10 @@ void prefs_message_save(PrefsPage *_page) GTK_TOGGLE_BUTTON(page->chkbtn_mbalnum)); prefs_common.display_header_pane = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(page->chkbtn_disphdrpane)); +#if HAVE_LIBCOMPFACE prefs_common.display_xface = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(page->chkbtn_dispxface)); +#endif prefs_common.display_header = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(page->chkbtn_disphdr)); prefs_common.render_html = gtk_toggle_button_get_active( -- 2.25.1