talons

commit fd506f340be7784b59afa03f1230761f8d51278a
parent 31f451b98746c2bc27fbba75a44f965f2d0ecab1
Author: Colin Leroy <colin@colino.net>
Date:   Fri,  6 Mar 2009 09:18:16 +0000

2009-03-06 [colin]	3.7.1cvs1

	* src/gedit-print.c
	* src/gtk/gtksourceprintjob.c
		Fix build with old print interface

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gedit-print.c
 | 
2
+-
M
src/gtk/gtksourceprintjob.c
 | 
1
+

5 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-06 [colin]	3.7.1cvs1
+
+	* src/gedit-print.c
+	* src/gtk/gtksourceprintjob.c
+		Fix build with old print interface
+
 2009-03-06 [paul]	3.7.1
 
 	* NEWS
diff --git a/PATCHSETS b/PATCHSETS
@@ -3740,3 +3740,4 @@
 ( cvs diff -u -r 1.179.2.243 -r 1.179.2.244 src/imap.c;  ) > 3.7.0cvs76.patchset
 ( cvs diff -u -r 1.59.2.78 -r 1.59.2.79 src/prefs_filtering.c;  ) > 3.7.0cvs77.patchset
 ( cvs diff -u -r 1.9.2.14 -r 1.9.2.15 po/cs.po;  cvs diff -u -r 1.58.2.42 -r 1.58.2.43 po/de.po;  cvs diff -u -r 1.1.2.21 -r 1.1.2.22 po/fi.po;  cvs diff -u -r 1.42.2.45 -r 1.42.2.46 po/fr.po;  cvs diff -u -r 1.5.2.12 -r 1.5.2.13 po/hu.po;  cvs diff -u -r 1.28.2.12 -r 1.28.2.13 po/nl.po;  cvs diff -u -r 1.50.2.34 -r 1.50.2.35 po/pt_BR.po;  cvs diff -u -r 1.4.2.10 -r 1.4.2.11 po/sv.po;  cvs diff -u -r 1.5.2.28 -r 1.5.2.29 po/zh_CN.po;  ) > 3.7.0cvs78.patchset
+( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/gedit-print.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/gtk/gtksourceprintjob.c;  ) > 3.7.1cvs1.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=0
+EXTRA_VERSION=1
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gedit-print.c b/src/gedit-print.c
@@ -171,7 +171,7 @@ gedit_print_dialog_response (GtkWidget *dialog, int response, GeditPrintJobInfo 
 		break;
 
 	default:
-		cm_return_if_reached ();
+		g_return_if_reached ();
 	}
 
 	switch (response)
diff --git a/src/gtk/gtksourceprintjob.c b/src/gtk/gtksourceprintjob.c
@@ -35,6 +35,7 @@
 
 #include "gtksourceprintjob.h"
 #include "image_viewer.h"
+#include "utils.h"
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>