frameclockidle: Rename header so it's private now

diff --git a/gdk/gdkdrawingcontext.c b/gdk/gdkdrawingcontext.c
index 671da319304cf94b4f73a3775d88504db9f52dfe..9489ecb93ff28076266c5cefb623f8015118aebf 100644 (file)
--- a/gdk/gdkdrawingcontext.c
+++ b/gdk/gdkdrawingcontext.c
@@ -48,7 +48,6 @@
 #include "gdkrectangle.h"
 #include "gdkinternals.h"
 #include "gdkintl.h"
-#include "gdkframeclockidle.h"
 #include "gdksurfaceimpl.h"
 #include "gdkglcontextprivate.h"
 #include "gdk-private.h"

diff --git a/gdk/gdkframeclockidle.c b/gdk/gdkframeclockidle.c
index ebb7efe71347f856d8940252f5de8184bdca0c38..911680fffdbbdde7ed72c405c8d7eefb73397808 100644 (file)
--- a/gdk/gdkframeclockidle.c
+++ b/gdk/gdkframeclockidle.c
@@ -24,9 +24,10 @@
 
 #include "config.h"
 
+#include "gdkframeclockidleprivate.h"
+
 #include "gdkinternals.h"
 #include "gdkframeclockprivate.h"
-#include "gdkframeclockidle.h"
 #include "gdk.h"
 
 #ifdef G_OS_WIN32

diff --git a/gdk/gdkframeclockidle.h b/gdk/gdkframeclockidle.h
deleted file mode 100644 (file)
index 42f765f..0000000
--- a/gdk/gdkframeclockidle.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2010.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-/* Uninstalled header, internal to GDK */
-
-#ifndef __GDK_FRAME_CLOCK_IDLE_H__
-#define __GDK_FRAME_CLOCK_IDLE_H__
-
-#include "gdkframeclockprivate.h"
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_FRAME_CLOCK_IDLE            (gdk_frame_clock_idle_get_type ())
-#define GDK_FRAME_CLOCK_IDLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_FRAME_CLOCK_IDLE, GdkFrameClockIdle))
-#define GDK_FRAME_CLOCK_IDLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_FRAME_CLOCK_IDLE, GdkFrameClockIdleClass))
-#define GDK_IS_FRAME_CLOCK_IDLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_FRAME_CLOCK_IDLE))
-#define GDK_IS_FRAME_CLOCK_IDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_FRAME_CLOCK_IDLE))
-#define GDK_FRAME_CLOCK_IDLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_FRAME_CLOCK_IDLE, GdkFrameClockIdleClass))
-
-
-typedef struct _GdkFrameClockIdle              GdkFrameClockIdle;
-typedef struct _GdkFrameClockIdlePrivate       GdkFrameClockIdlePrivate;
-typedef struct _GdkFrameClockIdleClass         GdkFrameClockIdleClass;
-
-struct _GdkFrameClockIdle
-{
-  GdkFrameClock parent_instance;
-
-  /*< private >*/
-  GdkFrameClockIdlePrivate *priv;
-};
-
-struct _GdkFrameClockIdleClass
-{
-  GdkFrameClockClass parent_class;
-};
-
-GType           gdk_frame_clock_idle_get_type       (void) G_GNUC_CONST;
-
-GdkFrameClock *_gdk_frame_clock_idle_new            (void);
-
-G_END_DECLS
-
-#endif /* __GDK_FRAME_CLOCK_IDLE_H__ */

diff --git a/gdk/gdkframeclockidleprivate.h b/gdk/gdkframeclockidleprivate.h
new file mode 100644 (file)
index 0000000..42f765f
--- /dev/null
+++ b/gdk/gdkframeclockidleprivate.h
@@ -0,0 +1,65 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2010.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+/* Uninstalled header, internal to GDK */
+
+#ifndef __GDK_FRAME_CLOCK_IDLE_H__
+#define __GDK_FRAME_CLOCK_IDLE_H__
+
+#include "gdkframeclockprivate.h"
+
+G_BEGIN_DECLS
+
+#define GDK_TYPE_FRAME_CLOCK_IDLE            (gdk_frame_clock_idle_get_type ())
+#define GDK_FRAME_CLOCK_IDLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_FRAME_CLOCK_IDLE, GdkFrameClockIdle))
+#define GDK_FRAME_CLOCK_IDLE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_FRAME_CLOCK_IDLE, GdkFrameClockIdleClass))
+#define GDK_IS_FRAME_CLOCK_IDLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_FRAME_CLOCK_IDLE))
+#define GDK_IS_FRAME_CLOCK_IDLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_FRAME_CLOCK_IDLE))
+#define GDK_FRAME_CLOCK_IDLE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_FRAME_CLOCK_IDLE, GdkFrameClockIdleClass))
+
+
+typedef struct _GdkFrameClockIdle              GdkFrameClockIdle;
+typedef struct _GdkFrameClockIdlePrivate       GdkFrameClockIdlePrivate;
+typedef struct _GdkFrameClockIdleClass         GdkFrameClockIdleClass;
+
+struct _GdkFrameClockIdle
+{
+  GdkFrameClock parent_instance;
+
+  /*< private >*/
+  GdkFrameClockIdlePrivate *priv;
+};
+
+struct _GdkFrameClockIdleClass
+{
+  GdkFrameClockClass parent_class;
+};
+
+GType           gdk_frame_clock_idle_get_type       (void) G_GNUC_CONST;
+
+GdkFrameClock *_gdk_frame_clock_idle_new            (void);
+
+G_END_DECLS
+
+#endif /* __GDK_FRAME_CLOCK_IDLE_H__ */

diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index fd3c213506f1bc5120e9cdabb01b6a8ed4d16c7c..ea1f3fe65415bb2024ce09f1fb9d64c9014a740d 100644 (file)
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -34,8 +34,8 @@
 #include "gdkintl.h"
 #include "gdkdisplayprivate.h"
 #include "gdkdeviceprivate.h"
+#include "gdkframeclockidleprivate.h"
 #include "gdkmarshalers.h"
-#include "gdkframeclockidle.h"
 #include "gdksurfaceimpl.h"
 #include "gdkglcontextprivate.h"
 #include "gdkdrawingcontextprivate.h"