From ef19b94397c10d408288811bc04641334bfecf89 Mon Sep 17 00:00:00 2001 From: Stephen Watson Date: Mon, 21 May 2007 16:58:15 +0000 Subject: [PATCH] Use gdk.display_get_default() as gdk.get_display() is 2.8 or later (Stephen Watson). git-svn-id: https://rox.svn.sourceforge.net/svnroot/rox/trunk/rox-lib@5028 66de3db3-b00d-0410-b41b-f4738ad19bea --- ROX-Lib2/AppRun | 2 +- ROX-Lib2/python/rox/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ROX-Lib2/AppRun b/ROX-Lib2/AppRun index e8a95ad..e454dbd 100755 --- a/ROX-Lib2/AppRun +++ b/ROX-Lib2/AppRun @@ -17,7 +17,7 @@ PyGTK version: %s\n\ GTK version: %s\n\n\ PyGTK location:\n%s") % (rox.roxlib_version, g.pygtk_version, g.gtk_version, dirname(g.__file__)) -if rox.g.gdk.get_display() is not None: +if rox.g.gdk.display_get_default() is not None: box = g.MessageDialog(None, g.MESSAGE_QUESTION, 0, g.BUTTONS_OK, message) box.add_button(g.STOCK_HELP, g.RESPONSE_HELP) box.set_title('ROX-Lib') diff --git a/ROX-Lib2/python/rox/__init__.py b/ROX-Lib2/python/rox/__init__.py index 95601d7..0d01c1e 100644 --- a/ROX-Lib2/python/rox/__init__.py +++ b/ROX-Lib2/python/rox/__init__.py @@ -80,7 +80,7 @@ except ImportError: sys.stderr.write(_('Broken pygtk installation: found pygtk (%s), but not gtk!\n') % pygtk.__file__) raise assert g.Window # Ensure not 1.2 bindings -have_display=g.gdk.get_display() is not None +have_display=g.gdk.display_get_default() is not None if not have_display: sys.stderr.write(_("WARNING from ROX-Lib: This does not appear to be a valid X environment (DISPLAY is not set), many functions will not work and may cause a segmentation fault.")+"\n") -- 2.11.4.GIT