set a correct status message.

2003-12-17  Rodrigo Moya <rodrigo@ximian.com>

	* gui/gnome-cal.c (client_cal_opened_cb): set a correct status
	message.

	* gui/tasks-component.c (fill_popup_menu_cb):
	* gui/calendar-component.c (fill_popup_menu_cb): use the folder*.png
	icons for folder operations.

	* gui/Makefile.am: removed cal-client directory from $INCLUDES.

svn path=/trunk/; revision=23968

5 files changed, 22 insertions, 12 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e22964c70d..07dfc662a1 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,14 @@
+2003-12-17  Rodrigo Moya <rodrigo@ximian.com>
+
+	* gui/gnome-cal.c (client_cal_opened_cb): set a correct status
+	message.
+
+	* gui/tasks-component.c (fill_popup_menu_cb):
+	* gui/calendar-component.c (fill_popup_menu_cb): use the folder*.png
+	icons for folder operations.
+
+	* gui/Makefile.am: removed cal-client directory from $INCLUDES.
+
 2003-12-17  Harry Lu  <harry.lu@sun.com>
  
  	Fixes #51665.
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index bdb5f454fa..217dbc557a 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -65,8 +65,6 @@ INCLUDES =						\
 	-I$(top_srcdir)/shell				\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/calendar			\
-	-I$(top_srcdir)/calendar/cal-client		\
-	-I$(top_builddir)/calendar/cal-client		\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/a11y/calendar			\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 34471badc6..e113abb296 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -431,8 +431,10 @@ fill_popup_menu_cb (ESourceSelector *selector, GtkMenu *menu, CalendarComponent
 	sensitive = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (comp->priv->source_selector)) ?
 		TRUE : FALSE;
 
-	add_popup_menu_item (menu, _("New Calendar"), GTK_STOCK_NEW, G_CALLBACK (new_calendar_cb), comp, TRUE);
-	add_popup_menu_item (menu, _("Copy"), NULL, G_CALLBACK (copy_calendar_cb), comp, sensitive);
+	add_popup_menu_item (menu, _("New Calendar"), EVOLUTION_IMAGESDIR "/evolution-calendar-mini.png",
+			     G_CALLBACK (new_calendar_cb), comp, TRUE);
+	add_popup_menu_item (menu, _("Copy"), EVOLUTION_IMAGESDIR "/folder-copy-16.png",
+			     G_CALLBACK (copy_calendar_cb), comp, sensitive);
 	add_popup_menu_item (menu, _("Rename"), NULL, G_CALLBACK (rename_calendar_cb), comp, sensitive);
 	add_popup_menu_item (menu, _("Delete"), GTK_STOCK_DELETE, G_CALLBACK (delete_calendar_cb), comp, sensitive);
 }
@@ -885,7 +887,6 @@ calendar_component_peek_config_directory (CalendarComponent *component)
 	return component->priv->config_directory;
 }
 
-
 EActivityHandler *
 calendar_component_peek_activity_handler (CalendarComponent *component)
 {
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 7c6e0366ae..44766bc958 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1802,16 +1802,15 @@ client_cal_opened_cb (ECal *client, ECalendarStatus status, gpointer data)
 			e_cal_set_default_timezone (client, priv->zone, NULL);
 		}
 
-		/* add the alarms for this client */
+		/* add the clients to the models */
 		uristr = get_uri_without_password (e_cal_get_uri (client));
-		msg = g_strdup_printf (_("Adding alarms for %s"), uristr);
+		msg = g_strdup_printf (_("Adding %s"), uristr);
 		g_free (uristr);
 		if (client == priv->task_pad_client) {
 			e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->todo), msg);
 			e_cal_model_add_client (e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo)),
 						priv->task_pad_client);
-		}
-		else {
+		} else {
 			e_calendar_view_set_status_message (E_CALENDAR_VIEW (priv->week_view), msg);
 			e_cal_model_add_client (e_calendar_view_get_model (E_CALENDAR_VIEW (priv->week_view)), client);
 
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 9ece3bb9a9..575b8ca4eb 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -404,9 +404,10 @@ fill_popup_menu_cb (ESourceSelector *selector, GtkMenu *menu, TasksComponent *co
 	sensitive = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component->priv->source_selector)) ?
 		TRUE : FALSE;
 
-	add_popup_menu_item (menu, _("New Task List"), GTK_STOCK_NEW, G_CALLBACK (new_task_list_cb),
-			     component, TRUE);
-	add_popup_menu_item (menu, _("Copy"), NULL, G_CALLBACK (copy_task_list_cb), component, sensitive);
+	add_popup_menu_item (menu, _("New Task List"), EVOLUTION_IMAGESDIR "/evolution-tasks-mini.png",
+			     G_CALLBACK (new_task_list_cb), component, TRUE);
+	add_popup_menu_item (menu, _("Copy"), EVOLUTION_IMAGESDIR "/folder-copy-16.png",
+			     G_CALLBACK (copy_task_list_cb), component, sensitive);
 	add_popup_menu_item (menu, _("Rename"), NULL, G_CALLBACK (rename_task_list_cb),
 			     component, sensitive);
 	add_popup_menu_item (menu, _("Delete"), GTK_STOCK_DELETE, G_CALLBACK (delete_task_list_cb),