Initialize collection field to NULL. Set the collection on the model as

2001-01-22  Christopher James Lahey  <clahey@helixcode.com>

	* gal-define-views-dialog.c, gal-define-views-dialog.h
	(gal_define_views_dialog_init): Initialize collection field to
	NULL.  Set the collection on the model as soon as we create it.
	(gal_define_views_dialog_new): Add a GalViewCollection argument to
	this function.  This just makes this dialog a bit easier to use
	through the API.
	(gal_define_views_dialog_set_arg): When we set the collection, set
	it on the dialog->model.

	* gal-define-views-model.c, gal-define-views-model.h: Rewrote this
	object to use a GalViewCollection to store the information instead
	of an array of GalViews.

	* gal-view-collection.c, gal-view-collection.h: Added
	gal_view_collection_get_count, gal_view_collection_get_view,
	gal_view_collection_append, gal_view_collection_delete_view, and
	gal_view_collection_copy_view.
	(view_changed, load_single_file): Connect to the "changed" signal
	on the views.
	(load_single_dir): Survive loading if there's no xml file.

	* gal-view-etable.c: Implemented get_type_code method.

	* gal-view-factory-etable.c: Implemented get_type_code method.

	* gal-view.c, gal-view.h: Added gal_view_get_type_code and
	"changed" signal.

svn path=/trunk/; revision=7699

1 files changed, 3 insertions, 3 deletions

diff --git a/widgets/menus/gal-define-views-model.h b/widgets/menus/gal-define-views-model.h
index 4f1115d66a..ff05c497af 100644
--- a/widgets/menus/gal-define-views-model.h
+++ b/widgets/menus/gal-define-views-model.h
@@ -3,7 +3,8 @@
 #define _GAL_DEFINE_VIEWS_MODEL_H_
 
 #include <gal/e-table/e-table-model.h>
-#include "gal-view.h"
+#include <gal/menus/gal-view.h>
+#include <gal/menus/gal-view-collection.h>
 
 #define GAL_DEFINE_VIEWS_MODEL_TYPE        (gal_define_views_model_get_type ())
 #define GAL_DEFINE_VIEWS_MODEL(o)          (GTK_CHECK_CAST ((o), GAL_DEFINE_VIEWS_MODEL_TYPE, GalDefineViewsModel))
@@ -22,8 +23,7 @@ typedef struct {
 	ETableModel parent;
 
 	/* item specific fields */
-	GalView **data;
-	int data_count;
+	GalViewCollection *collection;
 
 	guint editable : 1;
 } GalDefineViewsModel;