diff options
Diffstat (limited to 'calendar/cal-client/cal-client.c')
| -rw-r--r-- | calendar/cal-client/cal-client.c | 32 |
1 files changed, 16 insertions, 16 deletions
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; |