Mercurial > pidgin.yaz
changeset 26813:0e67e1b7581e
merge of '2833fd1d337477c5b6efc4247a9e6127580414ea'
and '4831edb99cb3b9420b5fc9cee492184c163b291b'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 27 Apr 2009 17:01:11 +0000 |
| parents | 911a325116d5 (diff) baa3867f2281 (current diff) |
| children | d1a0c36cc4ea |
| files | |
| diffstat | 3 files changed, 14 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/qq/buddy_info.c Mon Apr 27 16:57:26 2009 +0000 +++ b/libpurple/protocols/qq/buddy_info.c Mon Apr 27 17:01:11 2009 +0000 @@ -191,7 +191,7 @@ } switch (field_infos[index].type) { case QQ_FIELD_BOOL: - purple_notify_user_info_add_pair(user_info, field_infos[index].text, + purple_notify_user_info_add_pair(user_info, _(field_infos[index].text), strtol(segments[index], NULL, 10) ? _("True") : _("False")); break; case QQ_FIELD_CHOICE: @@ -200,7 +200,7 @@ choice_num = 0; } - purple_notify_user_info_add_pair(user_info, field_infos[index].text, field_infos[index].choice[choice_num]); + purple_notify_user_info_add_pair(user_info, _(field_infos[index].text), field_infos[index].choice[choice_num]); break; case QQ_FIELD_LABEL: case QQ_FIELD_STRING: @@ -208,7 +208,7 @@ default: if (strlen(segments[index]) != 0) { utf8_value = qq_to_utf8(segments[index], QQ_CHARSET_DEFAULT); - purple_notify_user_info_add_pair(user_info, field_infos[index].text, utf8_value); + purple_notify_user_info_add_pair(user_info, _(field_infos[index].text), utf8_value); g_free(utf8_value); } break; @@ -348,18 +348,18 @@ utf8_value = qq_to_utf8(segments[index], QQ_CHARSET_DEFAULT); if (field_infos[index].type == QQ_FIELD_STRING) { field = purple_request_field_string_new( - field_infos[index].id, field_infos[index].text, utf8_value, FALSE); + field_infos[index].id, _(field_infos[index].text), utf8_value, FALSE); } else { field = purple_request_field_string_new( - field_infos[index].id, field_infos[index].text, utf8_value, TRUE); + field_infos[index].id, _(field_infos[index].text), utf8_value, TRUE); } purple_request_field_group_add_field(group, field); g_free(utf8_value); break; case QQ_FIELD_BOOL: field = purple_request_field_bool_new( - field_infos[index].id, field_infos[index].text, - strtol(segments[index], NULL, 10) ? TRUE : FALSE); + field_infos[index].id, _(field_infos[index].text), + strtol(segments[index], NULL, 10) ? TRUE : FALSE); purple_request_field_group_add_field(group, field); break; case QQ_FIELD_CHOICE: @@ -374,7 +374,7 @@ } } field = purple_request_field_choice_new( - field_infos[index].id, field_infos[index].text, choice_num); + field_infos[index].id, _(field_infos[index].text), choice_num); for (i = 0; i < field_infos[index].choice_size; i++) { purple_request_field_choice_add(field, field_infos[index].choice[i]); }
--- a/libpurple/protocols/qq/qq.c Mon Apr 27 16:57:26 2009 +0000 +++ b/libpurple/protocols/qq/qq.c Mon Apr 27 17:01:11 2009 +0000 @@ -674,8 +674,8 @@ g_string_append(info, "wd<br>\n"); g_string_append(info, "x6719620<br>\n"); g_string_append(info, "netelk<br>\n"); - g_string_append(info, "and more, please let me know... thank you!<br>\n"); - g_string_append(info, "<br>\n"); + g_string_append(info, _("and more, please let me know... thank you!))")); + g_string_append(info, "<br>\n<br>\n"); g_string_append(info, _("<p><i>And, all the boys in the backroom...</i><br>\n")); g_string_append(info, _("<i>Feel free to join us!</i> :)")); g_string_append(info, "</body></html>");
--- a/pidgin/gtkstatusbox.c Mon Apr 27 16:57:26 2009 +0000 +++ b/pidgin/gtkstatusbox.c Mon Apr 27 17:01:11 2009 +0000 @@ -719,7 +719,8 @@ } stock = pidgin_stock_id_from_status_primitive(prim); - pixbuf = pidgin_status_box_get_pixbuf(status_box, stock); + if (stock) + pixbuf = pidgin_status_box_get_pixbuf(status_box, stock); } if (status_box->account != NULL) { @@ -2158,7 +2159,8 @@ } stock = pidgin_stock_id_from_status_primitive(prim); - pixbuf = pidgin_status_box_get_pixbuf(status_box, stock); + if (stock) + pixbuf = pidgin_status_box_get_pixbuf(status_box, stock); } gtk_list_store_append(status_box->dropdown_store, &iter);