pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [16961] trunk/libgaim/protocols/jabber/roster.c

[<the...@us...>]

Revision: 16961
Author:   thekingant
Date:     2006-08-21 15:44:46 -0700 (Mon, 21 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16961&view=rev

Log Message:
-----------
Remove an unnecessary strdup

Modified Paths:
--------------
    trunk/libgaim/protocols/jabber/roster.c
Modified: trunk/libgaim/protocols/jabber/roster.c
===================================================================
--- trunk/libgaim/protocols/jabber/roster.c	2006-08-21 22:43:54 UTC (rev 16960)
+++ trunk/libgaim/protocols/jabber/roster.c	2006-08-21 22:44:46 UTC (rev 16961)
@@ -325,9 +325,7 @@
 	GaimBuddy *b = gaim_find_buddy(gc->account, name);
 	char *a;
 
-	a = g_strdup(alias);
 	gaim_blist_alias_buddy(b, a);
-	g_free(a);
 
 	jabber_roster_update(gc->proto_data, name, NULL);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16962] trunk/libgaim/protocols/jabber/roster.c

[<the...@us...>]

Revision: 16962
Author:   thekingant
Date:     2006-08-21 15:48:19 -0700 (Mon, 21 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16962&view=rev

Log Message:
-----------
Fix that last commit

Modified Paths:
--------------
    trunk/libgaim/protocols/jabber/roster.c
Modified: trunk/libgaim/protocols/jabber/roster.c
===================================================================
--- trunk/libgaim/protocols/jabber/roster.c	2006-08-21 22:44:46 UTC (rev 16961)
+++ trunk/libgaim/protocols/jabber/roster.c	2006-08-21 22:48:19 UTC (rev 16962)
@@ -323,9 +323,8 @@
 void jabber_roster_alias_change(GaimConnection *gc, const char *name, const char *alias)
 {
 	GaimBuddy *b = gaim_find_buddy(gc->account, name);
-	char *a;
 
-	gaim_blist_alias_buddy(b, a);
+	gaim_blist_alias_buddy(b, alias);
 
 	jabber_roster_update(gc->proto_data, name, NULL);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17886] trunk/libgaim/protocols/jabber/roster.c

[<fac...@us...>]

Revision: 17886
          http://svn.sourceforge.net/gaim/?rev=17886&view=rev
Author:   faceprint
Date:     2006-12-03 17:53:12 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
close 1588351 and adhere to rfc3921bis

Modified Paths:
--------------
    trunk/libgaim/protocols/jabber/roster.c

Modified: trunk/libgaim/protocols/jabber/roster.c
===================================================================
--- trunk/libgaim/protocols/jabber/roster.c	2006-12-04 01:52:05 UTC (rev 17885)
+++ trunk/libgaim/protocols/jabber/roster.c	2006-12-04 01:53:12 UTC (rev 17886)
@@ -262,8 +262,7 @@
 
 	xmlnode_set_attrib(item, "jid", name);
 
-	if(b->alias)
-		xmlnode_set_attrib(item, "name", b->alias);
+	xmlnode_set_attrib(item, "name", b->alias ? b->alias : "");
 
 	for(l = groups; l; l = l->next) {
 		group = xmlnode_new_child(item, "group");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [18049] trunk/libgaim/protocols/jabber/roster.c

[<fac...@us...>]

Revision: 18049
          http://svn.sourceforge.net/gaim/?rev=18049&view=rev
Author:   faceprint
Date:     2006-12-22 21:42:41 -0800 (Fri, 22 Dec 2006)

Log Message:
-----------
fix an odd crash

Modified Paths:
--------------
    trunk/libgaim/protocols/jabber/roster.c

Modified: trunk/libgaim/protocols/jabber/roster.c
===================================================================
--- trunk/libgaim/protocols/jabber/roster.c	2006-12-22 19:15:38 UTC (rev 18048)
+++ trunk/libgaim/protocols/jabber/roster.c	2006-12-23 05:42:41 UTC (rev 18049)
@@ -331,9 +331,11 @@
 {
 	GaimBuddy *b = gaim_find_buddy(gc->account, name);
 
-	gaim_blist_alias_buddy(b, alias);
+	if(b != NULL) {
+		gaim_blist_alias_buddy(b, alias);
 
-	jabber_roster_update(gc->proto_data, name, NULL);
+		jabber_roster_update(gc->proto_data, name, NULL);
+	}
 }
 
 void jabber_roster_group_change(GaimConnection *gc, const char *name,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [18190] trunk/libgaim/protocols/jabber/roster.c

[<ev...@us...>]

Revision: 18190
          http://svn.sourceforge.net/gaim/?rev=18190&view=rev
Author:   evands
Date:     2007-02-14 06:22:06 -0800 (Wed, 14 Feb 2007)

Log Message:
-----------
Stu pointed out that this still needed to be g_strdup()'d because jabber_normalize returns a static buffer

Modified Paths:
--------------
    trunk/libgaim/protocols/jabber/roster.c

Modified: trunk/libgaim/protocols/jabber/roster.c
===================================================================
--- trunk/libgaim/protocols/jabber/roster.c	2007-02-13 22:21:30 UTC (rev 18189)
+++ trunk/libgaim/protocols/jabber/roster.c	2007-02-14 14:22:06 UTC (rev 18190)
@@ -176,11 +176,12 @@
 			char *jid_norm;
 			const char *username;
 
-			jid_norm = jabber_normalize(js->gc->account, jid);
+			jid_norm = g_strdup(jabber_normalize(js->gc->account, jid));
 			username = gaim_account_get_username(js->gc->account);
 			me = g_utf8_collate(jid_norm,
 			                    jabber_normalize(js->gc->account,
 			                                     username));
+			g_free(jid_norm);
 
 			if(me == 0)
 				jb->subscription = JABBER_SUB_BOTH;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.