Mercurial > pidgin.yaz
changeset 13023:e8adf8183cf4
[gaim-migrate @ 15376]
A few tweaks. Don't show connection errors in the buddy list.
Anything else for beta2? I'll tag and make tarballs tonight around
11:30 EST, if not.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 23 Jan 2006 23:16:31 +0000 |
| parents | 228b1f95e5b4 |
| children | 01e09b601840 |
| files | src/gtkblist.c src/gtkstatusbox.c src/proxy.c |
| diffstat | 3 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkblist.c Mon Jan 23 15:15:01 2006 +0000 +++ b/src/gtkblist.c Mon Jan 23 23:16:31 2006 +0000 @@ -3470,12 +3470,15 @@ connection_error_button_clicked_cb(GtkButton *widget, gpointer user_data) { GaimAccount *account; - char *text; + char *primary; + const char *text; account = user_data; + primary = g_strdup_printf(_("%s disconnected"), + gaim_account_get_username(account)); text = g_hash_table_lookup(gtkblist->connection_errors, account); gaim_notify_formatted(NULL, _("Connection Error"), - _("Connection Error"), NULL, text, NULL, NULL); + primary, NULL, text, NULL, NULL); gtk_widget_destroy(GTK_WIDGET(widget)); g_hash_table_remove(gtkblist->connection_errors, account); } @@ -3491,7 +3494,7 @@ GdkPixbuf *pixbuf, *emblem, *scale; account = key; - text = g_strdup_printf("<span color=\"red\">%s disconnected: %s</span>", + text = g_strdup_printf(_("<span color=\"red\">%s disconnected: %s</span>"), gaim_account_get_username(account), (gchar *)value);
--- a/src/gtkstatusbox.c Mon Jan 23 15:15:01 2006 +0000 +++ b/src/gtkstatusbox.c Mon Jan 23 23:16:31 2006 +0000 @@ -945,8 +945,10 @@ if (status_box->error) g_free(status_box->error); status_box->error = NULL; +#if 0 if (error != NULL) status_box->error = g_strdup(error); +#endif gtk_gaim_status_box_refresh(status_box); }
--- a/src/proxy.c Mon Jan 23 15:15:01 2006 +0000 +++ b/src/proxy.c Mon Jan 23 23:16:31 2006 +0000 @@ -624,7 +624,7 @@ struct sockaddr *addr = NULL; size_t addrlen; - gaim_debug_info("dns", "Host '%s' resolved\n", req->host); + gaim_debug_info("dns", "Got response for '%s'\n", req->host); gaim_input_remove(req->inpa); rc = read(req->fd_out, &err, sizeof(err));