diff pidgin/gtkmain.c @ 20690:b92fde9b03a6

propagate from branch 'im.pidgin.rlaager.merging.2_2_1_conflicts' (head 193dd268b0be5ca0a4a8fa0e4188452907114be0) to branch 'im.pidgin.pidgin' (head 563924526117e45ff6134011258940e8b1988d72)

--- a/pidgin/gtkmain.c	Fri Sep 28 17:18:13 2007 +0000
+++ b/pidgin/gtkmain.c	Fri Sep 28 17:20:33 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);