[gtk+] immodule: Move private functions to a private header



commit c2da143aa6748d8f01e66edfd646dc0bff673d09
Author: Benjamin Otte <otte redhat com>
Date:   Tue Nov 8 20:03:09 2011 +0100

    immodule: Move private functions to a private header

 gtk/Makefile.am          |    1 +
 gtk/gtkimmodule.c        |    1 +
 gtk/gtkimmodule.h        |    7 -------
 gtk/gtkimmoduleprivate.h |   35 +++++++++++++++++++++++++++++++++++
 gtk/gtkimmulticontext.c  |    1 +
 5 files changed, 38 insertions(+), 7 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 0edd14a..514c2c7 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -414,6 +414,7 @@ gtk_private_h_sources =		\
 	gtkfontchooserutils.h	\
 	gtkiconcache.h		\
 	gtkimageprivate.h	\
+	gtkimmoduleprivate.h	\
 	gtkimcontextsimpleseqs.h \
 	gtkintl.h		\
 	gtkkeyhash.h		\
diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index de03fda..4b38d68 100644
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -33,6 +33,7 @@
 #include <glib/gstdio.h>
 #include <gmodule.h>
 #include "gtkimmodule.h"
+#include "gtkimmoduleprivate.h"
 #include "gtkimcontextsimple.h"
 #include "gtksettings.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkimmodule.h b/gtk/gtkimmodule.h
index 794b36f..750e603 100644
--- a/gtk/gtkimmodule.h
+++ b/gtk/gtkimmodule.h
@@ -35,13 +35,6 @@ struct _GtkIMContextInfo
   const gchar *default_locales;
 };
 
-/* Functions for use within GTK+
- */
-void           _gtk_im_module_list                   (const GtkIMContextInfo ***contexts,
-						      guint                    *n_contexts);
-GtkIMContext * _gtk_im_module_create                 (const gchar              *context_id);
-const gchar  * _gtk_im_module_get_default_context_id (GdkWindow                *client_window);
-
 /* The following entry points are exported by each input method module
  */
 
diff --git a/gtk/gtkimmoduleprivate.h b/gtk/gtkimmoduleprivate.h
new file mode 100644
index 0000000..d559c28
--- /dev/null
+++ b/gtk/gtkimmoduleprivate.h
@@ -0,0 +1,35 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 2000 Red Hat Software
+ *
+ * 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, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GTK_IM_MODULE_PRIVATE_H__
+#define __GTK_IM_MODULE_PRIVATE_H__
+
+#include <gdk/gdk.h>
+#include <gtk/gtkimmodule.h>
+
+G_BEGIN_DECLS
+
+void           _gtk_im_module_list                   (const GtkIMContextInfo ***contexts,
+						      guint                    *n_contexts);
+GtkIMContext * _gtk_im_module_create                 (const gchar              *context_id);
+const gchar  * _gtk_im_module_get_default_context_id (GdkWindow                *client_window);
+
+G_END_DECLS
+
+#endif /* __GTK_IM_MODULE_PRIVATE_H__ */
diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index dee54ec..c88294e 100644
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -24,6 +24,7 @@
 
 #include "gtkimmulticontext.h"
 #include "gtkimmodule.h"
+#include "gtkimmoduleprivate.h"
 #include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkradiomenuitem.h"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]