Make gtk_im_modules_init properly private

Putting non-exported symbols in public headers can
only lead to confusion and day drinking. Don't do it.

Fixes: #3676

diff --git a/gtk/gtkimmodule.h b/gtk/gtkimmodule.h
index 913542aef90316d81b28d5128f99a0afe1bac8e6..d70772b2196820fea71f18c77b101303bdbacc22 100644 (file)
--- a/gtk/gtkimmodule.h
+++ b/gtk/gtkimmodule.h
@@ -22,8 +22,6 @@
 
 G_BEGIN_DECLS
 
-void          gtk_im_modules_init (void);
-
 #define GTK_IM_MODULE_EXTENSION_POINT_NAME "gtk-im-module"
 
 G_END_DECLS

diff --git a/gtk/gtkimmoduleprivate.h b/gtk/gtkimmoduleprivate.h
index 3619ebaacfa8d02a32dd06271b9e5ecae731e5d0..cd4361c41498066ab64ba976a3a1029a92a2c5e8 100644 (file)
--- a/gtk/gtkimmoduleprivate.h
+++ b/gtk/gtkimmoduleprivate.h
@@ -24,6 +24,8 @@
 
 G_BEGIN_DECLS
 
+void          gtk_im_modules_init (void);
+
 void           gtk_im_module_ensure_extension_point  (void);
 GtkIMContext * _gtk_im_module_create                 (const char *context_id);
 const char   * _gtk_im_module_get_default_context_id (GdkDisplay *display);

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 498b4ec8d4f88046da9279e43567a1224f5f22b7..4ad1802b700dc91b8b8ecbf500661ab360d83c40 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -129,7 +129,7 @@
 #include "gtkwindowprivate.h"
 #include "gtkwindowgroup.h"
 #include "gtkprintbackendprivate.h"
-#include "gtkimmodule.h"
+#include "gtkimmoduleprivate.h"
 #include "gtkroot.h"
 #include "gtknative.h"
 #include "gtkpopcountprivate.h"