[glib/glib-2-26] GTimeZone: hide some API

[Ryan Lortie <ryanl src gnome org>]

commit bee39ac0ded498de58d055de9140723d720eefaa
Author: Ryan Lortie <desrt desrt ca>
Date:   Fri Sep 24 14:55:53 2010 -0400

    GTimeZone: hide some API
    
    I'm not totally happy with the API yet, so only expose the bits that are
    required to make meaningful use of GDateTime.

 docs/reference/glib/glib-sections.txt |    8 -----
 glib/Makefile.am                      |    1 +
 glib/gdatetime.c                      |    2 +-
 glib/glib.symbols                     |    5 ---
 glib/gtimezone.c                      |    2 +-
 glib/gtimezone.h                      |   37 -------------------------
 glib/gtimezoneprivate.h               |   48 +++++++++++++++++++++++++++++++++
 7 files changed, 51 insertions(+), 52 deletions(-)
---
diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 344e2d4..98cb530 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -1417,14 +1417,6 @@ g_time_zone_ref
 g_time_zone_new
 g_time_zone_new_local
 g_time_zone_new_utc
-<SUBSECTION>
-GTimeType
-g_time_zone_find_interval
-g_time_zone_adjust_time
-<SUBSECTION>
-g_time_zone_get_abbreviation
-g_time_zone_get_offset
-g_time_zone_is_dst
 </SECTION>
 
 <SECTION>
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 6f3d526..f95ef60 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -177,6 +177,7 @@ libglib_2_0_la_SOURCES = 	\
 	gthreadprivate.h	\
 	gthreadpool.c   	\
 	gtimer.c		\
+	gtimezoneprivate.h 	\
 	gtimezone.c	 	\
 	gtree.c			\
 	guniprop.c		\
diff --git a/glib/gdatetime.c b/glib/gdatetime.c
index c2e3407..2b6a27a 100644
--- a/glib/gdatetime.c
+++ b/glib/gdatetime.c
@@ -69,7 +69,7 @@
 #include "gstrfuncs.h"
 #include "gtestutils.h"
 #include "gthread.h"
-#include "gtimezone.h"
+#include "gtimezoneprivate.h"
 
 #include "glibintl.h"
 
diff --git a/glib/glib.symbols b/glib/glib.symbols
index f4b45a0..39000bd 100644
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -381,11 +381,6 @@ g_time_zone_new_local
 g_time_zone_new_utc
 g_time_zone_ref
 g_time_zone_unref
-g_time_zone_adjust_time
-g_time_zone_find_interval
-g_time_zone_get_abbreviation
-g_time_zone_get_offset
-g_time_zone_is_dst
 #endif
 #endif
 
diff --git a/glib/gtimezone.c b/glib/gtimezone.c
index ce42f50..f861ce4 100644
--- a/glib/gtimezone.c
+++ b/glib/gtimezone.c
@@ -21,7 +21,7 @@
 
 /* Prologue {{{1 */
 
-#include "gtimezone.h"
+#include "gtimezoneprivate.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/glib/gtimezone.h b/glib/gtimezone.h
index 8bc6684..1032a3c 100644
--- a/glib/gtimezone.h
+++ b/glib/gtimezone.h
@@ -32,28 +32,6 @@ G_BEGIN_DECLS
 
 typedef struct _GTimeZone GTimeZone;
 
-/**
- * GTimeType:
- * @G_TIME_TYPE_STANDARD: the time is in local standard time
- * @G_TIME_TYPE_DAYLIGHT: the time is in local daylight time
- * @G_TIME_TYPE_UNIVERSAL: the time is in UTC
- *
- * Disambiguates a given time in two ways.
- *
- * First, specifies if the given time is in universal or local time.
- *
- * Second, if the time is in local time, specifies if it is local
- * standard time or local daylight time.  This is important for the case
- * where the same local time occurs twice (during daylight savings time
- * transitions, for example).
- */
-typedef enum
-{
-  G_TIME_TYPE_STANDARD,
-  G_TIME_TYPE_DAYLIGHT,
-  G_TIME_TYPE_UNIVERSAL
-} GTimeType;
-
 GTimeZone *             g_time_zone_new                                 (const gchar *identifier);
 GTimeZone *             g_time_zone_new_utc                             (void);
 GTimeZone *             g_time_zone_new_local                           (void);
@@ -61,21 +39,6 @@ GTimeZone *             g_time_zone_new_local                           (void);
 GTimeZone *             g_time_zone_ref                                 (GTimeZone   *tz);
 void                    g_time_zone_unref                               (GTimeZone   *tz);
 
-gint                    g_time_zone_find_interval                       (GTimeZone   *tz,
-                                                                         GTimeType    type,
-                                                                         gint64       time);
-
-gint                    g_time_zone_adjust_time                         (GTimeZone   *tz,
-                                                                         GTimeType    type,
-                                                                         gint64      *time);
-
-const gchar *           g_time_zone_get_abbreviation                    (GTimeZone   *tz,
-                                                                         gint         interval);
-gint32                  g_time_zone_get_offset                          (GTimeZone   *tz,
-                                                                         gint         interval);
-gboolean                g_time_zone_is_dst                              (GTimeZone   *tz,
-                                                                         gint         interval);
-
 G_END_DECLS
 
 #endif /* __G_TIME_ZONE_H__ */
diff --git a/glib/gtimezoneprivate.h b/glib/gtimezoneprivate.h
new file mode 100644
index 0000000..767d310
--- /dev/null
+++ b/glib/gtimezoneprivate.h
@@ -0,0 +1,48 @@
+#ifndef __G_TIME_ZONE_PRIVATE_H__
+#define __G_TIME_ZONE_PRIVATE_H__
+
+#include "gtimezone.h"
+
+/*< internal >
+ * GTimeType:
+ * @G_TIME_TYPE_STANDARD: the time is in local standard time
+ * @G_TIME_TYPE_DAYLIGHT: the time is in local daylight time
+ * @G_TIME_TYPE_UNIVERSAL: the time is in UTC
+ *
+ * Disambiguates a given time in two ways.
+ *
+ * First, specifies if the given time is in universal or local time.
+ *
+ * Second, if the time is in local time, specifies if it is local
+ * standard time or local daylight time.  This is important for the case
+ * where the same local time occurs twice (during daylight savings time
+ * transitions, for example).
+ */
+typedef enum
+{
+  G_TIME_TYPE_STANDARD,
+  G_TIME_TYPE_DAYLIGHT,
+  G_TIME_TYPE_UNIVERSAL
+} GTimeType;
+
+G_GNUC_INTERNAL
+gint                    g_time_zone_find_interval                       (GTimeZone   *tz,
+                                                                         GTimeType    type,
+                                                                         gint64       time);
+
+G_GNUC_INTERNAL
+gint                    g_time_zone_adjust_time                         (GTimeZone   *tz,
+                                                                         GTimeType    type,
+                                                                         gint64      *time);
+
+G_GNUC_INTERNAL
+const gchar *           g_time_zone_get_abbreviation                    (GTimeZone   *tz,
+                                                                         gint         interval);
+G_GNUC_INTERNAL
+gint32                  g_time_zone_get_offset                          (GTimeZone   *tz,
+                                                                         gint         interval);
+G_GNUC_INTERNAL
+gboolean                g_time_zone_is_dst                              (GTimeZone   *tz,
+                                                                         gint         interval);
+
+#endif /* __G_TIME_ZONE_PRIVATE_H__ */