cal-client/cal-listener.h

2002-10-31  Rodrigo Moya <rodrigo@ximian.com>

	* cal-util/cal-component.[ch]:
	* cal-util/cal-recur.h:
	* cal-util/cal-util.[ch]:
	* cal-client/cal-client.h:
	* cal-client/cal-client-multi.h:
	* cal-client/cal-client-types.[ch]:
	* cal-client/cal-listener.h
	* cal-client/cal-query.[ch]:
	* cal-client/query-listener.h:
	* pcs/cal.h:
	* pcs/cal-backend.[ch]:
	* pcs/cal-backend-file.h:
	* pcs/cal-backend-util.h:
	* pcs/cal-common.h:
	* pcs/cal-factory.h:
	* pcs/query.[ch]:
	* pcs/query-backend.[ch]: started GNOME 2 porting.
	cal-util, cal-client and pcs compiled ok.

	* cal-client/cal-client.c (cal_client_construct):
	* pcs/cal-factory.c: use b-a instead of OAF and bonobo-config
	instead of bonobo-conf.

svn path=/trunk/; revision=18496

10 files changed, 44 insertions, 46 deletions

diff --git a/calendar/cal-client/cal-client-multi.c b/calendar/cal-client/cal-client-multi.c
index aeebc72fda..7ccaae8472 100644
--- a/calendar/cal-client/cal-client-multi.c
+++ b/calendar/cal-client/cal-client-multi.c
@@ -93,7 +93,7 @@ cal_client_multi_class_init (CalClientMultiClass *klass)
 	cal_multi_signals[CAL_OPENED] =
 		gtk_signal_new ("cal_opened",
 				GTK_RUN_FIRST,
-				object_class->type,
+				G_TYPE_FROM_CLASS (object_class),
 				GTK_SIGNAL_OFFSET (CalClientMultiClass, cal_opened),
 				gtk_marshal_NONE__POINTER_INT,
 				GTK_TYPE_NONE, 2,
@@ -101,7 +101,7 @@ cal_client_multi_class_init (CalClientMultiClass *klass)
 	cal_multi_signals[OBJ_UPDATED] =
 		gtk_signal_new ("obj_updated",
 				GTK_RUN_FIRST,
-				object_class->type,
+				G_TYPE_FROM_CLASS (object_class),
 				GTK_SIGNAL_OFFSET (CalClientMultiClass, obj_updated),
 				gtk_marshal_NONE__POINTER_POINTER,
 				GTK_TYPE_NONE, 2,
@@ -109,7 +109,7 @@ cal_client_multi_class_init (CalClientMultiClass *klass)
 	cal_multi_signals[OBJ_REMOVED] =
 		gtk_signal_new ("obj_removed",
 				GTK_RUN_FIRST,
-				object_class->type,
+				G_TYPE_FROM_CLASS (object_class),
 				GTK_SIGNAL_OFFSET (CalClientMultiClass, obj_removed),
 				gtk_marshal_NONE__POINTER_POINTER,
 				GTK_TYPE_NONE, 2,
@@ -117,7 +117,7 @@ cal_client_multi_class_init (CalClientMultiClass *klass)
 	cal_multi_signals[CATEGORIES_CHANGED] =
 		gtk_signal_new ("categories_changed",
 				GTK_RUN_FIRST,
-				object_class->type,
+				G_TYPE_FROM_CLASS (object_class),
 				GTK_SIGNAL_OFFSET (CalClientMultiClass, categories_changed),
 				gtk_marshal_NONE__POINTER_POINTER,
 				GTK_TYPE_NONE, 2,
@@ -125,7 +125,7 @@ cal_client_multi_class_init (CalClientMultiClass *klass)
 	cal_multi_signals[FORGET_PASSWORD] =
 		gtk_signal_new ("forget_password",
 				GTK_RUN_FIRST,
-                                object_class->type,
+                                G_TYPE_FROM_CLASS (object_class),
                                 GTK_SIGNAL_OFFSET (CalClientMultiClass, forget_password),
                                 gtk_marshal_NONE__POINTER_POINTER,
                                 GTK_TYPE_NONE, 2,
diff --git a/calendar/cal-client/cal-client-multi.h b/calendar/cal-client/cal-client-multi.h
index cded02e194..f16b2d60f4 100644
--- a/calendar/cal-client/cal-client-multi.h
+++ b/calendar/cal-client/cal-client-multi.h
@@ -23,7 +23,7 @@
 
 #include <cal-client/cal-client.h>
 
-BEGIN_GNOME_DECLS
+G_BEGIN_DECLS
 
 #define CAL_CLIENT_MULTI_TYPE            (cal_client_multi_get_type ())
 #define CAL_CLIENT_MULTI(obj)            (GTK_CHECK_CAST ((obj), CAL_CLIENT_MULTI_TYPE, CalClientMulti))
@@ -99,6 +99,6 @@ void               cal_client_multi_generate_instances (CalClientMulti *multi,
 GSList            *cal_client_multi_get_alarms_in_range (CalClientMulti *multi,
 							 time_t start, time_t end);
 
-END_GNOME_DECLS
+G_END_DECLS
 
 #endif
diff --git a/calendar/cal-client/cal-client-types.h b/calendar/cal-client/cal-client-types.h
index 9727fc9b3d..c160a1fa94 100644
--- a/calendar/cal-client/cal-client-types.h
+++ b/calendar/cal-client/cal-client-types.h
@@ -23,10 +23,9 @@
 #ifndef CAL_CLIENT_TYPES_H
 #define CAL_CLIENT_TYPES_H
 
-#include <libgnome/gnome-defs.h>
 #include <cal-util/cal-component.h>
 
-BEGIN_GNOME_DECLS
+G_BEGIN_DECLS
 
 
 
@@ -44,7 +43,7 @@ typedef struct
 
 void cal_client_change_list_free (GList *list);
 
-END_GNOME_DECLS
+G_END_DECLS
 
 #endif
 
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c
index ec5401fb0f..9881a7c032 100644
--- a/calendar/cal-client/cal-client.c
+++ b/calendar/cal-client/cal-client.c
@@ -23,10 +23,10 @@
 #endif
 
 #include <gtk/gtksignal.h>
-#include <liboaf/liboaf.h>
+#include <bonobo-activation/bonobo-activation.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-moniker-util.h>
-#include <bonobo-conf/bonobo-config-database.h>
+#include <bonobo-config/bonobo-config-database.h>
 #include <libgnome/gnome-util.h>
 
 #include "e-util/e-component-listener.h"
@@ -159,7 +159,7 @@ cal_client_class_init (CalClientClass *class)
 	cal_client_signals[CAL_OPENED] =
 		gtk_signal_new ("cal_opened",
 				GTK_RUN_FIRST,
-				object_class->type,
+				G_TYPE_FROM_CLASS (object_class),
 				GTK_SIGNAL_OFFSET (CalClientClass, cal_opened),
 				gtk_marshal_NONE__ENUM,
 				GTK_TYPE_NONE, 1,
@@ -167,7 +167,7 @@ cal_client_class_init (CalClientClass *class)
 	cal_client_signals[CAL_SET_MODE] =
 		gtk_signal_new ("cal_set_mode",
 				GTK_RUN_FIRST,
-				object_class->type,
+				G_TYPE_FROM_CLASS (object_class),
 				GTK_SIGNAL_OFFSET (CalClientClass, cal_set_mode),
 				marshal_NONE__ENUM_ENUM,
 				GTK_TYPE_NONE, 2,
@@ -176,7 +176,7 @@ cal_client_class_init (CalClientClass *class)
 	cal_client_signals[OBJ_UPDATED] =
 		gtk_signal_new ("obj_updated",
 				GTK_RUN_FIRST,
-				object_class->type,
+				G_TYPE_FROM_CLASS (object_class),
 				GTK_SIGNAL_OFFSET (CalClientClass, obj_updated),
 				gtk_marshal_NONE__STRING,
 				GTK_TYPE_NONE, 1,
@@ -184,7 +184,7 @@ cal_client_class_init (CalClientClass *class)
 	cal_client_signals[OBJ_REMOVED] =
 		gtk_signal_new ("obj_removed",
 				GTK_RUN_FIRST,
-				object_class->type,
+				G_TYPE_FROM_CLASS (object_class),
 				GTK_SIGNAL_OFFSET (CalClientClass, obj_removed),
 				gtk_marshal_NONE__STRING,
 				GTK_TYPE_NONE, 1,
@@ -192,7 +192,7 @@ cal_client_class_init (CalClientClass *class)
 	cal_client_signals[BACKEND_ERROR] =
 		gtk_signal_new ("backend_error",
 				GTK_RUN_FIRST,
-				object_class->type,
+				G_TYPE_FROM_CLASS (object_class),
 				GTK_SIGNAL_OFFSET (CalClientClass, backend_error),
 				gtk_marshal_NONE__STRING,
 				GTK_TYPE_NONE, 1,
@@ -200,7 +200,7 @@ cal_client_class_init (CalClientClass *class)
 	cal_client_signals[CATEGORIES_CHANGED] =
 		gtk_signal_new ("categories_changed",
 				GTK_RUN_FIRST,
-				object_class->type,
+				G_TYPE_FROM_CLASS (object_class),
 				GTK_SIGNAL_OFFSET (CalClientClass, categories_changed),
 				gtk_marshal_NONE__POINTER,
 				GTK_TYPE_NONE, 1,
@@ -208,7 +208,7 @@ cal_client_class_init (CalClientClass *class)
 	cal_client_signals[FORGET_PASSWORD] =
 		gtk_signal_new ("forget_password",
 				GTK_RUN_FIRST,
-                                object_class->type,
+                                G_TYPE_FROM_CLASS (object_class),
                                 GTK_SIGNAL_OFFSET (CalClientClass, forget_password),
                                 gtk_marshal_NONE__STRING,
                                 GTK_TYPE_NONE, 1,
@@ -216,7 +216,7 @@ cal_client_class_init (CalClientClass *class)
 	cal_client_signals[BACKEND_DIED] =
 		gtk_signal_new ("backend_died",
 				GTK_RUN_FIRST,
-				object_class->type,
+				G_TYPE_FROM_CLASS (object_class),
 				GTK_SIGNAL_OFFSET (CalClientClass, backend_died),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
@@ -654,7 +654,7 @@ cal_client_construct (CalClient *client)
 {
 	CalClientPrivate *priv;
 	GNOME_Evolution_Calendar_CalFactory factory;
-	OAF_ServerInfoList *servers;
+	Bonobo_ServerInfoList *servers;
 	CORBA_Environment ev;
 	int i;
 
@@ -666,7 +666,7 @@ cal_client_construct (CalClient *client)
 
 	CORBA_exception_init (&ev);
 
-	servers = oaf_query ("repo_ids.has ('IDL:GNOME/Evolution/Calendar/CalFactory:1.0')", NULL, &ev);
+	servers = bonobo_activation_query ("repo_ids.has ('IDL:GNOME/Evolution/Calendar/CalFactory:1.0')", NULL, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_message ("Cannot perform OAF query for Calendar servers.");
 		CORBA_exception_free (&ev);
@@ -677,12 +677,12 @@ cal_client_construct (CalClient *client)
 		g_warning ("No Calendar servers installed.");
 
 	for (i = 0; i < servers->_length; i++) {
-		const OAF_ServerInfo *info;
+		const Bonobo_ServerInfo *info;
 
 		info = servers->_buffer + i;
 
 		factory = (GNOME_Evolution_Calendar_CalFactory)
-			oaf_activate_from_id (info->iid, 0, NULL, &ev);
+			bonobo_activation_activate_from_id (info->iid, 0, NULL, &ev);
 		if (BONOBO_EX (&ev)) {
 			g_warning ("cal_client_construct: Could not activate calendar server %s", info->iid);
 			CORBA_free (servers);
@@ -1054,8 +1054,8 @@ cal_client_is_read_only (CalClient *client)
 	CORBA_Environment ev;
 	CORBA_boolean read_only;
 
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);
+	g_return_val_if_fail (client != NULL, FALSE);
+	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);
 
 	priv = client->priv;
 
diff --git a/calendar/cal-client/cal-client.h b/calendar/cal-client/cal-client.h
index bb1a02e8e6..9c40722888 100644
--- a/calendar/cal-client/cal-client.h
+++ b/calendar/cal-client/cal-client.h
@@ -21,13 +21,13 @@
 #ifndef CAL_CLIENT_H
 #define CAL_CLIENT_H
 
-#include <libgnome/gnome-defs.h>
+#include <glib/gmacros.h>
 #include <gtk/gtkobject.h>
 #include <cal-util/cal-recur.h>
 #include <cal-util/cal-util.h>
 #include <cal-client/cal-query.h>
 
-BEGIN_GNOME_DECLS
+G_BEGIN_DECLS
 
 
 
@@ -208,6 +208,6 @@ char* cal_client_get_component_as_string (CalClient *client,
 
 
 
-END_GNOME_DECLS
+G_END_DECLS
 
 #endif
diff --git a/calendar/cal-client/cal-listener.h b/calendar/cal-client/cal-listener.h
index 4d557a1fbc..536ea035c6 100644
--- a/calendar/cal-client/cal-listener.h
+++ b/calendar/cal-client/cal-listener.h
@@ -21,11 +21,11 @@
 #ifndef CAL_LISTENER_H
 #define CAL_LISTENER_H
 
-#include <libgnome/gnome-defs.h>
+#include <gtk/gtkobject.h>
 #include <bonobo/bonobo-xobject.h>
 #include "evolution-calendar.h"
 
-BEGIN_GNOME_DECLS
+G_BEGIN_DECLS
 
 
 
@@ -101,6 +101,6 @@ void cal_listener_stop_notification (CalListener *listener);
 
 
 
-END_GNOME_DECLS
+G_END_DECLS
 
 #endif
diff --git a/calendar/cal-client/cal-query.c b/calendar/cal-client/cal-query.c
index 80ffe5c845..8d87bb30a9 100644
--- a/calendar/cal-client/cal-query.c
+++ b/calendar/cal-client/cal-query.c
@@ -110,7 +110,7 @@ cal_query_class_init (CalQueryClass *class)
 	query_signals[OBJ_UPDATED] =
 		gtk_signal_new ("obj_updated",
 				GTK_RUN_FIRST,
-				object_class->type,
+				G_TYPE_FROM_CLASS (object_class),
 				GTK_SIGNAL_OFFSET (CalQueryClass, obj_updated),
 				marshal_obj_updated,
 				GTK_TYPE_NONE, 4,
@@ -121,7 +121,7 @@ cal_query_class_init (CalQueryClass *class)
 	query_signals[OBJ_REMOVED] =
 		gtk_signal_new ("obj_removed",
 				GTK_RUN_FIRST,
-				object_class->type,
+				G_TYPE_FROM_CLASS (object_class),
 				GTK_SIGNAL_OFFSET (CalQueryClass, obj_removed),
 				gtk_marshal_NONE__STRING,
 				GTK_TYPE_NONE, 1,
@@ -129,7 +129,7 @@ cal_query_class_init (CalQueryClass *class)
 	query_signals[QUERY_DONE] =
 		gtk_signal_new ("query_done",
 				GTK_RUN_FIRST,
-				object_class->type,
+				G_TYPE_FROM_CLASS (object_class),
 				GTK_SIGNAL_OFFSET (CalQueryClass, query_done),
 				marshal_query_done,
 				GTK_TYPE_NONE, 2,
@@ -138,7 +138,7 @@ cal_query_class_init (CalQueryClass *class)
 	query_signals[EVAL_ERROR] =
 		gtk_signal_new ("eval_error",
 				GTK_RUN_FIRST,
-				object_class->type,
+				G_TYPE_FROM_CLASS (object_class),
 				GTK_SIGNAL_OFFSET (CalQueryClass, eval_error),
 				gtk_marshal_NONE__STRING,
 				GTK_TYPE_NONE, 1,
diff --git a/calendar/cal-client/cal-query.h b/calendar/cal-client/cal-query.h
index 5af5f3864d..a8d7d2a514 100644
--- a/calendar/cal-client/cal-query.h
+++ b/calendar/cal-client/cal-query.h
@@ -21,12 +21,11 @@
 #ifndef CAL_QUERY_H
 #define CAL_QUERY_H
 
-#include <libgnome/gnome-defs.h>
 #include <gtk/gtkobject.h>
 
 #include "evolution-calendar.h"
 
-BEGIN_GNOME_DECLS
+G_BEGIN_DECLS
 
 
 
@@ -76,6 +75,6 @@ CalQuery *cal_query_new (GNOME_Evolution_Calendar_Cal cal,
 
 
 
-END_GNOME_DECLS
+G_END_DECLS
 
 #endif
diff --git a/calendar/cal-client/client-test.c b/calendar/cal-client/client-test.c
index 56651566eb..cbd6335acc 100644
--- a/calendar/cal-client/client-test.c
+++ b/calendar/cal-client/client-test.c
@@ -23,10 +23,9 @@
 #include <stdlib.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-init.h>
-#include <liboaf/liboaf.h>
+#include <libgnome/gnome-init.h>
+#include <bonobo-activation/bonobo-activation.h>
 #include <bonobo/bonobo-main.h>
 #include "cal-client.h"
 #include "cal-util/cal-component.h"
@@ -221,10 +220,10 @@ main (int argc, char **argv)
 	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
 	textdomain (PACKAGE);
 
-	gnome_init ("tl-test", VERSION, argc, argv);
+	gnome_program_init ("tl-test", VERSION, LIBGNOME_MODULE, argc, argv, NULL);
 	oaf_init (argc, argv);
 
-	if (!bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) {
+	if (!bonobo_init (&argc, argv)) {
 		g_message ("main(): could not initialize Bonobo");
 		exit (1);
 	}
diff --git a/calendar/cal-client/query-listener.h b/calendar/cal-client/query-listener.h
index 65cc9fbad4..fe509643dd 100644
--- a/calendar/cal-client/query-listener.h
+++ b/calendar/cal-client/query-listener.h
@@ -21,10 +21,11 @@
 #ifndef QUERY_LISTENER_H
 #define QUERY_LISTENER_H
 
+#include <gtk/gtkobject.h>
 #include <bonobo/bonobo-xobject.h>
 #include "evolution-calendar.h"
 
-BEGIN_GNOME_DECLS
+G_BEGIN_DECLS
 
 
 
@@ -92,6 +93,6 @@ void query_listener_stop_notification (QueryListener *ql);
 
 
 
-END_GNOME_DECLS
+G_END_DECLS
 
 #endif