r13126 - in /desktop/unstable/gtk+2.0/debian: changelog patches/060_opening-display-by-env-error-message.patch patches/series

[lool at users.alioth.debian.org]

Author: lool
Date: Sun Oct 14 18:35:45 2007
New Revision: 13126

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13126
Log:
* 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.

Added:
    desktop/unstable/gtk+2.0/debian/patches/060_opening-display-by-env-error-message.patch
Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/patches/series

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=13126&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Sun Oct 14 18:35:45 2007
@@ -30,8 +30,11 @@
   * 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.
-
- -- Loic Minier <lool at dooz.org>  Sun, 14 Oct 2007 19:50:19 +0200
+  * 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 at dooz.org>  Sun, 14 Oct 2007 19:59:24 +0200
 
 gtk+2.0 (2.12.0-2) unstable; urgency=low
 

Added: desktop/unstable/gtk+2.0/debian/patches/060_opening-display-by-env-error-message.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/060_opening-display-by-env-error-message.patch?rev=13126&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/060_opening-display-by-env-error-message.patch (added)
+++ desktop/unstable/gtk+2.0/debian/patches/060_opening-display-by-env-error-message.patch Sun Oct 14 18:35:45 2007
@@ -1,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);
+     }

Modified: desktop/unstable/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/series?rev=13126&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/series (original)
+++ desktop/unstable/gtk+2.0/debian/patches/series Sun Oct 14 18:35:45 2007
@@ -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