Merge revisions 35951:35992 from trunk.

svn path=/branches/kill-bonobo/; revision=35994

2 files changed, 13 insertions, 22 deletions

diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 3f7ad5fa4a..bfc0375c8f 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -32,7 +32,6 @@
 #include "alarm-notify-dialog.h"
 #include "config-data.h"
 #include "util.h"
-#include "e-util/e-icon-factory.h"
 #include "e-util/e-util-private.h"
 
 
@@ -212,8 +211,6 @@ notified_alarms_dialog_new (void)
 	GtkWidget *edit_btn;
 	GtkWidget *snooze_btn;
 	GtkWidget *image;
-	char *icon_path;
-	GList *icon_list;
 	GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
 	AlarmNotificationsDialog *na = NULL;
 	AlarmNotify *an = g_new0 (AlarmNotify, 1);
@@ -286,10 +283,9 @@ notified_alarms_dialog_new (void)
 	gtk_widget_realize (an->dialog);
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (an->dialog)->vbox), 0);
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (an->dialog)->action_area), 12);
-		image = glade_xml_get_widget (an->xml, "alarm-image");
-	icon_path = e_icon_factory_get_icon_filename ("stock_alarm", E_ICON_SIZE_DIALOG);
-	gtk_image_set_from_file (GTK_IMAGE (image), icon_path);
-	g_free (icon_path);
+	image = glade_xml_get_widget (an->xml, "alarm-image");
+	gtk_image_set_from_icon_name (
+		GTK_IMAGE (image), "stock_alarm", GTK_ICON_SIZE_DIALOG);
 
 	g_signal_connect (edit_btn, "clicked", G_CALLBACK (edit_pressed_cb), an);
 	g_signal_connect (snooze_btn, "clicked", G_CALLBACK (snooze_pressed_cb), an);
@@ -298,12 +294,8 @@ notified_alarms_dialog_new (void)
 
 	if (!GTK_WIDGET_REALIZED (an->dialog))
 	gtk_widget_realize (an->dialog);
-		icon_list = e_icon_factory_get_icon_list ("stock_alarm");
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (an->dialog), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
+
+	gtk_window_set_icon_name (GTK_WINDOW (an->dialog), "stock_alarm");
 
 	/* Set callback for updating the snooze "minutes" label */
 	g_signal_connect (G_OBJECT (an->snooze_time_min), "value_changed",
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 219dfdc82d..720a757eed 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -35,7 +35,6 @@
 #include <libgnomeui/gnome-dialog-util.h>
 #include <libgnomeui/gnome-uidefs.h>
 
-#include <e-util/e-icon-factory.h>
 #include <libecal/e-cal-time-util.h>
 #include <libecal/e-cal-component.h>
 
@@ -1384,19 +1383,18 @@ static gboolean
 tray_icon_blink_cb (gpointer data)
 {
 	static gboolean tray_blink_state = FALSE;
-	GdkPixbuf *pixbuf;
+	const gchar *icon_name;
 
 	tray_blink_countdown--;
 	tray_blink_state = !tray_blink_state;
 
-	pixbuf = e_icon_factory_get_icon  ((tray_blink_state || tray_blink_countdown <= 0)?
-					   "stock_appointment-reminder-excl" :
-					   "stock_appointment-reminder",
-					   E_ICON_SIZE_LARGE_TOOLBAR);
+	if (tray_blink_state || tray_blink_countdown <= 0)
+		icon_name = "stock_appointment-reminder-excl";
+	else
+		icon_name = "stock_appointment-reminder";
 
 	if (tray_icon)
-		gtk_status_icon_set_from_pixbuf (tray_icon, pixbuf);
-	g_object_unref (pixbuf);
+		gtk_status_icon_set_from_icon_name (tray_icon, icon_name);
 
 	if (tray_blink_countdown <= 0)
 		tray_blink_id = -1;
@@ -1480,7 +1478,8 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
 	/* create the tray icon */
 	if (tray_icon == NULL) {
 		tray_icon = gtk_status_icon_new ();
-		gtk_status_icon_set_from_pixbuf (tray_icon, e_icon_factory_get_icon ("stock_appointment-reminder", E_ICON_SIZE_LARGE_TOOLBAR));
+		gtk_status_icon_set_from_icon_name (
+			tray_icon, "stock_appointment-reminder");
 		g_signal_connect (G_OBJECT (tray_icon), "activate",
 				  G_CALLBACK (icon_activated), NULL);
 		g_signal_connect (G_OBJECT (tray_icon), "popup-menu",