Fixes #53499

2004-03-25  JP Rosevear <jpr@ximian.com>

	Fixes #53499

	* gui/gnome-cal.c (setup_widgets): don't give the state file to
	the list view
	(set_view): ensure that if the list view was in custom mode it
	stays that way
	(display_view_cb): attach to the etable of the list view
	(gnome_calendar_setup_view_menus): use an etable gal view for the
	list view and don't set the view twice

	* gui/e-tasks.c (e_tasks_setup_view_menus): the instance should no
	longer be per task uri since all the uris are shown together

	* gui/e-cal-list-view.h: update/add protos

	* gui/e-cal-list-view.etspec: limit the available columns to what
	product design agreed on

	* gui/e-calendar-table.etspec: ditto

	* gui/e-cal-list-view.c (e_cal_list_view_class_init): ignore
	update query calls
	(e_cal_list_view_load_state): make public
	(e_cal_list_view_save_state): ditto
	(setup_e_table): don't handle state saving ourselves
	(e_cal_list_view_construct): ditto
	(e_cal_list_view_new): ditto
	(e_cal_list_view_destroy): ditto

	* gui/calendar-view.c (calendar_view_get_type_code): we don't
	handle the list view here

	* gui/calendar-view-factory.c
	(calendar_view_factory_get_type_code): we don't handle the list
	view here
	(calendar_view_factory_get_title): ditto

svn path=/trunk/; revision=25185

1 files changed, 6 insertions, 13 deletions

diff --git a/calendar/gui/e-cal-list-view.h b/calendar/gui/e-cal-list-view.h
index 55eb79f94d..6b700c7b8a 100644
--- a/calendar/gui/e-cal-list-view.h
+++ b/calendar/gui/e-cal-list-view.h
@@ -31,9 +31,7 @@
 #include "e-calendar-view.h"
 #include "gnome-cal.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*
  * ECalListView - displays calendar events in an ETable.
@@ -54,9 +52,6 @@ struct _ECalListView
 	/* The main display table */
 	ETableScrolled *table_scrolled;
 
-	/* The path to the table's state file */
-	gchar *table_state_path;
-
 	/* S-expression for query and the query object */
 	ECalView *query;
 
@@ -80,18 +75,16 @@ struct _ECalListViewClass
 
 
 GtkType	   e_cal_list_view_get_type		(void);
-GtkWidget *e_cal_list_view_construct            (ECalListView *cal_list_view, const gchar *table_state_path);
+GtkWidget *e_cal_list_view_construct            (ECalListView *cal_list_view);
 
-GtkWidget *e_cal_list_view_new			(const gchar *table_state_path);
+GtkWidget *e_cal_list_view_new			(void);
+void e_cal_list_view_load_state (ECalListView *cal_list_view, gchar *filename);
+void e_cal_list_view_save_state (ECalListView *cal_list_view, gchar *filename);
 
-void       e_cal_list_view_set_query		(ECalListView *cal_list_view, const gchar *sexp);
-void       e_cal_list_view_set_default_category	(ECalListView *cal_list_view, const gchar *category);
 gboolean   e_cal_list_view_get_range_shown      (ECalListView *cal_list_view, GDate *start_date,
 						 gint *days_shown);
 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _E_CAL_LIST_VIEW_H_ */