callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* New patch, 060_opening-display-by-env-error-message, fixes error message

Browse Source 
on opening of display to include the display when it was set via the
  DISPLAY env var; GNOME #486636; closes: #283076.
This commit is contained in:
Loïc Minier
2007-10-14 18:35:45 +00:00
parent 35833014cf
commit 0f86341ba5
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -30,8 +30,11 @@ gtk+2.0 (2.12.0-3) UNRELEASED; urgency=low
* New patch, 080_from_bugzilla_workaround_eclipse_crash, fixes crash when
displaying tooltips in SWT apps such as Eclipse; GNOME #410194; LP
#128232; closes: #445613.
* New patch, 060_opening-display-by-env-error-message, fixes error message
on opening of display to include the display when it was set via the
DISPLAY env var; GNOME #486636; closes: #283076.
-- Loic Minier <lool@dooz.org> Sun, 14 Oct 2007 19:50:19 +0200
-- Loic Minier <lool@dooz.org> Sun, 14 Oct 2007 19:59:24 +0200
gtk+2.0 (2.12.0-2) unstable; urgency=low

14
debian/patches/060_opening-display-by-env-error-message.patch vendored Normal file
View File

@ -0,0 +1,14 @@
GNOME #486636; Debian #283076; fixes error message on opening of display to
include the display when it was set via the DISPLAY env var
--- gtk+2.0-2.12.0.orig/gtk/gtkmain.c 2007-09-13 22:35:41.000000000 +0200
+++ gtk+2.0-2.12.0/gtk/gtkmain.c 2007-10-14 19:55:34.000000000 +0200
@@ -933,6 +933,8 @@
if (!gtk_init_check (argc, argv))
{
const char *display_name_arg = gdk_get_display_arg_name ();
+ if (display_name_arg == NULL)
+ display_name_arg = getenv("DISPLAY");
g_warning ("cannot open display: %s", display_name_arg ? display_name_arg : " ");
exit (1);
}

1
debian/patches/series vendored
View File

@ -14,6 +14,7 @@
033_treeview_resizing.patch
040_filechooser_single-click.patch
041_ia32-libs.patch
60_opening-display-by-env-error-message.patch
070_mandatory-relibtoolize.patch
080_from_bugzilla_workaround_eclipse_crash.patch
081_icon-cache-validate.patch