GNOME.org
 

[goffice] configure: gtk+ to 3.8.7; glib to 2.38; libgsf to 1.14.24

commit 272389b8136ae7c15884f93f29d2cd62d3c9881a
Author: Morten Welinder <terra gnome org>
Date:   Mon May 5 22:14:22 2014 -0400

    configure: gtk+ to 3.8.7; glib to 2.38; libgsf to 1.14.24

 NEWS                                 |    3 +++
 configure.ac                         |   24 +++++++-----------------
 goffice/canvas/goc-canvas.c          |    2 --
 goffice/canvas/goc-item.c            |    4 ----
 goffice/goffice.c                    |    3 ---
 goffice/graph/gog-reg-curve.c        |    3 ---
 goffice/gtk/goffice-gtk.c            |   26 --------------------------
 goffice/utils/datetime.c             |    4 ----
 goffice/utils/go-format.c            |   14 +-------------
 plugins/reg_linear/gog-lin-reg.c     |    5 -----
 plugins/reg_linear/gog-polynom-reg.c |    5 -----
 11 files changed, 11 insertions(+), 82 deletions(-)
---
diff --git a/NEWS b/NEWS
index f58776a..7a99775 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,9 @@ goffice 0.10.16:
 Jean
        * Don't use GDK_THREADS_*. [728793]
 
+Morten:
+       * Clean out old #ifdef mess.
+
 --------------------------------------------------------------------------
 goffice 0.10.15:
 
diff --git a/configure.ac b/configure.ac
index b9345d8..e563645 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
--*- mode: m4 -*-
+>-*- mode: m4 -*-
 dnl We require Automake 1.7.2, which requires Autoconf 2.54.
 dnl (It needs _AC_AM_CONFIG_HEADER_HOOK, for example.)
 AC_PREREQ(2.54)
@@ -113,11 +113,11 @@ PKG_PROG_PKG_CONFIG
 
 dnl *****************************
 goffice_reqs="
-       glib-2.0                >= 2.28.0
-       gobject-2.0             >= 2.28.0
-       gmodule-2.0             >= 2.28.0
-       gio-2.0                 >= 2.28.0
-       libgsf-1                >= 1.14.9
+       glib-2.0                >= 2.38.0
+       gobject-2.0             >= 2.38.0
+       gmodule-2.0             >= 2.38.0
+       gio-2.0                 >= 2.38.0
+       libgsf-1                >= 1.14.24
        libxml-2.0              >= 2.4.12
        pango                   >= 1.24.0
        pangocairo              >= 1.24.0
@@ -128,7 +128,7 @@ goffice_reqs="
 "
 
 goffice_gtk_reqs="
-       gtk+-3.0                >= 3.2.0
+       gtk+-3.0                >= 3.8.7
 "
 
 surfaces_reqs="
@@ -567,16 +567,6 @@ fi
 
 AC_CHECK_FUNCS(nextafter nextafterl rint)
 
