From: Colin Leroy <colin@colino.net>
Date: Mon, 26 Jul 2004 16:21:12 +0000 (+0000)
Subject: maybe fix 551
X-Git-Tag: gtk2_win32_last_merge~283
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=8b3906da9f13db4bd3dbd438b52e34671ae27b6b;ds=sidebyside

maybe fix 551
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 7f16af559..a20ae3d3c 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-07-26 [colin]	0.9.12cvs33.24
+
+	* src/alertpanel.c
+		Maybe fix 551 (Truncated font in alert window)
+
 2004-07-26 [colin]	0.9.12cvs33.23
 
 	* po/de.po
diff --git a/PATCHSETS b/PATCHSETS
index 8a8663152..cc1af63f4 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -77,3 +77,4 @@
 ( cvs diff -u -r 1.382.2.33 -r 1.382.2.34 src/compose.c; cvs diff -u -r 1.9.2.6 -r 1.9.2.7 src/gtk/gtkaspell.c; cvs diff -u -r 1.5.2.1 -r 1.5.2.2 src/gtk/gtkaspell.h; ) > 0.9.12cvs33.21.patchset
 ( cvs diff -u -r 1.382.2.34 -r 1.382.2.35 src/compose.c; ) > 0.9.12cvs33.22.patchset
 ( cvs diff -u -r 1.58.2.2 -r 1.58.2.3 po/de.po; cvs diff -u -r 1.60.2.2 -r 1.60.2.3 po/es.po; cvs diff -u -r 1.42.2.2 -r 1.42.2.3 po/fr.po; cvs diff -u -r 1.34 -r 1.35 po/it.po; cvs diff -u -r 1.16.2.1 -r 1.16.2.2 po/ja.po; cvs diff -u -r 1.10.2.2 -r 1.10.2.3 po/pl.po; cvs diff -u -r 1.17 -r 1.18 po/ru.po; cvs diff -u -r 1.2.2.2 -r 1.2.2.3 po/sk.po; cvs diff -u -r 1.17.2.2 -r 1.17.2.3 po/sr.po; cvs diff -u -r 1.5.2.2 -r 1.5.2.3 po/zh_CN.po; ) > 0.9.12cvs33.23.patchset
+( cvs diff -u -r 1.17.2.2 -r 1.17.2.3 src/alertpanel.c; ) > 0.9.12cvs33.24.patchset
diff --git a/configure.ac b/configure.ac
index 25e4e2299..4484c1038 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=33
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.23
+EXTRA_GTK2_VERSION=.24
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
diff --git a/src/alertpanel.c b/src/alertpanel.c
index 8fd030f6e..e44b6e603 100644
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -39,7 +39,7 @@
 #define TITLE_HEIGHT		72
 #define MESSAGE_HEIGHT		62
 
-#define DEFAULT_TITLE_FONT	"Helvetica 16"
+#define DEFAULT_TITLE_FONT	"Sans Bold 12"
 
 static gboolean alertpanel_is_open = FALSE;
 static AlertValue value;
@@ -259,7 +259,6 @@ static void alertpanel_create(const gchar *title,
 	/* pixmapwid = create_pixmapwid(dialog, GNUstep_xpm); */
 	/* gtk_box_pack_start(GTK_BOX(hbox), pixmapwid, FALSE, FALSE, 16); */
 	label = gtk_label_new(title);
-	gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 16);
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 	if (!font_desc) {
 		gchar *fontstr = prefs_common.titlefont
@@ -270,6 +269,7 @@ static void alertpanel_create(const gchar *title,
 	if (font_desc) {
 		gtk_widget_modify_font (label, font_desc);
 	}
+	gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 16);
 
 	/* for message and button(s) */
 	vbox = gtk_vbox_new(FALSE, 0);