im.pidgin.pidgin: 37f061ef6d824b11d69828c2ca473760dbbcd387

nosnilmot at pidgin.im nosnilmot at pidgin.im
Tue Dec 18 11:15:53 EST 2007


-----------------------------------------------------------------
Revision: 37f061ef6d824b11d69828c2ca473760dbbcd387
Ancestor: 1eae93501cff51faf3f1d65be12e9c2c9011794f
Author: nosnilmot at pidgin.im
Date: 2007-12-18T15:53:05
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkmain.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- pidgin/gtkmain.c	6b7ebb5d08bd31dc3ff0eb5aaad41a29a73e16fa
+++ pidgin/gtkmain.c	985a2b4724e17ba4871989c2cbb97b5240eb6bce
@@ -397,6 +397,7 @@ show_usage(const char *name, gboolean te
 	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 @@ show_usage(const char *name, gboolean te
 		       "  -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, 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
 	}
 
 	purple_print_utf8_to_console(stdout, text);


More information about the Commits mailing list