2009-02-10 [holger] 3.7.0cvs57

	* src/printing.c
	* src/common/defs.h
		Move filename define for printing page setup cache to defs.h

diff --git a/ChangeLog b/ChangeLog
index 64c63a0ba9ef53fc1951809f30e1438db82e47c8..e6bd62a3867986b895f05d5f524d82a67a6f131b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-10 [holger]    3.7.0cvs57
+
+       * src/printing.c
+       * src/common/defs.h
+               Move filename define for printing page setup cache to defs.h
+

 2009-02-08 [mones]     3.7.0cvs56
 
        * src/matcher.h
 2009-02-08 [mones]     3.7.0cvs56
 
        * src/matcher.h

diff --git a/PATCHSETS b/PATCHSETS
index a1a0973276705e759957a45560826a14df4c458d..c912fc69ce12de8bbf5f8aada90079f9bc5d0708 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3718,3 +3718,4 @@
 ( cvs diff -u -r 1.274.2.297 -r 1.274.2.298 src/mainwindow.c;  ) > 3.7.0cvs54.patchset
 ( cvs diff -u -r 1.204.2.185 -r 1.204.2.186 src/prefs_common.c;  cvs diff -u -r 1.103.2.121 -r 1.103.2.122 src/prefs_common.h;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/printing.c;  ) > 3.7.0cvs55.patchset
 ( cvs diff -u -r 1.39.2.16 -r 1.39.2.17 src/matcher.h;  ) > 3.7.0cvs56.patchset
 ( cvs diff -u -r 1.274.2.297 -r 1.274.2.298 src/mainwindow.c;  ) > 3.7.0cvs54.patchset
 ( cvs diff -u -r 1.204.2.185 -r 1.204.2.186 src/prefs_common.c;  cvs diff -u -r 1.103.2.121 -r 1.103.2.122 src/prefs_common.h;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/printing.c;  ) > 3.7.0cvs55.patchset
 ( cvs diff -u -r 1.39.2.16 -r 1.39.2.17 src/matcher.h;  ) > 3.7.0cvs56.patchset

+( cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/printing.c;  cvs diff -u -r 1.9.2.48 -r 1.9.2.49 src/common/defs.h;  ) > 3.7.0cvs57.patchset

diff --git a/configure.ac b/configure.ac
index abf30d04f73536920e1ef598bba344c0e56d2ad7..c3bcca8e75ceab527bba7195b045f004d6124d17 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=56
+EXTRA_VERSION=57

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/defs.h b/src/common/defs.h
index e7b315ce9526e8e200b8568cc6344a92658f3d24..93925923bb25780d3ff4fb515ec781becf32a747 100644 (file)
--- a/src/common/defs.h
+++ b/src/common/defs.h
@@ -100,6 +100,7 @@
 #define OLD_MARK_FILE          ".sylpheed_mark"
 #define MARK_FILE              ".claws_mark"
 #define TAGS_FILE              ".claws_tags"
 #define OLD_MARK_FILE          ".sylpheed_mark"
 #define MARK_FILE              ".claws_mark"
 #define TAGS_FILE              ".claws_tags"

+#define PRINTING_PAGE_SETUP_STORAGE_FILE "print_page_setup"

 #define CACHE_VERSION          24
 #define MARK_VERSION           2
 #define TAGS_VERSION           1
 #define CACHE_VERSION          24
 #define MARK_VERSION           2
 #define TAGS_VERSION           1

diff --git a/src/printing.c b/src/printing.c
index d5c389adeec94f17f0daac2a1b1d3b58bd6b8576..a6e09453ce8652b6d2edc6b0cc278fbd66b87d86 100644 (file)
--- a/src/printing.c
+++ b/src/printing.c
@@ -21,6 +21,8 @@
 #  include "config.h"
 #endif
 
 #  include "config.h"
 #endif
 

+#include "defs.h"
+

 #include "printing.h"
 #include "image_viewer.h"
 
 #include "printing.h"
 #include "image_viewer.h"
 


@@ -116,7 +118,6 @@ static void     printing_layout_set_text_attributes(PrintData*, GtkPrintContext
 static gboolean printing_is_pango_gdk_color_equal(PangoColor*, GdkColor*); 
 static gint     printing_text_iter_get_offset_bytes(PrintData *, const GtkTextIter*);
 
 static gboolean printing_is_pango_gdk_color_equal(PangoColor*, GdkColor*); 
 static gint     printing_text_iter_get_offset_bytes(PrintData *, const GtkTextIter*);
 

-#define PAGE_SETUP_STORAGE_FILE "print_page_setup"

 #define PAGE_MARGIN_STORAGE_UNIT GTK_UNIT_MM
 #define PREVIEW_SCALE 72
 #define PREVIEW_SHADOW_OFFSET 3
 #define PAGE_MARGIN_STORAGE_UNIT GTK_UNIT_MM
 #define PREVIEW_SCALE 72
 #define PREVIEW_SHADOW_OFFSET 3


@@ -188,7 +189,7 @@ GtkPageSetup *printing_get_page_setup(void)
 
 #if GTK_CHECK_VERSION(2,14,0)
     /* try reading the page setup from file */
 
 #if GTK_CHECK_VERSION(2,14,0)
     /* try reading the page setup from file */

-    page_setup_filename = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, PAGE_SETUP_STORAGE_FILE, NULL);
+    page_setup_filename = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, PRINTING_PAGE_SETUP_STORAGE_FILE, NULL);

     keyfile = g_key_file_new();
     key_file_read = g_key_file_load_from_file(keyfile, page_setup_filename, 0, NULL);
     g_free(page_setup_filename);
     keyfile = g_key_file_new();
     key_file_read = g_key_file_load_from_file(keyfile, page_setup_filename, 0, NULL);
     g_free(page_setup_filename);


@@ -363,7 +364,7 @@ void printing_page_setup(GtkWindow *parent)
 
 #if GTK_CHECK_VERSION(2,14,0)
   /* save to file */
 
 #if GTK_CHECK_VERSION(2,14,0)
   /* save to file */

-    keyfile = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, PAGE_SETUP_STORAGE_FILE, NULL);
+    keyfile = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, PRINTING_PAGE_SETUP_STORAGE_FILE, NULL);

     if(!gtk_page_setup_to_file(page_setup, keyfile, NULL)) {
       debug_print("Printing: Could not store page setup in file `%s'\n", keyfile);
     }
     if(!gtk_page_setup_to_file(page_setup, keyfile, NULL)) {
       debug_print("Printing: Could not store page setup in file `%s'\n", keyfile);
     }