# HG changeset patch # User Nathan Walp # Date 1125291197 0 # Node ID e4868370c43390fa98a48715fbfef8911ab77db5 # Parent cf15c1cdcfbdd490ea1df79764bd7571d2a01e8d [gaim-migrate @ 13585] cleaning out my tree committer: Tailor Script diff -r cf15c1cdcfbd -r e4868370c433 po/stats.pl --- a/po/stats.pl Sun Aug 28 22:46:01 2005 +0000 +++ b/po/stats.pl Mon Aug 29 04:53:17 2005 +0000 @@ -48,12 +48,9 @@ $total = $1; -print "\n"; -print "$PACKAGE i18n statistics\n"; -print "\n"; -print "
\n"; - -print"\n"; +print "\n"; +print "\n"; +print "\n"; foreach $index (0 .. $#pos) { $trans = $fuzz = $untrans = 0; @@ -65,32 +62,11 @@ if(/(\d+) translated message/) { $trans = $1; } if(/(\d+) fuzzy translation/) { $fuzz = $1; } if(/(\d+) untranslated message/) { $untrans = $1; } - $transp = 100 * $trans / $total; - $fuzzp = 100 * $fuzz / $total; - $untransp = 100 * $untrans / $total; - if($index % 2) { - $color = " bgcolor='#e0e0e0'"; - } else { - $color = " bgcolor='#d0e0ff'"; - } - $name = ""; - $name = $lang{$po}; - $name = code2language($po) unless $name ne ""; - $name = "???" unless $name ne ""; - printf "\n"; unlink("$po.new"); + + print "\n"; print STDERR "done ($untrans untranslated strings).\n" if($ARGV[0] eq '-v'); } -print "
languagetrans%fuzzy%untrans% 
%s(%s.po)%d%0.2f%d%0.2f%d%0.2f", - $name, $po, $trans, $transp, $fuzz, $fuzzp, $untrans, $untransp; - printf "", $transp*2 - unless $transp*2 < 0.5; - printf "", $fuzzp*2 - unless $fuzzp*2 < 0.5; - printf "", $untransp*2 - unless $untransp*2 < 0.5; - print "
\n"; -print "Latest $PACKAGE.pot generated $now: $PACKAGE.pot
\n"; -print "\n"; -print "\n"; +print "\n"; + diff -r cf15c1cdcfbd -r e4868370c433 src/protocols/jabber/buddy.c --- a/src/protocols/jabber/buddy.c Sun Aug 28 22:46:01 2005 +0000 +++ b/src/protocols/jabber/buddy.c Mon Aug 29 04:53:17 2005 +0000 @@ -256,8 +256,8 @@ {N_("Region"), NULL, TRUE, TRUE, "REGION", "ADR", NULL}, {N_("Postal Code"), NULL, TRUE, TRUE, "PCODE", "ADR", NULL}, {N_("Country"), NULL, TRUE, TRUE, "COUNTRY", "ADR", NULL}, - {N_("Telephone"), NULL, TRUE, TRUE, "TEL", NULL, NULL}, - {N_("Email"), NULL, TRUE, TRUE, "EMAIL", NULL, "%s"}, + {N_("Telephone"), NULL, TRUE, TRUE, "NUMBER", "TEL", NULL}, + {N_("Email"), NULL, TRUE, TRUE, "USERID", "EMAIL", "%s"}, {N_("Organization Name"), NULL, TRUE, TRUE, "ORGNAME", "ORG", NULL}, {N_("Organization Unit"), NULL, TRUE, TRUE, "ORGUNIT", "ORG", NULL}, {N_("Title"), NULL, TRUE, TRUE, "TITLE", NULL, NULL}, @@ -598,6 +598,9 @@ if(!from) return; + if(!(jb = jabber_buddy_find(js, from, TRUE))) + return; + /* XXX: handle the error case */ resource_name = jabber_get_resource(from); @@ -605,7 +608,7 @@ b = gaim_find_buddy(js->gc->account, bare_jid); - jb = jabber_buddy_find(js, from, TRUE); + info_text = g_string_new(""); g_string_append_printf(info_text, "%s: %s
", _("Jabber ID"), @@ -808,8 +811,10 @@ !strcmp(child->name, "LOGO")) { char *bintext = NULL; xmlnode *binval; - if((binval = xmlnode_get_child(child, "BINVAL")) && - (bintext = xmlnode_get_data(binval))) { + + if( ((binval = xmlnode_get_child(child, "BINVAL")) && + (bintext = xmlnode_get_data(binval))) || + (bintext = xmlnode_get_data(child))) { gsize size; guchar *data; int i; @@ -817,7 +822,7 @@ char *p, hash[41]; gboolean photo = (strcmp(child->name, "PHOTO") == 0); - data = gaim_base64_decode(text, &size); + data = gaim_base64_decode(bintext, &size); imgids = g_slist_prepend(imgids, GINT_TO_POINTER(gaim_imgstore_add(data, size, "logo.png"))); g_string_append_printf(info_text, diff -r cf15c1cdcfbd -r e4868370c433 src/protocols/jabber/presence.c --- a/src/protocols/jabber/presence.c Sun Aug 28 22:46:01 2005 +0000 +++ b/src/protocols/jabber/presence.c Mon Aug 29 04:53:17 2005 +0000 @@ -221,8 +221,9 @@ if((vcard = xmlnode_get_child(packet, "vCard")) || (vcard = xmlnode_get_child_with_namespace(packet, "query", "vcard-temp"))) { if((photo = xmlnode_get_child(vcard, "PHOTO")) && - (binval = xmlnode_get_child(photo, "BINVAL")) && - (text = xmlnode_get_data(binval))) { + (( (binval = xmlnode_get_child(photo, "BINVAL")) && + (text = xmlnode_get_data(binval))) || + (text = xmlnode_get_data(photo)))) { data = gaim_base64_decode(text, &size); gaim_buddy_icons_set_for_user(js->gc->account, from, data, size); diff -r cf15c1cdcfbd -r e4868370c433 src/util.c --- a/src/util.c Sun Aug 28 22:46:01 2005 +0000 +++ b/src/util.c Mon Aug 29 04:53:17 2005 +0000 @@ -1895,6 +1895,9 @@ int gaim_build_dir (const char *path, int mode) { +#if GLIB_CHECK_VERSION(2,8,0) + return g_mkdir_with_parents(path, mode); +#else char *dir, **components, delim[] = { G_DIR_SEPARATOR, '\0' }; int cur, len; @@ -1941,6 +1944,7 @@ g_strfreev(components); g_free(dir); return 0; +#endif } /*