[Gaim-commits] CVS: gaim/src dialogs.c,1.337,1.338 server.c,1.237,1.238

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv12140/src

Modified Files:
	dialogs.c server.c 
Log Message:
some memleak fixes.


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -d -r1.337 -r1.338
--- dialogs.c	16 Sep 2002 07:04:55 -0000	1.337
+++ dialogs.c	16 Sep 2002 19:50:52 -0000	1.338
@@ -593,6 +593,7 @@
 	}
 	if (filename) {
 		img = gtk_image_new_from_file(filename);
+		g_free(filename);
 		gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
 	}
 	d = gtk_dialog_new_with_buttons("", NULL, GTK_DIALOG_MODAL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT);

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- server.c	16 Sep 2002 18:13:45 -0000	1.237
+++ server.c	16 Sep 2002 19:50:52 -0000	1.238
@@ -691,7 +691,7 @@
 		
 		if (new_conv && (sound_options & OPT_SOUND_FIRST_RCV))
 			play_sound(SND_FIRST_RECEIVE);
-		else if (cnv->makesound)
+		else if (cnv && cnv->makesound)
 			play_sound(SND_RECEIVE);
 		
 		if (away_options & OPT_AWAY_QUEUE_UNREAD && !find_conversation(name)) {