Use gtk_window_set_icon_list() here instead of gtk_window_set_icon().

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

	* gui/dialogs/url-editor-dialog.c (init_widgets): Use
	gtk_window_set_icon_list() here instead of gtk_window_set_icon().

	* gui/dialogs/select-source-dialog.c (select_source_dialog): Use
	gtk_window_set_icon_list() here instead of gtk_window_set_icon().

	* gui/dialogs/calendar-setup.c (source_to_dialog): Huh?? Why are
	integer colours in an array of char*? Fixed to be an array of
	guint32.

	* gui/dialogs/changed-comp.c (changed_component_dialog): Use
	gtk_window_set_icon_list() here instead of gtk_window_set_icon().

	* gui/dialogs/calendar-setup.c (calendar_setup_new_calendar):
	Don't bother calling tk_window_set_icon() if we are gonna call
	gtk_window_set_icon_list a few lines later.
	(calendar_setup_edit_calendar): Same.
	instead.
	(calendar_setup_new_task_list): Same.
	(calendar_setup_edit_task_list): Same.

	* gui/dialogs/alarm-options.c (alarm_options_dialog_run): Use
	gtk_window_set_icon_list() instead of gtk_window_set_icon() so gtk
	can do the Right Thing (tm).

svn path=/trunk/; revision=26086

1 files changed, 11 insertions, 3 deletions

diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c
index b97876408b..5932abeab8 100644
--- a/calendar/gui/dialogs/delete-error.c
+++ b/calendar/gui/dialogs/delete-error.c
@@ -40,9 +40,10 @@
 void
 delete_error_dialog (GError *error, ECalComponentVType vtype)
 {
+	GList *icon_list = NULL;
 	GtkWidget *dialog;
 	const char *str;
-
+	
 	if (!error)
 		return;
 	
@@ -106,9 +107,16 @@ delete_error_dialog (GError *error, ECalComponentVType vtype)
 					 GTK_MESSAGE_ERROR,
 					 GTK_BUTTONS_OK, str);
 	if (vtype == E_CAL_COMPONENT_EVENT)
-		gtk_window_set_icon (GTK_WINDOW (dialog), e_icon_factory_get_icon ("stock_calendar", 32));
+		icon_list = e_icon_factory_get_icon_list ("stock_calendar");
 	else if (vtype == E_CAL_COMPONENT_TODO)
-		gtk_window_set_icon (GTK_WINDOW (dialog), e_icon_factory_get_icon ("stock_todo", 32));
+		icon_list = e_icon_factory_get_icon_list ("stock_todo");
+	
+	if (icon_list) {
+		gtk_window_set_icon_list (GTK_WINDOW (dialog), icon_list);
+		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
+		g_list_free (icon_list);
+	}
+	
 	gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
 }