GNOME.org
 

[gtk+] gtk: move _gtk_modules_has_mixed_deps() to gtkmodlesprivate.h

commit 5c4f2ef0c1e658827091aadf4fc3c4d5f5964785
Author: Michael Natterer <mitch gimp org>
Date:   Sun Oct 23 13:57:07 2011 +0200

    gtk: move _gtk_modules_has_mixed_deps() to gtkmodlesprivate.h
    
    and remove gtkmainprivate.h completely.

 gtk/Makefile.am          |    1 -
 gtk/gtkaboutdialog.c     |    2 +-
 gtk/gtkaccelgroup.c      |    1 -
 gtk/gtkcombobox.c        |    1 -
 gtk/gtkentrycompletion.c |    2 +-
 gtk/gtkimmodule.c        |    1 -
 gtk/gtklabel.c           |    1 -
 gtk/gtklinkbutton.c      |    2 +-
 gtk/gtkmain.c            |   40 ++++++----------------------------------
 gtk/gtkmainprivate.h     |   30 ------------------------------
 gtk/gtkmenushell.c       |    1 -
 gtk/gtkmodules.c         |   28 +++++++++++++++++++++++++++-
 gtk/gtkmodulesprivate.h  |    2 ++
 gtk/gtkoverlay.c         |    1 -
 gtk/gtkprintoperation.c  |    1 -
 gtk/gtkrange.c           |    1 -
 gtk/gtkscale.c           |    1 -
 gtk/gtksocket.c          |    1 -
 gtk/gtkspinbutton.c      |    1 -
 gtk/gtktextattributes.c  |    1 -
 gtk/gtktexttag.c         |    1 -
 gtk/gtktoolbar.c         |    2 +-
 gtk/gtktoolitem.c        |    1 -
 gtk/gtktreeview.c        |    1 -
 gtk/gtkwidget.c          |    1 -
 25 files changed, 39 insertions(+), 86 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 68df3c9..906c158 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -416,7 +416,6 @@ gtk_private_h_sources =		\
 	gtkimcontextsimpleseqs.h \
 	gtkintl.h		\
 	gtkkeyhash.h		\
-	gtkmainprivate.h	\
 	gtkmenuprivate.h	\
 	gtkmenuitemprivate.h	\
 	gtkmenushellprivate.h	\
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index 65ddfa0..aaa82fb 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -49,7 +49,7 @@
 #include "gtktextview.h"
 #include "gtkiconfactory.h"
 #include "gtkshow.h"
-#include "gtkmainprivate.h"
+#include "gtkmain.h"
 #include "gtkmessagedialog.h"
 #include "gtktogglebutton.h"
 #include "gtktypebuiltins.h"
diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index 929cb03..154ad29 100644
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -33,7 +33,6 @@
 #include "gtkaccellabel.h"
 #include "gtkaccelmap.h"
 #include "gtkintl.h"
-#include "gtkmainprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index c0bf2c8..a7948c9 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -41,7 +41,6 @@
 #include "gtkseparator.h"
 #include "gtkwindow.h"
 #include "gtktypebuiltins.h"
-#include "gtkmainprivate.h"
 #include "gtkprivate.h"
 
 #include <gobject/gvaluecollector.h>
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index d3d3a04..4847b9d 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -82,7 +82,7 @@
 #include "gtkbox.h"
 #include "gtkwindow.h"
 #include "gtkentry.h"
-#include "gtkmainprivate.h"
+#include "gtkmain.h"
 #include "gtkmarshalers.h"
 
 #include "gtkprivate.h"
diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 93ac7b9..ef547fc 100644
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -35,7 +35,6 @@
 #include "gtkimmodule.h"
 #include "gtkimcontextsimple.h"
 #include "gtksettings.h"
-#include "gtkmainprivate.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
 
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 7035da4..26fb56a 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -31,7 +31,6 @@
 #include "gtklabel.h"
 #include "gtkaccellabel.h"
 #include "gtkdnd.h"
