From 7c349155a53ccc3691037d02305c2cf594f2c15e Mon Sep 17 00:00:00 2001
From: JP Rosevear <jpr@helixcode.com>
Date: Fri, 8 Sep 2000 16:43:45 +0000
Subject: Tidy

2000-09-08  JP Rosevear  <jpr@helixcode.com>

	* conduits/calendar/Makefile.am: Tidy

	* conduits/todo/Makefile.am: Tidy

svn path=/trunk/; revision=5263
---
 calendar/ChangeLog                                 |  6 +++++
 calendar/conduits/calendar/Makefile.am             | 18 ++-------------
 calendar/conduits/todo/Makefile.am                 | 27 +++++++++++-----------
 .../conduits/todo/todo-conduit-control-applet.c    | 15 +++++++-----
 4 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 6f7f813f42..4273145b40 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-08  JP Rosevear  <jpr@helixcode.com>
+
+	* conduits/calendar/Makefile.am: Tidy
+
+	* conduits/todo/Makefile.am: Tidy
+
 2000-09-08  Federico Mena Quintero  <federico@helixcode.com>
 
 	Fall equinox cleanup!
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index a35f83c601..28014384cc 100644
--- a/calendar/conduits/calendar/Makefile.am
+++ b/calendar/conduits/calendar/Makefile.am
@@ -1,7 +1,3 @@
-#
-#
-#
-
 INCLUDES = 					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/calendar		\
@@ -10,8 +6,6 @@ INCLUDES = 					\
 	$(BONOBO_GNOME_CFLAGS)			\
 	$(GNOME_PILOT_CFLAGS)
 
-file_conduitsdir=$(libdir)/gnome-pilot/conduits
-
 bin_PROGRAMS = calendar-conduit-control-applet
 
 calendar_conduit_control_applet_SOURCES = calendar-conduit-control-applet.c
@@ -19,22 +13,14 @@ calendar_conduit_control_applet_SOURCES = calendar-conduit-control-applet.c
 calendar_conduit_control_applet_LDADD = \
 		$(CAPPLET_LIBS)  \
 		$(GNOME_LIBDIR) \
-		-lgpilotdcm \
-		-lgpilotd \
-		-lgpilotdconduit \
+		$(GNOME_PILOT_LIBS) \
+		$(PISOCK_LIBDIR) $(PISOCK_LIBS) \
 		$(GNOME_CAPPLET_LIBS) \
 		$(BONOBO_VFS_GNOME_LIBS) \
 		$(GNOME_XML_LIB) \
 	        $(GNOMEUI_LIBS) \
-		$(PISOCK_LIBDIR) $(PISOCK_LIBS) \
                 $(INTLLIBS)
 
-
-#		$(top_builddir)/libgpilotdCM/libgpilotdcm.la \
-#		$(top_builddir)/gpilotd/libgpilotd.la \
-#		$(top_builddir)/gpilotd/libgpilotdconduit.la \
-
-
 # calendar_conduit
 calendar_conduitsdir=$(libdir)/gnome-pilot/conduits
 calendar_conduits_LTLIBRARIES = libcalendar_conduit.la
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
index 1c74cea2dc..0dbc404d8e 100644
--- a/calendar/conduits/todo/Makefile.am
+++ b/calendar/conduits/todo/Makefile.am
@@ -1,7 +1,3 @@
-#
-#
-#
-
 INCLUDES = 					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/calendar		\
@@ -10,8 +6,6 @@ INCLUDES = 					\
 	$(BONOBO_GNOME_CFLAGS)			\
 	$(GNOME_PILOT_CFLAGS)
 
-file_conduitsdir=$(libdir)/gnome-pilot/conduits
-
 bin_PROGRAMS = todo-conduit-control-applet
 
 todo_conduit_control_applet_SOURCES = todo-conduit-control-applet.c
@@ -19,21 +13,15 @@ todo_conduit_control_applet_SOURCES = todo-conduit-control-applet.c
 todo_conduit_control_applet_LDADD = \
 		$(CAPPLET_LIBS)  \
 		$(GNOME_LIBDIR) \
-		-lgpilotdcm \
-		-lgpilotd \
-		-lgpilotdconduit \
+		$(GNOME_PILOT_LIBS) \
+		$(PISOCK_LIBDIR) $(PISOCK_LIBS) \
 		$(GNOME_CAPPLET_LIBS) \
 		$(BONOBO_VFS_GNOME_LIBS) \
 		$(GNOME_XML_LIB) \
 	        $(GNOMEUI_LIBS) \
-		$(PISOCK_LIBDIR) $(PISOCK_LIBS) \
                 $(INTLLIBS)
 
 
-#		$(top_builddir)/libgpilotdCM/libgpilotdcm.la \
-#		$(top_builddir)/gpilotd/libgpilotd.la \
-#		$(top_builddir)/gpilotd/libgpilotdconduit.la \
-
 
 # todo_conduit
 todo_conduitsdir=$(libdir)/gnome-pilot/conduits
@@ -83,3 +71,14 @@ EXTRA_DIST = \
 install-data-local:
 	$(mkinstalldirs) $(ccenterConduitsdir)
 	$(mkinstalldirs) $(Conduitdir)
+
+
+
+
+
+
+
+
+
+
+
diff --git a/calendar/conduits/todo/todo-conduit-control-applet.c b/calendar/conduits/todo/todo-conduit-control-applet.c
index 188aadc16e..7d0b159d70 100644
--- a/calendar/conduits/todo/todo-conduit-control-applet.c
+++ b/calendar/conduits/todo/todo-conduit-control-applet.c
@@ -351,14 +351,17 @@ main (int argc, char *argv[])
 				G_LOG_LEVEL_CRITICAL |
 				G_LOG_LEVEL_WARNING);
 	
-	/* we're a capplet */
-	gnome_capplet_init ("todo conduit control applet", NULL, argc, argv, 
+	/* Init capplet */
+	gnome_capplet_init ("Evolution ToDo conduit control applet", 
+			    NULL, argc, argv, 
 			    NULL, 0, NULL);
    
-	gpc = gnome_pilot_client_new();
-	gnome_pilot_client_connect_to_daemon(gpc);
-	pilotId = get_pilot_id_from_gpilotd();
-	if(!pilotId) return -1;
+	/* Setup Client */
+	gpc = gnome_pilot_client_new ();
+	gnome_pilot_client_connect_to_daemon (gpc);
+	pilotId = get_pilot_id_from_gpilotd ();
+	if (!pilotId) 
+		return -1;
 
 	/* put all code to set things up in here */
 	gcalconduit_load_configuration (&origState, pilotId);
-- 
cgit