-SAVE_CFLAGS=$CFLAGS
-SAVE_LIBS=$LIBS
-CFLAGS="$CFLAGS $GOFFICE_CFLAGS"
-LIBS="$GOFFICE_LIBS $LIBS"
-AC_CHECK_FUNCS(gsf_odf_out_get_version)
-AC_CHECK_FUNCS(gdk_event_get_scroll_deltas)
-AC_CHECK_FUNCS(gtk_style_context_set_parent)
-CFLAGS=$SAVE_CFLAGS
-LIBS=$SAVE_LIBS
-
 AC_DEFUN([GOFFICE_CHECK_FUNC],
 [AC_CHECK_FUNC([$1],
        [],
diff --git a/goffice/canvas/goc-canvas.c b/goffice/canvas/goc-canvas.c
index 899bb4c..b8a6379 100644
--- a/goffice/canvas/goc-canvas.c
+++ b/goffice/canvas/goc-canvas.c
@@ -299,9 +299,7 @@ goc_canvas_init (GocCanvas *canvas)
                               GDK_KEY_RELEASE_MASK |
                               GDK_ENTER_NOTIFY_MASK |
                               GDK_LEAVE_NOTIFY_MASK |
-#ifdef HAVE_GDK_EVENT_GET_SCROLL_DELTAS
                               GDK_SMOOTH_SCROLL_MASK |
-#endif
                               GDK_SCROLL_MASK
                               );
        g_signal_connect (G_OBJECT (w), "button-press-event", G_CALLBACK (button_press_cb), NULL);
diff --git a/goffice/canvas/goc-item.c b/goffice/canvas/goc-item.c
index 67aa1c2..90eb2c1 100644
--- a/goffice/canvas/goc-item.c
+++ b/goffice/canvas/goc-item.c
@@ -237,9 +237,7 @@ goc_item_dispose (GObject *object)
        if (context) {
                g_signal_handlers_disconnect_by_func
                        (object, G_CALLBACK (cb_hierarchy_changed), NULL);
-#ifdef HAVE_GTK_STYLE_CONTEXT_SET_PARENT
                gtk_style_context_set_parent (context, NULL);
-#endif
                g_object_set_qdata (object, quark_style_context, NULL);
        }
 #endif
@@ -878,9 +876,7 @@ cb_hierarchy_changed (const GocItem *item)
        gtk_widget_path_append_type (path, G_TYPE_FROM_INSTANCE (item));
        gtk_style_context_set_path (context, path);
        gtk_widget_path_free (path);
-#ifdef HAVE_GTK_STYLE_CONTEXT_SET_PARENT
        gtk_style_context_set_parent (context, pcontext);
-#endif
 }
 
 
diff --git a/goffice/goffice.c b/goffice/goffice.c
index 0adf407..98d49e5 100644
--- a/goffice/goffice.c
+++ b/goffice/goffice.c
@@ -197,9 +197,6 @@ libgoffice_init (void)
 
        bindtextdomain (GETTEXT_PACKAGE, libgoffice_locale_dir);
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-#if (!GLIB_CHECK_VERSION (2, 36, 0))
-       g_type_init ();
-#endif
        gsf_init ();
 
        _go_string_init ();
diff --git a/goffice/graph/gog-reg-curve.c b/goffice/graph/gog-reg-curve.c
index 69e5ffb..c667e87 100644
--- a/goffice/graph/gog-reg-curve.c
+++ b/goffice/graph/gog-reg-curve.c
@@ -182,9 +182,6 @@ gog_reg_curve_populate_editor (GogObject    *gobj,
        gtk_combo_box_set_active (GTK_COMBO_BOX (w), db);
        g_signal_connect (G_OBJECT (w), "changed",
                G_CALLBACK (limits_changed_cb), cl);
-#if !GTK_CHECK_VERSION(3,4,0)
-       g_object_set_data (G_OBJECT (grid), "last-label", gtk_builder_get_object (gui, "last-lbl"));
-#endif
        if ((GOG_REG_CURVE_GET_CLASS (gobj))->populate_editor != NULL)
                (GOG_REG_CURVE_GET_CLASS (gobj))->populate_editor (GOG_REG_CURVE (gobj), grid);
 
diff --git a/goffice/gtk/goffice-gtk.c b/goffice/gtk/goffice-gtk.c
index aa546a1..da84826 100644
--- a/goffice/gtk/goffice-gtk.c
+++ b/goffice/gtk/goffice-gtk.c
@@ -718,18 +718,6 @@ gu_delete_handler (GtkDialog *dialog,
        return TRUE; /* Do not destroy */
 }
 
-#if !GTK_CHECK_VERSION(3,4,0)
-static void
-recent_func_log_func (G_GNUC_UNUSED const gchar   *log_domain,
-                     G_GNUC_UNUSED GLogLevelFlags log_level,
-                     G_GNUC_UNUSED const gchar   *message,
-                     G_GNUC_UNUSED gpointer       user_data)
-{
-       /* We just want to suppress the warnings */
-       /* http://bugzilla.gnome.org/show_bug.cgi?id=664587 */
-}
-#endif
-
 /**
  * go_gtk_file_sel_dialog:
  * @toplevel: #GtkWindow
@@ -758,21 +746,7 @@ go_gtk_file_sel_dialog (GtkWindow *toplevel, GtkWidget *w)
        gtk_widget_show (w);
        gtk_grab_add (w);
 
-#if GTK_CHECK_VERSION(3,4,0)
        gtk_main ();
-#else
-       /* Hack: the gtk file dialog warns when it can't access a new file, so shut it up.  */
-       /* http://bugzilla.gnome.org/show_bug.cgi?id=664587 */
-       /* This hack should be unneccessary in GTK 3.3.5 and later  */
-       {
-               const char *domain = "Gtk";
-               guint log_handler =
-                       g_log_set_handler (domain, G_LOG_LEVEL_WARNING,
-                                          recent_func_log_func, NULL);
-               gtk_main ();
-               g_log_remove_handler (domain, log_handler);
-       }
-#endif
 
        g_signal_handler_disconnect (w, delete_handler);
 
diff --git a/goffice/utils/datetime.c b/goffice/utils/datetime.c
index 53a2dbb..4f4c40a 100644
--- a/goffice/utils/datetime.c
+++ b/goffice/utils/datetime.c
@@ -137,11 +137,7 @@ go_date_timet_to_serial_raw (time_t t, GODateConventions const *conv)
        GDate date;
 
         g_date_clear (&date, 1);
-#if GLIB_CHECK_VERSION(2,10,0)
        g_date_set_time_t (&date, t);
-#else
-       g_date_set_time (&date, t);
-#endif
        secs = tm->tm_hour * 3600 + tm->tm_min * 60 + tm->tm_sec;
        return go_date_g_to_serial (&date, conv) +
                secs / (double)SECS_PER_DAY;
diff --git a/goffice/utils/go-format.c b/goffice/utils/go-format.c
index 4fd2241..452b2ed 100644
--- a/goffice/utils/go-format.c
+++ b/goffice/utils/go-format.c
@@ -8020,18 +8020,6 @@ go_format_output_date_to_odf (GsfXMLOut *xout, GOFormat const *fmt,
 #undef ODF_CLOSE_STRING
 #undef ODF_OPEN_STRING
 
-static int
-get_odf_version (GsfXMLOut *xout)
-{
-#ifdef HAVE_GSF_ODF_OUT_GET_VERSION
-       return gsf_odf_out_get_version (GSF_ODF_OUT (xout));
-#else
-       return get_gsf_odf_version ();
-#endif
-}
-
-
-
 #define ODF_CLOSE_STRING  if (string_is_open) {  \
                                  gsf_xml_out_add_cstr (xout, NULL, accum->str); \
                                  gsf_xml_out_end_element (xout); /* </number:text> */  \
@@ -8051,7 +8039,7 @@ go_format_output_fraction_to_odf (GsfXMLOut *xout, GOFormat const *fmt,
 {
        char const *xl = go_format_as_XL (fmt);
        GString *accum = g_string_new (NULL);
-       int odf_version = get_odf_version (xout);
+       int odf_version = gsf_odf_out_get_version (GSF_ODF_OUT (xout));
 
        int int_digits = -1; /* -1 means no integer part */
        int min_numerator_digits = 0;
diff --git a/plugins/reg_linear/gog-lin-reg.c b/plugins/reg_linear/gog-lin-reg.c
index 27eea0b..b72a217 100644
--- a/plugins/reg_linear/gog-lin-reg.c
+++ b/plugins/reg_linear/gog-lin-reg.c
@@ -158,12 +158,7 @@ gog_lin_reg_curve_populate_editor (GogRegCurve *reg_curve, gpointer table)
        w = gtk_check_button_new_with_label (_("Affine"));
        gtk_widget_set_tooltip_text (w, _("Uncheck to force zero intercept"));
        gtk_widget_show (w);
-#if GTK_CHECK_VERSION(3,4,0)
        gtk_grid_attach_next_to (table, w, NULL, GTK_POS_BOTTOM, 1, 3);
-#else
-       gtk_grid_attach_next_to (table, w, GTK_WIDGET (g_object_get_data (table, "last-label")), 
GTK_POS_BOTTOM, 1, 3);
-       g_object_set_data (G_OBJECT (table), "last-label", w);
-#endif
        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), lin->affine);
        g_signal_connect (G_OBJECT (w), "toggled", G_CALLBACK (affine_toggled_cb), lin);
 }
diff --git a/plugins/reg_linear/gog-polynom-reg.c b/plugins/reg_linear/gog-polynom-reg.c
index 86e7310..c43b881 100644
--- a/plugins/reg_linear/gog-polynom-reg.c
+++ b/plugins/reg_linear/gog-polynom-reg.c
@@ -203,12 +203,7 @@ gog_polynom_reg_curve_populate_editor (GogRegCurve *reg_curve, gpointer table)
        gtk_misc_set_alignment (GTK_MISC (l), 0., 0.5);
        gtk_label_set_justify (GTK_LABEL (l), GTK_JUSTIFY_LEFT);
        gtk_widget_show (l);
-#if GTK_CHECK_VERSION(3,4,0)
        gtk_grid_attach_next_to (table, l, NULL, GTK_POS_BOTTOM, 1, 1);
-#else
-       gtk_grid_attach_next_to (table, l, GTK_WIDGET (g_object_get_data (table, "last-label")), 
GTK_POS_BOTTOM, 1, 1);
-       g_object_set_data (G_OBJECT (table), "last-label", l);
-#endif
        w = gtk_spin_button_new_with_range (2, 10, 1);
        gtk_spin_button_set_digits (GTK_SPIN_BUTTON (w), 0);
        gtk_widget_show (w);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]