Commit 7acc758c authored by Alexander Larsson's avatar Alexander Larsson Committed by Alexander Larsson

Fix old test

2007-12-20  Alexander Larsson  <alexl@redhat.com>

	* libnautilus-private/nautilus-file.c (nautilus_self_check_file):
	Fix old test

	* NEWS: 
	Update for release

	* configure.in:
	Remove gnome-vfs requirement
	Bump glib and eel requirements


svn path=/trunk/; revision=13541
parent be0c2889
2007-12-20 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-file.c (nautilus_self_check_file):
Fix old test
* NEWS:
Update for release
* configure.in:
Remove gnome-vfs requirement
Bump glib and eel requirements
2007-12-20 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-mime-actions.c:
......
Major changes in 2.21.1 are:
* Totally replaced gnome-vfs use with gio
* New implementation of file operations like copy/move with
a shared progress dialog
* Lots of cleanup
Major changes in 2.20.0 are:
* Load thumbnails asynchronously
* Support direct save DnD (XDS)
......
......@@ -4,13 +4,12 @@ dnl ===========================================================================
m4_define(bonobo_activation_minver, 2.1.0)
m4_define(bonobo_minver, 2.1.0)
m4_define(eel_minver, 2.15.91)
m4_define(eel_minver, 2.21.1)
m4_define(esound_minver, 0.2.27)
m4_define(glib_minver, 2.6.0)
m4_define(glib_minver, 2.15.0)
m4_define(gnome_desktop_minver, 2.9.91)
m4_define(gnome_minver, 2.14.0)
m4_define(gnome_ui_minver, 2.6.0)
m4_define(gnome_vfs_minver, 2.19.3)
m4_define(orbit_minver, 2.4.0)
m4_define(pango_minver, 1.1.2)
m4_define(gtk_minver, 2.11.6)
......@@ -49,7 +48,6 @@ AC_SUBST(GLIB_REQUIRED [glib_minver])
AC_SUBST(GNOME_DESKTOP_REQUIRED, [gnome_desktop_minver])
AC_SUBST(GNOME_REQUIRED, [gnome_minver])
AC_SUBST(GNOME_UI_REQUIRED, [gnome_ui_minver])
AC_SUBST(GNOME_VFS_REQUIRED, [gnome_vfs_minver])
AC_SUBST(ORBIT_REQUIRED, [orbit_minver])
AC_SUBST(PANGO_REQUIRED, [pango_minver])
AC_SUBST(GTK_REQUIRED, [gtk_minver])
......@@ -94,8 +92,6 @@ PKG_CHECK_MODULES(ALL, [
eel-2.0 >= eel_minver
glib-2.0 >= glib_minver
gnome-desktop-2.0 >= gnome_desktop_minver
gnome-vfs-2.0 >= gnome_vfs_minver
gnome-vfs-module-2.0 >= gnome_vfs_minver
gio-2.0
ORBit-2.0 >= orbit_minver
pango >= pango_minver
......@@ -399,14 +395,14 @@ 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 gnome-vfs-2.0"
LIBNAUTILUS_EXTENSION_MODULES="glib-2.0 gtk+-2.0"
LIBNAUTILUS_EXTENSION_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_EXTENSION_MODULES` $WARNING_CFLAGS"
AC_SUBST(LIBNAUTILUS_EXTENSION_CFLAGS)
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 gnome-vfs-module-2.0 gio-2.0 $EXTRA_CORE_MODULES"
CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 esound gnome-desktop-2.0 gio-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"
......
......@@ -6958,10 +6958,6 @@ nautilus_self_check_file (void)
EEL_CHECK_STRING_RESULT (nautilus_file_get_name (file_1), "eazel");
nautilus_file_unref (file_1);
file_1 = nautilus_file_get_by_uri (EEL_TRASH_URI);
EEL_CHECK_STRING_RESULT (nautilus_file_get_display_name (file_1), _("Trash"));
nautilus_file_unref (file_1);
/* sorting */
file_1 = nautilus_file_get_by_uri ("file:///etc");
file_2 = nautilus_file_get_by_uri ("file:///usr");
......
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