aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/pcs
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/pcs')
-rw-r--r--calendar/pcs/.cvsignore4
-rw-r--r--calendar/pcs/Makefile.am82
-rw-r--r--calendar/pcs/cal-backend.c2
-rw-r--r--calendar/pcs/cal-backend.h2
-rw-r--r--calendar/pcs/icalendar.h2
-rw-r--r--calendar/pcs/tlacuache.c114
-rw-r--r--calendar/pcs/tlacuache.gnorba5
7 files changed, 12 insertions, 199 deletions
diff --git a/calendar/pcs/.cvsignore b/calendar/pcs/.cvsignore
index 7178965a3a..f4bf65a918 100644
--- a/calendar/pcs/.cvsignore
+++ b/calendar/pcs/.cvsignore
@@ -5,7 +5,3 @@ evolution-calendar-stubs.c
evolution-calendar-skels.c
evolution-calendar-common.c
evolution-calendar.h
-tlacuache
-.libs
-*.la
-*.lo \ No newline at end of file
diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am
index a567597975..a13df5b990 100644
--- a/calendar/pcs/Makefile.am
+++ b/calendar/pcs/Makefile.am
@@ -1,26 +1,9 @@
-#
-# Tlacuache personal calendar server
-#
-
-bin_PROGRAMS = tlacuache
-lib_LTLIBRARIES = libpcs.la
-
-#INCLUDES = \
-# -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-# -I$(top_srcdir)/libical/src/libical \
-# -I$(top_srcdir)/libversit \
-# -I$(top_srcdir)/calendar \
-# -I. \
-# -I$(top_srcdir)/calendar/cal-client \
-# $(GNOME_INCLUDEDIR)
-
-INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/calendar/cal-client \
- -I$(top_srcdir)/calendar/cal-util \
- -I$(top_srcdir)/calendar \
- -I$(top_srcdir)/libical/src/libical \
- $(GNOME_INCLUDEDIR) \
+INCLUDES = \
+ -DG_LOG_DOMAIN=\"pcs\" \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/calendar \
+ -I$(top_srcdir)/libical/src/libical \
+ $(GNOME_INCLUDEDIR) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
CORBA_GENERATED = \
@@ -37,16 +20,9 @@ idl_flags = `$(GNOME_CONFIG) --cflags idl`
$(CORBA_GENERATED): $(idls)
$(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl
-#tlacuache_INCLUDES = \
-# -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-# -I$(srcdir) -I$(top_srcdir) \
-# -I. \
-# -I.. \
-# -I$(top_builddir) \
-# -I$(includedir) \
-# $(GNOME_INCLUDEDIR)
+noinst_LIBRARIES = libpcs.a
-tlacuache_SOURCES = \
+libpcs_a_SOURCES = \
$(CORBA_GENERATED) \
cal.c \
cal.h \
@@ -58,44 +34,4 @@ tlacuache_SOURCES = \
icalendar.c \
icalendar.h \
job.c \
- job.h \
- tlacuache.c
-
-# alarm.c \
-# alarm.h \
-# cal-util.c \
-# cal-util.h \
-
-libpcs_la_SOURCES = \
- $(CORBA_GENERATED) \
- cal.c \
- cal-backend.c \
- cal-factory.c \
- icalendar.c \
- job.c
-
-libpcsincludedir = $(includedir)/calendar/pcs
-
-libpcsinclude_HEADERS = \
- cal.h \
- cal-backend.h \
- cal-common.h \
- cal-factory.h \
- icalendar.h \
- job.h
-
-ICAL_LINK_FLAGS = $(top_builddir)/libical/src/libical/libical.la
-
-tlacuache_LDADD = \
- $(BONOBO_VFS_GNOME_LIBS) \
- $(top_builddir)/calendar/cal-util/libcalutil.la \
- $(top_builddir)/libversit/libversit.la \
- $(ICAL_LINK_FLAGS)
-
-gnorbadir = $(sysconfdir)/CORBA/servers
-
-gnorba_DATA = \
- tlacuache.gnorba
-
-EXTRA_DIST = \
- $(gnorba_DATA)
+ job.h
diff --git a/calendar/pcs/cal-backend.c b/calendar/pcs/cal-backend.c
index 89d7532e50..ddbf23c438 100644
--- a/calendar/pcs/cal-backend.c
+++ b/calendar/pcs/cal-backend.c
@@ -22,8 +22,8 @@
#include <config.h>
#include <gtk/gtksignal.h>
+#include <cal-util/calobj.h>
#include "cal-backend.h"
-#include "calobj.h"
#include "libversit/vcc.h"
#include "icalendar.h"
diff --git a/calendar/pcs/cal-backend.h b/calendar/pcs/cal-backend.h
index 21c516126d..af487f7551 100644
--- a/calendar/pcs/cal-backend.h
+++ b/calendar/pcs/cal-backend.h
@@ -24,10 +24,10 @@
#include <libgnome/gnome-defs.h>
#include <libgnomevfs/gnome-vfs.h>
+#include <cal-util/cal-util.h>
#include "evolution-calendar.h"
#include "cal-common.h"
#include "cal.h"
-#include "cal-util.h"
BEGIN_GNOME_DECLS
diff --git a/calendar/pcs/icalendar.h b/calendar/pcs/icalendar.h
index 09bfa06fad..2a22fbab71 100644
--- a/calendar/pcs/icalendar.h
+++ b/calendar/pcs/icalendar.h
@@ -2,7 +2,7 @@
#define ICALENDAR_H
#include <ical.h>
-#include "calobj.h"
+#include <cal-util/calobj.h>
diff --git a/calendar/pcs/tlacuache.c b/calendar/pcs/tlacuache.c
deleted file mode 100644
index f5dd3d233c..0000000000
--- a/calendar/pcs/tlacuache.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/* Tlacuache - personal calendar server main module
- *
- * 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 <libgnorba/gnorba.h>
-#include <bonobo.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include "cal-factory.h"
-#include "calobj.h"
-
-
-
-/* Callback used when the calendar factory is destroyed */
-static void
-factory_destroy_cb (GtkObject *object, gpointer data)
-{
- gtk_main_quit ();
-}
-
-/* Creates and registers the calendar factory */
-static gboolean
-create_cal_factory (void)
-{
- CalFactory *factory;
- CORBA_Object object;
- CORBA_Environment ev;
- int result;
-
- factory = cal_factory_new ();
- if (!factory) {
- g_message ("create_cal_factory(): could not create the calendar factory!");
- return FALSE;
- }
-
- object = bonobo_object_corba_objref (BONOBO_OBJECT (factory));
-
- CORBA_exception_init (&ev);
- result = goad_server_register (CORBA_OBJECT_NIL,
- object,
- "evolution:calendar-factory",
- "object",
- &ev);
-
- if (ev._major != CORBA_NO_EXCEPTION || result == -1) {
- g_message ("create_cal_factory(): could not register the calendar factory");
- bonobo_object_unref (BONOBO_OBJECT (factory));
- CORBA_exception_free (&ev);
- return FALSE;
- } else if (result == -2) {
- g_message ("create_cal_factory(): a calendar factory is already registered");
- bonobo_object_unref (BONOBO_OBJECT (factory));
- CORBA_exception_free (&ev);
- return FALSE;
- }
-
- gtk_signal_connect (GTK_OBJECT (factory), "destroy",
- GTK_SIGNAL_FUNC (factory_destroy_cb),
- NULL);
-
- CORBA_exception_free (&ev);
- return TRUE;
-}
-
-int
-main (int argc, char **argv)
-{
- CORBA_Environment ev;
-
- bindtextdomain (PACKAGE, GNOMELOCALEDIR);
- textdomain (PACKAGE);
-
- CORBA_exception_init (&ev);
- gnome_CORBA_init ("tlacuache", VERSION, &argc, argv, GNORBA_INIT_SERVER_FUNC, &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);
- }
-
- if (!gnome_vfs_init ()) {
- g_message ("main(): could not initialize GNOME-VFS");
- exit (1);
- }
-
- if (!create_cal_factory ())
- exit (1);
-
- bonobo_main ();
- return 0;
-}
diff --git a/calendar/pcs/tlacuache.gnorba b/calendar/pcs/tlacuache.gnorba
deleted file mode 100644
index 8f600305d7..0000000000
--- a/calendar/pcs/tlacuache.gnorba
+++ /dev/null
@@ -1,5 +0,0 @@
-[evolution:calendar-factory]
-type=exe
-repo_id=IDL:Evolution/Calendar/CalFactory:1.0 IDL:Bonobo/Unknown:1.0
-description=Calendar factory for the Personal Calendar Server
-location_info=tlacuache