Mercurial > pidgin.yaz
comparison pidgin/gtkconv.c @ 21031:afb4704781ed
merge of '74f5f273ea24887c8df0384ce8795613dfbbd7ee'
and 'df5eddde2a5d7ede22d8136c865b525bf6c0c677'
author | Will Thompson <will.thompson@collabora.co.uk> |
---|---|
date | Sat, 27 Oct 2007 17:47:48 +0000 |
parents | 3cc856ca2338 |
children | e376393e4f35 |
comparison
equal
deleted
inserted
replaced
21023:42ecde230f91 | 21031:afb4704781ed |
---|---|
357 { | 357 { |
358 char *tmp, *markup; | 358 char *tmp, *markup; |
359 PurpleCmdStatus status; | 359 PurpleCmdStatus status; |
360 | 360 |
361 if (!g_ascii_strcasecmp(args[0], "version")) { | 361 if (!g_ascii_strcasecmp(args[0], "version")) { |
362 tmp = g_strdup_printf("me is using %s v%s.", "Pidgin", VERSION); | 362 tmp = g_strdup_printf("me is using %s v%s.", "Pidgin", DISPLAY_VERSION); |
363 markup = g_markup_escape_text(tmp, -1); | 363 markup = g_markup_escape_text(tmp, -1); |
364 | 364 |
365 status = purple_cmd_do_command(conv, tmp, markup, error); | 365 status = purple_cmd_do_command(conv, tmp, markup, error); |
366 | 366 |
367 g_free(tmp); | 367 g_free(tmp); |