Mercurial > pidgin
changeset 16933:9278933225eb
merge of '87f23e108affd467aea07671ede1fdd589b2cc32'
and 'b7e900fdd4234a05a5ce3210c5a3b5cef39d527a'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Tue, 08 May 2007 00:43:52 +0000 |
| parents | 3d0aec991e5d (current diff) 00c24829e243 (diff) |
| children | 2fffd9d72b8f |
| files | |
| diffstat | 5 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/finch.c Tue May 08 00:28:22 2007 +0000 +++ b/finch/finch.c Tue May 08 00:43:52 2007 +0000 @@ -274,7 +274,7 @@ } /* show version message */ if (opt_version) { - printf("%s %s\n", _("Finch"), VERSION); + printf("%s v%s.\n", "Finch", VERSION); return 0; } @@ -303,7 +303,7 @@ char *text = g_strdup_printf(_( "%s encountered errors migrating your settings " "from %s to %s. Please investigate and complete the " - "migration by hand. Please report this error at http://developer.pidgin.im"), _("Finch"), + "migration by hand. Please report this error at http://developer.pidgin.im"), "Finch", old, purple_user_dir()); g_free(old);
--- a/finch/gntblist.c Tue May 08 00:28:22 2007 +0000 +++ b/finch/gntblist.c Tue May 08 00:43:52 2007 +0000 @@ -280,6 +280,8 @@ error = _("You must provide a group."); else if (!account) error = _("You must select an account."); + else if (!purple_account_is_connected(account)) + error = _("The selected account is not online."); if (error) {
--- a/finch/gntconv.c Tue May 08 00:28:22 2007 +0000 +++ b/finch/gntconv.c Tue May 08 00:43:52 2007 +0000 @@ -789,7 +789,7 @@ PurpleCmdStatus status; if (!g_ascii_strcasecmp(args[0], "version")) { - tmp = g_strdup_printf("me is using %s.", VERSION); + tmp = g_strdup_printf("me is using Finch v%s.", VERSION); markup = g_markup_escape_text(tmp, -1); status = purple_cmd_do_command(conv, tmp, markup, error);
--- a/finch/gntrequest.c Tue May 08 00:28:22 2007 +0000 +++ b/finch/gntrequest.c Tue May 08 00:43:52 2007 +0000 @@ -497,7 +497,9 @@ field->ui_data = combo; all = purple_request_field_account_get_show_all(field); - def = purple_request_field_account_get_default_value(field); + def = purple_request_field_account_get_value(field); + if (!def) + def = purple_request_field_account_get_default_value(field); if (all) list = purple_accounts_get_all();
--- a/pidgin/gtkconv.c Tue May 08 00:28:22 2007 +0000 +++ b/pidgin/gtkconv.c Tue May 08 00:43:52 2007 +0000 @@ -376,7 +376,7 @@ PurpleCmdStatus status; if (!g_ascii_strcasecmp(args[0], "version")) { - tmp = g_strdup_printf("me is using %s v%s.", PIDGIN_NAME, VERSION); + tmp = g_strdup_printf("me is using %s v%s.", "Pidgin", VERSION); markup = g_markup_escape_text(tmp, -1); status = purple_cmd_do_command(conv, tmp, markup, error);