Author: branden
Date: 2005-01-11 02:26:36 -0500 (Tue, 11 Jan 2005)
New Revision: 2130
Added:
trunk/debian/patches/099r_xlsfonts_do_not_spew_usage_on_connection_error.diff
Removed:
trunk/debian/patches/099r_xprop_do_not_spew_usage_on_connection_error.diff
Modified:
trunk/debian/CHANGESETS
Log:
Rename patch #099r to be more accurate.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-01-11 06:48:21 UTC (rev 2129)
+++ trunk/debian/CHANGESETS 2005-01-11 07:26:36 UTC (rev 2130)
@@ -130,6 +130,6 @@
Fix xlsfonts, xprop, xwd, and xwininfo to not bleat a usage message when
XOpenDisplay() fails. Being unable to connect to the X server is an
operational error, not a user-input error.
- 2128, 2129
+ 2128, 2129, 2130
vim:set ai et sts=4 sw=4 tw=80:
Copied:
trunk/debian/patches/099r_xlsfonts_do_not_spew_usage_on_connection_error.diff
(from rev 2129,
trunk/debian/patches/099r_xprop_do_not_spew_usage_on_connection_error.diff)
Deleted:
trunk/debian/patches/099r_xprop_do_not_spew_usage_on_connection_error.diff
===================================================================
--- trunk/debian/patches/099r_xprop_do_not_spew_usage_on_connection_error.diff
2005-01-11 06:48:21 UTC (rev 2129)
+++ trunk/debian/patches/099r_xprop_do_not_spew_usage_on_connection_error.diff
2005-01-11 07:26:36 UTC (rev 2130)
@@ -1,27 +0,0 @@
-$Id$
-
-This patch by Branden Robinson.
-
-General philosophy:
-
-The user should only be shown a usage messages when:
- * it is asked for with a --help option or the like.
- * the command line is syntactically invalid.
-
-Because xlsfonts's dsimple.c source file is also used in xprop, xwd, and
-xwininfo, this patch also corrects this behavior for those programs.
-
-Not submitted upstream to XFree86 or X.Org.
-
---- xc/programs/xlsfonts/dsimple.c~ 2005-01-09 02:40:41.000000000 -0500
-+++ xc/programs/xlsfonts/dsimple.c 2005-01-09 02:41:58.000000000 -0500
-@@ -144,8 +144,7 @@
- if (d == NULL) {
- fprintf (stderr, "%s: unable to open display '%s'\n",
- program_name, XDisplayName (display_name));
-- usage ();
-- /* doesn't return */
-+ exit (1);
- }
-
- return(d);
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
