diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-10-31 21:12:23 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-10-31 21:12:23 +0000 |
| commit | 550bf181d2e754425aa592f61108a0a0c9139256 (patch) | |
| tree | 82047181585ec2c8cc9bf85b8d35a88e27fc93ee /gtk/gtkmain.c | |
| parent | 089a38826365adbd8153318eb740c6b44cb9c49d (diff) | |
| download | gdk-pixbuf-550bf181d2e754425aa592f61108a0a0c9139256.tar.gz | |
Add a --screen option for setting the default screen. (Based on a patch
Thu Oct 31 12:40:39 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.[ch] gdk/gdkglobals.c gdk/gdkinternals.h
gdk/{x11,win32,linux-fb}/gdkscreen-{x11,win32,linux-fb}.c:
Add a --screen option for setting the default screen.
(Based on a patch from Balamurali Viswanathan, #81145)
* gdk/gdk.c gdkdisplay.h gtk/gtkmain.c: Add
gdk_display_open_default_libgtk_only(), so gtk_init_check()
and gdk_init_check() can share the same behavior w.r.t.
--screen.
* gdk/gdk.[ch]: Make gdk_get_display_arg_name() G_CONST_RETURN.
* gdk/x11/gdkselection-x11.c (gdk_selection_property_get):
Suppress a spurious warning.
* tests/testgtkrc: Remove someleft-over commented out
includes that could be confusing.
Diffstat (limited to 'gtk/gtkmain.c')
| -rw-r--r-- | gtk/gtkmain.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index fead858f0..a21d95aca 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -871,19 +871,7 @@ gtk_init_check (int *argc, if (!gtk_parse_args (argc, argv)) return FALSE; - if (gdk_display_get_default ()) - return TRUE; - - display = gdk_display_open (gdk_get_display_arg_name ()); - - if (display) - { - gdk_display_manager_set_default_display (gdk_display_manager_get (), - display); - return TRUE; - } - else - return FALSE; + return gdk_display_open_default_libgtk_only () != NULL; } #undef gtk_init |