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, 22 insertions, 14 deletions

diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index 5d9b5fb6c5..2f35688bd5 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -533,7 +533,7 @@ source_to_dialog (SourceDialog *source_dialog)
 		g_signal_handlers_unblock_matched (source_dialog->refresh_spin, G_SIGNAL_MATCH_DATA,
 						   0, 0, NULL, NULL, source_dialog);
 	if (source_dialog->source_color) {
-		static char *assigned_colors[] = {
+		static guint32 assigned_colors[] = {
 			0xBECEDD, /* 190 206 221     Blue */
 			0xE2F0EF, /* 226 240 239     Light Blue */
 			0xC6E2B7, /* 198 226 183     Green */
@@ -739,9 +739,7 @@ calendar_setup_new_calendar (GtkWindow *parent)
 	
 	gtk_window_set_type_hint (GTK_WINDOW (source_dialog->window), GDK_WINDOW_TYPE_HINT_DIALOG);
 	gtk_window_set_modal (GTK_WINDOW (source_dialog->window), TRUE);
-	gtk_window_set_icon (GTK_WINDOW (source_dialog->window),
-			     e_icon_factory_get_icon("stock_calendar", 32));
-
+	
 	icon_list = e_icon_factory_get_icon_list ("stock_calendar");
 	if (icon_list) {
 		gtk_window_set_icon_list (GTK_WINDOW (source_dialog->window), icon_list);
@@ -770,7 +768,8 @@ gboolean
 calendar_setup_edit_calendar (GtkWindow *parent, ESource *source)
 {
 	SourceDialog *source_dialog = g_new0 (SourceDialog, 1);
-
+	GList *icon_list;
+	
 	g_return_val_if_fail (source != NULL, FALSE);
 
 	source_dialog->gui_xml = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, "calendar-editor-window", NULL);
@@ -813,9 +812,14 @@ calendar_setup_edit_calendar (GtkWindow *parent, ESource *source)
 
 	gtk_window_set_type_hint (GTK_WINDOW (source_dialog->window), GDK_WINDOW_TYPE_HINT_DIALOG);
 	gtk_window_set_modal (GTK_WINDOW (source_dialog->window), TRUE);
-	gtk_window_set_icon (GTK_WINDOW (source_dialog->window),
-			     e_icon_factory_get_icon("stock_calendar", 32));
-
+	
+	icon_list = e_icon_factory_get_icon_list ("stock_calendar");
+	if (icon_list) {
+		gtk_window_set_icon_list (GTK_WINDOW (source_dialog->window), icon_list);
+		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
+		g_list_free (icon_list);
+	}
+	
 	gtk_widget_show_all (source_dialog->window);
 
 	if (!source_is_remote (source_dialog->source))
@@ -911,8 +915,6 @@ calendar_setup_new_task_list (GtkWindow *parent)
 
 	gtk_window_set_type_hint (GTK_WINDOW (source_dialog->window), GDK_WINDOW_TYPE_HINT_DIALOG);
 	gtk_window_set_modal (GTK_WINDOW (source_dialog->window), TRUE);
-	gtk_window_set_icon (GTK_WINDOW (source_dialog->window),
-			     e_icon_factory_get_icon ("stock_todo", 32));
 	
 	icon_list = e_icon_factory_get_icon_list ("stock_task");
 	if (icon_list) {
@@ -942,7 +944,8 @@ gboolean
 calendar_setup_edit_task_list (GtkWindow *parent, ESource *source)
 {
 	SourceDialog *source_dialog = g_new0 (SourceDialog, 1);
-
+	GList *icon_list;
+	
 	g_return_val_if_fail (source != NULL, FALSE);
 
 	source_dialog->gui_xml = glade_xml_new (EVOLUTION_GLADEDIR "/" GLADE_FILE_NAME, "task-list-editor-window", NULL);
@@ -985,9 +988,14 @@ calendar_setup_edit_task_list (GtkWindow *parent, ESource *source)
 
 	gtk_window_set_type_hint (GTK_WINDOW (source_dialog->window), GDK_WINDOW_TYPE_HINT_DIALOG);
 	gtk_window_set_modal (GTK_WINDOW (source_dialog->window), TRUE);
-	gtk_window_set_icon (GTK_WINDOW (source_dialog->window),
-			     e_icon_factory_get_icon ("stock_todo", 32));
-
+	
+	icon_list = e_icon_factory_get_icon_list ("stock_task");
+	if (icon_list) {
+		gtk_window_set_icon_list (GTK_WINDOW (source_dialog->window), icon_list);
+		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
+		g_list_free (icon_list);
+	}
+	
 	gtk_widget_show_all (source_dialog->window);
 
 	if (!source_is_remote (source_dialog->source))