From b87002d69794ef55c90b21b9ee7ca58e40a64960 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Sat, 2 Nov 2002 00:26:06 +0000 Subject: cal-client/cal-listener.h 2002-10-31 Rodrigo Moya * 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 --- calendar/pcs/cal-backend-file.h | 5 ++--- calendar/pcs/cal-backend-util.h | 6 +++--- calendar/pcs/cal-backend.c | 12 ++++++------ calendar/pcs/cal-backend.h | 5 ++--- calendar/pcs/cal-common.h | 6 +++--- calendar/pcs/cal-factory.c | 18 +++++++++--------- calendar/pcs/cal-factory.h | 5 ++--- calendar/pcs/cal.h | 6 +++--- calendar/pcs/query-backend.c | 1 - calendar/pcs/query-backend.h | 4 ++-- calendar/pcs/query.c | 1 - calendar/pcs/query.h | 5 ++--- 12 files changed, 34 insertions(+), 40 deletions(-) (limited to 'calendar/pcs') diff --git a/calendar/pcs/cal-backend-file.h b/calendar/pcs/cal-backend-file.h index 30fc210dd8..0dd2c1fde1 100644 --- a/calendar/pcs/cal-backend-file.h +++ b/calendar/pcs/cal-backend-file.h @@ -22,10 +22,9 @@ #ifndef CAL_BACKEND_FILE_H #define CAL_BACKEND_FILE_H -#include #include "pcs/cal-backend.h" -BEGIN_GNOME_DECLS +G_BEGIN_DECLS @@ -57,6 +56,6 @@ GtkType cal_backend_file_get_type (void); -END_GNOME_DECLS +G_END_DECLS #endif diff --git a/calendar/pcs/cal-backend-util.h b/calendar/pcs/cal-backend-util.h index aed52f4bb7..6e9f48a8c6 100644 --- a/calendar/pcs/cal-backend-util.h +++ b/calendar/pcs/cal-backend-util.h @@ -23,10 +23,10 @@ #ifndef CAL_BACKEND_UTIL_H #define CAL_BACKEND_UTIL_H -#include +#include #include -BEGIN_GNOME_DECLS +G_BEGIN_DECLS /* * CORBA utility functions @@ -46,6 +46,6 @@ gboolean cal_backend_mail_account_get_default (Bonobo_ConfigDatabase db, gboolean cal_backend_mail_account_is_valid (Bonobo_ConfigDatabase db, char *user, char **name); -END_GNOME_DECLS +G_END_DECLS #endif diff --git a/calendar/pcs/cal-backend.c b/calendar/pcs/cal-backend.c index 95bc26b093..cf6b173f7d 100644 --- a/calendar/pcs/cal-backend.c +++ b/calendar/pcs/cal-backend.c @@ -48,7 +48,7 @@ static void cal_backend_class_init (CalBackendClass *class); static guint cal_backend_signals[LAST_SIGNAL]; -#define CLASS(backend) (CAL_BACKEND_CLASS (GTK_OBJECT (backend)->klass)) +#define CLASS(backend) (CAL_BACKEND_CLASS (G_OBJECT_GET_CLASS (backend))) @@ -96,14 +96,14 @@ cal_backend_class_init (CalBackendClass *class) cal_backend_signals[LAST_CLIENT_GONE] = gtk_signal_new ("last_client_gone", GTK_RUN_FIRST, - object_class->type, + G_TYPE_FROM_CLASS (object_class), GTK_SIGNAL_OFFSET (CalBackendClass, last_client_gone), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); cal_backend_signals[CAL_ADDED] = gtk_signal_new ("cal_added", GTK_RUN_FIRST, - object_class->type, + G_TYPE_FROM_CLASS (object_class), GTK_SIGNAL_OFFSET (CalBackendClass, cal_added), gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, @@ -111,7 +111,7 @@ cal_backend_class_init (CalBackendClass *class) cal_backend_signals[OPENED] = gtk_signal_new ("opened", GTK_RUN_FIRST, - object_class->type, + G_TYPE_FROM_CLASS (object_class), GTK_SIGNAL_OFFSET (CalBackendClass, opened), gtk_marshal_NONE__ENUM, GTK_TYPE_NONE, 1, @@ -119,7 +119,7 @@ cal_backend_class_init (CalBackendClass *class) cal_backend_signals[OBJ_UPDATED] = gtk_signal_new ("obj_updated", GTK_RUN_FIRST, - object_class->type, + G_TYPE_FROM_CLASS (object_class), GTK_SIGNAL_OFFSET (CalBackendClass, obj_updated), gtk_marshal_NONE__STRING, GTK_TYPE_NONE, 1, @@ -127,7 +127,7 @@ cal_backend_class_init (CalBackendClass *class) cal_backend_signals[OBJ_REMOVED] = gtk_signal_new ("obj_removed", GTK_RUN_FIRST, - object_class->type, + G_TYPE_FROM_CLASS (object_class), GTK_SIGNAL_OFFSET (CalBackendClass, obj_removed), gtk_marshal_NONE__STRING, GTK_TYPE_NONE, 1, diff --git a/calendar/pcs/cal-backend.h b/calendar/pcs/cal-backend.h index 8bc71ac91e..c0e969165a 100644 --- a/calendar/pcs/cal-backend.h +++ b/calendar/pcs/cal-backend.h @@ -24,7 +24,6 @@ #ifndef CAL_BACKEND_H #define CAL_BACKEND_H -#include #include #include #include "pcs/evolution-calendar.h" @@ -32,7 +31,7 @@ #include "pcs/cal.h" #include "pcs/query.h" -BEGIN_GNOME_DECLS +G_BEGIN_DECLS @@ -216,6 +215,6 @@ void cal_backend_obj_removed (CalBackend *backend, const char *uid); -END_GNOME_DECLS +G_END_DECLS #endif diff --git a/calendar/pcs/cal-common.h b/calendar/pcs/cal-common.h index 228a67fcfe..3bf229ee8f 100644 --- a/calendar/pcs/cal-common.h +++ b/calendar/pcs/cal-common.h @@ -22,9 +22,9 @@ #ifndef CAL_COMMON_H #define CAL_COMMON_H -#include +#include -BEGIN_GNOME_DECLS +G_BEGIN_DECLS @@ -36,6 +36,6 @@ typedef struct _CalClass CalClass; -END_GNOME_DECLS +G_END_DECLS #endif diff --git a/calendar/pcs/cal-factory.c b/calendar/pcs/cal-factory.c index 4c5ea41db1..1a12a77e03 100644 --- a/calendar/pcs/cal-factory.c +++ b/calendar/pcs/cal-factory.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "e-util/e-url.h" #include "evolution-calendar.h" #include "cal.h" @@ -618,7 +618,7 @@ cal_factory_destroy (GtkObject *object) priv->backends = NULL; if (priv->registered) { - oaf_active_server_unregister (priv->iid, BONOBO_OBJREF (factory)); + bonobo_activation_active_server_unregister (priv->iid, BONOBO_OBJREF (factory)); priv->registered = FALSE; } g_free (priv->iid); @@ -642,7 +642,7 @@ cal_factory_class_init (CalFactoryClass *klass) signals[LAST_CALENDAR_GONE] = gtk_signal_new ("last_calendar_gone", GTK_RUN_FIRST, - object_class->type, + G_TYPE_FROM_CLASS (object_class), GTK_SIGNAL_OFFSET (CalFactoryClass, last_calendar_gone), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -705,7 +705,7 @@ gboolean cal_factory_oaf_register (CalFactory *factory, const char *iid) { CalFactoryPrivate *priv; - OAF_RegistrationResult result; + Bonobo_RegistrationResult result; char *tmp_iid; g_return_val_if_fail (factory != NULL, FALSE); @@ -721,25 +721,25 @@ cal_factory_oaf_register (CalFactory *factory, const char *iid) else tmp_iid = g_strdup (DEFAULT_CAL_FACTORY_OAF_ID); - result = oaf_active_server_register (tmp_iid, BONOBO_OBJREF (factory)); + result = bonobo_activation_active_server_register (tmp_iid, BONOBO_OBJREF (factory)); switch (result) { - case OAF_REG_SUCCESS: + case Bonobo_ACTIVATION_REG_SUCCESS: priv->registered = TRUE; priv->iid = tmp_iid; return TRUE; - case OAF_REG_NOT_LISTED: + case Bonobo_ACTIVATION_REG_NOT_LISTED: g_message ("cal_factory_oaf_register(): Cannot register the calendar factory: " "not listed"); break; - case OAF_REG_ALREADY_ACTIVE: + case Bonobo_ACTIVATION_REG_ALREADY_ACTIVE: g_message ("cal_factory_oaf_register(): Cannot register the calendar factory: " "already active"); break; - case OAF_REG_ERROR: + case Bonobo_ACTIVATION_REG_ERROR: default: g_message ("cal_factory_oaf_register(): Cannot register the calendar factory: " "generic error"); diff --git a/calendar/pcs/cal-factory.h b/calendar/pcs/cal-factory.h index 7e83cfd2b7..e246056169 100644 --- a/calendar/pcs/cal-factory.h +++ b/calendar/pcs/cal-factory.h @@ -21,12 +21,11 @@ #ifndef CAL_FACTORY_H #define CAL_FACTORY_H -#include #include #include "pcs/evolution-calendar.h" -BEGIN_GNOME_DECLS +G_BEGIN_DECLS @@ -68,6 +67,6 @@ void cal_factory_register_method (CalFactory *factory, int cal_factory_get_n_backends (CalFactory *factory); void cal_factory_dump_active_backends (CalFactory *factory); -END_GNOME_DECLS +G_END_DECLS #endif diff --git a/calendar/pcs/cal.h b/calendar/pcs/cal.h index 52889b4f9a..f8ef057c44 100644 --- a/calendar/pcs/cal.h +++ b/calendar/pcs/cal.h @@ -23,12 +23,12 @@ #ifndef CAL_H #define CAL_H -#include +#include #include #include "pcs/evolution-calendar.h" #include "pcs/cal-common.h" -BEGIN_GNOME_DECLS +G_BEGIN_DECLS @@ -75,6 +75,6 @@ void cal_forget_password (Cal *cal, const char *key); -END_GNOME_DECLS +G_END_DECLS #endif diff --git a/calendar/pcs/query-backend.c b/calendar/pcs/query-backend.c index 3757a14076..31308e7fcc 100644 --- a/calendar/pcs/query-backend.c +++ b/calendar/pcs/query-backend.c @@ -23,7 +23,6 @@ #endif #include -#include #include #include #include diff --git a/calendar/pcs/query-backend.h b/calendar/pcs/query-backend.h index 9a581757a7..1e05ae597a 100644 --- a/calendar/pcs/query-backend.h +++ b/calendar/pcs/query-backend.h @@ -24,7 +24,7 @@ #include "cal-backend.h" #include "query.h" -BEGIN_GNOME_DECLS +G_BEGIN_DECLS #define QUERY_BACKEND_TYPE (query_backend_get_type ()) #define QUERY_BACKEND(obj) (GTK_CHECK_CAST ((obj), QUERY_BACKEND_TYPE, QueryBackend)) @@ -50,6 +50,6 @@ QueryBackend *query_backend_new (Query *query, CalBackend *backend); GList *query_backend_get_uids (QueryBackend *qb, CalObjType type); CalComponent *query_backend_get_object_component (QueryBackend *qb, const char *uid); -END_GNOME_DECLS +G_END_DECLS #endif diff --git a/calendar/pcs/query.c b/calendar/pcs/query.c index ca22ab38dd..1c8785eec4 100644 --- a/calendar/pcs/query.c +++ b/calendar/pcs/query.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/calendar/pcs/query.h b/calendar/pcs/query.h index 4e732aefd4..31388a5494 100644 --- a/calendar/pcs/query.h +++ b/calendar/pcs/query.h @@ -21,12 +21,11 @@ #ifndef QUERY_H #define QUERY_H -#include #include #include "pcs/cal-common.h" #include "pcs/evolution-calendar.h" -BEGIN_GNOME_DECLS +G_BEGIN_DECLS @@ -64,6 +63,6 @@ Query *query_new (CalBackend *backend, -END_GNOME_DECLS +G_END_DECLS #endif -- cgit v1.2.3