From 7ade227e6409c98a4010992450e111cf7bb10520 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 14 Aug 2008 20:19:12 +0000 Subject: Merge revisions 35951:35992 from trunk. svn path=/branches/kill-bonobo/; revision=35994 --- calendar/gui/dialogs/delete-error.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'calendar/gui/dialogs/delete-error.c') diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c index d1280da16a..7c264d0638 100644 --- a/calendar/gui/dialogs/delete-error.c +++ b/calendar/gui/dialogs/delete-error.c @@ -25,7 +25,6 @@ #include #include #include -#include #include "delete-error.h" @@ -39,9 +38,9 @@ void delete_error_dialog (GError *error, ECalComponentVType vtype) { - GList *icon_list = NULL; GtkWidget *dialog; const char *str; + const gchar *icon_name = NULL; if (!error) return; @@ -106,15 +105,12 @@ delete_error_dialog (GError *error, ECalComponentVType vtype) GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", str); if (vtype == E_CAL_COMPONENT_EVENT) - icon_list = e_icon_factory_get_icon_list ("x-office-calendar"); + icon_name = "x-office-calendar"; else if (vtype == E_CAL_COMPONENT_TODO) - icon_list = e_icon_factory_get_icon_list ("stock_todo"); + icon_name = "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); - } + if (icon_name) + gtk_window_set_icon_name (GTK_WINDOW (dialog), icon_name); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); -- cgit v1.2.3