[dia] Remove GTK_CHECK_VERSION checks up to 2.10.0.



commit bd6491e67b5ff4682d0528600db0cc43f55a2887
Author: Adam Buchbinder <adam buchbinder gmail com>
Date:   Tue Jul 28 16:11:39 2009 -0400

    Remove GTK_CHECK_VERSION checks up to 2.10.0.
    
    We can do this because configure.in currently assumes >=2.12.
    
    Signed-off-by: Hans Breuer <hans breuer org>

 plug-ins/cairo/diacairo-print.c |    4 ----
 plug-ins/cairo/diacairo-print.h |    2 --
 plug-ins/cairo/diacairo.c       |   12 ------------
 3 files changed, 0 insertions(+), 18 deletions(-)
---
diff --git a/plug-ins/cairo/diacairo-print.c b/plug-ins/cairo/diacairo-print.c
index 11dab78..ecaac72 100644
--- a/plug-ins/cairo/diacairo-print.c
+++ b/plug-ins/cairo/diacairo-print.c
@@ -24,8 +24,6 @@
 
 #include "message.h"
 
-#if GTK_CHECK_VERSION (2,10,0)
-
 typedef struct _PrintData
 {
   DiagramData *data;
@@ -237,5 +235,3 @@ cairo_print_callback (DiagramData *data,
     g_error_free (error);
   }
 }
-
-#endif /* Gtk+ 2.10 */
diff --git a/plug-ins/cairo/diacairo-print.h b/plug-ins/cairo/diacairo-print.h
index ae8f4b9..ffce88e 100644
--- a/plug-ins/cairo/diacairo-print.h
+++ b/plug-ins/cairo/diacairo-print.h
@@ -1,7 +1,6 @@
 
 #include <gtk/gtkversion.h>
 
-#if GTK_CHECK_VERSION(2,10,0)
 #include <gtk/gtkprintoperation.h>
 #include "diagramdata.h"
 
@@ -14,4 +13,3 @@ cairo_print_callback (DiagramData *dia,
                       const gchar *filename,
                       guint flags, /* further additions */
                       void *user_data);
-#endif
diff --git a/plug-ins/cairo/diacairo.c b/plug-ins/cairo/diacairo.c
index 2a2e042..bb81588 100644
--- a/plug-ins/cairo/diacairo.c
+++ b/plug-ins/cairo/diacairo.c
@@ -313,7 +313,6 @@ export_print_data (DiagramData *data, const gchar *filename_utf8,
                    const gchar *diafilename, void* user_data)
 {
   OutputKind kind = (OutputKind)user_data;
-#if GTK_CHECK_VERSION (2,10,0)
   GtkPrintOperation *op = create_print_operation (data, filename_utf8);
   GtkPrintOperationResult res;
   GError *error = NULL;
@@ -334,9 +333,6 @@ export_print_data (DiagramData *data, const gchar *filename_utf8,
     message_error (error->message);
     g_error_free (error);
   }
-#else
-  message_error (_("Printing with Gtk+(cairo) requires at least version 2.10."));
-#endif
 }
 
 #ifdef CAIRO_HAS_PS_SURFACE
@@ -355,11 +351,7 @@ static const gchar *pdf_extensions[] = { "pdf", NULL };
 static DiaExportFilter pdf_export_filter = {
     N_("Cairo Portable Document Format"),
     pdf_extensions,
-# if GTK_CHECK_VERSION (2,10,0)
     export_print_data,
-# else
-    export_data,
-# endif
     (void*)OUTPUT_PDF,
     "cairo-pdf"
 };
@@ -448,7 +440,6 @@ static DiaCallbackFilter cb_clipboard = {
 };
 #endif
 
-#if GTK_CHECK_VERSION (2,10,0)
 static DiaCallbackFilter cb_gtk_print = {
     "FilePrintGTK",
     N_("Print (GTK) ..."),
@@ -456,7 +447,6 @@ static DiaCallbackFilter cb_gtk_print = {
     cairo_print_callback,
     (void*)OUTPUT_PDF
 };
-#endif
 
 static gboolean
 _plugin_can_unload (PluginInfo *info)
@@ -532,9 +522,7 @@ dia_plugin_init(PluginInfo *info)
   filter_register_export(&cb_export_filter);
 #endif
 
-#if GTK_CHECK_VERSION (2,10,0)
   filter_register_callback (&cb_gtk_print);
-#endif
   
   return DIA_PLUGIN_INIT_OK;
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]