Mercurial > pidgin.yaz
changeset 21865:886fa5f83f91
Ye Olde Compiler complained about this:
gtkmain.c:409:1: directives may not be used inside a macro argument
gtkmain.c:408:24: unterminated argument list invoking macro "_"
So just do the whole string separate for win32/non-win32 instead.
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Tue, 18 Dec 2007 15:53:05 +0000 |
| parents | e5208b29d807 |
| children | 03c950701fac |
| files | pidgin/gtkmain.c |
| diffstat | 1 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkmain.c Tue Dec 18 11:05:40 2007 +0000 +++ b/pidgin/gtkmain.c Tue Dec 18 15:53:05 2007 +0000 @@ -397,6 +397,7 @@ if (terse) { text = g_strdup_printf(_("%s %s. Try `%s -h' for more information.\n"), PIDGIN_NAME, DISPLAY_VERSION, name); } else { +#ifndef WIN32 text = g_strdup_printf(_("%s %s\n" "Usage: %s [OPTION]...\n\n" " -c, --config=DIR use DIR for config files\n" @@ -406,10 +407,20 @@ " -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" + " -v, --version display the current version and exit\n"), PIDGIN_NAME, DISPLAY_VERSION, name); +#else + text = g_strdup_printf(_("%s %s\n" + "Usage: %s [OPTION]...\n\n" + " -c, --config=DIR use DIR for config files\n" + " -d, --debug print debugging messages to stdout\n" + " -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, DISPLAY_VERSION, name); #endif - " -v, --version display the current version and exit\n"), PIDGIN_NAME, DISPLAY_VERSION, name); } purple_print_utf8_to_console(stdout, text);