X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=libempathy-gtk%2Fgossip-private-chat.c;fp=libempathy-gtk%2Fgossip-private-chat.c;h=a3bdbb6be2c6ccf0cd3a5355655129820075448a;hp=17c55b19cba98dbb0b08343f6c233e46cdcfcb60;hb=c7010d43264dafca66ff65540c5d6666f1c66e2a;hpb=6e542b100fd2efcfb7b8a3b58bf173fed1e3e494

diff --git a/libempathy-gtk/gossip-private-chat.c b/libempathy-gtk/gossip-private-chat.c
index 17c55b19..a3bdbb6b 100644
--- a/libempathy-gtk/gossip-private-chat.c
+++ b/libempathy-gtk/gossip-private-chat.c
@@ -44,7 +44,7 @@
 #include "gossip-chat.h"
 #include "gossip-preferences.h"
 //#include "gossip-sound.h"
-#include "gossip-stock.h"
+#include "empathy-images.h"
 #include "gossip-ui-utils.h"
 
 #define DEBUG_DOMAIN "PrivateChat"
@@ -78,13 +78,9 @@ static void           private_chat_widget_destroy_cb            (GtkWidget
 								 GossipPrivateChat      *chat);
 static const gchar *  private_chat_get_name                     (GossipChat             *chat);
 static gchar *        private_chat_get_tooltip                  (GossipChat             *chat);
-static GdkPixbuf *    private_chat_get_status_pixbuf            (GossipChat             *chat);
+static const gchar *  private_chat_get_status_icon_name         (GossipChat             *chat);
 static GossipContact *private_chat_get_contact                  (GossipChat             *chat);
 static GtkWidget *    private_chat_get_widget                   (GossipChat             *chat);
-/*static GdkPixbuf *    private_chat_pad_to_size                  (GdkPixbuf              *pixbuf,
-								 gint                    width,
-								 gint                    height,
-								 gint                    extra_padding_right);*/
 
 G_DEFINE_TYPE (GossipPrivateChat, gossip_private_chat, GOSSIP_TYPE_CHAT);
 
@@ -96,14 +92,14 @@ gossip_private_chat_class_init (GossipPrivateChatClass *klass)
 
 	object_class->finalize = private_chat_finalize;
 
-	chat_class->get_name          = private_chat_get_name;
-	chat_class->get_tooltip       = private_chat_get_tooltip;
-	chat_class->get_status_pixbuf = private_chat_get_status_pixbuf;
-	chat_class->get_contact       = private_chat_get_contact;
-	chat_class->get_widget        = private_chat_get_widget;
-	chat_class->get_show_contacts = NULL;
-	chat_class->set_show_contacts = NULL;
-	chat_class->is_group_chat     = NULL;
+	chat_class->get_name             = private_chat_get_name;
+	chat_class->get_tooltip          = private_chat_get_tooltip;
+	chat_class->get_status_icon_name = private_chat_get_status_icon_name;
+	chat_class->get_contact          = private_chat_get_contact;
+	chat_class->get_widget           = private_chat_get_widget;
+	chat_class->get_show_contacts    = NULL;
+	chat_class->set_show_contacts    = NULL;
+	chat_class->is_group_chat        = NULL;
 
 	g_type_class_add_private (object_class, sizeof (GossipPrivateChatPriv));
 }
@@ -283,8 +279,8 @@ private_chat_get_tooltip (GossipChat *chat)
 				status);
 }
 
-static GdkPixbuf *
-private_chat_get_status_pixbuf (GossipChat *chat)
+static const gchar *
+private_chat_get_status_icon_name (GossipChat *chat)
 {
 	GossipPrivateChatPriv *priv;
 	GossipContact         *contact;
@@ -295,7 +291,7 @@ private_chat_get_status_pixbuf (GossipChat *chat)
 
 	contact = gossip_chat_get_contact (chat);
 
-	return gossip_pixbuf_for_contact (contact);
+	return gossip_icon_name_for_contact (contact);
 }
 
 static GossipContact *