Use E_ICON_SIZE enum here. (display_notification): Same.

2004-05-17  Jeffrey Stedfast  <fejj@novell.com>

	* gui/alarm-notify/alarm-queue.c (tray_icon_blink_cb): Use
	E_ICON_SIZE enum here.
	(display_notification): Same.

	* gui/alarm-notify/alarm-notify-dialog.c (write_html_heading): Use
	E_ICON_SIZE_DIALOG here.

	* gui/e-week-view.c (e_week_view_realize): Same as below.

	* gui/e-day-view.c (e_day_view_realize): Use E_ICON_SIZE_MENU for
	the icon sizes rather than using pixel values.

svn path=/trunk/; revision=25941

5 files changed, 22 insertions, 10 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 4e9c5c6c36..9eb3184d65 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,17 @@
 2004-05-17  Jeffrey Stedfast  <fejj@novell.com>
 
+	* gui/alarm-notify/alarm-queue.c (tray_icon_blink_cb): Use
+	E_ICON_SIZE enum here.
+	(display_notification): Same.
+
+	* gui/alarm-notify/alarm-notify-dialog.c (write_html_heading): Use
+	E_ICON_SIZE_DIALOG here.
+
+	* gui/e-week-view.c (e_week_view_realize): Same as below.
+
+	* gui/e-day-view.c (e_day_view_realize): Use E_ICON_SIZE_MENU for
+	the icon sizes rather than using pixel values.
+
 	* gui/calendar-commands.c (pixmaps): Change E_PIXMAP size args
 	over to E_ICON_SIZE_* values.
 
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index c914bdb8a0..af31715ea9 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -228,7 +228,7 @@ write_html_heading (GtkHTMLStream *stream, const char *message,
 	gchar *icon_path;
 	icaltimezone *current_zone;
 
-	icon_path = e_icon_factory_get_icon_filename ("stock_alarm", 48);
+	icon_path = e_icon_factory_get_icon_filename ("stock_alarm", E_ICON_SIZE_DIALOG);
 	image_path = g_strdup_printf ("file://%s", icon_path);
 	g_free (icon_path);
 
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 83e676d12c..b00e979ad6 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -895,7 +895,7 @@ tray_icon_blink_cb (gpointer data)
 	pixbuf = e_icon_factory_get_icon  (tray_data->blink_state == TRUE ?
 				 	   "stock_appointment-reminder-excl" :
 				 	   "stock_appointment-reminder",
-					   24);
+					   E_ICON_SIZE_LARGE_TOOLBAR);
 	gtk_image_set_from_pixbuf (GTK_IMAGE (tray_data->image), pixbuf);
 	gdk_pixbuf_unref (pixbuf);
 
@@ -949,7 +949,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
 
 	/* FIXME: Use stock image equivalent when it becomes available */
 	tray_icon = egg_tray_icon_new (qa->instance->auid);
-	pixbuf = e_icon_factory_get_icon  ("stock_appointment-reminder", 24);
+	pixbuf = e_icon_factory_get_icon  ("stock_appointment-reminder", E_ICON_SIZE_LARGE_TOOLBAR);
 	image = gtk_image_new_from_pixbuf (pixbuf);
 	gdk_pixbuf_unref (pixbuf);
 	ebox = gtk_event_box_new ();
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 31366bafc2..30232e7279 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1219,10 +1219,10 @@ e_day_view_realize (GtkWidget *widget)
 	gdk_gc_set_colormap (day_view->main_gc, colormap);
 
 	/* Create the pixmaps. */
-	day_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_DAY_VIEW_ICON_WIDTH);
-	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_DAY_VIEW_ICON_WIDTH);
-	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_DAY_VIEW_ICON_WIDTH);
-	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_DAY_VIEW_ICON_WIDTH);
+	day_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
+	day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
+	day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
+	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU);
 
 
 	/* Set the canvas item colors. */
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 1e11149874..c3f575b42e 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -827,9 +827,9 @@ e_week_view_realize (GtkWidget *widget)
 	gdk_gc_set_colormap (week_view->main_gc, colormap);
 
 	/* Create the pixmaps. */
-	week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_WEEK_VIEW_ICON_WIDTH);
-	week_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_WEEK_VIEW_ICON_WIDTH);
-	week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_WEEK_VIEW_ICON_WIDTH);
+	week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU);
+	week_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU);
+	week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU);
 }