Mercurial > pidgin.yaz
changeset 17795:2af1f8ccd396
merge of '03da073664bc840f76d0cec53eea61517337c5a7'
and '7a42aa3364e820295fa0a820d9fc4af116bae86f'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Fri, 08 Jun 2007 15:37:48 +0000 |
| parents | ef3f817cac91 (diff) 612dc5149964 (current diff) |
| children | 6e4e2d234c3a |
| files | |
| diffstat | 3 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Fri Jun 08 15:28:00 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.c Fri Jun 08 15:37:48 2007 +0000 @@ -1074,8 +1074,10 @@ /* lets make sure our buddy icon is up to date * before we go letting people know we're here */ img = purple_buddy_icons_find_account_icon(js->gc->account); - jabber_set_buddy_icon(js->gc, img); - purple_imgstore_unref(img); + if(NULL != img) { + jabber_set_buddy_icon(js->gc, img); + purple_imgstore_unref(img); + } /* now we can alert the core that we're ready to send status */ purple_connection_set_state(js->gc, PURPLE_CONNECTED);
--- a/pidgin/gtkaccount.c Fri Jun 08 15:28:00 2007 +0000 +++ b/pidgin/gtkaccount.c Fri Jun 08 15:37:48 2007 +0000 @@ -1024,7 +1024,7 @@ if (dialog->proxy_frame != NULL) gtk_widget_destroy(dialog->proxy_frame); - frame = pidgin_make_frame(parent, _("Pro_xy Options")); + frame = pidgin_make_frame(parent, _("Proxy Options")); dialog->proxy_frame = gtk_widget_get_parent(gtk_widget_get_parent(frame)); gtk_box_reorder_child(GTK_BOX(parent), dialog->proxy_frame, 1);
--- a/pidgin/gtkpounce.c Fri Jun 08 15:28:00 2007 +0000 +++ b/pidgin/gtkpounce.c Fri Jun 08 15:37:48 2007 +0000 @@ -783,7 +783,7 @@ gtk_widget_show(table); dialog->on_away = - gtk_check_button_new_with_mnemonic(_("P_ounce only when my status is not available")); + gtk_check_button_new_with_mnemonic(_("P_ounce only when my status is not Available")); gtk_table_attach(GTK_TABLE(table), dialog->on_away, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);