2006-09-13 [wwp] 2.4.0cvs180

	* src/prefs_common.c
		fix broken font entry in prefs (patch issued by the gpg4win team,
		probably by Marcus Brinkmann <marcus@g10code.de>).

diff --git a/ChangeLog b/ChangeLog
index b9f4a2c91eaf7ba3dec39a5223b8414514b7ea70..6ea9d1634b5596e5cdbfd3f13343a92df6a2db66 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-13 [wwp]       2.4.0cvs180
+
+       * src/prefs_common.c
+               fix broken font entry in prefs (patch issued by the gpg4win team,
+               probably by Marcus Brinkmann <marcus@g10code.de>).
+
 2006-09-13 [colin]     2.4.0cvs179
 
        * src/folder.h

diff --git a/PATCHSETS b/PATCHSETS
index 8919c94387e6af0ca5325d82deca3245f5fc9796..16788ee051f13a768ef35e2e0f58af08c9b5bbea 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1871,3 +1871,4 @@
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/fr/addrbook.xml;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 manual/fr/handling.xml;  ) > 2.4.0cvs177.patchset
 ( cvs diff -u -r 1.60.2.41 -r 1.60.2.42 src/prefs_actions.c;  cvs diff -u -r 1.1.4.29 -r 1.1.4.30 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.46 -r 1.43.2.47 src/prefs_matcher.c;  ) > 2.4.0cvs178.patchset
 ( cvs diff -u -r 1.87.2.29 -r 1.87.2.30 src/folder.h;  cvs diff -u -r 1.274.2.149 -r 1.274.2.150 src/mainwindow.c;  cvs diff -u -r 1.395.2.247 -r 1.395.2.248 src/summaryview.c;  cvs diff -u -r 1.68.2.25 -r 1.68.2.26 src/summaryview.h;  ) > 2.4.0cvs179.patchset
+( cvs diff -u -r 1.204.2.100 -r 1.204.2.101 src/prefs_common.c;  ) > 2.4.0cvs180.patchset

diff --git a/configure.ac b/configure.ac
index 22f6576fa002d934b90468e29c3b1bae02eccfa7..b22e9fc55af0dbad2362cc36d366fcead97afbf2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=179
+EXTRA_VERSION=180
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_common.c b/src/prefs_common.c
index e28d2b96dfb2478462c0a7a0f081d3fcfe4a2b5a..ad91aa1726464cd90867bc504a666dbcf46127c2 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -95,8 +95,8 @@ static PrefParam param_os_specific[] = {
          &prefs_common.widgetfont,             P_STRING, NULL, NULL, NULL},
        {"message_font_gtk2",   "Monospace 9",
         &prefs_common.textfont,                P_STRING, NULL, NULL, NULL},
-        {"print_font_gtk2",     "Monospace 9"
-         &prefs_common.printfont
+       {"print_font_gtk2",     "Monospace 9",
+        &prefs_common.printfont,               P_STRING, NULL, NULL, NULL},
        {"small_font_gtk2",     "Sans 9",
          &prefs_common.smallfont,              P_STRING, NULL, NULL, NULL},
        {"normal_font_gtk2",    "Sans 9",