comparison finch/finch.c @ 21284:6de09629f091

propagate from branch 'im.pidgin.pidgin.next.minor' (head 0c9637482b845cc65e95a26e144697391c51133f) to branch 'im.pidgin.pidgin' (head e3a6991e78dac328f13804950fee54dfb8afc3c5)
author Ka-Hing Cheung <khc@hxbc.us>
date Sat, 10 Nov 2007 04:52:20 +0000
parents 3cc856ca2338
children 2325df611c04
comparison
equal deleted inserted replaced
21283:406aa3be6b32 21284:6de09629f091
201 show_usage(const char *name, gboolean terse) 201 show_usage(const char *name, gboolean terse)
202 { 202 {
203 char *text; 203 char *text;
204 204
205 if (terse) { 205 if (terse) {
206 text = g_strdup_printf(_("%s. Try `%s -h' for more information.\n"), VERSION, name); 206 text = g_strdup_printf(_("%s. Try `%s -h' for more information.\n"), DISPLAY_VERSION, name);
207 } else { 207 } else {
208 text = g_strdup_printf(_("%s\n" 208 text = g_strdup_printf(_("%s\n"
209 "Usage: %s [OPTION]...\n\n" 209 "Usage: %s [OPTION]...\n\n"
210 " -c, --config=DIR use DIR for config files\n" 210 " -c, --config=DIR use DIR for config files\n"
211 " -d, --debug print debugging messages to stdout\n" 211 " -d, --debug print debugging messages to stdout\n"
212 " -h, --help display this help and exit\n" 212 " -h, --help display this help and exit\n"
213 " -n, --nologin don't automatically login\n" 213 " -n, --nologin don't automatically login\n"
214 " -v, --version display the current version and exit\n"), VERSION, name); 214 " -v, --version display the current version and exit\n"), DISPLAY_VERSION, name);
215 } 215 }
216 216
217 purple_print_utf8_to_console(stdout, text); 217 purple_print_utf8_to_console(stdout, text);
218 g_free(text); 218 g_free(text);
219 } 219 }
296 /* show version message */ 296 /* show version message */
297 if (opt_version) { 297 if (opt_version) {
298 /* Translators may want to transliterate the name. 298 /* Translators may want to transliterate the name.
299 It is not to be translated. */ 299 It is not to be translated. */
300 gnt_quit(); 300 gnt_quit();
301 printf("%s %s\n", _("Finch"), VERSION); 301 printf("%s %s\n", _("Finch"), DISPLAY_VERSION);
302 return 0; 302 return 0;
303 } 303 }
304 304
305 /* set a user-specified config directory */ 305 /* set a user-specified config directory */
306 if (opt_config_dir_arg != NULL) { 306 if (opt_config_dir_arg != NULL) {