[Gaim-commits] CVS: gaim/src away.c,1.69,1.70 buddy.c,1.284,1.285 conversation.c,1.326,1.327 server.c,1.217,1.218

[Rob F. <rob...@us...>]

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

Modified Files:
	away.c buddy.c conversation.c server.c 
Log Message:
I'll never tell...



Index: away.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/away.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- away.c	21 Dec 2001 10:23:04 -0000	1.69
+++ away.c	23 Feb 2002 22:50:43 -0000	1.70
@@ -73,7 +73,6 @@
 			cnv = new_conversation(qm->name);
 		if (g_slist_index(connections, qm->gc) >= 0)
 			set_convo_gc(cnv, qm->gc);
-
 		write_to_conv(cnv, qm->message, qm->flags, NULL, qm->tm, qm->len);
 
 		message_queue = g_slist_remove(message_queue, qm);

Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -d -r1.284 -r1.285
--- buddy.c	1 Jan 2002 09:49:04 -0000	1.284
+++ buddy.c	23 Feb 2002 22:50:43 -0000	1.285
@@ -2133,6 +2133,7 @@
 					write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time(NULL), -1);
 				} else if (clistqueue && find_queue_total_by_name(b->name)) {
 					struct queued_message *qm = g_new0(struct queued_message, 1);
+					g_snprintf(qm->name, sizeof(qm->name), "%s", b->name);
 					qm->message = g_strdup_printf(_("%s logged in."), b->name);
 					qm->gc = gc;
 					qm->tm = time(NULL);
@@ -2196,6 +2197,7 @@
 				write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time(NULL), -1);
 			} else if (clistqueue && find_queue_total_by_name(b->name)) {
 				struct queued_message *qm = g_new0(struct queued_message, 1);
+				g_snprintf(qm->name, sizeof(qm->name), "%s", b->name);
 				qm->message = g_strdup_printf(_("%s logged out."), b->name);
 				qm->gc = gc;
 				qm->tm = time(NULL);

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -d -r1.326 -r1.327
--- conversation.c	25 Jan 2002 04:49:39 -0000	1.326
+++ conversation.c	23 Feb 2002 22:50:43 -0000	1.327
@@ -2867,15 +2867,19 @@
 						MAX(gdk_pixbuf_get_height(buf) * SCALE(c->anim) /
 						    gdk_pixbuf_animation_get_height(c->anim), 1),
 						GDK_INTERP_NEAREST);
-		gdk_pixbuf_render_pixmap_and_mask(scale, &src, NULL, 0);
+		gdk_pixbuf_render_pixmap_and_mask(scale, &src, &bm, 100);
 		gdk_pixbuf_unref(scale);
-		gtk_pixmap_get(GTK_PIXMAP(c->icon), &pm, &bm);
+		gtk_pixmap_get(GTK_PIXMAP(c->icon), &pm, NULL);
 		gc = gdk_gc_new(pm);
-		gdk_draw_pixmap(pm, gc, src, 0, 0,
-				MAX(gdk_pixbuf_frame_get_x_offset(frame) * SCALE(c->anim) /
-				    gdk_pixbuf_animation_get_width(c->anim), 1),
-				MAX(gdk_pixbuf_frame_get_y_offset(frame) * SCALE(c->anim) /
-				    gdk_pixbuf_animation_get_height(c->anim), 1), -1, -1);
+		gdk_gc_set_clip_mask(gc, bm);
+
+		gdk_gc_set_clip_origin(gc, gdk_pixbuf_frame_get_x_offset(frame) *
+				       SCALE(c->anim)/gdk_pixbuf_get_width(scale),  
+				       gdk_pixbuf_frame_get_y_offset(frame));   
+		gdk_draw_pixmap(pm, gc, src, 0, 0, gdk_pixbuf_frame_get_x_offset(frame)*
+				SCALE(c->anim)/gdk_pixbuf_get_width(scale),
+				gdk_pixbuf_frame_get_y_offset(frame),-1,-1);
+		
 		gdk_pixmap_unref(src);
 		gtk_widget_queue_draw(c->icon);
 		gdk_gc_unref(gc);
@@ -2888,7 +2892,7 @@
 						MAX(gdk_pixbuf_get_height(buf) * SCALE(c->anim) /
 						    gdk_pixbuf_animation_get_height(c->anim), 1),
 						GDK_INTERP_NEAREST);
-		gdk_pixbuf_render_pixmap_and_mask(scale, &pm, &bm, 0);
+		gdk_pixbuf_render_pixmap_and_mask(scale, &pm, &bm, 100);
 		gdk_pixbuf_unref(scale);
 		gtk_pixmap_set(GTK_PIXMAP(c->icon), pm, bm);
 		gdk_pixmap_unref(pm);
@@ -2904,7 +2908,7 @@
 						MAX(gdk_pixbuf_get_height(buf) * SCALE(c->anim) /
 						    gdk_pixbuf_animation_get_height(c->anim), 1),
 						GDK_INTERP_NEAREST);
-		gdk_pixbuf_render_pixmap_and_mask(scale, &pm, &bm, 0);
+		gdk_pixbuf_render_pixmap_and_mask(scale, &pm, &bm, 100);
 		gdk_pixbuf_unref(scale);
 		gtk_pixmap_set(GTK_PIXMAP(c->icon), pm, bm);
 		gdk_pixmap_unref(pm);

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -d -r1.217 -r1.218
--- server.c	25 Jan 2002 04:49:39 -0000	1.217
+++ server.c	23 Feb 2002 22:50:43 -0000	1.218
@@ -621,6 +621,7 @@
 			qm->gc = gc;
 			qm->tm = mtime;
 			qm->flags = WFLAG_SEND | WFLAG_AUTO;
+			qm->len = -1;
 			message_queue = g_slist_append(message_queue, qm);
 		} else if (cnv != NULL)
 			write_to_conv(cnv, away_subs(tmpmsg, alias), WFLAG_SEND | WFLAG_AUTO, NULL,