[gtk+/gtk-2-18] Fix declaration of gtk_print_job_set_status
- From: Matthias Clasen <matthiasc src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-18] Fix declaration of gtk_print_job_set_status
- Date: Sat, 13 Feb 2010 00:35:00 +0000 (UTC)
commit 1d4c18e9c464f4008fef69f6e02d7f74f597677f
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Jan 17 23:47:20 2010 -0500
Fix declaration of gtk_print_job_set_status
The problem was reported in bug 606698.
(cherry picked from commit 5e7801a304b4dd6c5955762e3f6ddc0678e93edd)
gtk/gtk.symbols | 9 ++++++++-
gtk/gtkcustompaperunixdialog.c | 1 -
gtk/gtkpagesetupunixdialog.c | 1 -
gtk/gtkprintbackend.c | 1 -
gtk/gtkprintoperation-unix.c | 1 -
5 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 841780b..d875960 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -3001,7 +3001,6 @@ gtk_print_job_get_settings
gtk_print_job_get_printer
gtk_print_job_get_title
gtk_print_job_get_status
-gtk_print_job_set_status
gtk_print_job_set_source_file
gtk_print_job_get_surface
gtk_print_job_send
@@ -3011,6 +3010,14 @@ gtk_print_job_get_track_print_status
#endif
#endif
+#if IN_HEADER(__GTK_PRINTER_PRIVATE_H__)
+#if IN_FILE(__GTK_PRINT_JOB_C__)
+#ifdef G_OS_UNIX
+gtk_print_job_set_status
+#endif
+#endif
+#endif
+
#if IN_HEADER(__GTK_PRINT_OPERATION_H__)
#if IN_FILE(__GTK_PRINT_OPERATION_C__)
gtk_print_error_quark
diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c
index 9006eab..e4093e6 100644
--- a/gtk/gtkcustompaperunixdialog.c
+++ b/gtk/gtkcustompaperunixdialog.c
@@ -39,7 +39,6 @@
#include "gtkcustompaperunixdialog.h"
#include "gtkprintbackend.h"
#include "gtkprintutils.h"
-#include "gtkprinter-private.h"
#include "gtkalias.h"
#define CUSTOM_PAPER_FILENAME ".gtk-custom-papers"
diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c
index 1e90339..6cc2989 100644
--- a/gtk/gtkpagesetupunixdialog.c
+++ b/gtk/gtkpagesetupunixdialog.c
@@ -52,7 +52,6 @@
#include "gtkpagesetupunixdialog.h"
#include "gtkcustompaperunixdialog.h"
#include "gtkprintbackend.h"
-#include "gtkprinter-private.h"
#include "gtkpapersize.h"
#include "gtkprintutils.h"
#include "gtkalias.h"
diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c
index 3c64823..dc2d06d 100644
--- a/gtk/gtkprintbackend.c
+++ b/gtk/gtkprintbackend.c
@@ -28,7 +28,6 @@
#include "gtkmarshalers.h"
#include "gtkprivate.h"
#include "gtkprintbackend.h"
-#include "gtkprinter-private.h"
#include "gtkalias.h"
#define GTK_PRINT_BACKEND_GET_PRIVATE(o) \
diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c
index 64b3a38..62e930a 100644
--- a/gtk/gtkprintoperation-unix.c
+++ b/gtk/gtkprintoperation-unix.c
@@ -41,7 +41,6 @@
#include "gtkpagesetupunixdialog.h"
#include "gtkprintbackend.h"
#include "gtkprinter.h"
-#include "gtkprinter-private.h"
#include "gtkprintjob.h"
#include "gtklabel.h"
#include "gtkintl.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]