summaryrefslogtreecommitdiff
path: root/gtk/gtkmain.c
diff options
context:
space:
mode:
Diffstat (limited to 'gtk/gtkmain.c')
-rw-r--r--gtk/gtkmain.c34
1 files changed, 0 insertions, 34 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index e8e74238ce..deb5810959 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -32,7 +32,6 @@
* Before using GTK+, you need to initialize it; initialization connects to the
* window system display, and parses some standard command line arguments. The
* gtk_init() macro initializes GTK+. gtk_init() exits the application if errors
- * occur; to avoid this, use gtk_init_check(). gtk_init_check() allows you to
* recover from a failed GTK+ initialization - you might start up your
* application in text mode instead.
*
@@ -120,8 +119,6 @@
#include "gtkdndprivate.h"
#include "gtkmain.h"
#include "gtkmenu.h"
-#include "gtkmodules.h"
-#include "gtkmodulesprivate.h"
#include "gtkprivate.h"
#include "gtkrecentmanager.h"
#include "gtksettingsprivate.h"
@@ -157,7 +154,6 @@ static const GDebugKey gtk_debug_keys[] = {
{ "tree", GTK_DEBUG_TREE },
{ "updates", GTK_DEBUG_UPDATES },
{ "keybindings", GTK_DEBUG_KEYBINDINGS },
- { "modules", GTK_DEBUG_MODULES },
{ "geometry", GTK_DEBUG_GEOMETRY },
{ "icontheme", GTK_DEBUG_ICONTHEME },
{ "printing", GTK_DEBUG_PRINTING} ,
@@ -383,8 +379,6 @@ gtk_disable_setlocale (void)
#undef gtk_init_check
#endif
-static GString *gtk_modules_string = NULL;
-
#ifdef G_OS_WIN32
static char *iso639_to_check = NULL;
@@ -559,9 +553,6 @@ do_pre_parse_initialization (void)
pre_initialized = TRUE;
- if (_gtk_module_has_mixed_deps (NULL))
- g_error ("GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in the same process is not supported");
-
gdk_pre_parse ();
gdk_event_handler_set ((GdkEventFunc)gtk_main_do_event, NULL, NULL);
@@ -576,21 +567,6 @@ do_pre_parse_initialization (void)
}
#endif /* G_ENABLE_DEBUG */
- env_string = g_getenv ("GTK3_MODULES");
- if (env_string)
- gtk_modules_string = g_string_new (env_string);
-
- env_string = g_getenv ("GTK_MODULES");
- if (env_string)
- {
- if (gtk_modules_string)
- g_string_append_c (gtk_modules_string, G_SEARCHPATH_SEPARATOR);
- else
- gtk_modules_string = g_string_new (NULL);
-
- g_string_append (gtk_modules_string, env_string);
- }
-
env_string = g_getenv ("GTK_SLOWDOWN");
if (env_string)
{
@@ -647,16 +623,6 @@ do_post_parse_initialization (void)
gtk_initialized = TRUE;
- if (gtk_modules_string)
- {
- _gtk_modules_init (NULL, NULL, gtk_modules_string->str);
- g_string_free (gtk_modules_string, TRUE);
- }
- else
- {
- _gtk_modules_init (NULL, NULL, NULL);
- }
-
display_manager = gdk_display_manager_get ();
if (gdk_display_manager_get_default_display (display_manager) != NULL)
_gtk_accessibility_init ();