-#include "gtkmainprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkpango.h"
 #include "gtkwindow.h"
diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c
index ffa89c0..f072427 100644
--- a/gtk/gtklinkbutton.c
+++ b/gtk/gtklinkbutton.c
@@ -55,7 +55,7 @@
 #include "gtkdnd.h"
 #include "gtkimagemenuitem.h"
 #include "gtklabel.h"
-#include "gtkmainprivate.h"
+#include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkmenu.h"
 #include "gtkmenuitem.h"
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index a4c38f6..25e61eb 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -91,9 +91,6 @@
 
 #include "config.h"
 
-#include "gtkmainprivate.h"
-
-#include <glib.h>
 #include "gdk/gdk.h"
 
 #include <locale.h>
@@ -117,19 +114,20 @@
 #include "gtkaccelmap.h"
 #include "gtkbox.h"
 #include "gtkclipboard.h"
+#include "gtkdebug.h"
 #include "gtkdnd.h"
-#include "gtkversion.h"
+#include "gtkmain.h"
+#include "gtkmenu.h"
 #include "gtkmodules.h"
 #include "gtkmodulesprivate.h"
+#include "gtkprivate.h"
 #include "gtkrecentmanager.h"
 #include "gtkselectionprivate.h"
 #include "gtksettingsprivate.h"
+#include "gtktooltip.h"
+#include "gtkversion.h"
 #include "gtkwidgetprivate.h"
 #include "gtkwindowprivate.h"
-#include "gtktooltip.h"
-#include "gtkdebug.h"
-#include "gtkmenu.h"
-#include "gtkprivate.h"
 
 
 /* Private type definitions
@@ -622,32 +620,6 @@ setlocale_initialization (void)
     }
 }
 
-/* Return TRUE if module_to_check causes version conflicts.
- * If module_to_check is NULL, check the main module.
- */
-gboolean
-_gtk_module_has_mixed_deps (GModule *module_to_check)
-{
-  GModule *module;
-  gpointer func;
-  gboolean result;
-
-  if (!module_to_check)
-    module = g_module_open (NULL, 0);
-  else
-    module = module_to_check;
-
-  if (g_module_symbol (module, "gtk_progress_get_type", &func))
-    result = TRUE;
-  else
-    result = FALSE;
-
-  if (!module_to_check)
-    g_module_close (module);
-
-  return result;
-}
-
 static void
 do_pre_parse_initialization (int    *argc,
                              char ***argv)
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 4b6749d..7bda535 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -42,7 +42,6 @@
 #include "gtkbindings.h"
 #include "gtkkeyhash.h"
 #include "gtklabel.h"
-#include "gtkmainprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkmenubar.h"
 #include "gtkmenuitemprivate.h"
diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index cdd85db..f94c0d1 100644
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -27,7 +27,7 @@
 #include "gtksettings.h"
 #include "gtkdebug.h"
 #include "gtkprivate.h"
-#include "gtkmainprivate.h"
+#include "gtkmodulesprivate.h"
 #include "gtkintl.h"
 
 #include <gmodule.h>
@@ -599,3 +599,29 @@ _gtk_modules_settings_changed (GtkSettings *settings,
 			  new_modules,
 			  settings_destroy_notify);
 }
