aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--calendar/ChangeLog3
-rw-r--r--calendar/Makefile.am59
-rw-r--r--calendar/cal-client/Makefile.am4
-rw-r--r--calendar/gui/Makefile.am59
-rw-r--r--calendar/job.c98
-rw-r--r--calendar/job.h35
6 files changed, 11 insertions, 247 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e9cd5ba38e..d2003c3169 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -8,6 +8,9 @@
* cal-client/Makefile.am: New file. Moved the libcal-client stuff
from calendar/Makefile.am to here.
+ * pcs/Makefile.am: New file. Moved the tlacuache stuff from
+ calendar/Makefile.am to here.
+
* Makefile.am (SUBDIRS): Added the idl and cal-client directories.
2000-03-01 Federico Mena Quintero <federico@helixcode.com>
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index e7d5083ef4..d9001476a4 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = doc idl cal-client
+SUBDIRS = doc idl pcs cal-client
idldir = $(datadir)/idl
idl_DATA = \
@@ -8,8 +8,7 @@ idl_flags = `$(GNOME_CONFIG) --cflags idl`
gnorbadir = $(sysconfdir)/CORBA/servers
gnorba_DATA = \
- gnomecal.gnorba \
- tlacuache.gnorba
+ gnomecal.gnorba
help_base = $(datadir)/gnome/help/cal
@@ -19,7 +18,7 @@ extra_pilot_bins = \
calendar-pilot-sync
endif
-bin_PROGRAMS = gnomecal tlacuache $(extra_pilot_bins)
+bin_PROGRAMS = gnomecal $(extra_pilot_bins)
ICAL_LINK_FLAGS = ../libical/src/libical/libical.la
@@ -46,28 +45,12 @@ corba-cal.h \
corba-cal-factory.c \
corba-cal-factory.h: GnomeCal.h
-EVOLUTION_CALENDAR_CORBA_GENERATED = \
- evolution-calendar.h \
- evolution-calendar-common.c \
- evolution-calendar-skels.c \
- evolution-calendar-stubs.c
-
-$(EVOLUTION_CALENDAR_CORBA_GENERATED): evolution-calendar.idl
- $(ORBIT_IDL) $(idl_flags) $(srcdir)/evolution-calendar.idl
-
gnomecal_SOURCES = \
- $(EVOLUTION_CALENDAR_CORBA_GENERATED) \
GnomeCal-common.c \
GnomeCal-skels.c \
GnomeCal.h \
alarm.c \
alarm.h \
- cal-client.c \
- cal-client.h \
- cal-listener.c \
- cal-listener.h \
- cal-util.c \
- cal-util.h \
calendar.c \
calendar.h \
calendar-conduit.h \
@@ -130,48 +113,12 @@ calendar_pilot_sync_SOURCES = \
timeutil.c \
timeutil.h
-#
-# tlacuache personal calendar server
-#
-
-tlacuache_SOURCES = \
- $(EVOLUTION_CALENDAR_CORBA_GENERATED) \
- alarm.c \
- alarm.h \
- cal.c \
- cal.h \
- cal-backend.c \
- cal-backend.h \
- cal-common.h \
- cal-factory.c \
- cal-factory.h \
- cal-util.c \
- cal-util.h \
- calobj.c \
- calobj.h \
- icalendar.c \
- icalendar.h \
- job.c \
- job.h \
- timeutil.c \
- timeutil.h \
- tlacuache.c
-
LINK_FLAGS = \
$(BONOBO_VFS_GNOME_LIBS) \
$(INTLLIBS) \
../libversit/libversit.la \
$(ICAL_LINK_FLAGS)
-tlacuache_INCLUDES = \
- $(INCLUDES) \
- -DG_LOG_DOMAIN=\"tlacuache\"
-
-tlacuache_LDADD = \
- $(BONOBO_VFS_GNOME_LIBS) \
- ../libversit/libversit.la \
- $(ICAL_LINK_FLAGS)
-
calendar_pilot_sync_LDADD = \
$(PISOCK_LIBDIR) $(PISOCK_LIBS) \
$(LINK_FLAGS)
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
index 2f34579d0b..cbe5993dec 100644
--- a/calendar/cal-client/Makefile.am
+++ b/calendar/cal-client/Makefile.am
@@ -47,11 +47,11 @@ libcal_clientinclude_HEADERS = \
noinst_PROGRAMS = client-test
client_test_SOURCES = \
- tl-test.c
+ client-test.c
client_test_INCLUDES = \
$(INCLUDES) \
- -DG_LOG_DOMAIN=\"tl-test\"
+ -DG_LOG_DOMAIN=\"client-test\"
client_test_LDADD = \
$(BONOBO_VFS_GNOME_LIBS) \
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index e7d5083ef4..d9001476a4 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = doc idl cal-client
+SUBDIRS = doc idl pcs cal-client
idldir = $(datadir)/idl
idl_DATA = \
@@ -8,8 +8,7 @@ idl_flags = `$(GNOME_CONFIG) --cflags idl`
gnorbadir = $(sysconfdir)/CORBA/servers
gnorba_DATA = \
- gnomecal.gnorba \
- tlacuache.gnorba
+ gnomecal.gnorba
help_base = $(datadir)/gnome/help/cal
@@ -19,7 +18,7 @@ extra_pilot_bins = \
calendar-pilot-sync
endif
-bin_PROGRAMS = gnomecal tlacuache $(extra_pilot_bins)
+bin_PROGRAMS = gnomecal $(extra_pilot_bins)
ICAL_LINK_FLAGS = ../libical/src/libical/libical.la
@@ -46,28 +45,12 @@ corba-cal.h \
corba-cal-factory.c \
corba-cal-factory.h: GnomeCal.h
-EVOLUTION_CALENDAR_CORBA_GENERATED = \
- evolution-calendar.h \
- evolution-calendar-common.c \
- evolution-calendar-skels.c \
- evolution-calendar-stubs.c
-
-$(EVOLUTION_CALENDAR_CORBA_GENERATED): evolution-calendar.idl
- $(ORBIT_IDL) $(idl_flags) $(srcdir)/evolution-calendar.idl
-
gnomecal_SOURCES = \
- $(EVOLUTION_CALENDAR_CORBA_GENERATED) \
GnomeCal-common.c \
GnomeCal-skels.c \
GnomeCal.h \
alarm.c \
alarm.h \
- cal-client.c \
- cal-client.h \
- cal-listener.c \
- cal-listener.h \
- cal-util.c \
- cal-util.h \
calendar.c \
calendar.h \
calendar-conduit.h \
@@ -130,48 +113,12 @@ calendar_pilot_sync_SOURCES = \
timeutil.c \
timeutil.h
-#
-# tlacuache personal calendar server
-#
-
-tlacuache_SOURCES = \
- $(EVOLUTION_CALENDAR_CORBA_GENERATED) \
- alarm.c \
- alarm.h \
- cal.c \
- cal.h \
- cal-backend.c \
- cal-backend.h \
- cal-common.h \
- cal-factory.c \
- cal-factory.h \
- cal-util.c \
- cal-util.h \
- calobj.c \
- calobj.h \
- icalendar.c \
- icalendar.h \
- job.c \
- job.h \
- timeutil.c \
- timeutil.h \
- tlacuache.c
-
LINK_FLAGS = \
$(BONOBO_VFS_GNOME_LIBS) \
$(INTLLIBS) \
../libversit/libversit.la \
$(ICAL_LINK_FLAGS)
-tlacuache_INCLUDES = \
- $(INCLUDES) \
- -DG_LOG_DOMAIN=\"tlacuache\"
-
-tlacuache_LDADD = \
- $(BONOBO_VFS_GNOME_LIBS) \
- ../libversit/libversit.la \
- $(ICAL_LINK_FLAGS)
-
calendar_pilot_sync_LDADD = \
$(PISOCK_LIBDIR) $(PISOCK_LIBS) \
$(LINK_FLAGS)
diff --git a/calendar/job.c b/calendar/job.c
deleted file mode 100644
index d97df6d883..0000000000
--- a/calendar/job.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* GNOME personal calendar server - job manager
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * 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 <config.h>
-#include "job.h"
-
-
-
-/* The job list */
-
-typedef struct {
- JobFunc func;
- gpointer data;
-} Job;
-
-static GSList *jobs_head;
-static GSList *jobs_tail;
-
-static guint jobs_idle_id;
-
-
-
-/* Runs a job and dequeues it */
-static gboolean
-run_job (gpointer data)
-{
- Job *job;
- GSList *l;
-
- g_assert (jobs_head != NULL);
-
- job = jobs_head->data;
- (* job->func) (job->data);
- g_free (job);
-
- l = jobs_head;
- jobs_head = g_slist_remove_link (jobs_head, jobs_head);
- g_slist_free_1 (l);
-
- if (!jobs_head) {
- jobs_tail = NULL;
- jobs_idle_id = 0;
- return FALSE;
- } else
- return TRUE;
-}
-
-/**
- * job_add:
- * @func: Function to run the job.
- * @data: Data to pass to @function.
- *
- * Adds a job to the queue. The job will automatically be run asynchronously.
- **/
-void
-job_add (JobFunc func, gpointer data)
-{
- Job *job;
-
- g_return_if_fail (func != NULL);
-
- job = g_new (Job, 1);
- job->func = func;
- job->data = data;
-
- if (!jobs_head) {
- g_assert (jobs_tail == NULL);
- g_assert (jobs_idle_id == 0);
-
- jobs_head = g_slist_append (NULL, job);
- jobs_tail = jobs_head;
-
- jobs_idle_id = g_idle_add (run_job, NULL);
- } else {
- g_assert (jobs_tail != NULL);
- g_assert (jobs_idle_id != 0);
-
- jobs_tail = g_slist_append (jobs_tail, job)->next;
- }
-}
diff --git a/calendar/job.h b/calendar/job.h
deleted file mode 100644
index c9bce24dd4..0000000000
--- a/calendar/job.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* GNOME personal calendar server - job manager
- *
- * Copyright (C) 2000 Helix Code, Inc.
- *
- * Author: Federico Mena-Quintero <federico@helixcode.com>
- *
- * 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 JOB_H
-#define JOB_H
-
-#include <glib.h>
-
-
-
-typedef void (* JobFunc) (gpointer data);
-
-void job_add (JobFunc func, gpointer data);
-
-
-
-#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 17:21:00 +0800