Move deprecated GCompletion 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 11e6e29..880bb65 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -113,6 +113,7 @@ uninstall-ms-lib:
 
 deprecated_sources = \
        deprecated/gallocator.c         \
+       deprecated/gcompletion.c        \
        deprecated/grel.c
 
 libglib_2_0_la_SOURCES =       \
@@ -130,7 +131,6 @@ libglib_2_0_la_SOURCES =    \
        gbufferprivate.h        \
        gcache.c                \
        gchecksum.c             \
-       gcompletion.c           \
        gconvert.c              \
        gdataset.c              \
        gdatasetprivate.h       \
@@ -237,6 +237,7 @@ glibinclude_HEADERS =   \
 deprecatedincludedir=$(includedir)/glib-2.0/glib/deprecated
 deprecatedinclude_HEADERS = \
        deprecated/gallocator.h         \
+       deprecated/gcompletion.h        \
        deprecated/grel.h
 
 glibsubincludedir=$(includedir)/glib-2.0/glib
@@ -251,7 +252,6 @@ glibsubinclude_HEADERS =   \
        gbookmarkfile.h \
        gcache.h        \
        gchecksum.h     \
-       gcompletion.h   \
        gconvert.h      \
        gdataset.h      \
        gdate.h         \

diff --git a/glib/gcompletion.c b/glib/deprecated/gcompletion.c
similarity index 99%
rename from glib/gcompletion.c
rename to glib/deprecated/gcompletion.c
index 87982d7..529e7c9 100644 (file)
--- a/glib/gcompletion.c
+++ b/glib/deprecated/gcompletion.c
@@ -30,15 +30,13 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include "gstrfuncs.h"
-#include "gmessages.h"
-#include "gunicode.h"
+#include "gcompletion.h"
 
-#undef G_DISABLE_DEPRECATED
+#include <glib/gstrfuncs.h>
+#include <glib/gmessages.h>
+#include <glib/gunicode.h>
 
-#include "gcompletion.h"
+#include <string.h>
 
 /**
  * SECTION:completion

diff --git a/glib/gcompletion.h b/glib/deprecated/gcompletion.h
similarity index 98%
rename from glib/gcompletion.h
rename to glib/deprecated/gcompletion.h
index 04c024f..900883e 100644 (file)
--- a/glib/gcompletion.h
+++ b/glib/deprecated/gcompletion.h
@@ -56,8 +56,6 @@ struct _GCompletion
   GCompletionStrncmpFunc strncmp_func;
 };
 
-#ifndef G_DISABLE_DEPRECATED
-
 GCompletion* g_completion_new           (GCompletionFunc func);
 void         g_completion_add_items     (GCompletion*    cmp,
                                          GList*          items);
@@ -74,8 +72,6 @@ void         g_completion_set_compare   (GCompletion *cmp,
                                         GCompletionStrncmpFunc strncmp_func);
 void         g_completion_free          (GCompletion*    cmp);
 
-#endif
-
 G_END_DECLS
 
 #endif /* __G_COMPLETION_H__ */

diff --git a/glib/glib.h b/glib/glib.h
index a4d5498..0831119 100644 (file)
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -39,7 +39,6 @@
 #include <glib/gbookmarkfile.h>
 #include <glib/gcache.h>
 #include <glib/gchecksum.h>
-#include <glib/gcompletion.h>
 #include <glib/gconvert.h>
 #include <glib/gdataset.h>
 #include <glib/gdate.h>
@@ -96,6 +95,7 @@
 
 #ifndef G_DISABLE_DEPRECATED
 #include <glib/deprecated/gallocator.h>
+#include <glib/deprecated/gcompletion.h>
 #include <glib/deprecated/grel.h>
 #endif