Move deprecated GRel to deprecated/

Keep the docs for now, though.  We'll remove them after a few more
cycles.

https://bugzilla.gnome.org/show_bug.cgi?id=659427

diff --git a/glib/Makefile.am b/glib/Makefile.am
index ada9641..11e6e29 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -112,7 +112,8 @@ uninstall-ms-lib:
        $(uninstall_ms_lib_cmd)
 
 deprecated_sources = \
-       deprecated/gallocator.c
+       deprecated/gallocator.c         \
+       deprecated/grel.c
 
 libglib_2_0_la_SOURCES =       \
        $(deprecated_sources)   \
@@ -163,7 +164,6 @@ libglib_2_0_la_SOURCES =    \
        gprimes.c               \
        gqsort.c                \
        gqueue.c                \
-       grel.c                  \
        grand.c                 \
        $(gregex_c)             \
        gscanner.c              \
@@ -236,7 +236,8 @@ glibinclude_HEADERS =   \
 
 deprecatedincludedir=$(includedir)/glib-2.0/glib/deprecated
 deprecatedinclude_HEADERS = \
-       deprecated/gallocator.h
+       deprecated/gallocator.h         \
+       deprecated/grel.h
 
 glibsubincludedir=$(includedir)/glib-2.0/glib
 glibsubinclude_HEADERS =   \
@@ -283,7 +284,6 @@ glibsubinclude_HEADERS =   \
        gqueue.h        \
        grand.h         \
        $(gregex_h)     \
-       grel.h          \
        gscanner.h      \
        gsequence.h     \
        gshell.h        \

diff --git a/glib/grel.c b/glib/deprecated/grel.c
similarity index 99%
rename from glib/grel.c
rename to glib/deprecated/grel.c
index f790390..fdf909a 100644 (file)
--- a/glib/grel.c
+++ b/glib/deprecated/grel.c
@@ -29,17 +29,16 @@
 
 #include "config.h"
 
-#include <stdarg.h>
-#include <string.h>
-
-#include "ghash.h"
-#include "gmessages.h"
-#include "gtestutils.h"
-#include "gstring.h"
+#include "grel.h"
 
-#undef G_DISABLE_DEPRECATED
+#include <glib/gmessages.h>
+#include <glib/gtestutils.h>
+#include <glib/gstring.h>
+#include <glib/gslice.h>
+#include <glib/ghash.h>
 
-#include "grel.h"
+#include <stdarg.h>
+#include <string.h>
 
 /**
  * SECTION:relations

diff --git a/glib/grel.h b/glib/deprecated/grel.h
similarity index 98%
rename from glib/grel.h
rename to glib/deprecated/grel.h
index 5cb8d09..e7c9291 100644 (file)
--- a/glib/grel.h
+++ b/glib/deprecated/grel.h
@@ -66,8 +66,6 @@ struct _GTuples
  * g_relation_count() counts ...
  */
 
-#ifndef G_DISABLE_DEPRECATED
-
 GRelation* g_relation_new     (gint         fields);
 void       g_relation_destroy (GRelation   *relation);
 void       g_relation_index   (GRelation   *relation,
@@ -94,8 +92,6 @@ gpointer   g_tuples_index     (GTuples     *tuples,
                                gint         index_,
                                gint         field);
 
-#endif
-
 G_END_DECLS
 
 #endif /* __G_REL_H__ */

diff --git a/glib/glib.h b/glib/glib.h
index 95cbe75..a4d5498 100644 (file)
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -69,7 +69,6 @@
 #include <glib/gquark.h>
 #include <glib/gqueue.h>
 #include <glib/grand.h>
-#include <glib/grel.h>
 #include <glib/gregex.h>
 #include <glib/gscanner.h>
 #include <glib/gsequence.h>
@@ -97,6 +96,7 @@
 
 #ifndef G_DISABLE_DEPRECATED
 #include <glib/deprecated/gallocator.h>
+#include <glib/deprecated/grel.h>
 #endif
 
 #undef __GLIB_H_INSIDE__