From 22a335e6143796e48d634cb39bf4d5555ba75ff7 Mon Sep 17 00:00:00 2001 From: Arturo Espinosa Date: Tue, 25 Jan 2000 09:58:51 +0000 Subject: Calendar client side work - Federico svn path=/trunk/; revision=1629 --- calendar/ChangeLog | 5 + calendar/cal-client.c | 291 +++++++++++++++++++++++++++++++++++++++ calendar/cal-client.h | 72 ++++++++++ calendar/cal-client/cal-client.c | 291 +++++++++++++++++++++++++++++++++++++++ calendar/cal-client/cal-client.h | 72 ++++++++++ 5 files changed, 731 insertions(+) create mode 100644 calendar/cal-client.c create mode 100644 calendar/cal-client.h create mode 100644 calendar/cal-client/cal-client.c create mode 100644 calendar/cal-client/cal-client.h diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 0345a9c5a8..af0471514f 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +2000-01-25 Federico Mena Quintero + + * cal-client.c cal-client.h: New files with the calendar client + object. + 2000-01-25 Federico Mena Quintero * cal-factory.c (CalFactory_load): Check that the listener is not diff --git a/calendar/cal-client.c b/calendar/cal-client.c new file mode 100644 index 0000000000..0f6b31c06a --- /dev/null +++ b/calendar/cal-client.c @@ -0,0 +1,291 @@ +/* GNOME calendar client + * + * Copyright (C) 2000 Helix Code, Inc. + * + * Author: Federico Mena-Quintero + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#include +#include "cal-client.h" +#include "cal-listener.h" + + + +/* Loading state for the calendar client */ +typedef enum { + LOAD_STATE_NOT_LOADED, + LOAD_STATE_LOADING, + LOAD_STATE_LOADED +} LoadState; + +/* Private part of the CalClient structure */ +typedef struct { + /* Load state to avoid multiple loads */ + LoadState load_state; + + /* The calendar factory we are contacting */ + GNOME_Calendar_CalFactory factory; + + /* Our calendar listener */ + CalListener *listener; +} CalClientPrivate; + + + +/* Signal IDs */ +enum { + CAL_LOADED, + LAST_SIGNAL +}; + +static void cal_client_class_init (CalClientClass *class); +static void cal_client_init (CalClient *client); +static void cal_client_destroy (GtkObject *object); + +static guint cal_client_signals[LAST_SIGNAL]; + +static GtkObjectClass *parent_class; + + + +/** + * cal_client_get_type: + * @void: + * + * Registers the #CalClient class if necessary, and returns the type ID assigned + * to it. + * + * Return value: The type ID of the #CalClient class. + **/ +GtkType +cal_client_get_type (void) +{ + static GtkType cal_client_type = 0; + + if (!cal_client_type) { + static const GtkTypeInfo cal_client_info = { + "CalClient", + sizeof (CalClient), + sizeof (CalClientClass), + (GtkClassInitFunc) cal_client_class_init, + (GtkObjectInitFunc) cal_client_init, + NULL, /* reserved_1 */ + NULL, /* reserved_2 */ + (GtkClassInitFunc) NULL + }; + + cal_client_type = gtk_type_unique (GTK_TYPE_OBJECT, &cal_client_info); + } + + return cal_client_type; +} + +/* Class initialization function for the calendar client */ +static void +cal_client_class_init (CalClientClass *class) +{ + GtkObjectClass *object_class; + + object_class = (GtkObjectClass *) class; + + parent_class = gtk_type_class (GTK_TYPE_OBJECT); + + cal_client_signals[CAL_LOADED] = + gtk_signal_new ("cal_loaded", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET (CalClientClass, cal_loaded), + gtk_marshal_NONE__ENUM, + GTK_TYPE_NONE, 1, + GTK_TYPE_ENUM); + + gtk_object_class_add_signals (object_class, cal_client_signals, LAST_SIGNAL); + + object_class->destroy = cal_client_destroy; +} + +/* Object initialization function for the calendar client */ +static void +cal_client_init (CalClient *client) +{ + CalClientPrivate *priv; + + priv = g_new0 (CalClientPrivate, 1); + client->priv = priv; + + priv->factory = CORBA_OBJECT_NIL; + priv->load_state = LOAD_STATE_NOT_LOADED; +} + +/* Destroy handler for the calendar client */ +static void +cal_client_destroy (GtkObject *object) +{ + CalClient *client; + CalClientPrivate *priv; + + g_return_if_fail (object != NULL); + g_return_if_fail (IS_CAL_CLIENT (object)); + + client = CAL_CLIENT (object); + priv = client->priv; + + /* FIXME */ + + g_free (priv); + + if (GTK_OBJECT_CLASS (parent_class)->destroy) + (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); +} + + + +/** + * cal_client_construct: + * @client: A calendar client. + * + * Constructs a calendar client object by contacting the calendar factory of the + * calendar server. + * + * Return value: The same object as the @client argument, or NULL if the + * calendar factory could not be contacted. + **/ +CalClient * +cal_client_construct (CalClient *client) +{ + CalClientPrivate *priv; + GNOME_Calendar_CalFactory factory, factory_copy; + CORBA_Environment ev; + int result; + + g_return_val_if_fail (client != NULL, NULL); + g_return_val_if_fail (IS_CAL_CLIENT (client), NULL); + + priv = client->priv; + + factory = (GNOME_Calendar_CalFactory) goad_server_activate_with_id ( + NULL, + "calendar:cal-factory", + GOAD_ACTIVATE_REMOTE, + NULL); + + CORBA_exception_init (&ev); + result = CORBA_Object_is_nil (factory, &ev); + if (ev._major != CORBA_NO_EXCEPTION) { + g_message ("cal_client_construct(): could not see if the factory is NIL"); + CORBA_exception_free (&ev); + return NULL; + } + CORBA_exception_free (&ev); + + if (result) { + g_message ("cal_client_construct(): could not contact Tlacuache, " + "the personal calendar server"); + return NULL; + } + + CORBA_exception_init (&ev); + factory_copy = CORBA_Object_duplicate (factory, &ev); + + if (ev._major != CORBA_NO_EXCEPTION) { + g_message ("cal_client_construct(): could not duplicate the calendar factory"); + CORBA_exception_free (&ev); + return NULL; + } + CORBA_exception_free (&ev); + + priv->factory = factory_copy; + return client; +} + +/** + * cal_client_new: + * @void: + * + * Creates a new calendar client. It should be initialized by calling + * cal_client_load_calendar() or cal_client_create_calendar(). + * + * Return value: A newly-created calendar client, or NULL if the client could + * not be constructed because it could not contact the calendar server. + **/ +CalClient * +cal_client_new (void) +{ + CalClient *client; + + client = gtk_type_new (CAL_CLIENT_TYPE); + + if (!cal_client_construct (client)) { + g_message ("cal_client_new(): could not construct the calendar client"); + gtk_object_unref (client); + return NULL; + } + + return client; +} + +/** + * cal_client_load_calendar: + * @client: A calendar client. + * @str_uri: URI of calendar to load. + * + * Makes a calendar client initiate a request to load a calendar. The calendar + * client will emit the "cal_loaded" signal when the response from the server is + * received. + * + * Return value: TRUE on success, FALSE on failure to issue the load request. + **/ +gboolean +cal_client_load_calendar (CalClient *client, const char *str_uri) +{ + CalClientPrivate *priv; + GNOME_Calendar_Listener corba_listener; + CORBA_Environment ev; + + g_return_val_if_fail (client != NULL, FALSE); + g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE); + + priv = client->priv; + g_return_val_if_fail (priv->load_state == LOAD_STATE_NOT_LOADED, FALSE); + + g_return_val_if_fail (str_uri != NULL, FALSE); + + priv->listener = cal_listener_new (); + if (!priv->listener) { + g_message ("cal_client_load_calendar(): could not create the listener"); + return FALSE; + } + + corba_listener = (GNOME_Calendar_Listener) gnome_object_corba_objref (priv->listener); + + CORBA_exception_init (&ev); + + priv->load_state = LOAD_STATE_LOADING; + GNOME_Calendar_CalFactory_load (priv->factory, str_uri, corba_listener, &ev); + + if (ev._major != CORBA_NO_EXCEPTION) { + g_message ("cal_client_load_calendar(): load request failed"); + gtk_object_unref (priv->listener); + priv->listener = NULL; + priv->load_state = LOAD_STATE_NOT_LOADED; + CORBA_exception_free (&ev); + return FALSE; + } + CORBA_exception_free (&ev); + + return TRUE; +} diff --git a/calendar/cal-client.h b/calendar/cal-client.h new file mode 100644 index 0000000000..e5935d9076 --- /dev/null +++ b/calendar/cal-client.h @@ -0,0 +1,72 @@ +/* GNOME calendar client + * + * Copyright (C) 2000 Helix Code, Inc. + * + * Author: Federico Mena-Quintero + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef CAL_CLIENT_H +#define CAL_CLIENT_H + +#include +#include + +BEGIN_GNOME_DECLS + + + +#define CAL_CLIENT_TYPE (cal_client_get_type ()) +#define CAL_CLIENT(obj) (GTK_CHECK_CAST ((obj), CAL_CLIENT_TYPE, CalClient)) +#define CAL_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), CAL_CLIENT_TYPE, CalClientClass)) +#define IS_CAL_CLIENT(obj) (GTK_CHECK_TYPE ((obj), CAL_CLIENT_TYPE)) +#define IS_CAL_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_TYPE)) + +typedef struct _CalClient CalClient; +typedef struct _CalClientClass CalClientClass; + +/* Load status for the cal_loaded signal */ +typedef enum { + CAL_CLIENT_LOAD_SUCCESS, + CAL_CLIENT_LOAD_ERROR +} CalClientLoadStatus; + +struct _CalClient { + GtkObject object; + + /* Private data */ + gpointer priv; +}; + +struct _CalClientClass { + GtkObjectClass parent_class; + + void (* cal_loaded) (CalClient *client, CalClientLoadStatus status); +}; + +GtkType cal_client_get_type (void); + +CalClient *cal_client_construct (CalClient *client); + +CalClient *cal_client_new (void); + +void cal_client_load_calendar (CalClient *client, const char *str_uri); + + + +END_GNOME_DECLS + +#endif diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c new file mode 100644 index 0000000000..0f6b31c06a --- /dev/null +++ b/calendar/cal-client/cal-client.c @@ -0,0 +1,291 @@ +/* GNOME calendar client + * + * Copyright (C) 2000 Helix Code, Inc. + * + * Author: Federico Mena-Quintero + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#include +#include "cal-client.h" +#include "cal-listener.h" + + + +/* Loading state for the calendar client */ +typedef enum { + LOAD_STATE_NOT_LOADED, + LOAD_STATE_LOADING, + LOAD_STATE_LOADED +} LoadState; + +/* Private part of the CalClient structure */ +typedef struct { + /* Load state to avoid multiple loads */ + LoadState load_state; + + /* The calendar factory we are contacting */ + GNOME_Calendar_CalFactory factory; + + /* Our calendar listener */ + CalListener *listener; +} CalClientPrivate; + + + +/* Signal IDs */ +enum { + CAL_LOADED, + LAST_SIGNAL +}; + +static void cal_client_class_init (CalClientClass *class); +static void cal_client_init (CalClient *client); +static void cal_client_destroy (GtkObject *object); + +static guint cal_client_signals[LAST_SIGNAL]; + +static GtkObjectClass *parent_class; + + + +/** + * cal_client_get_type: + * @void: + * + * Registers the #CalClient class if necessary, and returns the type ID assigned + * to it. + * + * Return value: The type ID of the #CalClient class. + **/ +GtkType +cal_client_get_type (void) +{ + static GtkType cal_client_type = 0; + + if (!cal_client_type) { + static const GtkTypeInfo cal_client_info = { + "CalClient", + sizeof (CalClient), + sizeof (CalClientClass), + (GtkClassInitFunc) cal_client_class_init, + (GtkObjectInitFunc) cal_client_init, + NULL, /* reserved_1 */ + NULL, /* reserved_2 */ + (GtkClassInitFunc) NULL + }; + + cal_client_type = gtk_type_unique (GTK_TYPE_OBJECT, &cal_client_info); + } + + return cal_client_type; +} + +/* Class initialization function for the calendar client */ +static void +cal_client_class_init (CalClientClass *class) +{ + GtkObjectClass *object_class; + + object_class = (GtkObjectClass *) class; + + parent_class = gtk_type_class (GTK_TYPE_OBJECT); + + cal_client_signals[CAL_LOADED] = + gtk_signal_new ("cal_loaded", + GTK_RUN_FIRST, + object_class->type, + GTK_SIGNAL_OFFSET (CalClientClass, cal_loaded), + gtk_marshal_NONE__ENUM, + GTK_TYPE_NONE, 1, + GTK_TYPE_ENUM); + + gtk_object_class_add_signals (object_class, cal_client_signals, LAST_SIGNAL); + + object_class->destroy = cal_client_destroy; +} + +/* Object initialization function for the calendar client */ +static void +cal_client_init (CalClient *client) +{ + CalClientPrivate *priv; + + priv = g_new0 (CalClientPrivate, 1); + client->priv = priv; + + priv->factory = CORBA_OBJECT_NIL; + priv->load_state = LOAD_STATE_NOT_LOADED; +} + +/* Destroy handler for the calendar client */ +static void +cal_client_destroy (GtkObject *object) +{ + CalClient *client; + CalClientPrivate *priv; + + g_return_if_fail (object != NULL); + g_return_if_fail (IS_CAL_CLIENT (object)); + + client = CAL_CLIENT (object); + priv = client->priv; + + /* FIXME */ + + g_free (priv); + + if (GTK_OBJECT_CLASS (parent_class)->destroy) + (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); +} + + + +/** + * cal_client_construct: + * @client: A calendar client. + * + * Constructs a calendar client object by contacting the calendar factory of the + * calendar server. + * + * Return value: The same object as the @client argument, or NULL if the + * calendar factory could not be contacted. + **/ +CalClient * +cal_client_construct (CalClient *client) +{ + CalClientPrivate *priv; + GNOME_Calendar_CalFactory factory, factory_copy; + CORBA_Environment ev; + int result; + + g_return_val_if_fail (client != NULL, NULL); + g_return_val_if_fail (IS_CAL_CLIENT (client), NULL); + + priv = client->priv; + + factory = (GNOME_Calendar_CalFactory) goad_server_activate_with_id ( + NULL, + "calendar:cal-factory", + GOAD_ACTIVATE_REMOTE, + NULL); + + CORBA_exception_init (&ev); + result = CORBA_Object_is_nil (factory, &ev); + if (ev._major != CORBA_NO_EXCEPTION) { + g_message ("cal_client_construct(): could not see if the factory is NIL"); + CORBA_exception_free (&ev); + return NULL; + } + CORBA_exception_free (&ev); + + if (result) { + g_message ("cal_client_construct(): could not contact Tlacuache, " + "the personal calendar server"); + return NULL; + } + + CORBA_exception_init (&ev); + factory_copy = CORBA_Object_duplicate (factory, &ev); + + if (ev._major != CORBA_NO_EXCEPTION) { + g_message ("cal_client_construct(): could not duplicate the calendar factory"); + CORBA_exception_free (&ev); + return NULL; + } + CORBA_exception_free (&ev); + + priv->factory = factory_copy; + return client; +} + +/** + * cal_client_new: + * @void: + * + * Creates a new calendar client. It should be initialized by calling + * cal_client_load_calendar() or cal_client_create_calendar(). + * + * Return value: A newly-created calendar client, or NULL if the client could + * not be constructed because it could not contact the calendar server. + **/ +CalClient * +cal_client_new (void) +{ + CalClient *client; + + client = gtk_type_new (CAL_CLIENT_TYPE); + + if (!cal_client_construct (client)) { + g_message ("cal_client_new(): could not construct the calendar client"); + gtk_object_unref (client); + return NULL; + } + + return client; +} + +/** + * cal_client_load_calendar: + * @client: A calendar client. + * @str_uri: URI of calendar to load. + * + * Makes a calendar client initiate a request to load a calendar. The calendar + * client will emit the "cal_loaded" signal when the response from the server is + * received. + * + * Return value: TRUE on success, FALSE on failure to issue the load request. + **/ +gboolean +cal_client_load_calendar (CalClient *client, const char *str_uri) +{ + CalClientPrivate *priv; + GNOME_Calendar_Listener corba_listener; + CORBA_Environment ev; + + g_return_val_if_fail (client != NULL, FALSE); + g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE); + + priv = client->priv; + g_return_val_if_fail (priv->load_state == LOAD_STATE_NOT_LOADED, FALSE); + + g_return_val_if_fail (str_uri != NULL, FALSE); + + priv->listener = cal_listener_new (); + if (!priv->listener) { + g_message ("cal_client_load_calendar(): could not create the listener"); + return FALSE; + } + + corba_listener = (GNOME_Calendar_Listener) gnome_object_corba_objref (priv->listener); + + CORBA_exception_init (&ev); + + priv->load_state = LOAD_STATE_LOADING; + GNOME_Calendar_CalFactory_load (priv->factory, str_uri, corba_listener, &ev); + + if (ev._major != CORBA_NO_EXCEPTION) { + g_message ("cal_client_load_calendar(): load request failed"); + gtk_object_unref (priv->listener); + priv->listener = NULL; + priv->load_state = LOAD_STATE_NOT_LOADED; + CORBA_exception_free (&ev); + return FALSE; + } + CORBA_exception_free (&ev); + + return TRUE; +} diff --git a/calendar/cal-client/cal-client.h b/calendar/cal-client/cal-client.h new file mode 100644 index 0000000000..e5935d9076 --- /dev/null +++ b/calendar/cal-client/cal-client.h @@ -0,0 +1,72 @@ +/* GNOME calendar client + * + * Copyright (C) 2000 Helix Code, Inc. + * + * Author: Federico Mena-Quintero + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef CAL_CLIENT_H +#define CAL_CLIENT_H + +#include +#include + +BEGIN_GNOME_DECLS + + + +#define CAL_CLIENT_TYPE (cal_client_get_type ()) +#define CAL_CLIENT(obj) (GTK_CHECK_CAST ((obj), CAL_CLIENT_TYPE, CalClient)) +#define CAL_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), CAL_CLIENT_TYPE, CalClientClass)) +#define IS_CAL_CLIENT(obj) (GTK_CHECK_TYPE ((obj), CAL_CLIENT_TYPE)) +#define IS_CAL_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_TYPE)) + +typedef struct _CalClient CalClient; +typedef struct _CalClientClass CalClientClass; + +/* Load status for the cal_loaded signal */ +typedef enum { + CAL_CLIENT_LOAD_SUCCESS, + CAL_CLIENT_LOAD_ERROR +} CalClientLoadStatus; + +struct _CalClient { + GtkObject object; + + /* Private data */ + gpointer priv; +}; + +struct _CalClientClass { + GtkObjectClass parent_class; + + void (* cal_loaded) (CalClient *client, CalClientLoadStatus status); +}; + +GtkType cal_client_get_type (void); + +CalClient *cal_client_construct (CalClient *client); + +CalClient *cal_client_new (void); + +void cal_client_load_calendar (CalClient *client, const char *str_uri); + + + +END_GNOME_DECLS + +#endif -- cgit v1.2.3