From c7010d43264dafca66ff65540c5d6666f1c66e2a Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xclaesse@src.gnome.org>
Date: Mon, 7 May 2007 19:48:22 +0000
Subject: [darcs-to-svn @ Use icon-name API instead of stock icons and update
 tango icons]

svn path=/trunk/; revision=32
---
 src/empathy-chat-main.c         | 3 ---
 src/empathy-contact-list-main.c | 5 -----
 src/empathy-main.c              | 8 ++------
 3 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/empathy-chat-main.c b/src/empathy-chat-main.c
index 7fde26ae0..91dd510b4 100644
--- a/src/empathy-chat-main.c
+++ b/src/empathy-chat-main.c
@@ -37,7 +37,6 @@
 #include <libempathy/empathy-contact-manager.h>
 #include <libempathy/empathy-contact-list.h>
 #include <libempathy-gtk/gossip-private-chat.h>
-#include <libempathy-gtk/gossip-stock.h>
 
 #define BUS_NAME "org.gnome.Empathy.Chat"
 #define OBJECT_PATH "/org/freedesktop/Telepathy/ChannelHandler"
@@ -80,8 +79,6 @@ main (int argc, char *argv[])
 	EmpathyChandler *chandler;
 
 	gtk_init (&argc, &argv);
-	/* FIXME: This is a horrible hack */
-	gossip_stock_init (gtk_window_new (GTK_WINDOW_TOPLEVEL));
 
 	chandler = empathy_chandler_new (BUS_NAME, OBJECT_PATH);
 
diff --git a/src/empathy-contact-list-main.c b/src/empathy-contact-list-main.c
index 084649bab..8ea131c21 100644
--- a/src/empathy-contact-list-main.c
+++ b/src/empathy-contact-list-main.c
@@ -30,14 +30,12 @@
 #include <libmissioncontrol/mc-account.h>
 
 #include <libempathy-gtk/empathy-main-window.h>
-#include <libempathy-gtk/gossip-stock.h>
 #include <libempathy-gtk/gossip-accounts-dialog.h>
 
 static void
 destroy_cb (GtkWidget *window,
 	    gpointer   user_data)
 {
-	gossip_stock_finalize ();
 	gtk_main_quit ();
 }
 
@@ -49,9 +47,6 @@ main (int argc, char *argv[])
 
 	gtk_init (&argc, &argv);
 
-	/* FIXME: This is a horrible hack */
-	gossip_stock_init (gtk_window_new (GTK_WINDOW_TOPLEVEL));
-
 	window = empathy_main_window_show ();
 	g_signal_connect (window, "destroy",
 			  G_CALLBACK (destroy_cb),
diff --git a/src/empathy-main.c b/src/empathy-main.c
index 2aea589f6..fb5684aa3 100644
--- a/src/empathy-main.c
+++ b/src/empathy-main.c
@@ -35,8 +35,8 @@
 
 #include <libempathy/gossip-debug.h>
 #include <libempathy-gtk/empathy-main-window.h>
+#include <libempathy-gtk/empathy-images.h>
 #include <libempathy-gtk/gossip-status-presets.h>
-#include <libempathy-gtk/gossip-stock.h>
 #include <libempathy-gtk/gossip-accounts-dialog.h>
 
 #define DEBUG_DOMAIN "Empathy"
@@ -104,7 +104,6 @@ static void
 destroy_cb (GtkWidget *window,
 	    gpointer   user_data)
 {
-	gossip_stock_finalize ();
 	gtk_main_quit ();
 }
 
@@ -130,9 +129,6 @@ main (int argc, char *argv[])
 
 	gtk_init (&argc, &argv);
 
-	/* FIXME: This is a horrible hack */
-	gossip_stock_init (gtk_window_new (GTK_WINDOW_TOPLEVEL));
-
 	/* Setting up MC */
 	monitor = mc_account_monitor_new ();
 	mc = mission_control_new (tp_get_bus ());
@@ -154,7 +150,7 @@ main (int argc, char *argv[])
 			  NULL);
 
 	/* Setting up the tray icon */
-	icon = gtk_status_icon_new_from_stock (GOSSIP_STOCK_MESSAGE);
+	icon = gtk_status_icon_new_from_icon_name (EMPATHY_IMAGE_MESSAGE);
 	gtk_status_icon_set_tooltip (icon, "Empathy - click here to show/hide the main window");
 	gtk_status_icon_set_visible (icon, TRUE);
 	g_signal_connect (icon, "activate",
-- 
cgit v1.2.3