6 files changed, 31 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 369222dcf5..e5928fa104 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 1999-04-20  bertrand <Bertrand.Guiheneuf@inria.fr>
+	
+	* camel/camel-store.h: now CamelStore inherits from
+	CamelService.
 
 	* camel/camel-service.c (camel_service_class_init): 
 	basic abstract service class.
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index b97bf970d9..e92a58982d 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -102,6 +102,11 @@ typedef struct {
 } CamelFolderClass;
 
 
+/* public methods */
+
+/* Standard Gtk function */
+GtkType camel_folder_get_type (void);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/camel/camel-service.c b/camel/camel-service.c
index 57df967c5e..4bcbe7088b 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -57,7 +57,7 @@ camel_service_class_init (CamelServiceClass *camel_service_class)
 
 
 GtkType
-camel_service__get_type (void)
+camel_service_get_type (void)
 {
 	static GtkType camel_service_type = 0;
 	
diff --git a/camel/camel-service.h b/camel/camel-service.h
index 7c0e74b066..ebb6464a3e 100644
--- a/camel/camel-service.h
+++ b/camel/camel-service.h
@@ -62,6 +62,13 @@ typedef struct {
 } CamelServiceClass;
 
 
+
+
+/* public methods */
+
+/* Standard Gtk function */
+GtkType camel_service_get_type (void);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/camel/camel-store.c b/camel/camel-store.c
index 93b05d8460..dc29e0a8ae 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -30,7 +30,6 @@ static GtkObjectClass *camel_store_parent_class=NULL;
 
 static void camel_store_set_separator(CamelStore *store, gchar sep);
 static gchar camel_store_get_geparator(CamelStore *store);
-static CamelFolder *camel_store_get_folder(GString *folder_name);
 static CamelFolder *camel_store_get_root_folder(CamelStore *store);
 static CamelFolder *camel_store_get_default_folder(CamelStore *store);
 
@@ -39,7 +38,7 @@ static CamelFolder *camel_store_get_default_folder(CamelStore *store);
 static void
 camel_store_class_init (CamelStoreClass *camel_store_class)
 {
-	camel_store_parent_class = gtk_type_class (gtk_object_get_type ());
+	camel_store_parent_class = gtk_type_class (camel_service_get_type ());
 	
 	/* virtual method definition */
 	camel_store_class->set_separator = camel_store_set_separator;
@@ -57,7 +56,7 @@ camel_store_class_init (CamelStoreClass *camel_store_class)
 
 
 GtkType
-camel_store__get_type (void)
+camel_store_get_type (void)
 {
 	static GtkType camel_store_type = 0;
 	
@@ -131,7 +130,7 @@ camel_store_get_geparator(CamelStore *store)
  * @Return value: the folder
  **/
 static CamelFolder *
-camel_store_get_folder(GString *folder_name)
+camel_store_get_folder(CamelStore *store, GString *folder_name)
 {
 
 #warning fill this part in.
diff --git a/camel/camel-store.h b/camel/camel-store.h
index 7c59f3764e..15fbbe6301 100644
--- a/camel/camel-store.h
+++ b/camel/camel-store.h
@@ -33,6 +33,7 @@ extern "C" {
 
 #include <gtk/gtk.h>
 #include "camel-folder.h"
+#include "camel-service.h"
 
 #define CAMEL_STORE_TYPE     (camel_store_get_type ())
 #define CAMEL_STORE(obj)     (GTK_CHECK_CAST((obj), CAMEL_STORE_TYPE, CamelStore))
@@ -51,7 +52,7 @@ typedef struct _CamelStore CamelStore;
 
 struct _CamelStore
 {
-	GtkObject parent_object;	
+	CamelService parent_object;	
 	
 	gchar separator;
 };
@@ -59,16 +60,24 @@ struct _CamelStore
 
 
 typedef struct {
-	GtkObjectClass parent_class;
+	CamelServiceClass parent_class;
+
 	void (*set_separator) (CamelStore *store, gchar sep);
 	gchar (*get_separator) (CamelStore *store);
-	CamelFolder * (*get_folder) (GString *folder_name);
+	CamelFolder * (*get_folder) (CamelStore *store, GString *folder_name);
 	CamelFolder * (*get_root_folder) (CamelStore *store);
 	CamelFolder * (*get_default_folder) (CamelStore *store);
 
 } CamelStoreClass;
 
 
+/* public methods */
+
+/* Standard Gtk function */
+GtkType camel_store_get_type (void);
+
+CamelFolder *camel_store_get_folder(CamelStore *store, GString *folder_name);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */