More Makefile organization to compile

svn path=/trunk/; revision=7350

5 files changed, 40 insertions, 42 deletions

diff --git a/help/devel/calendar/cal-client/evolution-cal-client-decl.txt b/help/devel/calendar/cal-client/evolution-cal-client-decl.txt
index 498285a370..54de988830 100644
--- a/help/devel/calendar/cal-client/evolution-cal-client-decl.txt
+++ b/help/devel/calendar/cal-client/evolution-cal-client-decl.txt
@@ -1,3 +1,16 @@
+<ENUM>
+<NAME>CalClientChangeType</NAME>
+typedef enum {
+	CAL_CLIENT_CHANGE_ADDED = 1 << 0,
+	CAL_CLIENT_CHANGE_MODIFIED = 1 << 1,
+	CAL_CLIENT_CHANGE_DELETED = 1 << 2
+} CalClientChangeType;
+</ENUM>
+<FUNCTION>
+<NAME>cal_client_change_list_free</NAME>
+<RETURNS>void  </RETURNS>
+GList *list
+</FUNCTION>
 <MACRO>
 <NAME>CAL_CLIENT_TYPE</NAME>
 #define CAL_CLIENT_TYPE            (cal_client_get_type ())
@@ -53,6 +66,19 @@ struct CalClient {
 	CalClientPrivate *priv;
 };
 </STRUCT>
+<STRUCT>
+<NAME>CalClientClass</NAME>
+struct CalClientClass {
+	GtkObjectClass parent_class;
+
+	/* Notification signals */
+
+	void (* cal_loaded) (CalClient *client, CalClientLoadStatus status);
+
+	void (* obj_updated) (CalClient *client, const char *uid);
+	void (* obj_removed) (CalClient *client, const char *uid);
+};
+</STRUCT>
 <FUNCTION>
 <NAME>cal_client_get_type</NAME>
 <RETURNS>GtkType  </RETURNS>
@@ -138,16 +164,3 @@ CalClient *client, CalComponent *comp
 <RETURNS>gboolean  </RETURNS>
 CalClient *client, const char *uid
 </FUNCTION>
-<ENUM>
-<NAME>CalClientChangeType</NAME>
-typedef enum {
-	CAL_CLIENT_CHANGE_ADDED = 1 << 0,
-	CAL_CLIENT_CHANGE_MODIFIED = 1 << 1,
-	CAL_CLIENT_CHANGE_DELETED = 1 << 2
-} CalClientChangeType;
-</ENUM>
-<FUNCTION>
-<NAME>cal_client_change_list_free</NAME>
-<RETURNS>void  </RETURNS>
-GList *list
-</FUNCTION>
diff --git a/help/devel/calendar/cal-client/evolution-cal-client.hierarchy b/help/devel/calendar/cal-client/evolution-cal-client.hierarchy
index 88efa3e673..21651b5e89 100644
--- a/help/devel/calendar/cal-client/evolution-cal-client.hierarchy
+++ b/help/devel/calendar/cal-client/evolution-cal-client.hierarchy
@@ -1,2 +1,5 @@
 GtkObject
+  GtkWidget
+    GtkRange
+    GtkContainer
   CalClient
diff --git a/help/devel/calendar/cal-client/evolution-cal-client.signals b/help/devel/calendar/cal-client/evolution-cal-client.signals
index d5af728e6f..97e360b6a2 100644
--- a/help/devel/calendar/cal-client/evolution-cal-client.signals
+++ b/help/devel/calendar/cal-client/evolution-cal-client.signals
@@ -2,20 +2,20 @@
 <NAME>CalClient::cal-loaded</NAME>
 <RETURNS>void</RETURNS>
 CalClient *calclient
-gint  arg1
+GtkEnum  arg1
 </SIGNAL>
 
 <SIGNAL>
 <NAME>CalClient::obj-updated</NAME>
 <RETURNS>void</RETURNS>
 CalClient *calclient
-gchar *arg1
+GtkString  arg1
 </SIGNAL>
 
 <SIGNAL>
 <NAME>CalClient::obj-removed</NAME>
 <RETURNS>void</RETURNS>
 CalClient *calclient
-gchar *arg1
+GtkString  arg1
 </SIGNAL>
 
diff --git a/help/devel/calendar/cal-client/tmpl/cal-client.sgml b/help/devel/calendar/cal-client/tmpl/cal-client.sgml
index 6de1ab8045..d3ef7c8113 100644
--- a/help/devel/calendar/cal-client/tmpl/cal-client.sgml
+++ b/help/devel/calendar/cal-client/tmpl/cal-client.sgml
@@ -61,15 +61,6 @@ GTK+ object for communication with personal calendar server.
     destroyed.
   </para>
 
-@CAL_CLIENT_LOAD_SUCCESS: Indicates a successful load or create
-  operation; the corresponding calendar is ready for use.
-@CAL_CLIENT_LOAD_ERROR: Indicates an error while loading or creating
-  the calendar.
-@CAL_CLIENT_LOAD_IN_USE: Indicates that a create request failed
-  because the specified calendar was already being used by another
-  client.
-@CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED: Indicates an error due to
-  trying to load a calendar for which a backend type is not present.
 
 <!-- ##### ENUM CalClientGetStatus ##### -->
   <para>
@@ -77,21 +68,12 @@ GTK+ object for communication with personal calendar server.
     function.
   </para>
 
-@CAL_CLIENT_GET_SUCCESS: Indicates a successful get operation.
-@CAL_CLIENT_GET_NOT_FOUND: Indicates that the requested object was
-  not found.
-@CAL_CLIENT_GET_SYNTAX_ERROR: Indicates a syntax error when parsing
-  the requested object.  This could indicate a bug in the calendar
-  client libraries or in the Wombat server.
 
 <!-- ##### ENUM CalClientChangeType ##### -->
 <para>
 
 </para>
 
-@CAL_CLIENT_CHANGE_ADDED: 
-@CAL_CLIENT_CHANGE_MODIFIED: 
-@CAL_CLIENT_CHANGE_DELETED: 
 
 <!-- ##### FUNCTION cal_client_new ##### -->
 <para>
diff --git a/help/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml b/help/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml
index a0c23894d9..77eb4a2b15 100644
--- a/help/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml
+++ b/help/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml
@@ -1,22 +1,22 @@
-<!-- ##### FUNCTION cal_client_update_pilot_id ##### -->
+<!-- ##### FUNCTION cal_client_get_events_in_range ##### -->
 <para>
 
 </para>
 
 @client: 
-@uid: 
-@pilot_id: 
-@pilot_status: 
+@start: 
+@end: 
+@Returns: 
 
-<!-- ##### FUNCTION cal_client_get_events_in_range ##### -->
+<!-- ##### FUNCTION cal_client_update_pilot_id ##### -->
 <para>
 
 </para>
 
 @client: 
-@start: 
-@end: 
-@Returns: 
+@uid: 
+@pilot_id: 
+@pilot_status: 
 
 <!-- ##### FUNCTION cal_client_get_uid_by_pilot_id ##### -->
 <para>