# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1189989632 0
# Node ID df2961ce071417a5a6cf7f39098cf616509aea1b
# Parent  2ab6b55ffa3da678758b8ca24bcc24fd10c6f87b
Accept --display as an argument, to be passed to Gtk+.

Fixes #3133

diff -r 2ab6b55ffa3d -r df2961ce0714 pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Sun Sep 16 18:59:11 2007 +0000
+++ b/pidgin/gtkmain.c	Mon Sep 17 00:40:32 2007 +0000
@@ -394,6 +394,9 @@
 		       "  -n, --nologin       don't automatically login\n"
 		       "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 		       "                      account(s) to use, separated by commas)\n"
+#ifndef WIN32
+		       "  --display=DISPLAY   X display to use\n"
+#endif
 		       "  -v, --version       display the current version and exit\n"), PIDGIN_NAME, VERSION, name);
 	}
 
@@ -481,6 +484,7 @@
 		{"nologin",  no_argument,       NULL, 'n'},
 		{"session",  required_argument, NULL, 's'},
 		{"version",  no_argument,       NULL, 'v'},
+		{"display",  required_argument, NULL, 'D'},
 		{0, 0, 0, 0}
 	};
 
@@ -626,6 +630,9 @@
 		case 'm':   /* do not ensure single instance. */
 			opt_si = FALSE;
 			break;
+		case 'D':   /* --display */
+			/* handled by gtk_init_check below */
+			break;
 		case '?':	/* show terse help */
 		default:
 			show_usage(argv[0], TRUE);