[jpilot] - Resolves: #665903 Cannot delete entries from DateBook

[Ivana Varekova]

commit b33d321671d00bd33211776dbbe4c7dd438bf412
Author: Ivana Hutarova Varekova <varekova at redhat.com>
Date:   Mon Jan 3 15:38:20 2011 +0100

    - Resolves: #665903
      Cannot delete entries from DateBook

 jpilot-1.8.0-datebook_version.patch |   24 ++++++++++++++++++++++++
 jpilot.spec                         |    8 +++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/jpilot-1.8.0-datebook_version.patch b/jpilot-1.8.0-datebook_version.patch
new file mode 100644
index 0000000..a784043
--- /dev/null
+++ b/jpilot-1.8.0-datebook_version.patch
@@ -0,0 +1,24 @@
+diff -up jpilot-1.8.0/datebook_gui.c.dbv jpilot-1.8.0/datebook_gui.c
+--- jpilot-1.8.0/datebook_gui.c.dbv	2010-02-28 20:21:59.000000000 +0100
++++ jpilot-1.8.0/datebook_gui.c	2011-01-03 15:20:51.000000000 +0100
+@@ -3018,7 +3018,19 @@ void cb_delete_appt(GtkWidget *widget, g
+     * record in that order. This is so that the sync code can check to see
+     * if the remote record is the same as the removed, or changed local
+     * or not before it goes and modifies it. */
+-   delete_pc_record(CALENDAR, mce, flag);
++   if (datebook_version) {
++	delete_pc_record(CALENDAR, mce, flag);
++   } else {
++	/* TODO Change delete to do the conversion for you? */
++	MyAppointment ma;
++	ma.rt=mce->rt;
++	ma.unique_id=mce->unique_id;
++	ma.attrib=mce->attrib;
++	copy_calendarEvent_to_appointment(&(mce->ce), &(ma.appt));
++	delete_pc_record(DATEBOOK, &ma, flag);
++	free_Appointment(&(ma.appt));
++   }
++
+    if (write_flag) {
+       pc_calendar_or_datebook_write(&(mce->ce), REPLACEMENT_PALM_REC, mce->attrib, write_unique_id, datebook_version);
+       free_CalendarEvent(ce);
diff --git a/jpilot.spec b/jpilot.spec
index daf1e95..b5ce6a2 100644
--- a/jpilot.spec
+++ b/jpilot.spec
@@ -1,7 +1,7 @@
 Summary: Jpilot pilot desktop software
 Name: jpilot
 Version: 1.8.0
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: Applications/Productivity
 URL: http://jpilot.org
@@ -11,6 +11,7 @@ Source: http://jpilot.org/jpilot-%{version}.tar.gz
 Source1: jpilot.desktop
 
 Patch0: jpilot-0.99.7-conf.patch
+Patch1: jpilot-1.8.0-datebook_version.patch
 
 BuildRequires: gettext
 BuildRequires: gtk2-devel >= 2.0.3
@@ -29,6 +30,7 @@ well known rampant legacy operating system.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p1 -b .dbv
 iconv -f windows-1252 -t utf-8 AUTHORS >AUTHORS.aux
 mv AUTHORS.aux AUTHORS
 
@@ -84,6 +86,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
 
 %changelog
+* Mon Jan  3 2011 Ivana Hutarova Varekova <varekova at redhat.com> - 1.8.0-3
+- Resolves: #665903
+  Cannot delete entries from DateBook
+
 * Thu Jun 24 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 1.8.0-1
 - update to 1.8.0