diff options
| author | Lars Uebernickel <lars.uebernickel@canonical.com> | 2015-02-03 11:01:29 +0100 |
|---|---|---|
| committer | Lars Uebernickel <lars.uebernickel@canonical.com> | 2015-02-04 13:42:39 +0100 |
| commit | 3e81653bd320b9d5c760c2731a225f546f353c7a (patch) | |
| tree | 93e130edc9a5c014361dd511bb320b678fe74447 /gtk/gtkmain.c | |
| parent | 2820c342f6fbe4dcac88b836404d748f27157e90 (diff) | |
| download | gtk+-3e81653bd320b9d5c760c2731a225f546f353c7a.tar.gz | |
Add support for loading gtk3-only modules
Introduce GTK3_MODULES environment variable for modules that don't work
in gtk3. The list of modules is now $GTK3_MODULES:$GTK_MODULES.
https://bugzilla.gnome.org/show_bug.cgi?id=743917
Diffstat (limited to 'gtk/gtkmain.c')
| -rw-r--r-- | gtk/gtkmain.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 88e326051b..36c2586c78 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -657,9 +657,20 @@ do_pre_parse_initialization (int *argc, } #endif /* G_ENABLE_DEBUG */ - env_string = g_getenv ("GTK_MODULES"); + 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); + } } static void |