unref the comp when finished

2001-10-28  JP Rosevear  <jpr@ximian.com>

	* conduits/calendar/calendar-conduit.c (add_record): unref the
	comp when finished

	* conduits/todo/todo-conduit.c (add_record): ditto

svn path=/trunk/; revision=14316

5 files changed, 14 insertions, 21 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index c546f503fa..1d53472148 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-28  JP Rosevear  <jpr@ximian.com>
+
+	* conduits/calendar/calendar-conduit.c (add_record): unref the
+	comp when finished
+
+	* conduits/todo/todo-conduit.c (add_record): ditto
+	
 2001-10-28  Damon Chaplin  <damon@ximian.com>
 
 	* gui/dialogs/task-page.c (task_page_fill_widgets): added break
@@ -62,8 +69,6 @@
 
 2001-10-27  Federico Mena Quintero  <federico@ximian.com>
 
-2001-10-27  Federico Mena Quintero  <federico@ximian.com>
-
 	* gui/e-day-view.c (e_day_view_on_text_item_event): Cancel editing
 	if the user presses Escape.
 
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 457ffa48cb..832651eb64 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -1271,9 +1271,10 @@ add_record (GnomePilotConduitSyncAbs *conduit,
 	update_comp (conduit, comp, ctxt);
 
 	cal_component_get_uid (comp, &uid);
-
 	e_pilot_map_insert (ctxt->map, remote->ID, uid, FALSE);
 
+	gtk_object_unref (GTK_OBJECT (comp));
+	
 	return retval;
 }
 
diff --git a/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in b/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in
deleted file mode 100644
index 5988e6cb08..0000000000
--- a/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-_Name=Evolution Calendar Conduit
-_Comment=Configure the Evolution Calendar conduit
-Exec=e-calendar-conduit-control-applet --cap-id=1
-TryExec=e-calendar-conduit-control-applet
-Terminal=0
-Type=Application
-Icon=gnome-calendar-conduit.png
diff --git a/calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in b/calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in
deleted file mode 100644
index ec5856fcad..0000000000
--- a/calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-_Name=Evolution ToDo Conduit
-_Comment=Configure the Evolution ToDo conduit
-Exec=e-todo-conduit-control-applet --cap-id=1
-TryExec=e-todo-conduit-control-applet
-Terminal=0
-Type=Application
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index fd0182a004..99da43b13f 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -576,7 +576,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 		cal_component_set_percent (comp, &percent);
 		cal_component_set_status (comp, ICAL_STATUS_COMPLETED);
 	} else {
-		int *percent;
+		int *percent = NULL;
 		icalproperty_status status;
 		
 		cal_component_set_completed (comp, NULL);
@@ -586,7 +586,8 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 			int p = 0;
 			cal_component_set_percent (comp, &p);
 		}
-		cal_component_free_percent (percent);
+		if (percent != NULL)
+			cal_component_free_percent (percent);
 
 		cal_component_get_status (comp, &status);
 		if (status == ICAL_STATUS_COMPLETED)
@@ -973,9 +974,10 @@ add_record (GnomePilotConduitSyncAbs *conduit,
 	update_comp (conduit, comp, ctxt);
 
 	cal_component_get_uid (comp, &uid);
-
 	e_pilot_map_insert (ctxt->map, remote->ID, uid, FALSE);
 
+	gtk_object_unref (GTK_OBJECT (comp));
+
 	return retval;
 }