# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 973020897 0
# Node ID 67ed2ee5be9fb76e0141892d974389f40abd6897
# Parent  daad2440a64204e6eec585c87392d301307f52f4
[gaim-migrate @ 1049]
AOL is doing funny things....

committer: Tailor Script <tailor@pidgin.im>

diff -r daad2440a642 -r 67ed2ee5be9f src/buddy.c
--- a/src/buddy.c	Tue Oct 31 10:49:53 2000 +0000
+++ b/src/buddy.c	Tue Oct 31 19:34:57 2000 +0000
@@ -88,12 +88,12 @@
 
 /* Predefine some functions */
 static void new_bp_callback(GtkWidget *w, char *name);
-static void log_callback(GtkWidget *w, char *name);
 
 /* stuff for actual display of buddy list */
 struct group_show {
 	GtkWidget *item;
 	GtkWidget *label;
+	GtkWidget *count;
 	GtkWidget *tree;
 	GSList *members;
 	char *name;
@@ -1087,30 +1087,6 @@
         show_new_bp(name);
 }
 
-static void log_callback(GtkWidget *w, char *name)
-{
-	struct conversation *c = find_conversation(name);
-
-	if (find_log_info(name))
-	{
-		if (c) { 
-			set_state_lock(1);
-			gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->log_button), FALSE);
-			set_state_lock(0);
-		}
-		rm_log(find_log_info(name));
-	}
-	else
-	{
-		if (c) {
-			show_log_dialog(c);
-			set_state_lock(1);
-			gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->log_button), TRUE);
-			set_state_lock(0);
-		}
-	}
-}
-
 void do_bp_menu()
 {
 	GtkWidget *menuitem, *mess, *messmenu;
@@ -1433,7 +1409,6 @@
 
 void set_buddy(struct gaim_connection *gc, struct buddy *b)
 {
-	time_t t;
 	struct group *g = find_group_by_buddy(gc, b->name);
 	struct group_show *gs;
 	struct buddy_show *bs;
@@ -1447,6 +1422,15 @@
 			bs = new_buddy_show(gs, b);
 		if (b->present == 1) {
 			play_sound(BUDDY_ARRIVE);
+			pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm,
+							NULL, (char **)login_icon_xpm);
+			gtk_widget_hide(bs->pix);
+			gtk_pixmap_set(GTK_PIXMAP(bs->pix), pm, bm);
+			gtk_widget_show(bs->pix);
+			if (ticker_prefs & OPT_DISP_SHOW_BUDDYTICKER)
+				BuddyTickerSetPixmap(b->name, pm, bm);
+			gdk_pixmap_unref(pm);
+			gdk_bitmap_unref(bm);
 			b->present = 2;
 			if (bs->log_timer > 0)
 				gtk_timeout_remove(bs->log_timer);
diff -r daad2440a642 -r 67ed2ee5be9f src/oscar.c
--- a/src/oscar.c	Tue Oct 31 10:49:53 2000 +0000
+++ b/src/oscar.c	Tue Oct 31 19:34:57 2000 +0000
@@ -860,9 +860,9 @@
 			while (i < exchangecount) {
 				sprintf(debug_buff, "chat info: \t\t%x: %s (%s/%s)\n",
 						exchanges[i].number,
-						exchanges[i].name,
-						exchanges[i].charset1,
-						exchanges[i].lang1);
+						exchanges[i].name ? exchanges[i].name : "NULL",
+						exchanges[i].charset1 ? exchanges[i].charset1 : "NULL",
+						exchanges[i].lang1 ? exchanges[i].lang1 : "NULL");
 				debug_print(debug_buff);
 				i++;
 			}
diff -r daad2440a642 -r 67ed2ee5be9f src/plugins.c
--- a/src/plugins.c	Tue Oct 31 10:49:53 2000 +0000
+++ b/src/plugins.c	Tue Oct 31 19:34:57 2000 +0000
@@ -759,22 +759,22 @@
 			g_snprintf(buf, sizeof buf, "\"%s\" \"%s\" %s", ((struct gaim_connection *)arg1)->username, (char *)arg2, *(char **)arg3);
 			break;
 		case event_buddy_signon:
-			g_snprintf(buf, sizeof buf, "\"%s\"", (char *)arg1);
+			g_snprintf(buf, sizeof buf, "\"%s\"", (char *)arg2);
 			break;
 		case event_buddy_signoff:
-			g_snprintf(buf, sizeof buf, "\"%s\"", (char *)arg1);
+			g_snprintf(buf, sizeof buf, "\"%s\"", (char *)arg2);
 			break;
 		case event_buddy_away:
-			g_snprintf(buf, sizeof buf, "\"%s\"", (char *)arg1);
+			g_snprintf(buf, sizeof buf, "\"%s\"", (char *)arg2);
 			break;
 		case event_buddy_back:
-			g_snprintf(buf, sizeof buf, "\"%s\"", (char *)arg1);
+			g_snprintf(buf, sizeof buf, "\"%s\"", (char *)arg2);
 			break;
 		case event_buddy_idle:
-			g_snprintf(buf, sizeof buf, "\"%s\"", (char *)arg1);
+			g_snprintf(buf, sizeof buf, "\"%s\"", (char *)arg2);
 			break;
 		case event_buddy_unidle:
-			g_snprintf(buf, sizeof buf, "\"%s\"", (char *)arg1);
+			g_snprintf(buf, sizeof buf, "\"%s\"", (char *)arg2);
 			break;
 		case event_chat_invited:
 			g_snprintf(buf, sizeof buf, "\"%s\" \"%s\" %s", (char *)arg2, (char *)arg3, (char *)arg4);