diff options
| author | Seth Alves <alves@src.gnome.org> | 2000-04-06 04:13:45 +0800 |
|---|---|---|
| committer | Seth Alves <alves@src.gnome.org> | 2000-04-06 04:13:45 +0800 |
| commit | ce3b224ed64f470fd5031342930f7c8f773c6eeb (patch) | |
| tree | fc3d645e2378d131901f99b193cf304b394f248e /calendar/cal-client/cal-client.c | |
| parent | 0c061c70785480f5d528722f89df2d32bf558121 (diff) | |
| download | gsoc2013-evolution-ce3b224ed64f470fd5031342930f7c8f773c6eeb.tar.gz gsoc2013-evolution-ce3b224ed64f470fd5031342930f7c8f773c6eeb.tar.zst gsoc2013-evolution-ce3b224ed64f470fd5031342930f7c8f773c6eeb.zip | |
build test-calendar-widget and evolution-calendar, common stuff is in a
* gui/Makefile.am: build test-calendar-widget and evolution-calendar,
common stuff is in a library
* gui/gnome-cal.c (gnome_calendar_get_type): made the calendar widget
based on a gtk_frame rather than a gnome_app
* gui/calendar-commands.c: split out some of main.c
* gui/evolution-calendar-control.c: bonobo bung so evolution
can use the calendar widget
svn path=/trunk/; revision=2294
Diffstat (limited to 'calendar/cal-client/cal-client.c')
| -rw-r--r-- | calendar/cal-client/cal-client.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c index 168ec31d72..710212ba7c 100644 --- a/calendar/cal-client/cal-client.c +++ b/calendar/cal-client/cal-client.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* Evolution calendar client * * Copyright (C) 2000 Helix Code, Inc. @@ -603,7 +604,9 @@ cal_client_get_uids (CalClient *client, CalObjType type) g_return_val_if_fail (IS_CAL_CLIENT (client), NULL); priv = client->priv; - g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, NULL); + /*g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, NULL);*/ + if (priv->load_state != LOAD_STATE_LOADED) + return NULL; t = (((type & CALOBJ_TYPE_EVENT) ? Evolution_Calendar_TYPE_EVENT : 0) | ((type & CALOBJ_TYPE_TODO) ? Evolution_Calendar_TYPE_TODO : 0) @@ -656,7 +659,9 @@ cal_client_get_events_in_range (CalClient *client, time_t start, time_t end) g_return_val_if_fail (IS_CAL_CLIENT (client), NULL); priv = client->priv; - g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, NULL); + /*g_return_val_if_fail (priv->load_state == LOAD_STATE_LOADED, NULL);*/ + if (priv->load_state != LOAD_STATE_LOADED) + return NULL; g_return_val_if_fail (start != -1 && end != -1, NULL); g_return_val_if_fail (start <= end, NULL); |