callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

load the calendar synchronously

Browse Source 
2003-11-11  JP Rosevear <jpr@ximian.com>

	* conduits/todo/todo-conduit.c (start_calendar_server): load the
	calendar synchronously

	* conduits/calendar/calendar-conduit.c (start_calendar_server):
ditto

svn path=/trunk/; revision=23285
This commit is contained in:
JP Rosevear
2003-11-11 17:03:36 +00:00
committed by JP Rosevear
parent f7cc8f7cbd
commit 4ea4ea5d28
3 changed files with 9 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/ChangeLog
View File

@ -1,3 +1,10 @@
2003-11-11 JP Rosevear <jpr@ximian.com>
* conduits/todo/todo-conduit.c (start_calendar_server): load the
calendar synchronously
* conduits/calendar/calendar-conduit.c (start_calendar_server): ditto
2003-11-10 JP Rosevear <jpr@ximian.com> 2003-11-10 JP Rosevear <jpr@ximian.com>
* importers/icalendar-importer.c (update_single_object): return * importers/icalendar-importer.c (update_single_object): return

29
calendar/conduits/calendar/calendar-conduit.c
View File

@ -386,29 +386,10 @@ static char *print_remote (GnomePilotRecord *remote)
return buff; return buff;
} }
/* Calendar Server routines */
static void
start_calendar_server_cb (ECal *e_cal,
ECalOpenStatus status,
gpointer data)
{
gboolean *success = data;
if (status == E_CAL_OPEN_SUCCESS) {
*success = TRUE;
} else {
*success = FALSE;
WARN ("Failed to open calendar!\n");
}
gtk_main_quit (); /* end the sub event loop */
}
static int static int
start_calendar_server (ECalConduitContext *ctxt) start_calendar_server (ECalConduitContext *ctxt)
{ {
char *uri; char *uri;
gboolean success = FALSE;
g_return_val_if_fail (ctxt != NULL, -2); g_return_val_if_fail (ctxt != NULL, -2);
@ -421,20 +402,10 @@ start_calendar_server (ECalConduitContext *ctxt)
if (!ctxt->client) if (!ctxt->client)
return -1; return -1;
g_signal_connect (ctxt->client, "cal_opened",
G_CALLBACK (start_calendar_server_cb), &success);
if (!e_cal_open (ctxt->client, FALSE, NULL)) if (!e_cal_open (ctxt->client, FALSE, NULL))
return -1; return -1;
/* run a sub event loop to turn cal-client's async load
notification into a synchronous call */
gtk_main ();
if (success)
return 0; return 0;
return -1;
} }
/* Utility routines */ /* Utility routines */

30
calendar/conduits/todo/todo-conduit.c
View File

@ -392,30 +392,10 @@ static char *print_remote (GnomePilotRecord *remote)
return buff; return buff;
} }
/* Calendar Server routines */
static void
start_calendar_server_cb (ECal *e_cal,
ECalOpenStatus status,
gpointer data)
{
gboolean *success = data;
if (status == E_CAL_OPEN_SUCCESS) {
*success = TRUE;
} else {
*success = FALSE;
WARN ("Failed to open calendar!\n");
}
gtk_main_quit (); /* end the sub event loop */
}
static int static int
start_calendar_server (EToDoConduitContext *ctxt) start_calendar_server (EToDoConduitContext *ctxt)
{ {
char *uri; char *uri;
gboolean success = FALSE;
g_return_val_if_fail (ctxt != NULL, -2); g_return_val_if_fail (ctxt != NULL, -2);
@ -428,20 +408,10 @@ start_calendar_server (EToDoConduitContext *ctxt)
if (!ctxt->client) if (!ctxt->client)
return -1; return -1;
g_signal_connect (ctxt->client, "cal_opened",
G_CALLBACK (start_calendar_server_cb), &success);
if (!e_cal_open (ctxt->client, FALSE, NULL)) if (!e_cal_open (ctxt->client, FALSE, NULL))
return -1; return -1;
/* run a sub event loop to turn cal-client's async load
notification into a synchronous call */
gtk_main ();
if (success)
return 0; return 0;
return -1;
} }
/* Utility routines */ /* Utility routines */