# HG changeset patch
# User Syd Logan <slogan>
# Date 961890784 0
# Node ID 5741dca6cc8a24037ce6e975b4787479d09530ff
# Parent  094a08a11e3a1b69f645d468334c04400da28202
[gaim-migrate @ 442]
Bug fixes already. heh.

committer: Tailor Script <tailor@pidgin.im>

diff -r 094a08a11e3a -r 5741dca6cc8a src/buddy.c
--- a/src/buddy.c	Sat Jun 24 23:16:14 2000 +0000
+++ b/src/buddy.c	Sat Jun 24 23:53:04 2000 +0000
@@ -374,6 +374,7 @@
 #else
         show_login();
 #endif /* USE_APPLET */
+	BuddyTickerSignoff();
 }
 
 void handle_click_group(GtkWidget *widget, GdkEventButton *event, gpointer func_data)
diff -r 094a08a11e3a -r 5741dca6cc8a src/ticker.c
--- a/src/ticker.c	Sat Jun 24 23:16:14 2000 +0000
+++ b/src/ticker.c	Sat Jun 24 23:53:04 2000 +0000
@@ -35,20 +35,25 @@
 } TickerData;
 
 static GList *tickerbuds = (GList *) NULL;
+static gboolean userclose = FALSE;
 
 void BuddyTickerDestroyWindow( GtkWidget *window );
 void BuddyTickerCreateWindow( void );
 void BuddyTickerAddUser( char *name, GdkPixmap *pm, GdkBitmap *bm );
 void BuddyTickerRemoveUser( char *name );
 void BuddyTickerSetPixmap( char *name, GdkPixmap *pm, GdkBitmap *bm );
+void BuddyTickerClearList( void );
+void BuddyTickerSignOff( void );
 GList * BuddyTickerFindUser( char *name );
 
 void
 BuddyTickerDestroyWindow( GtkWidget *window )
 {
+	BuddyTickerClearList();
         gtk_ticker_stop_scroll( GTK_TICKER( ticker ) );
 	gtk_widget_destroy( window );	
 	ticker = tickerwindow = (GtkWidget *) NULL;
+	userclose = TRUE;
 }
 
 void
@@ -77,6 +82,13 @@
 {
 	GtkWidget *hbox, *label, *pmap;
 	TickerData *p;
+	GList *q;
+
+	if ( userclose == TRUE )
+		return;
+	q = (GList *) BuddyTickerFindUser( name );
+	if ( q != (GList *) NULL )
+		return;
 
 	BuddyTickerCreateWindow();
 	p = (TickerData *) malloc( sizeof( TickerData ) );
@@ -105,6 +117,8 @@
 	GList *p = (GList *) BuddyTickerFindUser( name );
 	TickerData *data = (TickerData *) p->data;
 
+	if ( userclose == TRUE )
+		return;
 	if ( data ) {
 		gtk_ticker_remove( GTK_TICKER( ticker ), data->hbox );
 		tickerbuds = g_list_remove( tickerbuds, data );
@@ -115,9 +129,13 @@
 void
 BuddyTickerSetPixmap( char *name, GdkPixmap *pm, GdkBitmap *bm )
 {
-	GList *p = (GList *) BuddyTickerFindUser( name );
-	TickerData *data = (TickerData *) p->data;
+	GList *p; 
+	TickerData *data;
 
+	if ( userclose == TRUE )
+		return;
+	p = (GList *) BuddyTickerFindUser( name );
+	data = (TickerData *) p->data;
 	if ( data->pix == (GtkWidget *) NULL ) {
 		data->pix = gtk_pixmap_new( pm, bm );
 		gtk_box_pack_start_defaults( GTK_BOX( data->hbox ), data->pix );
@@ -145,14 +163,7 @@
 int
 BuddyTickerLogonTimeout( gpointer data )
 {
-	char *name = (char *) data;
-
-	GList *p = (GList *) BuddyTickerFindUser( name );
-	TickerData *q = (TickerData *) p->data;
-
-	if ( q ) {
-		
-	}
+	// XXX
 
 	return FALSE;
 }
@@ -162,7 +173,38 @@
 {
 	char *name = (char *) data;
 
+	if ( userclose == TRUE )
+		return FALSE;
 	BuddyTickerRemoveUser( name );
 
 	return FALSE;
 }
+
+void
+BuddyTickerSignoff( void )
+{
+	GList *p = tickerbuds;
+	TickerData *q;
+
+	while ( p ) {
+		q = (TickerData *) p->data;
+		BuddyTickerRemoveUser( q->buddy ); 
+		p = tickerbuds;
+	}
+	userclose = FALSE;
+}
+
+void
+BuddyTickerClearList( void )
+{
+	GList *p = tickerbuds;
+	TickerData *q;
+
+	while ( p ) {
+		q = (TickerData *) p->data;
+		p = g_list_remove( p, p->data );
+	}
+	tickerbuds = (GList *) NULL;
+}
+
+