comparison pidgin/gtkmain.c @ 20685:02df6998b466

propagate from branch 'im.pidgin.rlaager.merging.2_2_1_conflicts' (head 4ad1081695d083df424898e6e7091f731b401265) to branch 'im.pidgin.pidgin' (head d33243e8f5347776c81f81a0e4ba3a76ae5505a5)

20258:509ca8ebe515

		       "  -h, --help          display this help and exit\n"
		       "  -m, --multiple      do not ensure single instance\n"
		       "  -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"
		       "  -v, --version       display the current version and exit\n"), PIDGIN_NAME, VERSION, name);
	}

	purple_print_utf8_to_console(stdout, text);
	g_free(text);

		{"login",    optional_argument, NULL, 'l'},
		{"multiple", no_argument,       NULL, 'm'},
		{"nologin",  no_argument,       NULL, 'n'},
		{"session",  required_argument, NULL, 's'},
		{"version",  no_argument,       NULL, 'v'},
		{0, 0, 0, 0}
	};

#ifdef DEBUG
	debug_enabled = TRUE;

			opt_version = TRUE;
			break;
		case 'm':   /* do not ensure single instance. */
			opt_si = FALSE;
			break;
		case '?':	/* show terse help */
		default:
			show_usage(argv[0], TRUE);
#ifdef HAVE_SIGNAL_H
			g_free(segfault_message);

20685:02df6998b466

		       "  -h, --help          display this help and exit\n"
		       "  -m, --multiple      do not ensure single instance\n"
		       "  -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);
	}

	purple_print_utf8_to_console(stdout, text);
	g_free(text);

		{"login",    optional_argument, NULL, 'l'},
		{"multiple", no_argument,       NULL, 'm'},
		{"nologin",  no_argument,       NULL, 'n'},
		{"session",  required_argument, NULL, 's'},
		{"version",  no_argument,       NULL, 'v'},
		{"display",  required_argument, NULL, 'D'},
		{0, 0, 0, 0}
	};

#ifdef DEBUG
	debug_enabled = TRUE;

			opt_version = TRUE;
			break;
		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);
#ifdef HAVE_SIGNAL_H
			g_free(segfault_message);