[Gaim-commits] CVS: gaim/src gtkaccount.c,1.115,1.116 gtkimhtml.c,1.276,1.277 gtkutils.c,1.68,1.69

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18435/src

Modified Files:
	gtkaccount.c gtkimhtml.c gtkutils.c 
Log Message:
Nice patch from nosnilmot to make AIM icons work better.

My testing made me realize 2 things still don't work well:
Gaim doesn't clear icons when someone else sets their icon to nothing
Gaim doesn't show some icons.  Maybe the official ones?  
With the shorter, constant checksum thing?


Index: gtkaccount.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkaccount.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -p -r1.115 -r1.116
--- gtkaccount.c	12 Feb 2004 05:26:52 -0000	1.115
+++ gtkaccount.c	28 Feb 2004 22:45:34 -0000	1.116
@@ -252,9 +252,6 @@ buddy_icon_filesel_choose(GtkWidget *w, 
 		return;
 	}
 
-	if (dialog->account != NULL)
-		gaim_account_set_buddy_icon(dialog->account, filename);
-
 	gtk_entry_set_text(GTK_ENTRY(dialog->buddy_icon_entry), filename);
 	gtk_widget_destroy(dialog->buddy_icon_filesel);
 }
@@ -349,8 +346,6 @@ static void
 buddy_icon_reset_cb(GtkWidget *button, AccountPrefsDialog *dialog)
 {
 	gtk_entry_set_text(GTK_ENTRY(dialog->buddy_icon_entry), "");
-	if (dialog->account)
-		gaim_account_set_buddy_icon(dialog->account, NULL);
 }
 
 static void

Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -d -p -r1.276 -r1.277
--- gtkimhtml.c	27 Feb 2004 00:24:19 -0000	1.276
+++ gtkimhtml.c	28 Feb 2004 22:45:34 -0000	1.277
@@ -1377,7 +1377,6 @@ GString* gtk_imhtml_append_text_with_ima
 	g_return_val_if_fail (imhtml != NULL, NULL);
 	g_return_val_if_fail (GTK_IS_IMHTML (imhtml), NULL);
 	g_return_val_if_fail (text != NULL, NULL);
-	printf("Appending: %s\n", text);
 	c = text;
 	len = strlen(text);
 	ws = g_malloc(len + 1);
@@ -1913,7 +1912,6 @@ GString* gtk_imhtml_append_text_with_ima
 			if (url)
 				gtk_imhtml_insert_link(imhtml, url, ws);
 			else {
-				printf("Inserting %s\n", ws);
 				gtk_text_buffer_insert(imhtml->text_buffer, &iter, ws, wpos);
 			}
 			wpos = g_snprintf (ws, smilelen + 1, "%s", c);
@@ -2885,7 +2883,6 @@ char *gtk_imhtml_get_markup_range(GtkIMH
 		closers = g_list_remove(closers, span);
 
 	}
-	printf("Gotten: %s\n", str->str);
 	return g_string_free(str, FALSE);
 }
 

Index: gtkutils.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkutils.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -p -r1.68 -r1.69
--- gtkutils.c	19 Feb 2004 07:25:31 -0000	1.68
+++ gtkutils.c	28 Feb 2004 22:45:34 -0000	1.69
@@ -282,14 +282,12 @@ do_save_icon(GtkObject *obj, GaimConvers
 	if (gaim_gtk_check_if_dir(f, GTK_FILE_SELECTION(gtkconv->u.im->save_icon)))
 		return;
 
-	if ((file = fopen(f, "w")) != NULL) {
-		GaimBuddyIcon *icon = gaim_conv_im_get_icon(GAIM_CONV_IM(c));
-		size_t len;
-		const void *data = gaim_buddy_icon_get_data(icon, &len);
-
-		if (data)
-			fwrite(data, 1, len, file);
+	GaimBuddyIcon *icon = gaim_conv_im_get_icon(GAIM_CONV_IM(c));
+	size_t len;
+	const void *data = gaim_buddy_icon_get_data(icon, &len);
 
+	if ((len > 0) && (data != NULL) && (file = fopen(f, "wb")) != NULL) {
+		fwrite(data, 1, len, file);
 		fclose(file);
 	} else {
 		gaim_notify_error(NULL, NULL,