# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 956712561 0
# Node ID 5d62a5d50c89a38aac74888cd4d59306424bbfdd
# Parent  87160c1a39fc41b703a2b2ab42395fc48e37ee7c
[gaim-migrate @ 188]
Small changes and removal of unnecessary code.

committer: Tailor Script <tailor@pidgin.im>

diff -r 87160c1a39fc -r 5d62a5d50c89 src/buddy.c
--- a/src/buddy.c	Wed Apr 26 00:28:46 2000 +0000
+++ b/src/buddy.c	Wed Apr 26 01:29:21 2000 +0000
@@ -273,22 +273,7 @@
 
 #ifdef USE_APPLET
 gint applet_destroy_buddy( GtkWidget *widget, GdkEvent *event,gpointer *data ) {
-	GList *mem;
 	set_applet_draw_closed();
-	
-	/****NO LONGER NEEDED
-        while(groups) {
-		mem = ((struct group *)groups->data)->members;
-		while(mem) {
-			g_free(mem->data);
-                        mem = g_list_remove(mem, mem->data);
-		}
-		g_free(groups->data);
-                groups = g_list_remove(groups, groups->data);
-	}
-	
-	destroy_buddy();
-	*/
 	gnome_buddy_hide();
 	applet_widget_register_callback(APPLET_WIDGET(applet),
 			"buddy",
diff -r 87160c1a39fc -r 5d62a5d50c89 src/gnome_applet_mgr.c
--- a/src/gnome_applet_mgr.c	Wed Apr 26 00:28:46 2000 +0000
+++ b/src/gnome_applet_mgr.c	Wed Apr 26 01:29:21 2000 +0000
@@ -34,8 +34,6 @@
 #include "gnome_applet_mgr.h"
 
 enum gaim_user_states MRI_user_status; 
-gint total_num_of_buddies;  /* how many buddies I have in my list */ 
-gint num_of_buddies_online; /* how many of them are online */
 
 gboolean buddy_created = FALSE;
 gboolean applet_draw_open = FALSE;
@@ -136,15 +134,6 @@
 gboolean update_applet( gpointer *ap ){
      char temp_string[25];
      static enum gaim_user_states old_user_status = offline;
-     static gint old_total_num_of_buddies = -1;
-     static gint old_num_of_buddies_online = -1;
-     if( applet_draw_open ){
-     	sprintf(debug_buff, "Drawer is open\n");
-		debug_print(debug_buff);
-     } else {
-     	sprintf(debug_buff, "Drawer is closed\n");
-		debug_print(debug_buff);
-     }
      
      if( MRI_user_status != old_user_status || ap){
 
@@ -160,8 +149,6 @@
                            icon_connect_pm,
                            icon_connect_bm );   
       			gtk_label_set( GTK_LABEL(status_label), _MSG_CONNECT_ );
-      			old_total_num_of_buddies = -1;
-     			old_num_of_buddies_online = -1;
       		break;
       		case online:
       			gtk_pixmap_set( GTK_PIXMAP(icon),
@@ -186,28 +173,6 @@
       	}
       	old_user_status = MRI_user_status;
       }
-#ifdef _USE_BUDDY_COUNT_
-      if( (( old_total_num_of_buddies != total_num_of_buddies ) || 
-      		( old_num_of_buddies_online != num_of_buddies_online )) && 
-      		( MRI_user_status == online ) ){
-      			/*make user buffer can not overflow*/
-      			if(total_num_of_buddies<1000){
-      				sprintf(temp_string, "%i/%i", num_of_buddies_online, total_num_of_buddies);
-      		    } else {
-      		    	if(num_of_buddies_online<100000){
-      		    		sprintf(temp_string, "%i", num_of_buddies_online);
-      		    	} else {
-      		    		/*we most likely will never get to here but
-      		    		  hey, people also thought computer wouldn't
-      		    		  be around by the year 2000 :-) */
-      		    		sprintf(temp_string, _MSG_ONLINE_ );
-      		    	}
-      		    }
-      			gtk_label_set( GTK_LABEL(status_label), temp_string );
-      			old_total_num_of_buddies = total_num_of_buddies;
-      			old_num_of_buddies_online = num_of_buddies_online;
-      		} 
-#endif /*_USE_BUDDY_COUNT_*/
       return TRUE;
 
 }
@@ -355,6 +320,7 @@
                             "Jim Duchek <jimduchek@ou.edu>",
                             "Rob Flynn <rflynn@blueridge.net>",
 			    "Eric Warmenhoven <warmenhoven@yahoo.com>",
+			    "Syd Logan",
                             NULL};
 
   GtkWidget *about=gnome_about_new(_("GAIM"),
@@ -717,26 +683,10 @@
 	update_applet(NULL);
 }
 
-void setTotalBuddies( gint num ){
-	total_num_of_buddies = num;
-}
-
-void setNumBuddiesOnline( gint num ){
-	num_of_buddies_online=num;
-}
-
 enum gaim_user_states getUserState(){
 	return MRI_user_status;
 }
 
-gint getTotalBuddies(){
-	return total_num_of_buddies;
-}
-
-gint getNumBuddiesOnline(){
-	return num_of_buddies_online;
-}
-
 void set_applet_draw_open(){
 	applet_draw_open = TRUE;
 }
diff -r 87160c1a39fc -r 5d62a5d50c89 src/sound.c
--- a/src/sound.c	Wed Apr 26 00:28:46 2000 +0000
+++ b/src/sound.c	Wed Apr 26 01:29:21 2000 +0000
@@ -116,7 +116,7 @@
         guint16 *lineardata;
 	
 	
-        fd = esd_play_stream(format, 8012, NULL, "gaim");
+        fd = esd_play_stream_fallback(format, 8012, NULL, "gaim");
 
         if (fd < 0) {
                 return 0;