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/e-memo-table.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'calendar/gui/e-memo-table.c') diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index 9ce7993101..98f17a7121 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -1095,10 +1095,6 @@ static char *test[] = { #endif -/* Displays messages on the status bar */ -#define EVOLUTION_MEMOS_PROGRESS_IMAGE "stock_notes" -static GdkPixbuf *progress_icon = NULL; - void e_memo_table_set_activity_handler (EMemoTable *memo_table, EActivityHandler *activity_handler) { @@ -1123,11 +1119,8 @@ e_memo_table_set_status_message (EMemoTable *memo_table, const gchar *message) } else if (memo_table->activity_id == 0) { char *client_id = g_strdup_printf ("%p", memo_table); - if (progress_icon == NULL) - progress_icon = e_icon_factory_get_icon (EVOLUTION_MEMOS_PROGRESS_IMAGE, E_ICON_SIZE_STATUS); - - memo_table->activity_id = e_activity_handler_operation_started (memo_table->activity_handler, client_id, - progress_icon, message, TRUE); + memo_table->activity_id = e_activity_handler_operation_started ( + memo_table->activity_handler, client_id, message, TRUE); g_free (client_id); } else { -- cgit v1.2.3