commit 02b500086274d52f43a703da17d09a1fcc5112f8
parent 3f749c5a919f805f7470786ff8ae87830922ebea
Author: Colin Leroy <colin@colino.net>
Date: Wed, 24 Sep 2008 06:50:47 +0000
2008-09-24 [colin] 3.5.0cvs125
* src/main.c
* src/wizard.c
Integrate better with Windows' style
Diffstat:
5 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-24 [colin] 3.5.0cvs125
+
+ * src/main.c
+ * src/wizard.c
+ Integrate better with Windows' style
+
2008-09-23 [paul] 3.5.0cvs124
* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3536,3 +3536,4 @@
( cvs diff -u -r 1.61.2.87 -r 1.61.2.88 src/account.c; cvs diff -u -r 1.382.2.478 -r 1.382.2.479 src/compose.c; cvs diff -u -r 1.179.2.229 -r 1.179.2.230 src/imap.c; cvs diff -u -r 1.83.2.143 -r 1.83.2.144 src/mimeview.c; cvs diff -u -r 1.101.2.55 -r 1.101.2.56 src/news.c; cvs diff -u -r 1.36.2.147 -r 1.36.2.148 src/common/utils.c; ) > 3.5.0cvs122.patchset
( cvs diff -u -r 1.654.2.3596 -r 1.654.2.3597 configure.ac; cvs diff -u -r 1.60.2.46 -r 1.60.2.47 src/filtering.c; cvs diff -u -r 1.274.2.273 -r 1.274.2.274 src/mainwindow.c; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/prefs_logging.c; cvs diff -u -r 1.36.2.148 -r 1.36.2.149 src/common/utils.c; cvs diff -u -r 1.1.2.52 -r 1.1.2.53 src/plugins/pgpcore/sgpgme.c; diff -u /dev/null src/plugins/smime/claws.def; ) > 3.5.0cvs123.patchset
( cvs diff -u -r 1.382.2.479 -r 1.382.2.480 src/compose.c; cvs diff -u -r 1.274.2.274 -r 1.274.2.275 src/mainwindow.c; cvs diff -u -r 1.94.2.187 -r 1.94.2.188 src/messageview.c; ) > 3.5.0cvs124.patchset
+( cvs diff -u -r 1.115.2.206 -r 1.115.2.207 src/main.c; cvs diff -u -r 1.1.2.75 -r 1.1.2.76 src/wizard.c; ) > 3.5.0cvs125.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=124
+EXTRA_VERSION=125
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/main.c b/src/main.c
@@ -1121,6 +1121,13 @@ int main(int argc, char *argv[])
gtk_set_locale();
gtk_init(&argc, &argv);
+#ifdef G_OS_WIN32
+ gtk_settings_set_string_property(gtk_settings_get_default(),
+ "gtk-theme-name",
+ "MS-Windows",
+ "XProperty");
+#endif
+
#ifdef HAVE_NETWORKMANAGER_SUPPORT
went_offline_nm = FALSE;
nm_proxy = NULL;
diff --git a/src/wizard.c b/src/wizard.c
@@ -452,7 +452,20 @@ static void initialize_fonts(WizardWindow *wizard)
widget->style->font_desc)
/PANGO_SCALE;
gchar *tmp, *new;
-
+#ifdef G_OS_WIN32
+ PangoFontDescription *bold_desc;
+ gchar *curfont = pango_font_description_to_string(widget->style->font_desc);
+ g_free(prefs_common.smallfont);
+ g_free(prefs_common.normalfont);
+ g_free(prefs_common.boldfont);
+ prefs_common.smallfont = g_strdup(curfont);
+ prefs_common.normalfont = g_strdup(curfont);
+ bold_desc = pango_font_description_from_string(curfont);
+ pango_font_description_set_weight(bold_desc, PANGO_WEIGHT_BOLD);
+ prefs_common.boldfont = pango_font_description_to_string(bold_desc);
+ pango_font_description_free(bold_desc);
+ g_free(curfont);
+#endif
tmp = g_strdup(prefs_common.textfont);
if (strrchr(tmp, ' ')) {
*(strrchr(tmp, ' ')) = '\0';
