Mercurial > pidgin.yaz
changeset 27780:1a121394bfde
fixed indentation
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Sun, 02 Mar 2008 21:35:56 +0000 |
parents | 75ec5def57b3 |
children | 11713f052640 |
files | libpurple/protocols/msn/msn.c libpurple/protocols/oscar/oft.c libpurple/protocols/yahoo/yahoo_profile.c |
diffstat | 3 files changed, 27 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c Sat Mar 01 16:49:23 2008 +0000 +++ b/libpurple/protocols/msn/msn.c Sun Mar 02 21:35:56 2008 +0000 @@ -2293,7 +2293,7 @@ NULL, /* register_user */ NULL, /* get_cb_info */ NULL, /* get_cb_away */ - NULL, /* alias_buddy */ + NULL, /* alias_buddy */ msn_group_buddy, /* group_buddy */ msn_rename_group, /* rename_group */ NULL, /* buddy_free */
--- a/libpurple/protocols/oscar/oft.c Sat Mar 01 16:49:23 2008 +0000 +++ b/libpurple/protocols/oscar/oft.c Sun Mar 02 21:35:56 2008 +0000 @@ -682,14 +682,14 @@ conn->xferdata.modtime = 0; conn->xferdata.cretime = 0; - /* yaz */ - f1 = g_filename_display_basename(xfer->local_filename); - f2 = botch_utf(f1, strlen(f1), &dummy); - if(f2){ - purple_xfer_set_filename(xfer, (char *)f2); - } - g_free(f1); f1 = NULL; - g_free(f2); f2 = NULL; + /* yaz */ + f1 = g_filename_display_basename(xfer->local_filename); + f2 = botch_utf(f1, strlen(f1), &dummy); + if(f2){ + purple_xfer_set_filename(xfer, (char *)f2); + } + g_free(f1); f1 = NULL; + g_free(f2); f2 = NULL; conn->xferdata.name_length = MAX(64, strlen(xfer->filename) + 1); conn->xferdata.name = (guchar *)g_strndup(xfer->filename, conn->xferdata.name_length - 1);
--- a/libpurple/protocols/yahoo/yahoo_profile.c Sat Mar 01 16:49:23 2008 +0000 +++ b/libpurple/protocols/yahoo/yahoo_profile.c Sun Mar 02 21:35:56 2008 +0000 @@ -1022,7 +1022,7 @@ stripped = purple_utf8_ncr_decode(p); stripped_len = strlen(stripped); - purple_debug_misc("yahoo", "after utf8 conversion: stripped@1 = (%s)\n", + purple_debug_misc("yahoo", "after utf8 conversion: stripped@1 = (%s)\n", stripped); //payload --yaz g_free(p); } @@ -1072,42 +1072,42 @@ /* extract their Email address and put it in */ found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, strings->my_email_string, (yd->jp ? 4 : 1), " ", 0, - strings->private_string, _("E-Mail"), 0, NULL, NULL); + strings->private_string, _("E-Mail"), 0, NULL, NULL); #if 0 /* extract the Nickname if it exists */ found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, "Nickname:", 1, "\n", '\n', - NULL, _("Nickname"), 0, NULL, NULL); + NULL, _("Nickname"), 0, NULL, NULL); /* extract their RealName and put it in */ found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, strings->realname_string, (yd->jp ? 3 : 1), "\n", '\n', - NULL, _("Real Name"), 0, NULL, NULL); + NULL, _("Real Name"), 0, NULL, NULL); /* extract their Location and put it in */ found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, strings->location_string, (yd->jp ? 4 : 2), "\n", '\n', - NULL, _("Location"), 0, NULL, NULL); + NULL, _("Location"), 0, NULL, NULL); /* extract their Age and put it in */ found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, strings->age_string, (yd->jp ? 2 : 3), "\n", '\n', - NULL, _("Age"), 0, NULL, NULL); + NULL, _("Age"), 0, NULL, NULL); /* extract their MaritalStatus and put it in */ found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, strings->maritalstatus_string, (yd->jp ? 2 : 3), "\n", '\n', - strings->no_answer_string, _("Marital Status"), 0, NULL, NULL); + strings->no_answer_string, _("Marital Status"), 0, NULL, NULL); /* extract their Gender and put it in */ found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, strings->gender_string, (yd->jp ? 2 : 3), "\n", '\n', - strings->no_answer_string, _("Gender"), 0, NULL, NULL); + strings->no_answer_string, _("Gender"), 0, NULL, NULL); /* extract their Occupation and put it in */ found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, strings->occupation_string, 2, "\n", '\n', - NULL, _("Occupation"), 0, NULL, NULL); + NULL, _("Occupation"), 0, NULL, NULL); #endif /* Hobbies, Latest News, and Favorite Quote are a bit different, since * the values can contain embedded newlines... but any or all of them @@ -1120,15 +1120,15 @@ #if 0 if (!purple_markup_extract_info_field(stripped, stripped_len, user_info, strings->hobbies_string, (yd->jp ? 3 : 1), strings->latest_news_string, - '\n', "\n", _("Hobbies"), 0, NULL, NULL)) + '\n', "\n", _("Hobbies"), 0, NULL, NULL)) { if (!purple_markup_extract_info_field(stripped, stripped_len, user_info, strings->hobbies_string, 1, strings->favorite_quote_string, - '\n', "\n", _("Hobbies"), 0, NULL, NULL)) + '\n', "\n", _("Hobbies"), 0, NULL, NULL)) { found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, strings->hobbies_string, 1, strings->links_string, - '\n', "\n", _("Hobbies"), 0, NULL, NULL); + '\n', "\n", _("Hobbies"), 0, NULL, NULL); } else found = TRUE; @@ -1138,7 +1138,7 @@ if (!purple_markup_extract_info_field(stripped, stripped_len, user_info, strings->latest_news_string, 1, strings->favorite_quote_string, - '\n', "\n", _("Latest News"), 0, NULL, NULL)) + '\n', "\n", _("Latest News"), 0, NULL, NULL)) { found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, strings->latest_news_string, (yd->jp ? 2 : 1), strings->links_string, @@ -1149,7 +1149,7 @@ found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, strings->favorite_quote_string, 1, strings->links_string, - '\n', "\n", _("Favorite Quote"), 0, NULL, NULL); + '\n', "\n", _("Favorite Quote"), 0, NULL, NULL); /* Home Page will either be "No home page specified", * or "Home Page: " and a link. @@ -1163,7 +1163,7 @@ { found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, strings->home_page_string, 1, "\n", 0, NULL, - _("Home Page"), 1, NULL, NULL); + _("Home Page"), 1, NULL, NULL); } } @@ -1178,7 +1178,7 @@ { if (purple_markup_extract_info_field(stripped, stripped_len, user_info, strings->cool_link_1_string, 1, "\n", 0, NULL, - _("Cool Link 1"), 1, NULL, NULL)) + _("Cool Link 1"), 1, NULL, NULL)) { found = TRUE; if (purple_markup_extract_info_field(stripped, stripped_len, user_info, @@ -1196,12 +1196,12 @@ /* see if Member Since is there, and if so, extract it. */ found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, "Member Since:", 1, last_updated_utf8_string, - '\n', NULL, _("Member Since"), 0, NULL, yahoo_info_date_reformat); + '\n', NULL, _("Member Since"), 0, NULL, yahoo_info_date_reformat); /* extract the Last Updated date and put it in */ found |= purple_markup_extract_info_field(stripped, stripped_len, user_info, last_updated_utf8_string, (yd->jp ? 2 : 1), (yd->jp ? "\n" : " "), (yd->jp ? 0 : '\n'), NULL, - _("Last Update"), 0, NULL, (yd->jp ? NULL : yahoo_info_date_reformat)); + _("Last Update"), 0, NULL, (yd->jp ? NULL : yahoo_info_date_reformat)); } #endif } /* if (profile_state == PROFILE_STATE_DEFAULT) */