Mercurial > pidgin

changeset 18699:4cfc52d22970

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head e7e92461f2b02e785115d22ecca6212d9142a206) to branch 'im.pidgin.soc.2007.xmpp' (head 8a95e40ac983bda8b88d34d11519ca51bb8268a0)
author Andreas Monitzer <pidgin@monitzer.com>
date Wed, 18 Jul 2007 14:10:21 +0000
parents b5546f8f8c71 (current diff) 57fc767ceb7a (diff)
children fd19e7efad68
files
diffstat 7 files changed, 37 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/COPYRIGHT	Tue Jul 17 18:15:34 2007 +0000
+++ b/COPYRIGHT	Wed Jul 18 14:10:21 2007 +0000
@@ -48,6 +48,7 @@
 Craig Boston
 Chris Boyle
 Derrick J Brashear
+Mauro Sérgio Ferreira Brasil
 Matt Brenneke
 Jeremy Brooks
 Jonathan Brossard
--- a/finch/libgnt/gnttextview.h	Tue Jul 17 18:15:34 2007 +0000
+++ b/finch/libgnt/gnttextview.h	Wed Jul 18 14:10:21 2007 +0000
@@ -47,7 +47,7 @@
 typedef struct _GntTextViewPriv		GntTextViewPriv;
 typedef struct _GntTextViewClass		GntTextViewClass;
 
-typedef enum {
+typedef enum _GntTextViewFlag {
 	GNT_TEXT_VIEW_NO_SCROLL     = 1 << 0,
 	GNT_TEXT_VIEW_WRAP_CHAR     = 1 << 1,
 } GntTextViewFlag;
--- a/finch/libgnt/gnttree.h	Tue Jul 17 18:15:34 2007 +0000
+++ b/finch/libgnt/gnttree.h	Wed Jul 18 14:10:21 2007 +0000
@@ -47,7 +47,7 @@
 typedef struct _GntTreeRow		GntTreeRow;
 typedef struct _GntTreeCol		GntTreeCol;
 
-typedef enum {
+typedef enum _GntTreeColumnFlag {
 	GNT_TREE_COLUMN_INVISIBLE    = 1 << 0,
 	GNT_TREE_COLUMN_FIXED_SIZE   = 1 << 1,
 	GNT_TREE_COLUMN_BINARY_DATA  = 1 << 2,
--- a/finch/libgnt/gntwm.c	Tue Jul 17 18:15:34 2007 +0000
+++ b/finch/libgnt/gntwm.c	Wed Jul 18 14:10:21 2007 +0000
@@ -914,7 +914,7 @@
 	len = wcstombs(NULL, wide, 0) + 1;
 	string = g_new0(char, len);
 	wcstombs(string, wide, len);
-	ret = gnt_util_onscreen_width(string, NULL);
+	ret = string ? gnt_util_onscreen_width(string, NULL) : 1;
 	g_free(string);
 	return ret;
 }
--- a/libpurple/protocols/msn/notification.c	Tue Jul 17 18:15:34 2007 +0000
+++ b/libpurple/protocols/msn/notification.c	Wed Jul 18 14:10:21 2007 +0000
@@ -705,7 +705,7 @@
 	user = msn_userlist_find_user(session->userlist, passport);
 
 	old_friendly = msn_user_get_friendly_name(user);
-	if (!old_friendly || (old_friendly && strcmp(old_friendly, friendly)))
+	if (!old_friendly || (old_friendly && (!friendly || strcmp(old_friendly, friendly))))
 	{
 		serv_got_alias(gc, passport, friendly);
 		msn_user_set_friendly_name(user, friendly);
--- a/libpurple/protocols/oscar/family_locate.c	Tue Jul 17 18:15:34 2007 +0000
+++ b/libpurple/protocols/oscar/family_locate.c	Wed Jul 18 14:10:21 2007 +0000
@@ -1264,10 +1264,13 @@
 	 * this buddy's info explicitly, then notify them that we have info
 	 * for this buddy.
 	 */
-	was_explicit = aim_locate_gotuserinfo(od, conn, userinfo2->sn);
-	if (was_explicit == TRUE)
-		if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
-			ret = userfunc(od, conn, frame, userinfo2);
+	if (userinfo2 != NULL)
+	{
+		was_explicit = aim_locate_gotuserinfo(od, conn, userinfo2->sn);
+		if (was_explicit == TRUE)
+			if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
+				ret = userfunc(od, conn, frame, userinfo2);
+	}
 
 	return ret;
 }
--- a/libpurple/protocols/yahoo/yahoo_profile.c	Tue Jul 17 18:15:34 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo_profile.c	Wed Jul 18 14:10:21 2007 +0000
@@ -45,7 +45,7 @@
 	ES_AR, ES_ES, ES_MX, ES_US,
 	FR_CA, FR_FR, 
 	IT, JA, KO, NO, PT, SV, 
-	ZH_CN, ZH_HK, ZH_TW, ZH_US
+	ZH_CN, ZH_HK, ZH_TW, ZH_US, PT_BR
 } profile_lang_id_t;
 
 typedef struct profile_lang_node {
@@ -124,6 +124,7 @@
 	{ KO,    "\xb0\xbb\xbd\xc5\x20\xb3\xaf\xc2\xa5&nbsp;",           NULL },
 	{ NO,    "Sist oppdatert&nbsp;",                                 NULL },
 	{ PT,    "\332ltima atualiza\347\343o&nbsp;",                    NULL },
+	{ PT_BR, "\332ltima atualiza\347\343o:",                         NULL },
 	{ SV,    "Senast uppdaterad&nbsp;",                              NULL },
 	{ ZH_CN, "\xd7\xee\xba\xf3\xd0\xde\xb8\xc4\xc8\xd5\xc6\xda",     NULL },
 	{ ZH_HK, "\xb3\xcc\xaa\xf1\xa7\xf3\xb7\x73\xae\xc9\xb6\xa1",     NULL },
@@ -506,6 +507,29 @@
 		"Site legal 3:",
 		NULL
 	},
+	{ PT_BR, "pt_br", "ISO-8859-1",
+		"ID Yahoo!:",
+		"Particular",
+		"Sem resposta",
+		"Meu e-mail",
+		"Nome verdadeiro:",
+		"Localização:",
+		"Idade:",
+		"Estado civil:",
+		"Sexo:",
+		"Ocupação:",
+		"Pasatiempos:",
+		"Últimas novidades:",
+		"Frase preferida:",
+		"Links",
+		"Nenhuma home page especificada",
+		"Página Web:",
+		"Nenhum site legal especificado",
+		"Link legal 1",
+		"Link legal 2",
+		"Link legal 3",
+		NULL
+	},
 	{ SV, "sv", "ISO-8859-1",
 		"Yahoo!-ID:",
 		"Privat",