summaryrefslogtreecommitdiff
path: root/gdk/gdk.c
diff options
context:
space:
mode:
authorThomas Wood <thomas.wood@intel.com>2013-02-22 16:41:12 +0000
committerMatthias Clasen <mclasen@redhat.com>2013-03-22 22:23:39 -0400
commit3a9de35a6cefddc09aaf000e523f3435a955a5e7 (patch)
tree9464a10b592c8170cc709b78927a95b07fbd4693 /gdk/gdk.c
parent75f4f7a47179c6ab48ecbf07acfab16f9cd762b4 (diff)
downloadgtk+-3a9de35a6cefddc09aaf000e523f3435a955a5e7.tar.gz
gdk: Implement GInitable on GdkDisplayManager
Add GInitable interface with a default implementation that always succeeds. This allows backends to override the GInitable implementation and add their own checks to determine if the backend can be loaded. If a backend cannot be loaded, GDK can attempt to load the next available backend. Since backends may need to read any relevant options (such as the display flag) to determine if they can be created successfully, this patch also removes calls that attempt to create the display manager before the options have been parsed. https://bugzilla.gnome.org/show_bug.cgi?id=694465
Diffstat (limited to 'gdk/gdk.c')
-rw-r--r--gdk/gdk.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/gdk/gdk.c b/gdk/gdk.c
index 437ecf99d0..5d0dc1ce39 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -275,9 +275,6 @@ gdk_pre_parse_libgtk_only (void)
else if (g_str_equal (rendering_mode, "recording"))
_gdk_rendering_mode = GDK_RENDERING_MODE_RECORDING;
}
-
- /* Do any setup particular to the windowing system */
- gdk_display_manager_get ();
}