[gtk] Move the mixed module check function
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk] Move the mixed module check function
- Date: Sun, 18 Feb 2018 14:43:16 +0000 (UTC)
commit 7272610a02a144ff30106e647fa67736bf1642d8
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Feb 18 09:31:22 2018 -0500
Move the mixed module check function
This is only called in one place, move the function there.
gtk/gtkmain.c | 28 ++++++++++++++++++++++++++++
gtk/gtkmodules.c | 28 ----------------------------
gtk/gtkmodulesprivate.h | 2 --
3 files changed, 28 insertions(+), 30 deletions(-)
---
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 8af6ee4471..7a7d2e6ce7 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -545,6 +545,34 @@ setlocale_initialization (void)
}
}
+/* Return TRUE if module_to_check causes version conflicts.
+ * If module_to_check is NULL, check the main module.
+ */
+static 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 if (g_module_symbol (module, "gtk_misc_get_type", &func))
+ result = TRUE;
+ else
+ result = FALSE;
+
+ if (!module_to_check)
+ g_module_close (module);
+
+ return result;
+}
+
static void
do_pre_parse_initialization (void)
{
diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index 57e6eb0f24..2f10c8671b 100644
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -186,31 +186,3 @@ _gtk_find_module (const gchar *name,
g_strfreev (paths);
return module_name;
}
-
-/* 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 if (g_module_symbol (module, "gtk_misc_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 67da320f80..b7d5793127 100644
--- a/gtk/gtkmodulesprivate.h
+++ b/gtk/gtkmodulesprivate.h
@@ -33,8 +33,6 @@ gchar * _gtk_find_module (const gchar *name,
const gchar *type);
gchar ** _gtk_get_module_path (const gchar *type);
-gboolean _gtk_module_has_mixed_deps (GModule *module);
-
G_END_DECLS
#endif /* __GTK_MODULES_PRIVATE_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]