summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2013-04-17 23:04:54 +0100
committerBenjamin Otte <otte@redhat.com>2013-04-19 16:18:25 -0400
commitdd0fec47573e2893a7f0cdaf551f9a815984b01d (patch)
treed0f05a9bd3458a58e9efa7574efaf5973815fd71
parentf345051d3671e2321f20aad996f90f57859ae826 (diff)
downloadgtk+-dd0fec47573e2893a7f0cdaf551f9a815984b01d.tar.gz
x11: Simplify function
Displays get made default displays automatically, so there's no need to do it in the vfunc.
-rw-r--r--gdk/x11/gdkdisplaymanager-x11.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/gdk/x11/gdkdisplaymanager-x11.c b/gdk/x11/gdkdisplaymanager-x11.c
index e550983a79..59f270b10e 100644
--- a/gdk/x11/gdkdisplaymanager-x11.c
+++ b/gdk/x11/gdkdisplaymanager-x11.c
@@ -76,16 +76,7 @@ static GdkDisplay *
gdk_x11_display_manager_open_display (GdkDisplayManager *manager,
const gchar *name)
{
- GdkDisplay *display;
-
- display = _gdk_x11_display_open (name);
- if (display != NULL)
- {
- if (gdk_display_manager_get_default_display (manager) == NULL)
- gdk_display_manager_set_default_display (manager, display);
- }
-
- return display;
+ return _gdk_x11_display_open (name);
}
static void