Changes to compile with gtk3 and libgda5.

diff --git a/configure.ac b/configure.ac
index 2a04c6bf439e8c5eff9a9bec484367ef9c05f682..34981e2bf0a88e1fbbbb2aa1dc05fa44ea99861b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([libreptool], [0.2.2], [azagli@libero.it])
+AC_INIT([libreptool], [0.5.0], [azagli@libero.it])
 AC_CONFIG_SRCDIR([src/rptprint.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -36,9 +36,9 @@ dnl ******************************
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
 # Checks for libraries.
-PKG_CHECK_MODULES([REPTOOL], [gtk+-2.0 >= 2.10.0
+PKG_CHECK_MODULES([REPTOOL], [gtk+-3.0 >= 3.0.0
                               libxml-2.0 >= 2.6.0
-                              libgda-4.0 >= 4.0.0])
+                              libgda-5.0 >= 5.0.0])
 
 AC_SUBST(REPTOOL_CFLAGS)
 AC_SUBST(REPTOOL_LIBS)

diff --git a/libreptool.pc.in b/libreptool.pc.in
index 258e83c159475cd5f7c845f7e0a2489fa0352928..487406466932dfa03214ac4dfa58c8394603d59f 100644 (file)
--- a/libreptool.pc.in
+++ b/libreptool.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: @PACKAGE_NAME@
 Description: Library to manage RepTool files
 Version: @PACKAGE_VERSION@
-Requires: glib-2.0 gobject-2.0 libxml-2.0 libgda-4.0
+Requires: gtk+-3.0 libxml-2.0 libgda-5.0
 Libs: -L${libdir} -lreptool
 Cflags: -I${includedir}
 

diff --git a/src/rptcommon.h b/src/rptcommon.h
index 5fd860956a32be9ac45e4e4f6800da968a644574..a422be81d13f2632d3f0a9fdc50fd29ca8fb118d 100644 (file)
--- a/src/rptcommon.h
+++ b/src/rptcommon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2007-2013 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,7 +21,7 @@
 #define __RPT_COMMON_H__
 
 #include <glib.h>
-#include <gdk/gdkcolor.h>
+#include <gdk/gdk.h>
 #include <libxml/tree.h>
 
 #include <pango/pango-attributes.h>

diff --git a/tests/creation.c b/tests/creation.c
index 7f05ab167ea08e3c13543a527a38dc7680fd9a71..a4bc4f432d5ccdf7c14631072155928d0f3bb35a 100644 (file)
--- a/tests/creation.c
+++ b/tests/creation.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 Andrea Zagli <azagli@inwind.it>
+ * Copyright (C) 2007-2013 Andrea Zagli <azagli@libero.it>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,8 +36,6 @@ main (int argc, char **argv)
        RptStroke stroke;
        RptColor *color;
 
-       g_type_init ();
-
        rptr = rpt_report_new ();
 
        if (rptr != NULL)

diff --git a/tests/gtktreeview.c b/tests/gtktreeview.c
index 76dc3b61d353a85abeacc5cdb22a64e01474f986..357b8898710a75b712b4679c627727f0378375a7 100644 (file)
--- a/tests/gtktreeview.c
+++ b/tests/gtktreeview.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2011-2013 Andrea Zagli <azagli@libero.it>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -119,7 +119,7 @@ main (int argc, char **argv)
        g_signal_connect (w, "delete-event", G_CALLBACK (on_w_delete_event), NULL);
        g_signal_connect (w, "destroy", gtk_main_quit, NULL);
 
-       GtkWidget *box = gtk_vbox_new (FALSE, 5);
+       GtkWidget *box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
 
        gtk_container_add (GTK_CONTAINER (w), box);
 

diff --git a/tests/liststore.c b/tests/liststore.c
index 27458dcbd497ba9254d8948f4b3417acd9414034..3db3a1e0ec0ad4d5c61d3715a28905def6317d07 100644 (file)
--- a/tests/liststore.c
+++ b/tests/liststore.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2011-2013 Andrea Zagli <azagli@libero.it>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -58,8 +58,6 @@ main (int argc, char **argv)
        GtkTreeIter iter;
        GHashTable *columns_names;
 
-       g_type_init ();
-
        rptr = rpt_report_new_from_file (argv[1]);
 
        model = gtk_list_store_new (2,

diff --git a/tests/rptprint.c b/tests/rptprint.c
index 8b56093f3ef470bdeabf6a33fe3a736adf15c6ff..43f1e711c9d839a67e2b1c891e7f85c033bb109d 100644 (file)
--- a/tests/rptprint.c
+++ b/tests/rptprint.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2006-2013 Andrea Zagli <azagli@libero.it>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,8 +38,6 @@ main (int argc, char **argv)
 
        RptPrint *rptp;
 
-       g_type_init ();
-
        context = g_option_context_new ("- test rptprint");
        g_option_context_add_main_entries (context, entries, NULL);
 

diff --git a/tests/rptreport.c b/tests/rptreport.c
index 364df77758a0822d91e8e2dc95b1eb9dad6ed73c..a929e3e24e6955a3c77e0bc000b9172e9c976c9a 100644 (file)
--- a/tests/rptreport.c
+++ b/tests/rptreport.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2007-2013 Andrea Zagli <azagli@libero.it>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -79,8 +79,6 @@ main (int argc, char **argv)
 
        GtkPrintSettings *settings;
 
-       g_type_init ();
-
        context = g_option_context_new ("- test rptprint");
        g_option_context_add_main_entries (context, entries, NULL);