+
+/* Return TRUE if module_to_check causes version conflicts.
+ * If module_to_check is NULL, check the main module.
+ */
+gboolean
+_gtk_module_has_mixed_deps (GModule *module_to_check)
+{
+  GModule *module;
+  gpointer func;
+  gboolean result;
+
+  if (!module_to_check)
+    module = g_module_open (NULL, 0);
+  else
+    module = module_to_check;
+
+  if (g_module_symbol (module, "gtk_progress_get_type", &func))
+    result = TRUE;
+  else
+    result = FALSE;
+
+  if (!module_to_check)
+    g_module_close (module);
+
+  return result;
+}
diff --git a/gtk/gtkmodulesprivate.h b/gtk/gtkmodulesprivate.h
index 88f1c5e..dc8ea28 100644
--- a/gtk/gtkmodulesprivate.h
+++ b/gtk/gtkmodulesprivate.h
@@ -39,6 +39,8 @@ void     _gtk_modules_init             (gint          *argc,
 void     _gtk_modules_settings_changed (GtkSettings   *settings,
                                         const gchar   *modules);
 
+gboolean _gtk_module_has_mixed_deps    (GModule       *module);
+
 G_END_DECLS
 
 #endif /* __GTK_MODULES_PRIVATE_H__ */
diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c
index 40125ba..e8b66aa 100644
--- a/gtk/gtkoverlay.c
+++ b/gtk/gtkoverlay.c
@@ -25,7 +25,6 @@
 #include "gtkoverlay.h"
 #include "gtkbuildable.h"
 #include "gtkscrolledwindow.h"
-#include "gtkmainprivate.h"
 #include "gtkmarshalers.h"
 
 #include "gtkprivate.h"
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index ebc7ad4..b6fa95d 100644
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -31,7 +31,6 @@
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
-#include "gtkmainprivate.h"
 #include "gtkmessagedialog.h"
 #include "gtktypebuiltins.h"
 
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 94594dd..69b959b 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -30,7 +30,6 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "gtkmainprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkorientableprivate.h"
 #include "gtkrange.h"
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index 69c54e4..3266f2e 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -41,7 +41,6 @@
 #include "gtkintl.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
-#include "gtkmainprivate.h"
 
 #include "a11y/gtkscaleaccessible.h"
 
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index d20a567..d7f6df6 100644
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -31,7 +31,6 @@
 
 #include <string.h>
 
-#include "gtkmainprivate.h"
 #include "gtkmarshalers.h"
 #include "gtksizerequest.h"
 #include "gtkplug.h"
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 9a6b3ea..6be36aa 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -38,7 +38,6 @@
 #include "gtkbindings.h"
 #include "gtkspinbutton.h"
 #include "gtkentryprivate.h"
-#include "gtkmainprivate.h"
 #include "gtkmarshalers.h"
 #include "gtksettings.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtktextattributes.c b/gtk/gtktextattributes.c
index 8aca3b8..d9bb885 100644
--- a/gtk/gtktextattributes.c
+++ b/gtk/gtktextattributes.c
@@ -51,7 +51,6 @@
 
 #include "gtktextattributes.h"
 
-#include "gtkmainprivate.h"
 #include "gtktexttag.h"
 #include "gtktexttypes.h"
 
diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index 827a2dd..81f7932 100644
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -68,7 +68,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gtkmainprivate.h"
 #include "gtktexttag.h"
 #include "gtktexttypes.h"
 #include "gtktexttagtable.h"
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 2bd9be7..5e7cfe1 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -42,7 +42,7 @@
 #include "gtkcontainerprivate.h"
 #include "gtkimage.h"
 #include "gtklabel.h"
-#include "gtkmainprivate.h"
+#include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkmenu.h"
 #include "gtkorientable.h"
diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c
index 408494d..213fc82 100644
--- a/gtk/gtktoolitem.c
+++ b/gtk/gtktoolitem.c
@@ -32,7 +32,6 @@
 #include "gtksizerequest.h"
 #include "gtkactivatable.h"
 #include "gtkintl.h"
-#include "gtkmainprivate.h"
 #include "gtkprivate.h"
 
 
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index f7c5444..6ac6475 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -28,7 +28,6 @@
 #include "gtktreednd.h"
 #include "gtktreeprivate.h"
 #include "gtkcellrenderer.h"
-#include "gtkmainprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkbuildable.h"
 #include "gtkbutton.h"
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 3e9e1d5..8ebc2f5 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -39,7 +39,6 @@
 #include "gtkclipboard.h"
 #include "gtkiconfactory.h"
 #include "gtkintl.h"
-#include "gtkmainprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkselectionprivate.h"
 #include "gtksettingsprivate.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]