2.5.1.1NAUTILUS_2_5_1_1

003-11-12  Dave Camp  <dave@ximian.com>

	* NEWS:
	* configure.in: 2.5.1.1

	* configure.in:
	* components/emblem/Makefile.am:
	* components/image_properties/Makefile.am:
	* components/sample/Makefile.am:
	* src/Makefile.am:
	* src/file-manager/Makefile.am: Cleaned up DISABLE_DEPREACTED
	bits.

8 files changed, 32 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 2322bdf2b..f1d685dde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-11-12  Dave Camp  <dave@ximian.com>
+
+	* NEWS:
+	* configure.in: 2.5.1.1
+	
+	* configure.in:
+	* components/emblem/Makefile.am:
+	* components/image_properties/Makefile.am:
+	* components/sample/Makefile.am:
+	* src/Makefile.am:
+	* src/file-manager/Makefile.am: Cleaned up DISABLE_DEPREACTED 
+	bits.
+
 2003-11-11  Dave Camp  <dave@ximian.com>
 
 	* src/file-manager/fm-list-view.c 
diff --git a/NEWS b/NEWS
index eda12c678..84be22cd4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
-This is nautilus 2.5.1. The file manager for the Gnome 2 desktop.
+This is nautilus 2.5.1.1 The file manager for the Gnome 2 desktop.
 
-Major changes since 2.5.1 are:
+Major changes since 2.5.1.1 are:
+
+* Fixed a NautilusFile leak
+* DISABLE_DEPRECATED fixes.
+
+Major changes since 2.5.0 are:
 
 * Start of new volume handling system
 * deprecaton clean
diff --git a/components/emblem/Makefile.am b/components/emblem/Makefile.am
index 101dd2999..2364532d5 100644
--- a/components/emblem/Makefile.am
+++ b/components/emblem/Makefile.am
@@ -5,9 +5,8 @@ INCLUDES =						\
 	-DG_LOG_DOMAIN=\"Nautilus-Emblem-Sidebar\"	\
 	-DDATADIR=\""$(datadir)"\" \
 	-I$(top_srcdir)					\
-	-DGDK_DISABLE_DEPRECATED			\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
 	$(EMBLEM_COMPONENT_CFLAGS)			\
+	$(DISABLE_DEPRECATED_CFLAGS)                    \
 	$(NULL)
 
 EMBLEM_VIEW_COMMON_SOURCES =			\
diff --git a/components/image_properties/Makefile.am b/components/image_properties/Makefile.am
index 073497c55..6dde6a3b3 100644
--- a/components/image_properties/Makefile.am
+++ b/components/image_properties/Makefile.am
@@ -3,9 +3,6 @@
 # and change the G_LOG_DOMAIN.
 
 INCLUDES =						\
-	-DG_DISABLE_DEPRECATED				\
-	-DGTK_DISABLE_DEPRECATED			\
-	-DGNOME_DISABLE_DEPRECATED			\
 	-DG_LOG_DOMAIN=\"Nautilus-Image-Properties\"	\
 	-DDATADIR=\"$(datadir)\"			\
 	-I$(top_srcdir)					\
diff --git a/components/sample/Makefile.am b/components/sample/Makefile.am
index 4b5e619cb..051f41b82 100644
--- a/components/sample/Makefile.am
+++ b/components/sample/Makefile.am
@@ -3,9 +3,6 @@
 # and change the G_LOG_DOMAIN.
 
 INCLUDES =						\
-	-DG_DISABLE_DEPRECATED				\
-	-DGTK_DISABLE_DEPRECATED			\
-	-DGNOME_DISABLE_DEPRECATED			\
 	-DG_LOG_DOMAIN=\"Nautilus-Sample\"		\
 	-DDATADIR=\"$(datadir)\"			\
 	-I$(top_srcdir)					\
diff --git a/configure.in b/configure.in
index a301e9d74..8c8ebf023 100644
--- a/configure.in
+++ b/configure.in
@@ -43,7 +43,7 @@ AC_SUBST(STARTUP_NOTIFICATION_REQUIRED)
 
 dnl ===========================================================================
 
-AM_INIT_AUTOMAKE(nautilus, 2.5.1)
+AM_INIT_AUTOMAKE(nautilus, 2.5.1.1)
 AM_CONFIG_HEADER(config.h)
 
 AM_SANITY_CHECK
@@ -348,11 +348,14 @@ AC_SUBST(EMBLEM_COMPONENT_CFLAGS)
 EMBLEM_COMPONENT_LIBS="`$PKG_CONFIG --libs $EMBLEM_COMPONENT_MODULES`"
 AC_SUBST(EMBLEM_COMPONENT_LIBS)
 
-DISABLE_DEPRECATED_CFLAGS=" \
-	-DGDK_DISABLE_DEPRECATED \
-	-DGDK_PIXBUF_DISABLE_DEPRECATED \
-	-DGTK_DISABLE_DEPRECATED \
-	-DGNOME_DISABLE_DEPRECATED"
+DISABLE_DEPRECATED_CFLAGS=""
+
+
+dnl Taken out for now
+dnl	-DGDK_DISABLE_DEPRECATED \
+dnl	-DGDK_PIXBUF_DISABLE_DEPRECATED \
+dnl	-DGTK_DISABLE_DEPRECATED \
+dnl	-DGNOME_DISABLE_DEPRECATED"
 
 dnl FIXME: put this back once the registration_id stuff is cleared up.
 dnl	-DBONOBO_DISABLE_DEPRECATED
diff --git a/src/Makefile.am b/src/Makefile.am
index 6c599c22a..a9c123575 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,8 +22,7 @@ INCLUDES =							\
 	-DPREFIX=\""$(prefix)"\" 				\
 	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
 	-DVERSION="\"$(VERSION)\"" 				\
-	-DGDK_DISABLE_DEPRECATED 				\
-	-DGDK_PIXBUF_DISABLE_DEPRECATED 			\
+	$(DISABLE_DEPRECATED_CFLAGS)                            \
 	$(NULL)
 
 LDADD =\
diff --git a/src/file-manager/Makefile.am b/src/file-manager/Makefile.am
index 5a424303d..83f05b6f4 100644
--- a/src/file-manager/Makefile.am
+++ b/src/file-manager/Makefile.am
@@ -9,8 +9,7 @@ INCLUDES = 					\
 	-DVERSION="\"$(VERSION)\""		\
 	-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
 	-DDATADIR=\""$(datadir)"\"		\
-	-DGDK_DISABLE_DEPRECATED \
-	-DGDK_PIXBUF_DISABLE_DEPRECATED \
+	$(DISABLE_DEPRECATED_CFLAGS)            \
 	$(NULL)