Mercurial > pidgin.yaz
comparison pidgin/gtkconv.c @ 29674:9407348dc714
propagate from branch 'im.pidgin.pidgin' (head 73e463add9a124c86554c2958526e1a6ee5fc22f)
to branch 'im.pidgin.cpw.attention_ui' (head 70298cc7b74e537376e55f04be1e6f40aabe3d9d)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Mon, 16 Mar 2009 21:45:24 +0000 |
| parents | b98519a42e53 85bb3539d302 |
| children | ae24e54a5014 |
comparison
equal
deleted
inserted
replaced
| 29673:5640246d96c1 | 29674:9407348dc714 |
|---|---|
| 42 | 42 |
| 43 #include <gdk/gdkkeysyms.h> | 43 #include <gdk/gdkkeysyms.h> |
| 44 | 44 |
| 45 #include "account.h" | 45 #include "account.h" |
| 46 #include "cmds.h" | 46 #include "cmds.h" |
| 47 #include "core.h" | |
| 47 #include "debug.h" | 48 #include "debug.h" |
| 48 #include "idle.h" | 49 #include "idle.h" |
| 49 #include "imgstore.h" | 50 #include "imgstore.h" |
| 50 #include "log.h" | 51 #include "log.h" |
| 51 #include "notify.h" | 52 #include "notify.h" |
| 327 { | 328 { |
| 328 char *tmp, *markup; | 329 char *tmp, *markup; |
| 329 PurpleCmdStatus status; | 330 PurpleCmdStatus status; |
| 330 | 331 |
| 331 if (!g_ascii_strcasecmp(args[0], "version")) { | 332 if (!g_ascii_strcasecmp(args[0], "version")) { |
| 332 tmp = g_strdup_printf("me is using %s v%s.", "Pidgin", DISPLAY_VERSION); | 333 tmp = g_strdup_printf("me is using Pidgin v%s with libpurple v%s.", |
| 334 DISPLAY_VERSION, purple_core_get_version()); | |
| 333 markup = g_markup_escape_text(tmp, -1); | 335 markup = g_markup_escape_text(tmp, -1); |
| 334 | 336 |
| 335 status = purple_cmd_do_command(conv, tmp, markup, error); | 337 status = purple_cmd_do_command(conv, tmp, markup, error); |
| 336 | 338 |
| 337 g_free(tmp); | 339 g_free(tmp); |