changeset 1553:bf10d0673d34

[gaim-migrate @ 1563] modifying buddy lists doesn't exactly work. but it's somewhat closer. at least it occasionally changes. committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Fri, 09 Mar 2001 12:34:39 +0000
parents b669f48f0990
children c3afde736a8a
files plugins/yay/buddy.c plugins/yay/rxhandlers.c plugins/yay/yay.c
diffstat 3 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/yay/buddy.c	Fri Mar 09 12:10:56 2001 +0000
+++ b/plugins/yay/buddy.c	Fri Mar 09 12:34:39 2001 +0000
@@ -48,7 +48,7 @@
 		g_free(id);
 		return 0;
 	}
-	if (message && !(msg = yahoo_urlencode(message))) {
+	if (message && strlen(message) && !(msg = yahoo_urlencode(message))) {
 		g_free(grp);
 		g_free(bdy);
 		g_free(id);
@@ -109,7 +109,7 @@
 		g_free(id);
 		return 0;
 	}
-	if (message && !(msg = yahoo_urlencode(message))) {
+	if (message && strlen(message) && !(msg = yahoo_urlencode(message))) {
 		g_free(grp);
 		g_free(bdy);
 		g_free(id);
--- a/plugins/yay/rxhandlers.c	Fri Mar 09 12:10:56 2001 +0000
+++ b/plugins/yay/rxhandlers.c	Fri Mar 09 12:34:39 2001 +0000
@@ -268,7 +268,6 @@
 		g_free(buf);
 	} else if (conn->type == YAHOO_CONN_TYPE_MAIN) {
 		struct yahoo_packet pkt;
-		guchar temp;
 		int len;
 
 		if ((read(socket, &pkt, 8) != 8) || strcmp(pkt.version, "YHOO1.0")) {
--- a/plugins/yay/yay.c	Fri Mar 09 12:10:56 2001 +0000
+++ b/plugins/yay/yay.c	Fri Mar 09 12:34:39 2001 +0000
@@ -62,6 +62,7 @@
 	GtkWidget *email_label;
 	char *active_id;
 	GList *conns;
+	gboolean logged_in;
 };
 
 static char *yahoo_name() {
@@ -270,6 +271,7 @@
 	account_online(gc);
 	serv_finish_login(gc);
 	yd->active_id = g_strdup(gc->username);
+	yd->logged_in = TRUE;
 }
 
 static void yahoo_pending(gpointer data, gint source, GdkInputCondition condition) {
@@ -444,6 +446,9 @@
 	struct group *g = find_group_by_buddy(gc, name);
 	char *group = NULL;
 
+	if (!yd->logged_in)
+		return;
+
 	if (g) {
 		group = g->name;
 	} else if (yd->sess && yd->sess->groups) {
@@ -454,7 +459,7 @@
 	}
 
 	if (group)
-		yahoo_add_buddy(yd->sess, yd->active_id, name, group, "");
+		yahoo_add_buddy(yd->sess, yd->active_id, group, name, "");
 }
 
 static void yahoo_add_buddies(struct gaim_connection *gc, GList *buddies) {
@@ -480,7 +485,7 @@
 	}
 
 	if (group)
-		yahoo_remove_buddy(yd->sess, yd->active_id, name, group, "");
+		yahoo_remove_buddy(yd->sess, yd->active_id, group, name, "");
 }
 
 static char **yahoo_list_icon(int uc) {