r1434 - in /experimental/evolution/debian: changelog control patches/02_fix-ftbfs-pilot_charset.patch rules
corsac at users.alioth.debian.org
corsac at users.alioth.debian.org
Tue Dec 1 20:42:31 UTC 2009
Author: corsac
Date: Tue Dec 1 20:42:31 2009
New Revision: 1434
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1434
Log:
* New upstream release.
* debian/control:
- update build deps for gtkhtml 3.29.3 and eds 2.29.3.
- drop libglade build-dep.
* debian/rules:
- don't build contact-map plugin for now.
* debian/patches:
- 02_fix-ftbfs-pilot_charset added, fix FTBFS because of unknown component
in structure by reverting the culprit commit (GNOME #603452).
Added:
experimental/evolution/debian/patches/02_fix-ftbfs-pilot_charset.patch
Modified:
experimental/evolution/debian/changelog
experimental/evolution/debian/control
experimental/evolution/debian/rules
Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=1434&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Tue Dec 1 20:42:31 2009
@@ -1,3 +1,17 @@
+evolution (2.29.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ - update build deps for gtkhtml 3.29.3 and eds 2.29.3.
+ - drop libglade build-dep.
+ * debian/rules:
+ - don't build contact-map plugin for now.
+ * debian/patches:
+ - 02_fix-ftbfs-pilot_charset added, fix FTBFS because of unknown component
+ in structure by reverting the culprit commit (GNOME #603452).
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 01 Dec 2009 20:34:43 +0100
+
evolution (2.29.2-1) experimental; urgency=low
[2.29.1]
Modified: experimental/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/control?rev=1434&op=diff
==============================================================================
--- experimental/evolution/debian/control (original)
+++ experimental/evolution/debian/control Tue Dec 1 20:42:31 2009
@@ -28,33 +28,32 @@
gtk-doc-tools (>= 0.6),
libatk1.0-dev,
libldap2-dev,
- libgtkhtml3.14-dev (>= 3.29.2),
- libgtkhtml-editor-dev (>= 3.29.2),
+ libgtkhtml3.14-dev (>= 3.29.3),
+ libgtkhtml-editor-dev (>= 3.29.3),
libgnome-pilot2-dev (>= 2.0.15),
libkrb5-dev,
libnss3-dev,
psmisc,
libglib2.0-dev (>= 2.20.0),
- evolution-data-server-dev (>= 2.29.2),
+ evolution-data-server-dev (>= 2.29.3),
evolution-data-server-dev (<< 2.30.0),
libgtk2.0-dev (>= 2.12.0),
- libglade2-dev,
libgnomecanvas2-dev,
libxml2-dev,
libgconf2-dev,
libgnomeprint2.2-dev (>= 2.7.0),
libgnomeprintui2.2-dev (>= 2.2.1),
libhal-dev (>= 0.5.4) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libcamel1.2-dev (>= 2.29.2),
- libedataserver1.2-dev (>= 2.29.2),
- libegroupwise1.2-dev (>= 2.29.2),
- libedataserverui1.2-dev (>= 2.29.2),
- libebackend1.2-dev (>= 2.29.2),
- libgdata1.2-dev (>= 2.29.2),
- libgdata-google1.2-dev (>= 2.29.2),
+ libcamel1.2-dev (>= 2.29.3),
+ libedataserver1.2-dev (>= 2.29.3),
+ libegroupwise1.2-dev (>= 2.29.3),
+ libedataserverui1.2-dev (>= 2.29.3),
+ libebackend1.2-dev (>= 2.29.3),
+ libgdata1.2-dev (>= 2.29.3),
+ libgdata-google1.2-dev (>= 2.29.3),
libgnome2-dev,
- libecal1.2-dev (>= 2.29.2),
- libebook1.2-dev (>= 2.29.2),
+ libecal1.2-dev (>= 2.29.3),
+ libebook1.2-dev (>= 2.29.3),
libdbus-glib-1-dev,
libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libnotify-dev (>= 0.3.0),
@@ -74,7 +73,7 @@
libunique-dev,
libcanberra-dev,
libcanberra-gtk-dev,
- libgtkimageview-dev
+ libgtkimageview-dev,
Package: evolution
Architecture: any
Added: experimental/evolution/debian/patches/02_fix-ftbfs-pilot_charset.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/02_fix-ftbfs-pilot_charset.patch?rev=1434&op=file
==============================================================================
--- experimental/evolution/debian/patches/02_fix-ftbfs-pilot_charset.patch (added)
+++ experimental/evolution/debian/patches/02_fix-ftbfs-pilot_charset.patch Tue Dec 1 20:42:31 2009
@@ -1,0 +1,759 @@
+diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
+index aeb8a1e..2b0317e 100644
+--- a/addressbook/conduit/address-conduit.c
++++ b/addressbook/conduit/address-conduit.c
+@@ -256,8 +256,7 @@ e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *cate
+ */
+ static
+ void e_pilot_local_category_to_remote(gint * pilotCategory,
+- EContact *contact, struct CategoryAppInfo *category,
+- const gchar *pilot_charset)
++ EContact *contact, struct CategoryAppInfo *category)
+ {
+ GList *c_list = NULL, *l;
+ gchar * category_string, *first_category = NULL;
+@@ -266,12 +265,12 @@ void e_pilot_local_category_to_remote(gint * pilotCategory,
+ c_list = e_contact_get (contact, E_CONTACT_CATEGORY_LIST);
+ if (c_list) {
+ /* remember the first category */
+- first_category = e_pilot_utf8_to_pchar((const gchar *)c_list->data, pilot_charset);
++ first_category = e_pilot_utf8_to_pchar((const gchar *)c_list->data);
+ }
+ l = c_list;
+ while (l && *pilotCategory == 0) {
+ /* list != 0, so at least 1 category is assigned */
+- category_string = e_pilot_utf8_to_pchar((const gchar *)l->data, pilot_charset);
++ category_string = e_pilot_utf8_to_pchar((const gchar *)l->data);
+ for (i=0; i < PILOT_MAX_CATEGORIES; i++) {
+ /* only 15 chars + nul in palm category name */
+ if (strncmp(category_string,category->name[i], 15) == 0) {
+@@ -302,15 +301,14 @@ void e_pilot_local_category_to_remote(gint * pilotCategory,
+ */
+ static
+ void e_pilot_remote_category_to_local(gint pilotCategory,
+- EContact *contact, struct CategoryAppInfo *category,
+- const gchar *pilot_charset)
++ EContact *contact, struct CategoryAppInfo *category)
+ {
+ gchar *category_string = NULL;
+
+ if (pilotCategory != 0) {
+ /* pda has category assigned */
+ category_string = e_pilot_utf8_from_pchar(
+- category->name[pilotCategory], pilot_charset);
++ category->name[pilotCategory]);
+
+ LOG(g_message("PDA Category: %s\n", category_string));
+
+@@ -660,8 +658,6 @@ struct _EAddrConduitContext {
+ GList *locals;
+
+ EPilotMap *map;
+-
+- gchar * pilot_charset;
+ };
+
+ static EAddrConduitContext *
+@@ -679,7 +675,6 @@ e_addr_context_new (guint32 pilot_id)
+ ctxt->changed = NULL;
+ ctxt->locals = NULL;
+ ctxt->map = NULL;
+- ctxt->pilot_charset = NULL;
+
+ return ctxt;
+ }
+@@ -1037,13 +1032,12 @@ is_syncable (EAddrConduitContext *ctxt, EAddrLocalRecord *local)
+ }
+
+ static void
+-set_contact_text (EContact *contact, EContactField field, struct Address address,
+- gint entry, const gchar *pilot_charset)
++set_contact_text (EContact *contact, EContactField field, struct Address address, gint entry)
+ {
+ gchar *text = NULL;
+
+ if (address.entry[entry])
+- text = e_pilot_utf8_from_pchar (address.entry[entry], pilot_charset);
++ text = e_pilot_utf8_from_pchar (address.entry[entry]);
+
+ e_contact_set (contact, field, text);
+
+@@ -1051,10 +1045,10 @@ set_contact_text (EContact *contact, EContactField field, struct Address address
+ }
+
+ static gchar *
+-get_entry_text (struct Address address, gint entry, const gchar *pilot_charset)
++get_entry_text (struct Address address, gint entry)
+ {
+ if (address.entry[entry])
+- return e_pilot_utf8_from_pchar (address.entry[entry], pilot_charset);
++ return e_pilot_utf8_from_pchar (address.entry[entry]);
+
+ return NULL;
+ }
+@@ -1214,12 +1208,12 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui
+ }
+
+ /*Category support*/
+- e_pilot_local_category_to_remote(&(local->local.category), contact, &(ctxt->ai.category), ctxt->pilot_charset);
++ e_pilot_local_category_to_remote(&(local->local.category), contact, &(ctxt->ai.category));
+
+- local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME), ctxt->pilot_charset);
+- local->addr->entry[entryLastname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_FAMILY_NAME), ctxt->pilot_charset);
+- local->addr->entry[entryCompany] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_ORG), ctxt->pilot_charset);
+- local->addr->entry[entryTitle] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_TITLE), ctxt->pilot_charset);
++ local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME));
++ local->addr->entry[entryLastname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_FAMILY_NAME));
++ local->addr->entry[entryCompany] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_ORG));
++ local->addr->entry[entryTitle] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_TITLE));
+
+ /* See if the default has something in it */
+ if ((address = e_contact_get (contact, ctxt->cfg->default_address))) {
+@@ -1245,13 +1239,13 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui
+ add = g_strdup (address->street);
+ LOG (g_warning ("Address has only one line: [%s]\n", add));
+ }
+- local->addr->entry[entryAddress] = e_pilot_utf8_to_pchar (add, ctxt->pilot_charset);
++ local->addr->entry[entryAddress] = e_pilot_utf8_to_pchar (add);
+ g_free (add);
+
+- local->addr->entry[entryCity] = e_pilot_utf8_to_pchar (address->locality, ctxt->pilot_charset);
+- local->addr->entry[entryState] = e_pilot_utf8_to_pchar (address->region, ctxt->pilot_charset);
+- local->addr->entry[entryZip] = e_pilot_utf8_to_pchar (address->code, ctxt->pilot_charset);
+- local->addr->entry[entryCountry] = e_pilot_utf8_to_pchar (address->country, ctxt->pilot_charset);
++ local->addr->entry[entryCity] = e_pilot_utf8_to_pchar (address->locality);
++ local->addr->entry[entryState] = e_pilot_utf8_to_pchar (address->region);
++ local->addr->entry[entryZip] = e_pilot_utf8_to_pchar (address->code);
++ local->addr->entry[entryCountry] = e_pilot_utf8_to_pchar (address->country);
+
+ e_contact_address_free (address);
+ }
+@@ -1272,7 +1266,7 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui
+ phone_str = e_contact_get_const (contact, priority[i]);
+ if (phone_str && *phone_str) {
+ clear_entry_text (*local->addr, phone);
+- local->addr->entry[phone] = e_pilot_utf8_to_pchar (phone_str, ctxt->pilot_charset);
++ local->addr->entry[phone] = e_pilot_utf8_to_pchar (phone_str);
+ local->addr->phoneLabel[phone - entryPhone1] = priority_label[i];
+ phone++;
+ }
+@@ -1321,13 +1315,13 @@ local_record_from_ecard (EAddrLocalRecord *local, EContact *contact, EAddrCondui
+
+ if (phone_str && *phone_str) {
+ clear_entry_text (*local->addr, i);
+- local->addr->entry[i] = e_pilot_utf8_to_pchar (phone_str, ctxt->pilot_charset);
++ local->addr->entry[i] = e_pilot_utf8_to_pchar (phone_str);
+ }
+ }
+ }
+
+ /* Note */
+- local->addr->entry[entryNote] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_NOTE), ctxt->pilot_charset);
++ local->addr->entry[entryNote] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_NOTE));
+ }
+
+ static void
+@@ -1402,12 +1396,12 @@ ecard_from_remote_record(EAddrConduitContext *ctxt,
+ contact = e_contact_duplicate (in_contact);
+
+ /*Category support*/
+- e_pilot_remote_category_to_local(remote->category, contact, &(ctxt->ai.category), ctxt->pilot_charset);
++ e_pilot_remote_category_to_local(remote->category, contact, &(ctxt->ai.category));
+
+ /* Name */
+ name = e_contact_name_new ();
+- name->given = get_entry_text (address, entryFirstname, ctxt->pilot_charset);
+- name->family = get_entry_text (address, entryLastname, ctxt->pilot_charset);
++ name->given = get_entry_text (address, entryFirstname);
++ name->family = get_entry_text (address, entryLastname);
+
+ /* set the name, respecting the pilot's given/family names */
+ e_contact_set (contact, E_CONTACT_NAME, name);
+@@ -1418,13 +1412,13 @@ ecard_from_remote_record(EAddrConduitContext *ctxt,
+
+ /* File As */
+ if (!full_name || !*full_name)
+- set_contact_text (contact, E_CONTACT_FILE_AS, address, entryCompany, ctxt->pilot_charset);
++ set_contact_text (contact, E_CONTACT_FILE_AS, address, entryCompany);
+
+ g_free (full_name);
+
+ /* Title and Company */
+- set_contact_text (contact, E_CONTACT_TITLE, address, entryTitle, ctxt->pilot_charset);
+- set_contact_text (contact, E_CONTACT_ORG, address, entryCompany, ctxt->pilot_charset);
++ set_contact_text (contact, E_CONTACT_TITLE, address, entryTitle);
++ set_contact_text (contact, E_CONTACT_ORG, address, entryCompany);
+
+ /* Address */
+ mailing_address = -1;
+@@ -1446,7 +1440,7 @@ ecard_from_remote_record(EAddrConduitContext *ctxt,
+
+ eaddress = g_new0 (EContactAddress, 1);
+
+- txt = get_entry_text (address, entryAddress, ctxt->pilot_charset);
++ txt = get_entry_text (address, entryAddress);
+ if (txt && (find = strchr (txt, '\n')) != NULL) {
+ *find = '\0';
+ find++;
+@@ -1456,10 +1450,10 @@ ecard_from_remote_record(EAddrConduitContext *ctxt,
+
+ eaddress->street = txt;
+ eaddress->ext = find != NULL ? g_strdup (find) : g_strdup ("");
+- eaddress->locality = get_entry_text (address, entryCity, ctxt->pilot_charset);
+- eaddress->region = get_entry_text (address, entryState, ctxt->pilot_charset);
+- eaddress->country = get_entry_text (address, entryCountry, ctxt->pilot_charset);
+- eaddress->code = get_entry_text (address, entryZip, ctxt->pilot_charset);
++ eaddress->locality = get_entry_text (address, entryCity);
++ eaddress->region = get_entry_text (address, entryState);
++ eaddress->country = get_entry_text (address, entryCountry);
++ eaddress->code = get_entry_text (address, entryZip);
+
+ e_contact_set (contact, mailing_address, eaddress);
+ e_contact_address_free (eaddress);
+@@ -1470,7 +1464,7 @@ ecard_from_remote_record(EAddrConduitContext *ctxt,
+
+ for (i = entryPhone1; i <= entryPhone5; i++) {
+ gint phonelabel = address.phoneLabel[i - entryPhone1];
+- gchar *phonenum = get_entry_text (address, i, ctxt->pilot_charset);
++ gchar *phonenum = get_entry_text (address, i);
+
+ if (phonelabel == LABEL_EMAIL && !is_next_done (next_mail)) {
+ e_contact_set (contact, next_mail, phonenum);
+@@ -1502,7 +1496,7 @@ ecard_from_remote_record(EAddrConduitContext *ctxt,
+ }
+
+ /* Note */
+- set_contact_text (contact, E_CONTACT_NOTE, address, entryNote, ctxt->pilot_charset);
++ set_contact_text (contact, E_CONTACT_NOTE, address, entryNote);
+
+ free_Address(&address);
+
+@@ -1609,13 +1603,6 @@ pre_sync (GnomePilotConduit *conduit,
+
+ ctxt->dbi = dbi;
+
+-#ifdef PILOT_LINK_0_12
+- if(NULL == dbi->pilotInfo->pilot_charset)
+- ctxt->pilot_charset = NULL;
+- else
+- ctxt->pilot_charset = g_strdup(dbi->pilotInfo->pilot_charset);
+-#endif
+-
+ if (ctxt->cfg->source) {
+ ctxt->ebook = e_book_new (ctxt->cfg->source, NULL);
+ } else {
+@@ -1772,8 +1759,7 @@ post_sync (GnomePilotConduit *conduit,
+ if (e_book_get_changes (ctxt->ebook, change_id, &changed, NULL))
+ e_book_free_change_list (changed);
+ g_free (change_id);
+- if (ctxt->pilot_charset)
+- g_free (ctxt->pilot_charset);
++
+ LOG (g_message ( "---------------------------------------------------------\n" ));
+
+ return 0;
+diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
+index 6aa8838..677c234 100644
+--- a/calendar/conduits/calendar/calendar-conduit.c
++++ b/calendar/conduits/calendar/calendar-conduit.c
+@@ -305,8 +305,6 @@ struct _ECalConduitContext {
+ GList *locals;
+
+ EPilotMap *map;
+-
+- gchar *pilot_charset;
+ };
+
+ static ECalConduitContext *
+@@ -949,19 +947,19 @@ local_record_from_comp (ECalLocalRecord *local, ECalComponent *comp, ECalConduit
+ }
+
+ /*Category support*/
+- e_pilot_local_category_to_remote(&(local->local.category), comp, &(ctxt->ai.category), ctxt->pilot_charset);
++ e_pilot_local_category_to_remote(&(local->local.category), comp, &(ctxt->ai.category));
+
+ /* STOP: don't replace these with g_strdup, since free_Appointment
+ uses free to deallocate */
+ e_cal_component_get_summary (comp, &summary);
+ if (summary.value)
+- local->appt->description = e_pilot_utf8_to_pchar (summary.value, ctxt->pilot_charset);
++ local->appt->description = e_pilot_utf8_to_pchar (summary.value);
+
+ e_cal_component_get_description_list (comp, &d_list);
+ if (d_list) {
+ description = (ECalComponentText *) d_list->data;
+ if (description && description->value)
+- local->appt->note = e_pilot_utf8_to_pchar (description->value, ctxt->pilot_charset);
++ local->appt->note = e_pilot_utf8_to_pchar (description->value);
+ else
+ local->appt->note = NULL;
+ } else {
+@@ -1202,8 +1200,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
+ ECalComponent *in_comp,
+ ECal *client,
+ icaltimezone *timezone,
+- struct CategoryAppInfo *category,
+- const gchar *pilot_charset)
++ struct CategoryAppInfo *category)
+ {
+ ECalComponent *comp;
+ struct Appointment appt;
+@@ -1246,12 +1243,12 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
+
+ e_cal_component_set_last_modified (comp, &now);
+
+- summary.value = txt = e_pilot_utf8_from_pchar (appt.description, pilot_charset);
++ summary.value = txt = e_pilot_utf8_from_pchar (appt.description);
+ e_cal_component_set_summary (comp, &summary);
+ free (txt);
+
+ /*Category support*/
+- e_pilot_remote_category_to_local(remote->category, comp, category, pilot_charset);
++ e_pilot_remote_category_to_local(remote->category, comp, category);
+
+ /* The iCal description field */
+ if (!appt.note) {
+@@ -1260,7 +1257,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
+ GSList l;
+ ECalComponentText text;
+
+- text.value = txt = e_pilot_utf8_from_pchar (appt.note, pilot_charset);
++ text.value = txt = e_pilot_utf8_from_pchar (appt.note);
+ text.altrep = NULL;
+ l.data = &text;
+ l.next = NULL;
+@@ -1514,12 +1511,6 @@ pre_sync (GnomePilotConduit *conduit,
+ LOG (g_message ( "pre_sync: Calendar Conduit v.%s", CONDUIT_VERSION ));
+
+ ctxt->dbi = dbi;
+-#ifdef PILOT_LINK_0_12
+- if(NULL == dbi->pilotInfo->pilot_charset)
+- ctxt->pilot_charset = NULL;
+- else
+- ctxt->pilot_charset = g_strdup(dbi->pilotInfo->pilot_charset);
+-#endif
+ ctxt->client = NULL;
+
+ /* Get the timezone */
+@@ -1705,8 +1696,6 @@ post_sync (GnomePilotConduit *conduit,
+ if (e_cal_get_changes (ctxt->client, change_id, &changed, NULL))
+ e_cal_free_change_list (changed);
+ g_free (change_id);
+- if (ctxt->pilot_charset)
+- g_free (ctxt->pilot_charset);
+
+ LOG (g_message ( "---------------------------------------------------------\n" ));
+
+@@ -1906,7 +1895,7 @@ add_record (GnomePilotConduitSyncAbs *conduit,
+
+ LOG (g_message ( "add_record: adding %s to desktop\n", print_remote (remote) ));
+
+- comp = comp_from_remote_record (conduit, remote, ctxt->default_comp, ctxt->client, ctxt->timezone, &(ctxt->ai.category), ctxt->pilot_charset);
++ comp = comp_from_remote_record (conduit, remote, ctxt->default_comp, ctxt->client, ctxt->timezone, &(ctxt->ai.category));
+
+ /* Give it a new UID otherwise it will be the uid of the default comp */
+ uid = e_cal_component_gen_uid ();
+@@ -1938,8 +1927,7 @@ replace_record (GnomePilotConduitSyncAbs *conduit,
+ LOG (g_message ("replace_record: replace %s with %s\n",
+ print_local (local), print_remote (remote)));
+
+- new_comp = comp_from_remote_record (conduit, remote, local->comp, ctxt->client, ctxt->timezone, &(ctxt->ai.category),
+-ctxt->pilot_charset);
++ new_comp = comp_from_remote_record (conduit, remote, local->comp, ctxt->client, ctxt->timezone, &(ctxt->ai.category));
+ g_object_unref (local->comp);
+ local->comp = new_comp;
+
+diff --git a/calendar/conduits/common/libecalendar-common-conduit.c b/calendar/conduits/common/libecalendar-common-conduit.c
+index 5a08246..eee54e7 100644
+--- a/calendar/conduits/common/libecalendar-common-conduit.c
++++ b/calendar/conduits/common/libecalendar-common-conduit.c
+@@ -126,7 +126,7 @@ e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *cate
+ /*
+ *conversion from an evolution category to a palm category
+ */
+-void e_pilot_local_category_to_remote(gint * pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category, const gchar *pilot_charset)
++void e_pilot_local_category_to_remote(gint * pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category)
+ {
+ GSList *c_list = NULL;
+ gchar * category_string;
+@@ -134,7 +134,7 @@ void e_pilot_local_category_to_remote(gint * pilotCategory, ECalComponent *comp,
+ e_cal_component_get_categories_list (comp, &c_list);
+ if (c_list) {
+ /* list != 0, so at least 1 category is assigned */
+- category_string = e_pilot_utf8_to_pchar((const gchar *)c_list->data, pilot_charset);
++ category_string = e_pilot_utf8_to_pchar((const gchar *)c_list->data);
+ if (c_list->next != 0) {
+ LOG (g_message ("Note: item has more categories in evolution, first chosen"));
+ }
+@@ -162,13 +162,13 @@ void e_pilot_local_category_to_remote(gint * pilotCategory, ECalComponent *comp,
+ /*
+ *conversion from a palm category to an evolution category
+ */
+-void e_pilot_remote_category_to_local(gint pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category, const gchar *pilot_charset)
++void e_pilot_remote_category_to_local(gint pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category)
+ {
+ gchar *category_string = NULL;
+
+ if (pilotCategory != 0) {
+ /* pda has category assigned */
+- category_string = e_pilot_utf8_from_pchar(category->name[pilotCategory], pilot_charset);
++ category_string = e_pilot_utf8_from_pchar(category->name[pilotCategory]);
+
+ LOG(g_message("Category: %s\n", category_string));
+
+diff --git a/calendar/conduits/common/libecalendar-common-conduit.h b/calendar/conduits/common/libecalendar-common-conduit.h
+index 071403a..2eeb8b2 100644
+--- a/calendar/conduits/common/libecalendar-common-conduit.h
++++ b/calendar/conduits/common/libecalendar-common-conduit.h
+@@ -25,8 +25,8 @@
+ #define PILOT_MAX_CATEGORIES 16
+
+ gint e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *category);
+-void e_pilot_local_category_to_remote(gint * pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category, const gchar *pilot_charset);
+-void e_pilot_remote_category_to_local(gint pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category, const gchar *pilot_charset);
++void e_pilot_local_category_to_remote(gint * pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category);
++void e_pilot_remote_category_to_local(gint pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category);
+
+ gboolean e_pilot_setup_get_bool (const gchar *path, const gchar *key, gboolean def);
+ void e_pilot_setup_set_bool (const gchar *path, const gchar *key, gboolean value);
+diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
+index 5b25ca6..2a1b190 100644
+--- a/calendar/conduits/memo/memo-conduit.c
++++ b/calendar/conduits/memo/memo-conduit.c
+@@ -225,7 +225,6 @@ struct _EMemoConduitContext {
+ GList *locals;
+
+ EPilotMap *map;
+- gchar *pilot_charset;
+ };
+
+ static EMemoConduitContext *
+@@ -244,7 +243,6 @@ e_memo_context_new (guint32 pilot_id)
+ ctxt->changed = NULL;
+ ctxt->locals = NULL;
+ ctxt->map = NULL;
+- ctxt->pilot_charset = NULL;
+
+ return ctxt;
+ }
+@@ -578,7 +576,7 @@ local_record_from_comp (EMemoLocalRecord *local, ECalComponent *comp, EMemoCondu
+ }
+
+ /*Category support*/
+- e_pilot_local_category_to_remote(&(local->local.category), comp, &(ctxt->ai.category), ctxt->pilot_charset);
++ e_pilot_local_category_to_remote(&(local->local.category), comp, &(ctxt->ai.category));
+
+ /* STOP: don't replace these with g_strdup, since free_Memo
+ uses free to deallocate */
+@@ -587,7 +585,7 @@ local_record_from_comp (EMemoLocalRecord *local, ECalComponent *comp, EMemoCondu
+ if (d_list) {
+ description = (ECalComponentText *) d_list->data;
+ if (description && description->value) {
+- local->memo->text = e_pilot_utf8_to_pchar (description->value, ctxt->pilot_charset);
++ local->memo->text = e_pilot_utf8_to_pchar (description->value);
+ }
+ else{
+ local->memo->text = NULL;
+@@ -647,8 +645,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
+ GnomePilotRecord *remote,
+ ECalComponent *in_comp,
+ icaltimezone *timezone,
+- struct MemoAppInfo *ai,
+- const gchar *pilot_charset)
++ struct MemoAppInfo *ai)
+ {
+ ECalComponent *comp;
+ struct Memo memo;
+@@ -693,7 +690,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
+ e_cal_component_set_last_modified (comp, &now);
+
+ /*Category support*/
+- e_pilot_remote_category_to_local(remote->category, comp, &(ai->category), pilot_charset);
++ e_pilot_remote_category_to_local(remote->category, comp, &(ai->category));
+
+ /* The iCal description field */
+ if (!memo.text) {
+@@ -727,10 +724,10 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
+
+ }
+
+- sumText.value = txt3 = e_pilot_utf8_from_pchar(txt2, pilot_charset);
++ sumText.value = txt3 = e_pilot_utf8_from_pchar(txt2);
+ sumText.altrep = NULL;
+
+- text.value = txt = e_pilot_utf8_from_pchar (memo.text, pilot_charset);
++ text.value = txt = e_pilot_utf8_from_pchar (memo.text);
+ text.altrep = NULL;
+ l.data = &text;
+ l.next = NULL;
+@@ -810,13 +807,6 @@ pre_sync (GnomePilotConduit *conduit,
+ ctxt->dbi = dbi;
+ ctxt->client = NULL;
+
+-#ifdef PILOT_LINK_0_12
+- if(NULL == dbi->pilotInfo->pilot_charset)
+- ctxt->pilot_charset = NULL;
+- else
+- ctxt->pilot_charset = g_strdup(dbi->pilotInfo->pilot_charset);
+-#endif
+-
+ if (start_calendar_server (ctxt) != 0) {
+ WARN(_("Could not start evolution-data-server"));
+ gnome_pilot_conduit_error (conduit, _("Could not start evolution-data-server"));
+@@ -983,8 +973,7 @@ post_sync (GnomePilotConduit *conduit,
+ if (e_cal_get_changes (ctxt->client, change_id, &changed, NULL))
+ e_cal_free_change_list (changed);
+ g_free (change_id);
+- if (ctxt->pilot_charset)
+- g_free (ctxt->pilot_charset);
++
+ LOG (g_message ( "---------------------------------------------------------\n" ));
+
+ return 0;
+@@ -1185,7 +1174,7 @@ add_record (GnomePilotConduitSyncAbs *conduit,
+
+ LOG (g_message ( "add_record: adding %s to desktop\n", print_remote (remote) ));
+
+- comp = comp_from_remote_record (conduit, remote, ctxt->default_comp, ctxt->timezone, &(ctxt->ai), ctxt->pilot_charset);
++ comp = comp_from_remote_record (conduit, remote, ctxt->default_comp, ctxt->timezone, &(ctxt->ai));
+
+ /* Give it a new UID otherwise it will be the uid of the default comp */
+ uid = e_cal_component_gen_uid ();
+@@ -1215,7 +1204,7 @@ replace_record (GnomePilotConduitSyncAbs *conduit,
+ LOG (g_message ("replace_record: replace %s with %s\n",
+ print_local (local), print_remote (remote)));
+
+- new_comp = comp_from_remote_record (conduit, remote, local->comp, ctxt->timezone, &(ctxt->ai), ctxt->pilot_charset);
++ new_comp = comp_from_remote_record (conduit, remote, local->comp, ctxt->timezone, &(ctxt->ai));
+ g_object_unref (local->comp);
+ local->comp = new_comp;
+
+diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
+index 3620582..fd1e906 100644
+--- a/calendar/conduits/todo/todo-conduit.c
++++ b/calendar/conduits/todo/todo-conduit.c
+@@ -286,7 +286,6 @@ struct _EToDoConduitContext {
+ GList *locals;
+
+ EPilotMap *map;
+- gchar *pilot_charset;
+ };
+
+ static EToDoConduitContext *
+@@ -306,7 +305,6 @@ e_todo_context_new (guint32 pilot_id)
+ ctxt->changed = NULL;
+ ctxt->locals = NULL;
+ ctxt->map = NULL;
+- ctxt->pilot_charset = NULL;
+
+ return ctxt;
+ }
+@@ -393,7 +391,7 @@ print_local (EToDoLocalRecord *local)
+ return buff;
+ }
+
+-static gchar *print_remote (GnomePilotRecord *remote, const gchar *pilot_charset)
++static gchar *print_remote (GnomePilotRecord *remote)
+ {
+ static gchar buff[ 4096 ];
+ struct ToDo todo;
+@@ -427,9 +425,9 @@ static gchar *print_remote (GnomePilotRecord *remote, const gchar *pilot_charset
+ todo.priority,
+ todo.complete,
+ todo.description ?
+- e_pilot_utf8_from_pchar(todo.description, pilot_charset) : "",
++ e_pilot_utf8_from_pchar(todo.description) : "",
+ todo.note ?
+- e_pilot_utf8_from_pchar(todo.note, pilot_charset) : "",
++ e_pilot_utf8_from_pchar(todo.note) : "",
+ remote->category);
+
+ free_ToDo (&todo);
+@@ -709,19 +707,19 @@ local_record_from_comp (EToDoLocalRecord *local, ECalComponent *comp, EToDoCondu
+ }
+
+ /*Category support*/
+- e_pilot_local_category_to_remote(&(local->local.category), comp, &(ctxt->ai.category), ctxt->pilot_charset);
++ e_pilot_local_category_to_remote(&(local->local.category), comp, &(ctxt->ai.category));
+
+ /* STOP: don't replace these with g_strdup, since free_ToDo
+ uses free to deallocate */
+ e_cal_component_get_summary (comp, &summary);
+ if (summary.value)
+- local->todo->description = e_pilot_utf8_to_pchar (summary.value, ctxt->pilot_charset);
++ local->todo->description = e_pilot_utf8_to_pchar (summary.value);
+
+ e_cal_component_get_description_list (comp, &d_list);
+ if (d_list) {
+ description = (ECalComponentText *) d_list->data;
+ if (description && description->value)
+- local->todo->note = e_pilot_utf8_to_pchar (description->value, ctxt->pilot_charset);
++ local->todo->note = e_pilot_utf8_to_pchar (description->value);
+ else
+ local->todo->note = NULL;
+ } else {
+@@ -816,8 +814,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
+ GnomePilotRecord *remote,
+ ECalComponent *in_comp,
+ icaltimezone *timezone,
+- struct ToDoAppInfo *ai,
+- const gchar *pilot_charset)
++ struct ToDoAppInfo *ai)
+ {
+ ECalComponent *comp;
+ struct ToDo todo;
+@@ -864,12 +861,12 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
+
+ e_cal_component_set_last_modified (comp, &now);
+
+- summary.value = txt = e_pilot_utf8_from_pchar (todo.description, pilot_charset);
++ summary.value = txt = e_pilot_utf8_from_pchar (todo.description);
+ e_cal_component_set_summary (comp, &summary);
+ free (txt);
+
+ /*Category support*/
+- e_pilot_remote_category_to_local(remote->category, comp, &(ai->category), pilot_charset);
++ e_pilot_remote_category_to_local(remote->category, comp, &(ai->category));
+
+ /* The iCal description field */
+ if (!todo.note) {
+@@ -878,7 +875,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
+ GSList l;
+ ECalComponentText text;
+
+- text.value = txt = e_pilot_utf8_from_pchar (todo.note, pilot_charset);
++ text.value = txt = e_pilot_utf8_from_pchar (todo.note);
+ text.altrep = NULL;
+ l.data = &text;
+ l.next = NULL;
+@@ -1005,13 +1002,6 @@ pre_sync (GnomePilotConduit *conduit,
+ ctxt->dbi = dbi;
+ ctxt->client = NULL;
+
+-#ifdef PILOT_LINK_0_12
+- if(NULL == dbi->pilotInfo->pilot_charset)
+- ctxt->pilot_charset = NULL;
+- else
+- ctxt->pilot_charset = g_strdup(dbi->pilotInfo->pilot_charset);
+-#endif
+-
+ /* Get the timezone */
+ ctxt->timezone = get_default_timezone ();
+ if (ctxt->timezone == NULL)
+@@ -1172,8 +1162,7 @@ post_sync (GnomePilotConduit *conduit,
+ if (e_cal_get_changes (ctxt->client, change_id, &changed, NULL))
+ e_cal_free_change_list (changed);
+ g_free (change_id);
+- if (ctxt->pilot_charset)
+- g_free (ctxt->pilot_charset);
++
+ LOG (g_message ( "---------------------------------------------------------\n" ));
+
+ return 0;
+@@ -1340,7 +1329,7 @@ compare (GnomePilotConduitSyncAbs *conduit,
+ gint retval = 0;
+
+ LOG (g_message ("compare: local=%s remote=%s...\n",
+- print_local (local), print_remote (remote, ctxt->pilot_charset)));
++ print_local (local), print_remote (remote)));
+
+ g_return_val_if_fail (local!=NULL,-1);
+ g_return_val_if_fail (remote!=NULL,-1);
+@@ -1370,9 +1359,9 @@ add_record (GnomePilotConduitSyncAbs *conduit,
+
+ g_return_val_if_fail (remote != NULL, -1);
+
+- LOG (g_message ( "add_record: adding %s to desktop\n", print_remote (remote, ctxt->pilot_charset) ));
++ LOG (g_message ( "add_record: adding %s to desktop\n", print_remote (remote) ));
+
+- comp = comp_from_remote_record (conduit, remote, ctxt->default_comp, ctxt->timezone, &(ctxt->ai), ctxt->pilot_charset);
++ comp = comp_from_remote_record (conduit, remote, ctxt->default_comp, ctxt->timezone, &(ctxt->ai));
+
+ /* Give it a new UID otherwise it will be the uid of the default comp */
+ uid = e_cal_component_gen_uid ();
+@@ -1401,9 +1390,9 @@ replace_record (GnomePilotConduitSyncAbs *conduit,
+ g_return_val_if_fail (remote != NULL, -1);
+
+ LOG (g_message ("replace_record: replace %s with %s\n",
+- print_local (local), print_remote (remote, ctxt->pilot_charset)));
++ print_local (local), print_remote (remote)));
+
+- new_comp = comp_from_remote_record (conduit, remote, local->comp, ctxt->timezone, &(ctxt->ai), ctxt->pilot_charset);
++ new_comp = comp_from_remote_record (conduit, remote, local->comp, ctxt->timezone, &(ctxt->ai));
+ g_object_unref (local->comp);
+ local->comp = new_comp;
+
+@@ -1463,7 +1452,7 @@ match (GnomePilotConduitSyncAbs *conduit,
+ const gchar *uid;
+
+ LOG (g_message ("match: looking for local copy of %s\n",
+- print_remote (remote, ctxt->pilot_charset)));
++ print_remote (remote)));
+
+ g_return_val_if_fail (local != NULL, -1);
+ g_return_val_if_fail (remote != NULL, -1);
+diff --git a/e-util/e-pilot-util.c b/e-util/e-pilot-util.c
+index 3ce67c8..94c86a1 100644
+--- a/e-util/e-pilot-util.c
++++ b/e-util/e-pilot-util.c
+@@ -31,7 +31,7 @@
+ #include "e-pilot-util.h"
+
+ gchar *
+-e_pilot_utf8_to_pchar (const gchar *string, const gchar *pilot_charset)
++e_pilot_utf8_to_pchar (const gchar *string)
+ {
+ gchar *pstring = NULL;
+ gint res;
+@@ -39,12 +39,7 @@ e_pilot_utf8_to_pchar (const gchar *string, const gchar *pilot_charset)
+ if (!string)
+ return NULL;
+
+-#ifdef PILOT_LINK_0_12
+- res = convert_ToPilotChar_WithCharset ("UTF-8", string, strlen (string),
+- &pstring, pilot_charset);
+-#else
+- res = convert_ToPilotChar ("UTF-8", string, strlen (string), &pstring);
+-#endif
++ res = convert_ToPilotChar ("UTF-8", string, strlen (string), &pstring);
+
+ if (res != 0)
+ pstring = strdup (string);
+@@ -53,7 +48,7 @@ e_pilot_utf8_to_pchar (const gchar *string, const gchar *pilot_charset)
+ }
+
+ gchar *
+-e_pilot_utf8_from_pchar (const gchar *string, const gchar *pilot_charset)
++e_pilot_utf8_from_pchar (const gchar *string)
+ {
+ gchar *ustring = NULL;
+ gint res;
+@@ -61,12 +56,7 @@ e_pilot_utf8_from_pchar (const gchar *string, const gchar *pilot_charset)
+ if (!string)
+ return NULL;
+
+-#ifdef PILOT_LINK_0_12
+- res = convert_FromPilotChar_WithCharset ("UTF-8", string, strlen (string),
+- &ustring, pilot_charset);
+-#else
+- res = convert_FromPilotChar ("UTF-8", string, strlen (string), &ustring);
+-#endif
++ res = convert_FromPilotChar ("UTF-8", string, strlen (string), &ustring);
+
+ if (res != 0)
+ ustring = strdup (string);
+diff --git a/e-util/e-pilot-util.h b/e-util/e-pilot-util.h
+index 9def45a..6b9b0ad 100644
+--- a/e-util/e-pilot-util.h
++++ b/e-util/e-pilot-util.h
+@@ -29,8 +29,8 @@
+ #ifndef E_PILOT_UTIL_H
+ #define E_PILOT_UTIL_H
+
+-gchar *e_pilot_utf8_to_pchar (const gchar *string, const gchar *pilot_charset);
+-gchar *e_pilot_utf8_from_pchar (const gchar *string, const gchar *pilot_charset);
++gchar *e_pilot_utf8_to_pchar (const gchar *string);
++gchar *e_pilot_utf8_from_pchar (const gchar *string);
+
+ ESource *e_pilot_get_sync_source (ESourceList *source_list);
+ void e_pilot_set_sync_source (ESourceList *source_list, ESource *source);
Modified: experimental/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/rules?rev=1434&op=diff
==============================================================================
--- experimental/evolution/debian/rules (original)
+++ experimental/evolution/debian/rules Tue Dec 1 20:42:31 2009
@@ -29,7 +29,8 @@
--enable-nntp \
--libexecdir=/usr/lib \
--enable-plugins=experimental \
- --disable-pst-import
+ --disable-pst-import \
+ --disable-contacts-map
clean::
debconf-updatepo
More information about the pkg-evolution-commits
mailing list