2011-10-22 [colin] 3.7.10cvs42

	* src/printing.c
	* src/gtk/gtkshruler.c
	* src/gtk/gtkutils.h
		Fix GTK+2.16 build

diff --git a/ChangeLog b/ChangeLog
index 2041ddf587846ffe07965755a0aae8aabb493a8b..dac156ed3a9e90840911bb74b6e857d1cda8c8c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-22 [colin]     3.7.10cvs42
+
+       * src/printing.c
+       * src/gtk/gtkshruler.c
+       * src/gtk/gtkutils.h
+               Fix GTK+2.16 build
+
 2011-10-22 [colin]     3.7.10cvs41
 
        * src/account.c

diff --git a/PATCHSETS b/PATCHSETS
index 0b18f9428587ffc7d39da1f8ba0b1b2863400bfc..75fc2319474e64cbee875e83667322a0e033d606 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4245,3 +4245,4 @@
 ( cvs diff -u -r 1.100.2.80 -r 1.100.2.81 AUTHORS;  cvs diff -u -r 1.12.2.23 -r 1.12.2.24 src/ldif.c;  cvs diff -u -r 1.1.2.74 -r 1.1.2.75 src/gtk/authors.h;  ) > 3.7.10cvs39.patchset
 ( cvs diff -u -r 1.4.2.61 -r 1.4.2.62 src/gtk/gtkutils.h;  cvs diff -u -r 1.654.2.4320 -r 1.654.2.4321 configure.ac;  ) > 3.7.10cvs40.patchset
 ( cvs diff -u -r 1.61.2.100 -r 1.61.2.101 src/account.c;  cvs diff -u -r 1.27.2.57 -r 1.27.2.58 src/addr_compl.c;  cvs diff -u -r 1.5.10.35 -r 1.5.10.36 src/addrgather.c;  cvs diff -u -r 1.382.2.586 -r 1.382.2.587 src/compose.c;  cvs diff -u -r 1.8.2.42 -r 1.8.2.43 src/editldap.c;  cvs diff -u -r 1.1.4.34 -r 1.1.4.35 src/expldifdlg.c;  cvs diff -u -r 1.207.2.222 -r 1.207.2.223 src/folderview.c;  cvs diff -u -r 1.14.2.30 -r 1.14.2.31 src/grouplistdialog.c;  cvs diff -u -r 1.8.2.33 -r 1.8.2.34 src/headerview.c;  cvs diff -u -r 1.14.2.27 -r 1.14.2.28 src/importldif.c;  cvs diff -u -r 1.115.2.242 -r 1.115.2.243 src/main.c;  cvs diff -u -r 1.274.2.331 -r 1.274.2.332 src/mainwindow.c;  cvs diff -u -r 1.83.2.173 -r 1.83.2.174 src/mimeview.c;  cvs diff -u -r 1.5.2.26 -r 1.5.2.27 src/noticeview.c;  cvs diff -u -r 1.105.2.169 -r 1.105.2.170 src/prefs_account.c;  cvs diff -u -r 1.60.2.74 -r 1.60.2.75 src/prefs_actions.c;  cvs diff -u -r 1.3.2.26 -r 1.3.2.27 src/prefs_ext_prog.c;  cvs diff -u -r 1.59.2.83 -r 1.59.2.84 src/prefs_filtering.c;  cvs diff -u -r 1.52.2.84 -r 1.52.2.85 src/prefs_folder_item.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_image_viewer.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_logging.c;  cvs diff -u -r 1.1.2.45 -r 1.1.2.46 src/prefs_msg_colors.c;  cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/prefs_other.c;  cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/prefs_send.c;  cvs diff -u -r 1.5.2.42 -r 1.5.2.43 src/prefs_spelling.c;  cvs diff -u -r 1.1.2.68 -r 1.1.2.69 src/prefs_summaries.c;  cvs diff -u -r 1.12.2.76 -r 1.12.2.77 src/prefs_template.c;  cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/printing.c;  cvs diff -u -r 1.8.2.44 -r 1.8.2.45 src/quote_fmt.c;  cvs diff -u -r 1.17.2.60 -r 1.17.2.61 src/send_message.c;  cvs diff -u -r 1.5.2.30 -r 1.5.2.31 src/statusbar.c;  cvs diff -u -r 1.15.2.67 -r 1.15.2.68 src/summary_search.c;  cvs diff -u -r 1.395.2.432 -r 1.395.2.433 src/summaryview.c;  cvs diff -u -r 1.1.2.85 -r 1.1.2.86 src/wizard.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/gtkcmoptionmenu.c;  cvs diff -u -r 1.1.4.61 -r 1.1.4.62 src/gtk/gtksctree.c;  cvs diff -u -r 1.5.2.99 -r 1.5.2.100 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.62 -r 1.4.2.63 src/gtk/gtkutils.h;  cvs diff -u -r 1.5.2.22 -r 1.5.2.23 src/gtk/gtkvscrollbutton.c;  cvs diff -u -r 1.2.2.44 -r 1.2.2.45 src/gtk/inputdialog.c;  cvs diff -u -r 1.5.2.60 -r 1.5.2.61 src/gtk/pluginwindow.c;  cvs diff -u -r 1.1.2.105 -r 1.1.2.106 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/spell_entry.c;  cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.5.2.26 -r 1.5.2.27 src/plugins/dillo_viewer/dillo_prefs.c;  cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.23.2.56 -r 1.23.2.57 src/plugins/spamassassin/spamassassin_gtk.c;  cvs diff -u -r 1.14.2.78 -r 1.14.2.79 src/plugins/trayicon/trayicon.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/trayicon/trayicon_prefs.c;  ) > 3.7.10cvs41.patchset
+( cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/printing.c;  cvs diff -u -r 1.1.4.20 -r 1.1.4.21 src/gtk/gtkshruler.c;  cvs diff -u -r 1.4.2.63 -r 1.4.2.64 src/gtk/gtkutils.h;  ) > 3.7.10cvs42.patchset

diff --git a/configure.ac b/configure.ac
index 4061d07e05ab2233796f9c8f18ba4bda1fb04624..50f4d452ad87bcf65f3da741f75204f9ecdb92c3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=41
+EXTRA_VERSION=42
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkshruler.c b/src/gtk/gtkshruler.c
index 39fbe39e8650b121024646d1973bf6f18b28f375..4c8ef06d43bc9720a7896898e873bb8673abf6cc 100644 (file)
--- a/src/gtk/gtkshruler.c
+++ b/src/gtk/gtkshruler.c
@@ -23,6 +23,7 @@
 
 #include <gtk/gtk.h>
 
+#include "gtkutils.h"
 #include "gtkshruler.h"
 #include "gtkunit.h"
 
@@ -263,7 +264,7 @@ gtk_shruler_init (GtkSHRuler *ruler)
 {
   GtkSHRulerPrivate *priv = GTK_SHRULER_GET_PRIVATE (ruler);
 
-  gtk_widget_set_has_window (GTK_WIDGET (ruler), FALSE);
+  gtkut_widget_set_has_window (GTK_WIDGET (ruler), FALSE);
 
   priv->orientation   = GTK_ORIENTATION_HORIZONTAL;
   priv->unit          = GTK_PIXELS;

diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h
index 68f6de23ccba8204e681a097ae08a6c83e2f0e5d..fbc073dea7afa1aeb94bbdeb7ea724689d2ee60b 100644 (file)
--- a/src/gtk/gtkutils.h
+++ b/src/gtk/gtkutils.h
@@ -238,6 +238,8 @@ claws_input_add    (gint          source,
 #define gtk_widget_get_mapped(x) (GTK_WIDGET_MAPPED(x))
 #endif
 #if !GTK_CHECK_VERSION(2,18,0)
+#define gtk_widget_get_allocation(x,a) (*(a) = (x)->allocation)
+#define gtk_widget_set_allocation(x,a) ((x)->allocation = *(a))
 #define gtk_widget_has_focus(x) (GTK_WIDGET_HAS_FOCUS(x))
 #define gtk_widget_get_can_focus(x) (GTK_WIDGET_CAN_FOCUS(x))
 #define gtk_widget_has_grab(x) (GTK_WIDGET_HAS_GRAB(x))
@@ -250,5 +252,11 @@ claws_input_add    (gint         source,
 #define gtk_widget_get_mapped(x) (GTK_WIDGET_MAPPED(x))
 #define gtk_widget_get_has_window(x) (!(GTK_WIDGET_NO_WINDOW(x)))
 #define gtk_widget_get_app_paintable(x) (GTK_WIDGET_APP_PAINTABLE(x))
+#define gtk_widget_set_window(x,w) {                   \
+       if ((x)->window != w) {                         \
+               (x)->window = w;                        \
+               g_object_notify (G_OBJECT(x), "window");\
+       }                                               \
+}
 #endif
 #endif /* __GTKUTILS_H__ */

diff --git a/src/printing.c b/src/printing.c
index d8e9fd05f95be7057953fc538c8586077c9bd8c1..29ba0803714e0e0a97c28efcb9c2f55fab0ffa5a 100644 (file)
--- a/src/printing.c
+++ b/src/printing.c
@@ -276,9 +276,10 @@ void printing_print_full(GtkWindow *parent, PrintRenderer *renderer, gpointer re
        /* Config for printing */
        gtk_print_operation_set_print_settings(op, settings);
        gtk_print_operation_set_default_page_setup(op, page_setup);
+#if GTK_CHECK_VERSION(2,18,0)
         /* enable Page Size and Orientation in the print dialog */
        gtk_print_operation_set_embed_page_setup(op, TRUE);
-
+#endif
        /* signals */
        g_signal_connect(op, "begin_print", G_CALLBACK(renderer->cb_begin_print), print_data);
        g_signal_connect(op, "draw_page", G_CALLBACK(renderer->cb_draw_page), print_data);