From 3f2e2c06278e2c18938c62d31b719b0ba834383a Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Wed, 1 Mar 2000 22:31:11 +0000 Subject: At this point the calendar client and personal calendar server files were 2000-03-01 Federico Mena Quintero At this point the calendar client and personal calendar server files were moved to the idl/, cal-client/, and pcs/ directories. * idl/Makefile.am: New file. * cal-client/Makefile.am: New file. Moved the libcal-client stuff from calendar/Makefile.am to here. * Makefile.am (SUBDIRS): Added the idl and cal-client directories. svn path=/trunk/; revision=2003 --- calendar/ChangeLog | 12 +++ calendar/Makefile.am | 24 +----- calendar/cal-client/Makefile.am | 38 ++++++++++ calendar/gui/Makefile.am | 24 +----- calendar/idl/Makefile.am | 7 ++ calendar/tl-test.c | 160 ---------------------------------------- 6 files changed, 61 insertions(+), 204 deletions(-) create mode 100644 calendar/cal-client/Makefile.am create mode 100644 calendar/idl/Makefile.am delete mode 100644 calendar/tl-test.c (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 53a3570d2b..e9cd5ba38e 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,15 @@ +2000-03-01 Federico Mena Quintero + + At this point the calendar client and personal calendar server + files were moved to the idl/, cal-client/, and pcs/ directories. + + * idl/Makefile.am: New file. + + * cal-client/Makefile.am: New file. Moved the libcal-client stuff + from calendar/Makefile.am to here. + + * Makefile.am (SUBDIRS): Added the idl and cal-client directories. + 2000-03-01 Federico Mena Quintero * Makefile.am: Use the gnome-config flags for orbit-idl. diff --git a/calendar/Makefile.am b/calendar/Makefile.am index da5a843d0b..f81c2e7d0a 100644 --- a/calendar/Makefile.am +++ b/calendar/Makefile.am @@ -1,9 +1,8 @@ -SUBDIRS = doc +SUBDIRS = doc idl cal-client idldir = $(datadir)/idl idl_DATA = \ - GnomeCal.idl \ - evolution-calendar.idl + GnomeCal.idl idl_flags = `$(GNOME_CONFIG) --cflags idl` @@ -22,8 +21,6 @@ endif bin_PROGRAMS = gnomecal tlacuache $(extra_pilot_bins) -lib_LTLIBRARIES = libcal-client.la - ICAL_LINK_FLAGS = ../libical/src/libical/libical.la INCLUDES = \ @@ -133,23 +130,6 @@ calendar_pilot_sync_SOURCES = \ timeutil.c \ timeutil.h -# -# cal-client library -# - -libcal_clientincludedir = $(includedir)/cal-client - -libcal_client_la_SOURCES = \ - $(EVOLUTION_CALENDAR_CORBA_GENERATED) \ - cal-client.c \ - cal-listener.c \ - cal-util.c - -libcal_clientinclude_HEADERS = \ - cal-client.h \ - cal-listener.h \ - cal-util.h - # # tlacuache personal calendar server # diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am new file mode 100644 index 0000000000..fa9435d465 --- /dev/null +++ b/calendar/cal-client/Makefile.am @@ -0,0 +1,38 @@ +CORBA_GENERATED = \ + evolution-calendar.h \ + evolution-calendar-common.c \ + evolution-calendar-skels.c \ + evolution-calendar-stubs.c + +idls = \ + $(srcdir)/../idl/evolution-calendar.idl + +idl_flags = `$(GNOME_CONFIG) --cflags idl` + +$(CORBA_GENERATED): $(idls) + $(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl + +INCLUDES = \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DG_LOG_DOMAIN=\"cal-client\" \ + -I$(srcdir) -I$(top_srcdir) \ + -I. \ + -I.. \ + -I$(top_builddir) \ + -I$(includedir) \ + $(GNOME_INCLUDEDIR) + +lib_LTLIBRARIES = libcal-client.la + +libcal_clientincludedir = $(includedir)/cal-client + +libcal_client_la_SOURCES = \ + $(CORBA_GENERATED) \ + cal-client.c \ + cal-listener.c \ + cal-listener.h \ + cal-util.c + +libcal_clientinclude_HEADERS = \ + cal-client.h \ + cal-util.h diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index da5a843d0b..f81c2e7d0a 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -1,9 +1,8 @@ -SUBDIRS = doc +SUBDIRS = doc idl cal-client idldir = $(datadir)/idl idl_DATA = \ - GnomeCal.idl \ - evolution-calendar.idl + GnomeCal.idl idl_flags = `$(GNOME_CONFIG) --cflags idl` @@ -22,8 +21,6 @@ endif bin_PROGRAMS = gnomecal tlacuache $(extra_pilot_bins) -lib_LTLIBRARIES = libcal-client.la - ICAL_LINK_FLAGS = ../libical/src/libical/libical.la INCLUDES = \ @@ -133,23 +130,6 @@ calendar_pilot_sync_SOURCES = \ timeutil.c \ timeutil.h -# -# cal-client library -# - -libcal_clientincludedir = $(includedir)/cal-client - -libcal_client_la_SOURCES = \ - $(EVOLUTION_CALENDAR_CORBA_GENERATED) \ - cal-client.c \ - cal-listener.c \ - cal-util.c - -libcal_clientinclude_HEADERS = \ - cal-client.h \ - cal-listener.h \ - cal-util.h - # # tlacuache personal calendar server # diff --git a/calendar/idl/Makefile.am b/calendar/idl/Makefile.am new file mode 100644 index 0000000000..ec6b4e45f0 --- /dev/null +++ b/calendar/idl/Makefile.am @@ -0,0 +1,7 @@ +idldir = $(datadir)/idl + +idl_DATA = \ + evolution-calendar.idl + +EXTRA_DIST = \ + $(idl_DATA) diff --git a/calendar/tl-test.c b/calendar/tl-test.c deleted file mode 100644 index d2374db275..0000000000 --- a/calendar/tl-test.c +++ /dev/null @@ -1,160 +0,0 @@ -#include -#include -#include -#include "cal-client.h" - -static CalClient *client1; -static CalClient *client2; - -/* Prints a message with a client identifier */ -static void -cl_printf (CalClient *client, const char *format, ...) -{ - va_list args; - - va_start (args, format); - printf ("Client %s: ", - client == client1 ? "1" : - client == client2 ? "2" : - "UNKNOWN"); - vprintf (format, args); - va_end (args); -} - -/* Lists the UIDs of objects in a calendar, called as an idle handler */ -static gboolean -list_uids (gpointer data) -{ - CalClient *client; - GList *uids; - GList *l; - - client = CAL_CLIENT (data); - - uids = cal_client_get_uids (client, CALOBJ_TYPE_ANY); - - cl_printf (client, "UIDs: "); - - if (!uids) - printf ("none\n"); - else { - for (l = uids; l; l = l->next) { - char *uid; - - uid = l->data; - printf ("`%s' ", uid); - } - - printf ("\n"); - - for (l = uids; l; l = l->next) { - char *uid; - char *calobj; - - uid = l->data; - calobj = cal_client_get_object (client, uid); - - printf ("------------------------------\n%s", calobj); - printf ("------------------------------\n"); - - cal_client_update_object (client, uid, calobj); - - g_free (calobj); - } - } - - cal_obj_uid_list_free (uids); - -/* gtk_object_unref (GTK_OBJECT (client)); */ - - return FALSE; -} - -/* Callback used when a calendar is loaded */ -static void -cal_loaded (CalClient *client, CalClientLoadStatus status, gpointer data) -{ - cl_printf (client, "Load/create %s\n", - ((status == CAL_CLIENT_LOAD_SUCCESS) ? "success" : - (status == CAL_CLIENT_LOAD_ERROR) ? "error" : - (status == CAL_CLIENT_LOAD_IN_USE) ? "in use" : - "unknown status value")); - - if (status == CAL_CLIENT_LOAD_SUCCESS) - g_idle_add (list_uids, client); - else - gtk_object_unref (GTK_OBJECT (client)); -} - -/* Callback used when an object is updated */ -static void -obj_updated (CalClient *client, const char *uid, gpointer data) -{ - cl_printf (client, "Object updated: %s\n", uid); -} - -/* Creates a calendar client and tries to load the specified URI into it */ -static CalClient * -create_client (const char *uri, gboolean load) -{ - CalClient *client; - gboolean result; - - client = cal_client_new (); - if (!client) { - g_message ("create_client(): could not create the client"); - exit (1); - } - - gtk_signal_connect (GTK_OBJECT (client), "cal_loaded", - GTK_SIGNAL_FUNC (cal_loaded), - NULL); - gtk_signal_connect (GTK_OBJECT (client), "obj_updated", - GTK_SIGNAL_FUNC (obj_updated), - NULL); - - printf ("Calendar loading `%s'...\n", uri); - - if (load) - result = cal_client_load_calendar (client, uri); - else - result = cal_client_load_calendar (client, uri); - - if (!result) { - g_message ("create_client(): failure when issuing calendar load/create request `%s'", - uri); - exit (1); - } - - return client; -} - -int -main (int argc, char **argv) -{ - CORBA_Environment ev; - - bindtextdomain (PACKAGE, GNOMELOCALEDIR); - textdomain (PACKAGE); - - CORBA_exception_init (&ev); - gnome_CORBA_init ("tl-test", VERSION, &argc, argv, 0, &ev); - if (ev._major != CORBA_NO_EXCEPTION) { - g_message ("main(): could not initialize the ORB"); - CORBA_exception_free (&ev); - exit (1); - } - CORBA_exception_free (&ev); - - if (!bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) { - g_message ("main(): could not initialize Bonobo"); - exit (1); - } - - client1 = create_client ("/cvs/evolution/calendar/test2.vcf", TRUE); - client2 = create_client ("/cvs/evolution/calendar/test2.vcf", FALSE); - - bonobo_main (); - - return 0; -} -- cgit v1.2.3