# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1172094878 0
# Node ID 0457791756e7d2406272529ff6aa1bc95b99fe62
# Parent  f272a6384b7b756c7404121ddf268a23210cc3b6
New chatlist icons. founder and ignored still needed.

diff -r f272a6384b7b -r 0457791756e7 pidgin/gaimstock.c
--- a/pidgin/gaimstock.c	Wed Feb 21 21:25:37 2007 +0000
+++ b/pidgin/gaimstock.c	Wed Feb 21 21:54:38 2007 +0000
@@ -128,6 +128,7 @@
 	{ PIDGIN_STOCK_STATUS_PERSON, 	"status", "person.png",		TRUE, TRUE, TRUE, FALSE },
 	{ PIDGIN_STOCK_STATUS_OPERATOR,	"status", "operator.png",	TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_STATUS_HALFOP, 	"status", "half-operator.png",	TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_STATUS_VOICE, 	"status", "voice.png",		TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_STATUS_MESSAGE, 	"status", "message-pending.png",TRUE, FALSE, FALSE, FALSE },
 
 	{ PIDGIN_STOCK_DIALOG_AUTH,	"dialogs", "auth.png",		TRUE, FALSE, FALSE, TRUE },
diff -r f272a6384b7b -r 0457791756e7 pidgin/gaimstock.h
--- a/pidgin/gaimstock.h	Wed Feb 21 21:25:37 2007 +0000
+++ b/pidgin/gaimstock.h	Wed Feb 21 21:54:38 2007 +0000
@@ -83,6 +83,7 @@
 #define PIDGIN_STOCK_STATUS_PERSON     "pidgin-status-person"
 #define PIDGIN_STOCK_STATUS_OPERATOR   "pidgin-status-operator"
 #define PIDGIN_STOCK_STATUS_HALFOP     "pidgin-status-halfop"
+#define PIDGIN_STOCK_STATUS_VOICE      "pidgin-status-voice"
 #define PIDGIN_STOCK_STATUS_MESSAGE    "pidgin-status-message"
 
 /* Dialog icons */
diff -r f272a6384b7b -r 0457791756e7 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Wed Feb 21 21:25:37 2007 +0000
+++ b/pidgin/gtkconv.c	Wed Feb 21 21:54:38 2007 +0000
@@ -3338,6 +3338,7 @@
 static GdkPixbuf *
 get_chat_buddy_status_icon(GaimConvChat *chat, const char *name, GaimConvChatBuddyFlags flags)
 {
+        PidginConversation *gtkconv = PIDGIN_CONVERSATION(chat->conv);
 	GdkPixbuf *pixbuf, *scale, *scale2;
 	char *filename;
 	const char *image = NULL;
@@ -3345,21 +3346,20 @@
 	if (flags & GAIM_CBFLAGS_FOUNDER) {
 		image = "founder.png";
 	} else if (flags & GAIM_CBFLAGS_OP) {
-		image = "op.png";
+		image = PIDGIN_STOCK_STATUS_OPERATOR;
 	} else if (flags & GAIM_CBFLAGS_HALFOP) {
-		image = "halfop.png";
+		image = PIDGIN_STOCK_STATUS_HALFOP;
 	} else if (flags & GAIM_CBFLAGS_VOICE) {
-		image = "voice.png";
+		image = PIDGIN_STOCK_STATUS_VOICE;
 	} else if ((!flags) && gaim_conv_chat_is_user_ignored(chat, name)) {
 		image = "ignored.png";
 	} else {
 		return NULL;
 	}
 
-	filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL);
-	pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
-	g_free(filename);
-
+	pixbuf = gtk_widget_render_icon (gtkconv->tab_cont, image, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL),
+				 	 "GtkTreeView");
+	
 	if (!pixbuf)
 		return NULL;
 
diff -r f272a6384b7b -r 0457791756e7 pidgin/pixmaps/Makefile.am
--- a/pidgin/pixmaps/Makefile.am	Wed Feb 21 21:25:37 2007 +0000
+++ b/pidgin/pixmaps/Makefile.am	Wed Feb 21 21:54:38 2007 +0000
@@ -8,7 +8,7 @@
 		change-fgcolor-small.png	\
 		connect.png			\
 		edit.png			\
-		gaim.png			\
+		pidgin.png			\
 		gaim.svg			\
 		info.png 			\
 		insert-image.png		\
@@ -72,5 +72,5 @@
 gaimdistpix_DATA = logo.png tb_drag_arrow_down.xpm tb_drag_arrow_left.xpm tb_drag_arrow_right.xpm tb_drag_arrow_up.xpm typed.png typing.png status-online.png status-offline.png status-away.png status-invisible.png status-typing0.png status-typing1.png status-typing2.png status-typing3.png status-connect0.png status-connect1.png status-connect2.png status-connect3.png phone.png insert-image.png
 
 distpixmapdir = $(datadir)/pixmaps
-distpixmap_DATA = gaim.png gaim.svg
+distpixmap_DATA = pidgin.png gaim.svg
 
diff -r f272a6384b7b -r 0457791756e7 pidgin/pixmaps/status/16/Makefile.am
--- a/pidgin/pixmaps/status/16/Makefile.am	Wed Feb 21 21:25:37 2007 +0000
+++ b/pidgin/pixmaps/status/16/Makefile.am	Wed Feb 21 21:54:38 2007 +0000
@@ -15,7 +15,8 @@
 		message-pending.png \
 		offline.png \
 		operator.png \
-		person.png
+		person.png \
+		voice.png
 
 pidginstatuspixdir = $(datadir)/pixmaps/pidgin/status/16