Commit 85427124 authored by A. Walton's avatar A. Walton Committed by Andrew Walton

Remove GSequence hack as it is no longer necessary; we require a newer

2008-04-10  A. Walton  <awalton@svn.gnome.org>

	* configure.in:
	* cut-n-paste-code/Makefile.am:
	* cut-n-paste-code/gsequence/Makefile.am:
	* cut-n-paste-code/gsequence/gsequence.c:
	* cut-n-paste-code/gsequence/gsequence.h:
	* src/Makefile.am:
	* src/file-manager/fm-list-model.c:
	Remove GSequence hack as it is no longer necessary;
	we require a newer GLib in order to support GIO.
	More work towards bug #520773.


svn path=/trunk/; revision=14062
parent 6eb74f59
2008-04-10 A. Walton <awalton@svn.gnome.org>
* configure.in:
* cut-n-paste-code/Makefile.am:
* cut-n-paste-code/gsequence/Makefile.am:
* cut-n-paste-code/gsequence/gsequence.c:
* cut-n-paste-code/gsequence/gsequence.h:
* src/Makefile.am:
* src/file-manager/fm-list-model.c:
Remove GSequence hack as it is no longer necessary;
we require a newer GLib in order to support GIO.
More work towards bug #520773.
2008-04-10 A. Walton <awalton@svn.gnome.org>
* src/Makefile.am:
......
......@@ -390,21 +390,12 @@ else
fi
dnl ==========================================================================
dnl gsequence
GSEQUENCE_MODULES="glib-2.0"
GSEQUENCE_CFLAGS="`$PKG_CONFIG --cflags $GSEQUENCE_MODULES`"
AC_SUBST(GSEQUENCE_CFLAGS)
dnl libegg
LIBEGG_MODULES="gtk+-2.0 libgnome-2.0"
LIBEGG_CFLAGS="`$PKG_CONFIG --cflags $LIBEGG_MODULES`"
AC_SUBST(LIBEGG_CFLAGS)
# check for gsequence in glib
PKG_CHECK_EXISTS([glib-2.0 >= 2.13.0],[have_glib_2_14=yes],[have_glib_2_14=no])
AM_CONDITIONAL([HAVE_GLIB_2_14],[test "$have_glib_2_14" = "yes"])
dnl libnautilus-extension
LIBNAUTILUS_EXTENSION_MODULES="glib-2.0 gtk+-2.0"
LIBNAUTILUS_EXTENSION_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_EXTENSION_MODULES` $WARNING_CFLAGS"
......@@ -413,7 +404,7 @@ LIBNAUTILUS_EXTENSION_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_EXTENSION_MODULES`"
AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS)
dnl core nautilus (must list bonobo-activation and libbonobo because idldir does not respect "requires")
CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 esound gnome-desktop-2.0 gio-2.0 gio-unix-2.0 $EXTRA_CORE_MODULES"
CORE_MODULES="glib-2.0 eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 esound gnome-desktop-2.0 gio-2.0 gio-unix-2.0 $EXTRA_CORE_MODULES"
CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags $WARNING_CFLAGS"
AC_SUBST(CORE_CFLAGS)
CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
......@@ -469,7 +460,6 @@ AC_CONFIG_FILES([
Makefile
cut-n-paste-code/Makefile
cut-n-paste-code/libegg/Makefile
cut-n-paste-code/gsequence/Makefile
cut-n-paste-code/widgets/Makefile
data/Makefile
data/icons/Makefile
......
SUBDIRS = widgets libegg
if !HAVE_GLIB_2_14
SUBDIRS += gsequence
endif
NULL=
noinst_LTLIBRARIES = libgsequence.la
INCLUDES = $(GSEQUENCE_CFLAGS)
libgsequence_la_SOURCES = \
gsequence.c \
gsequence.h \
$(NULL)
This diff is collapsed.
/* GLIB - Library of useful routines for C programming
* Copyright (C) 2002, 2003, 2004, 2005 Soeren Sandmann (sandmann@daimi.au.dk)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include <glib.h>
#ifndef __GSEQUENCE_H__
#define __GSEQUENCE_H__
typedef struct _GSequence GSequence;
typedef struct _GSequenceNode GSequenceIter;
typedef gint (* GSequenceIterCompareFunc) (GSequenceIter *a,
GSequenceIter *b,
gpointer data);
typedef gpointer (* GSequenceAggregateFunction) (gconstpointer before,
GSequenceIter *mid,
gconstpointer after);
/* GSequence */
GSequence * g_sequence_new (GDestroyNotify data_destroy);
void g_sequence_free (GSequence *seq);
gint g_sequence_get_length (GSequence *seq);
void g_sequence_foreach (GSequence *seq,
GFunc func,
gpointer data);
void g_sequence_foreach_range (GSequenceIter *begin,
GSequenceIter *end,
GFunc func,
gpointer data);
void g_sequence_sort (GSequence *seq,
GCompareDataFunc cmp_func,
gpointer cmp_data);
void g_sequence_sort_iter (GSequence *seq,
GSequenceIterCompareFunc cmp_func,
gpointer cmp_data);
/* Getting iters */
GSequenceIter *g_sequence_get_begin_iter (GSequence *seq);
GSequenceIter *g_sequence_get_end_iter (GSequence *seq);
GSequenceIter *g_sequence_get_iter_at_pos (GSequence *seq,
gint pos);
GSequenceIter *g_sequence_append (GSequence *seq,
gpointer data);
GSequenceIter *g_sequence_prepend (GSequence *seq,
gpointer data);
GSequenceIter *g_sequence_insert_before (GSequenceIter * iter,
gpointer data);
void g_sequence_move (GSequenceIter * src,
GSequenceIter * dest);
void g_sequence_swap (GSequenceIter * a,
GSequenceIter * b);
GSequenceIter *g_sequence_insert_sorted (GSequence *seq,
gpointer data,
GCompareDataFunc cmp_func,
gpointer cmp_data);
GSequenceIter *g_sequence_insert_sorted_iter (GSequence *seq,
gpointer data,
GSequenceIterCompareFunc iter_cmp,
gpointer cmp_data);
void g_sequence_sort_changed (GSequenceIter * iter,
GCompareDataFunc cmp_func,
gpointer cmp_data);
void g_sequence_sort_changed_iter (GSequenceIter * iter,
GSequenceIterCompareFunc iter_cmp,
gpointer cmp_data);
void g_sequence_remove (GSequenceIter * iter);
void g_sequence_remove_range (GSequenceIter * begin,
GSequenceIter * end);
void g_sequence_move_range (GSequenceIter * iter,
GSequenceIter * begin,
GSequenceIter * end);
GSequenceIter *g_sequence_search (GSequence *seq,
gpointer data,
GCompareDataFunc cmp_func,
gpointer cmp_data);
GSequenceIter *g_sequence_search_iter (GSequence *seq,
gpointer data,
GSequenceIterCompareFunc cmp_func,
gpointer cmp_data);
/* dereferencing */
gpointer g_sequence_get (GSequenceIter * iter);
void g_sequence_set (GSequenceIter * iter,
gpointer data);
/* operations on GSequenceIter * */
gboolean g_sequence_iter_is_begin (GSequenceIter * iter);
gboolean g_sequence_iter_is_end (GSequenceIter * iter);
GSequenceIter *g_sequence_iter_next (GSequenceIter * iter);
GSequenceIter *g_sequence_iter_prev (GSequenceIter * iter);
gint g_sequence_iter_get_position (GSequenceIter * iter);
GSequenceIter *g_sequence_iter_move (GSequenceIter * iter,
gint leap);
GSequence * g_sequence_iter_get_sequence (GSequenceIter * iter);
/* search */
gint g_sequence_iter_compare (GSequenceIter *a,
GSequenceIter * b);
GSequenceIter *g_sequence_range_get_midpoint (GSequenceIter * begin,
GSequenceIter * end);
/* debug */
gint g_sequence_calc_tree_height (GSequence *seq);
void g_sequence_self_test (GSequence *seq);
#if 0
/* aggregates */
void g_sequence_set_aggregator (GSequence *seq,
GSequenceAggregateFunction func,
GDestroyNotify destroy);
gconstpointer g_sequence_get_aggregate (GSequenceIter * begin,
GSequenceIter * end);
void g_sequence_update_aggregate (GSequenceIter * iter);
#endif
#endif /* __GSEQUENCE_H__ */
......@@ -36,10 +36,6 @@ LDADD =\
$(POPT_LIBS) \
$(NULL)
if !HAVE_GLIB_2_14
LDADD += $(top_builddir)/cut-n-paste-code/gsequence/libgsequence.la
endif
@INTLTOOL_DESKTOP_RULE@
desktop_in_files=network-scheme.desktop.in
......
......@@ -36,12 +36,7 @@
#include <gtk/gtktreesortable.h>
#include <glib/gi18n.h>
#include <libnautilus-private/nautilus-dnd.h>
#if GLIB_CHECK_VERSION (2, 13, 0)
#include <glib/gsequence.h>
#else
#include <gsequence/gsequence.h>
#endif
enum {
SUBDIRECTORY_UNLOADED,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment