aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@helixcode.com>2000-05-09 00:58:27 +0800
committerFederico Mena Quintero <federico@src.gnome.org>2000-05-09 00:58:27 +0800
commit8160d7388e27c6f97e3ed96bc5d61fbf20ff2d16 (patch)
treeff1ff2df49f02deccc5424fdf6004f1b90e05553 /calendar/gui
parentc2dde9ab64a79b483804cddbd9622827b4b2baf2 (diff)
downloadgsoc2013-evolution-8160d7388e27c6f97e3ed96bc5d61fbf20ff2d16.tar
gsoc2013-evolution-8160d7388e27c6f97e3ed96bc5d61fbf20ff2d16.tar.gz
gsoc2013-evolution-8160d7388e27c6f97e3ed96bc5d61fbf20ff2d16.tar.bz2
gsoc2013-evolution-8160d7388e27c6f97e3ed96bc5d61fbf20ff2d16.tar.lz
gsoc2013-evolution-8160d7388e27c6f97e3ed96bc5d61fbf20ff2d16.tar.xz
gsoc2013-evolution-8160d7388e27c6f97e3ed96bc5d61fbf20ff2d16.tar.zst
gsoc2013-evolution-8160d7388e27c6f97e3ed96bc5d61fbf20ff2d16.zip
CalBackendClass now is just an interface for calendar backends; this is an
2000-05-08 Federico Mena Quintero <federico@helixcode.com> * pcs/cal-backend.h (CalBackendClass): CalBackendClass now is just an interface for calendar backends; this is an abstract class. Put in the vtable for the backend methods. * pcs/cal-backend.c (cal_backend_new): Removed function, since CalBackend is not just an abstract class. Removed implementation-specific functions and made public functions call the virtual methods instead. * pcs/cal-backend-imc.[ch]: New files with the CalBackendIMC implementation; this implements a backend for iCalendar and vCalendar files. Moved the implementation-specific stuff from cal-backend.[ch] to here. * pcs/cal-backend-imc.c (CalendarFormat): Moved enumeration to here. Added a CAL_UNKNOWN value for when the backend is not loaded yet. (cal_backend_imc_init): Initialize priv->format as CAL_UNKNOWN. (save_to_vcal): Use the same VCProdIdProp value as in cal-util/calobj.c. Use "1.0" as the VCVersionProp as per the vCalendar spec. (ensure_uid): Return nothing, since the result value need not be used anymore. (add_object): Since we mark the calendar as dirty anyways, we do not need to check the result value of ensure_uid() anymore. (remove_object): Asssert that we know how to handle the object's type. We do this in add_object() anyways. * pcs/Makefile.am (libpcs_a_SOURCES): Added cal-backend-imc.[ch]. * gui/gnome-cal.c: Replaced debugging printf()s with g_message() so that we can see the line number where they occur. * gui/gnome-cal.c (gnome_calendar_load_cb): Sort of handle the LOAD_METHOD_NOT_SUPPORTED result code, and added a default for the switch. * cal-client/cal-listener.h (CalListenerLoadStatus): Removed enumeration; it is stupid to translate all values for the CalClient when it is going to translate them again. (CalListenerClass::cal_loaded): This signal now passes the LoadStatus directly from the CORBA side. * cal-client/cal-listener.c (Listener_cal_loaded): Do not translate the status value. * cal-client/cal-client.h (CalClientLoadStatus): Added the CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED error code. * cal-client/cal-client.c (cal_loaded_cb): Translate the CORBA version of the LoadStatus result code. * pcs/cal-factory.c (CalFactoryPrivate): New methods field for the hash table from method strings to the GtkTypes for backend class types. (cal_factory_init): Create the priv->methods hash table. (cal_factory_destroy): Free the priv->methods hash table. (cal_factory_register_method): New function to register a backend class for a particular URI method. (launch_backend_for_uri): New function to launch a backend for a particular URI's method. (load_backend): Use launch_backend_for_uri(). Move the error notification code from load_fn() to here. (create_backend): Use launch_backend_for_uri(). Move the error notification code form create_fn() to here; it is #ifdefed out since currently cal_backend_create() does not have any error reporting capabilities. * idl/evolution-calendar.idl (Listener::LoadStatus): Added a PROTOCOL_NOT_SUPPORTED error code. * pcs/cal-factory.c (cal_factory_load cal_factory_create): Removed functions, since they were supposed to be internal only. (CalFactory_load): Call queue_load_create_job() directly. (CalFactory_create): Likewise. svn path=/trunk/; revision=2921
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/gnome-cal.c34
1 files changed, 23 insertions, 11 deletions
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index f7a6eb5ac4..db46b113ee 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -412,8 +412,8 @@ gnome_calendar_object_updated_cb (GtkWidget *cal_client,
const char *uid,
GnomeCalendar *gcal)
{
- printf ("gnome-cal: got object changed_cb, uid='%s'\n",
- uid?uid:"<NULL>");
+ g_message ("gnome-cal: got object changed_cb, uid='%s'",
+ uid?uid:"<NULL>");
/* FIXME: do we really want each view to reload the event itself?
Maybe we should keep track of events globally, maybe with ref
@@ -438,8 +438,8 @@ gnome_calendar_object_removed_cb (GtkWidget *cal_client,
const char *uid,
GnomeCalendar *gcal)
{
- printf ("gnome-cal: got object removed _cb, uid='%s'\n",
- uid?uid:"<NULL>");
+ g_message ("gnome-cal: got object removed _cb, uid='%s'",
+ uid?uid:"<NULL>");
e_day_view_remove_event (E_DAY_VIEW (gcal->day_view), uid);
e_day_view_remove_event (E_DAY_VIEW (gcal->work_week_view), uid);
@@ -493,21 +493,22 @@ typedef struct
static void
gnome_calendar_load_cb (GtkWidget *cal_client,
- CalClientLoadStatus success,
+ CalClientLoadStatus status,
load_or_create_data *locd)
{
g_return_if_fail (locd);
g_return_if_fail (GNOME_IS_CALENDAR (locd->gcal));
- switch (success) {
+ switch (status) {
case CAL_CLIENT_LOAD_SUCCESS:
gnome_calendar_update_all (locd->gcal, NULL, 0);
- printf ("gnome_calendar_load_cb: success\n");
+ g_message ("gnome_calendar_load_cb: success");
break;
+
case CAL_CLIENT_LOAD_ERROR:
- printf ("gnome_calendar_load_cb: load error.\n");
+ g_message ("gnome_calendar_load_cb: load error");
if (locd->gcom == CALENDAR_OPEN_OR_CREATE) {
- printf ("gnome_calendar_load_cb: trying create...\n");
+ g_message ("gnome_calendar_load_cb: trying create...");
/* FIXME: connect to the cal_loaded signal of the
* CalClient and get theasynchronous notification
* properly! */
@@ -523,9 +524,20 @@ gnome_calendar_load_cb (GtkWidget *cal_client,
gnome_calendar_update_all (locd->gcal, NULL, 0);
}
break;
+
case CAL_CLIENT_LOAD_IN_USE:
- printf ("gnome_calendar_load_cb: in use\n");
+ /* FIXME: what to do? */
+ g_message ("gnome_calendar_load_cb: in use");
+ break;
+
+ case CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED:
+ /* FIXME: what to do? */
+ g_message ("gnome_calendar_load_cb(): method not supported");
break;
+
+ default:
+ g_message ("gnome_calendar_load_cb(): unhandled result code %d!", (int) status);
+ g_assert_not_reached ();
}
g_free (locd->uri);
@@ -555,7 +567,7 @@ gnome_calendar_open (GnomeCalendar *gcal,
locd);
if (cal_client_load_calendar (gcal->client, file) == FALSE){
- printf ("Error loading calendar: %s\n", file);
+ g_message ("Error loading calendar: %s", file);
return 0;
}