[Evolution-hackers] Merge from head to gnome-2-8 branch.
- From: Not Zed <notzed ximian com>
- To: evolution-hackers lists ximian com
- Cc: gene-pool lists ximian com
- Subject: [Evolution-hackers] Merge from head to gnome-2-8 branch.
- Date: Thu, 16 Sep 2004 22:52:47 +0800
Hi all,
Ok, the merge from HEAD back to the gnome-2-8 branch is done for eds and evolution.
There are a few tags which 'mark this spot'.
evolution-2-0-1-merge-start - the point on HEAD from which the code was merged to gnome-2-8 branch.
evolution-2-0-1-merge - the point on the gnome-2-8 branch where it was merge to (pre-merge - should match 2.0.0 but doesn't for some files).
eds-1-0-1-merge-start
eds-1-0-1-merge - the same as above for evolution-data-server module.
For the evolution/po files, I had a lot of merge issues, so they ONLY include the gnome-2-8 data. I presumed this would be the most accurate files anyway. 1 or two strings may not be correct anymore, I appologise, it wasn't practical to do it any other way. For the eds ones, there were fewer, so I attempted to resolve things manually.
I've attached the diffs, essentially from the EDS 1.0.0 and Evolution 2.0.0 _release_ codebases (well actually from the -merge tags above), incase anyone cares to check. Just to verify that the merge process didn't mess anything up, although CVS normally does a fairly good job.
I should get the eplugin stuff merged to HEAD very soon, i'm too tired to finish it now though.
Michael
? eds.diff
? eds2.diff
? merge.txt
? reconfigure
? calendar/libical/src/libicalss/icalssyacc.output
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/ChangeLog,v
retrieving revision 1.154.2.5
diff -u -3 -r1.154.2.5 ChangeLog
--- ChangeLog 14 Sep 2004 15:50:34 -0000 1.154.2.5
+++ ChangeLog 16 Sep 2004 14:37:27 -0000
@@ -19,6 +19,23 @@
* configure.in: Added "cy" (Welsh) to ALL_LINGUAS.
+2004-09-14 Roozbeh Pournader <roozbeh farsiweb info>
+
+ * configure.in: Added 'fa' (Persian) to ALL_LINGUAG.
+
+2004-09-14 Tomasz KÅ?oczko <kloczek pld org pl>
+
+ * servers/groupwise/Makefile.am: automake fix for paralel build ("make -j<N>").
+
+2004-09-10 Mohammad DAMT <mdamt bisnisweb com>
+
+ * configure.in: Added 'id' to ALL_LINGUAS
+ * po/id.po: Added Indonesian translation
+
+2004-08-27 Akagic Amila <bono linux org ba>
+
+ * configure.in: Added 'bs' to ALL_LINGUAS.
+
2004-08-26 JP Rosevear <jpr novell com>
* configure.in: bump verision, libtool numbers
Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/ChangeLog,v
retrieving revision 1.196.2.2
diff -u -3 -r1.196.2.2 ChangeLog
--- addressbook/ChangeLog 9 Sep 2004 18:54:48 -0000 1.196.2.2
+++ addressbook/ChangeLog 16 Sep 2004 14:37:28 -0000
@@ -18,6 +18,33 @@
(e_book_dispose): Only disconnect the listener signal if it hasn't
already been done by GLib. Bug compatibility.
+2004-09-13 Hans Petter Jansson <hpj ximian com>
+
+ * backends/ldap/e-book-backend-ldap.c: Revert the LDAP attribute names
+ changed by Sivaiah's last commit.
+
+2004-09-09 Hans Petter Jansson <hpj ximian com>
+
+ Fixes #63385.
+
+ * libebook/e-book.c (fetch_corba_book): Use g_signal_connect_object ()
+ to connect to the listener, so we won't be destroyed in another thread
+ while processing signals from it.
+ (e_book_dispose): Only disconnect the listener signal if it hasn't
+ already been done by GLib. Bug compatibility.
+
+2004-09-06 Sivaiah Nallagatla <snallagatla novell com>
+
+ * backends/ldap/e-book-backend-ldap.c : Update
+ the ldap attribute names for calendar ui and free busy uri
+ fileds to match with what is present in evolutionPerson.schema
+ (add_to_supported_fields) : add E_CONTACT_EMAIL_1 also to list of supported fields.
+ Also use e_contact_field_name function instead of hardcodring field names
+ (anniversary_populate) : correct incorrect contact date
+ parameter passing. Also free the contact date
+
+ Fixes some of the issues mentioned in #59582
+
2004-08-26 Sivaiah Nallagatla <snallagatla novell com>
* backends/groupwise/e-book-backend-groupwise.c
Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/ChangeLog,v
retrieving revision 1.324
diff -u -3 -r1.324 ChangeLog
--- calendar/ChangeLog 27 Aug 2004 18:09:58 -0000 1.324
+++ calendar/ChangeLog 16 Sep 2004 14:37:33 -0000
@@ -1,3 +1,74 @@
+2004-09-08 Chenthill Palanisamy <pchenthill novell com>
+
+ * backends/groupwise/e-cal-backend-groupwise-utils.c
+ (set_properties_from_cal_component), (e_gw_item_to_cal_component),
+ (e_gw_item_set_changes): Added the support for allday events.
+
+2004-09-08 Chenthill Palanisamy <pchenthill novell com>
+
+ Fixes #65167
+ * backends/groupwise/e-cal-backend-groupwise.c
+ (connect_to_server): Reload the default zone into
+ the cache after clearing it.
+
+ * backends/groupwise/e-cal-backend-groupwise-utils.c
+ (set_categories_for_gw_item), e_gw_item_to_cal_component),
+ (set_properties_from_cal_component): replaced the assert
+ statements with If conditions.
+
+2004-09-07 Chenthill Palanisamy <pchenthill novell com>
+
+ Fixes #64685
+ * backends/groupwise/e-cal-backends-groupwise.c
+ (receive_object): Send the error message as
+ Permission Denied when the attendee tries to accept the
+ appointment more than once since we get the error message as
+ bad parameter from the server.
+
+2004-09-07 Chenthill Palanisamy <pchenthill novell com>
+
+ Fixes 63513
+ * backends/groupwise/e-cal-backends-groupwise-utils.c
+ (e_gw_connection_send_appointment): Do a case insensitive
+ comparison between the email ids. This is a partial fix.
+
+2004-09-07 Chenthill Palanisamy <pchenthill novell com>
+
+ Fixes #64398
+ * backends/groupwise/e-cal-backend-groupwise.c
+ (ECalBackendGroupwisePrivate): added an variable to store
+ the timeout ids.
+ (e_cal_backend_groupwise_init): intialize the variable.
+ (e_cal_backend_groupwise_finalize): remove the timeout_add
+ function so that it will not called when backend dies.
+ (get_deltas): It should not crash in any case if handle is
+ NULL.
+
+2004-09-05 Chenthill Palanisamy <pchenthill novell com>
+
+ Fixes 63513
+ * backends/groupwise/e-cal-backends-groupwise-utils.c
+ (e_gw_connection_send_appointment): Do a case insensitive
+ comparison between the email ids.
+
+2004-09-05 Chenthill Palanisamy <pchenthill novell com>
+
+ * libecal/e-cal-utils.h:
+ defined two macros for the handling the static capabilities for
+ backends which does not support the conversion of a non-recurring
+ appointment to a recurrence appointment and conversion of posted
+ task to group task.
+ * backends/groupwise/e-cal-backend-groupwise.c
+ (e_cal_backend_groupwise_get_static_capabilities): Added the
+ two macros in this function.
+
+2004-09-05 Chenthill Palanisamy <pchenthill novell com>
+
+ Fixes #64688
+ * backends/groupwise/e-cal-backend-groupwise.c
+ (connect_to_server): store the default zone in
+ backend before populating the cache.
+
2004-08-27 Rodrigo Moya <rodrigo novell com>
* libedata-cal/e-cal-backend-sexp.c (func_has_alarms_in_range): new
Index: calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c,v
retrieving revision 1.31
diff -u -3 -r1.31 e-cal-backend-groupwise-utils.c
--- calendar/backends/groupwise/e-cal-backend-groupwise-utils.c 27 Aug 2004 05:39:52 -0000 1.31
+++ calendar/backends/groupwise/e-cal-backend-groupwise-utils.c 16 Sep 2004 14:37:33 -0000
@@ -86,7 +86,7 @@
categories_by_id = e_cal_backend_groupwise_get_categories_by_id (cbgw);
cnc = e_cal_backend_groupwise_get_connection (cbgw);
- g_assert (cnc != NULL || categories_by_name != NULL || categories_by_id != NULL);
+ g_return_if_fail (categories_by_id != NULL || categories_by_name != NULL || cnc != NULL);
for (; category_names != NULL; category_names = g_list_next (category_names)) {
if (!category_names->data || strlen(category_names->data) == 0 )
@@ -131,8 +131,8 @@
struct icaltimetype itt_utc;
default_zone = e_cal_backend_groupwise_get_default_zone (cbgw);
-
- g_assert (default_zone != NULL);
+
+ g_return_if_fail (default_zone != NULL);
/* first set specific properties */
switch (e_cal_component_get_vtype (comp)) {
@@ -265,7 +265,11 @@
g_object_unref (item);
return NULL;
}
-
+
+ /* all day event */
+ if (!dt.tzid && e_gw_item_get_item_type (item) == E_GW_ITEM_TYPE_APPOINTMENT)
+ e_gw_item_set_is_allday_event (item, TRUE);
+
/* creation date */
e_cal_component_get_created (comp, &dt.value);
if (dt.value) {
@@ -346,10 +350,11 @@
GSList *recur_dates = NULL;
+ if (dt.tzid)
+ e_cal_recur_generate_instances (comp, -1, -1,get_recur_instance, &recur_dates, resolve_tzid_cb, NULL, (icaltimezone *) default_zone);
+ else
+ e_cal_recur_generate_instances (comp, -1, -1,get_recur_instance, &recur_dates, resolve_tzid_cb, NULL, icaltimezone_get_utc_timezone());
- e_cal_recur_generate_instances (comp, -1, -1,
- get_recur_instance, &recur_dates, resolve_tzid_cb, NULL,
- (icaltimezone *) default_zone);
recur_dates = g_slist_delete_link (recur_dates, recur_dates);
e_gw_item_set_recurrence_dates (item, recur_dates);
@@ -381,6 +386,7 @@
char *t, *name;
GList *category_ids, *categories;
GHashTable *categories_by_id;
+ gboolean is_allday;
icaltimezone *default_zone;
struct icaltimetype itt, itt_utc;
@@ -395,7 +401,6 @@
categories_by_id = e_cal_backend_groupwise_get_categories_by_id (cbgw);
g_return_val_if_fail (E_IS_GW_ITEM (item), NULL);
- g_assert (default_zone != NULL || categories_by_id != NULL);
comp = e_cal_component_new ();
@@ -462,7 +467,7 @@
/* categories */
category_ids = e_gw_item_get_categories (item);
categories = NULL;
- if (category_ids) {
+ if (category_ids && categories_by_id) {
for (; category_ids != NULL; category_ids = g_list_next (category_ids)) {
name = g_hash_table_lookup (categories_by_id, category_ids->data);
if (name)
@@ -472,7 +477,10 @@
e_cal_component_set_categories_list (comp,categories);
g_list_free (categories);
}
- }
+ }
+
+ /* all day event */
+ is_allday = e_gw_item_get_is_allday_event (item);
/* start date */
/* should i duplicate here ? */
@@ -490,6 +498,10 @@
dt.value = &itt_utc;
dt.tzid = g_strdup ("UTC");
}
+ if (is_allday) {
+ dt.value->is_date = 1;
+ dt.tzid = NULL;
+ }
e_cal_component_set_dtstart (comp, &dt);
g_free (t);
}
@@ -584,7 +596,10 @@
dt.value = &itt_utc;
dt.tzid = g_strdup ("UTC");
}
-
+ if (is_allday) {
+ dt.value->is_date = 1;
+ dt.tzid = NULL;
+ }
e_cal_component_set_dtend (comp, &dt);
}
@@ -685,13 +700,19 @@
/* get attendee here and add the list along. */
if (e_cal_component_has_attendees (comp)) {
GSList *attendee_list, *l;
+ char *email_id;
ECalComponentAttendee *attendee = NULL, *tmp;
e_cal_component_get_attendee_list (comp, &attendee_list);
for (l = attendee_list; l ; l = g_slist_next (l)) {
tmp = (ECalComponentAttendee *) (l->data);
- if (!strcmp (tmp->value + 7, e_gw_connection_get_user_email (cnc))) {
+ email_id = tmp->value;
+
+ if (!g_strncasecmp (email_id, "mailto:";, 7))
+ email_id += 7;
+
+ if (!g_ascii_strcasecmp (email_id, e_gw_connection_get_user_email (cnc))) {
attendee = tmp;
break;
}
@@ -1092,6 +1113,7 @@
char *due_date, *cache_due_date;
char *start_date, *cache_start_date;
char *end_date, *cache_end_date;
+ gboolean is_allday, cache_is_allday;
/* TODO assert the types of the items are the same */
@@ -1119,6 +1141,11 @@
}
else if (trigger)
e_gw_item_set_change (item, E_GW_ITEM_CHANGE_TYPE_ADD, "alarm", &trigger);
+ is_allday = e_gw_item_get_is_allday_event (item);
+ cache_is_allday = e_gw_item_get_is_allday_event (cache_item);
+
+ if ((is_allday && !cache_is_allday) || (!is_allday && cache_is_allday))
+ e_gw_item_set_change (item, E_GW_ITEM_CHANGE_TYPE_UPDATE, "allDayEvent", &is_allday);
}
else if ( e_gw_item_get_item_type (item) == E_GW_ITEM_TYPE_TASK) {
SET_DELTA(due_date);
Index: calendar/backends/groupwise/e-cal-backend-groupwise.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/groupwise/e-cal-backend-groupwise.c,v
retrieving revision 1.89
diff -u -3 -r1.89 e-cal-backend-groupwise.c
--- calendar/backends/groupwise/e-cal-backend-groupwise.c 25 Aug 2004 15:12:12 -0000 1.89
+++ calendar/backends/groupwise/e-cal-backend-groupwise.c 16 Sep 2004 14:37:34 -0000
@@ -50,6 +50,7 @@
char *username;
char *password;
char *container_id;
+ int timeout_id;
CalMode mode;
icaltimezone *default_zone;
GHashTable *categories_by_id;
@@ -179,6 +180,9 @@
EGwConnectionStatus status;
GSList *deletes = NULL, *updates = NULL, *adds = NULL, *l;
+ if (!handle)
+ return FALSE;
+
cbgw = (ECalBackendGroupwise *) handle;
cnc = cbgw->priv->cnc;
cache = cbgw->priv->cache;
@@ -329,25 +333,31 @@
e_cal_backend_notify_error (E_CAL_BACKEND (cbgw), _("Could not create cache file"));
return GNOME_Evolution_Calendar_OtherError;
}
+
+ /* read the default timezone*/
+ priv->default_zone = e_cal_backend_cache_get_default_timezone (priv->cache);
/* Clear the cache before populating it */
e_file_cache_clean (E_FILE_CACHE (priv->cache));
-
+
+ if (priv->default_zone)
+ e_cal_backend_cache_put_default_timezone (priv->cache, priv->default_zone);
+
/* Populate the cache for the first time.*/
/* start a timed polling thread set to 10 minutes*/
cnc_status = populate_cache (cbgw);
if (cnc_status != E_GW_CONNECTION_STATUS_OK) {
g_object_unref (priv->cnc);
+ g_object_unref (priv->cache);
priv->cnc = NULL;
+ priv->cache = NULL;
g_warning (G_STRLOC ": Could not populate the cache");
return GNOME_Evolution_Calendar_PermissionDenied;
} else {
g_object_ref (priv->cnc);
g_object_ref (priv->cache);
- g_timeout_add (CACHE_REFRESH_INTERVAL, (GSourceFunc) get_deltas, (gpointer) cbgw);
+ priv->timeout_id = g_timeout_add (CACHE_REFRESH_INTERVAL, (GSourceFunc) get_deltas, (gpointer) cbgw);
priv->mode = CAL_MODE_REMOTE;
- /* read the default timezone*/
- priv->default_zone = e_cal_backend_cache_get_default_timezone (priv->cache);
return GNOME_Evolution_Calendar_Success;
}
} else {
@@ -432,6 +442,9 @@
priv->user_email = NULL;
}
+ if (priv->timeout_id)
+ g_source_remove (priv->timeout_id);
+
g_free (priv);
cbgw->priv = NULL;
@@ -504,6 +517,8 @@
CAL_STATIC_CAPABILITY_REMOVE_ALARMS "," \
CAL_STATIC_CAPABILITY_NO_THISANDPRIOR "," \
CAL_STATIC_CAPABILITY_NO_THISANDFUTURE "," \
+ CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK "," \
+ CAL_STATIC_CAPABILITY_NO_CONV_TO_RECUR "," \
CAL_STATIC_CAPABILITY_SAVE_SCHEDULES);
return GNOME_Evolution_Calendar_Success;
@@ -1352,6 +1367,11 @@
if (status == E_GW_CONNECTION_STATUS_INVALID_OBJECT)
return GNOME_Evolution_Calendar_InvalidObject;
+ /* We need not do this when evolution starts deleting the calendar items from mail component
+ as when they are handled. The BAD_PARAMETER is checked due to the absence of proper error
+ code from the server */
+ else if (status == E_GW_CONNECTION_STATUS_BAD_PARAMETER)
+ return GNOME_Evolution_Calendar_PermissionDenied;
return GNOME_Evolution_Calendar_OtherError;
}
@@ -1506,6 +1526,7 @@
priv->categories_by_id = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
priv->categories_by_name = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+ priv->timeout_id = 0;
/* create the mutex for thread safety */
priv->mutex = g_mutex_new ();
Index: calendar/libecal/e-cal-util.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/libecal/e-cal-util.h,v
retrieving revision 1.4
diff -u -3 -r1.4 e-cal-util.h
--- calendar/libecal/e-cal-util.h 7 Jan 2004 18:15:26 -0000 1.4
+++ calendar/libecal/e-cal-util.h 16 Sep 2004 14:37:34 -0000
@@ -121,6 +121,8 @@
#define CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS "organizer-not-email-address"
#define CAL_STATIC_CAPABILITY_REMOVE_ALARMS "remove-alarms"
#define CAL_STATIC_CAPABILITY_SAVE_SCHEDULES "save-schedules"
+#define CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK "no-conv-to-assign-task"
+#define CAL_STATIC_CAPABILITY_NO_CONV_TO_RECUR "no-conv-to-recur"
/* Recurrent events. Management for instances */
icalcomponent *e_cal_util_construct_instance (icalcomponent *icalcomp,
Index: po/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/po/ChangeLog,v
retrieving revision 1.169.2.11
diff -u -3 -r1.169.2.11 ChangeLog
--- po/ChangeLog 14 Sep 2004 15:50:34 -0000 1.169.2.11
+++ po/ChangeLog 16 Sep 2004 14:37:37 -0000
@@ -43,6 +43,35 @@
* tr.po: Updated Turkish Translation
+2004-09-14 Roozbeh Pournader <roozbeh farsiweb info>
+
+ * fa.po: Added Persian Translation by Meelad Zakaria
+ <meelad bamdad org>.
+
+2004-09-14 Mohammad DAMT <mdamt bisnisweb com>
+
+ * id.po: Updated Indonesian translation
+
+2004-09-10 Mohammad DAMT <mdamt bisnisweb com>
+
+ * id.po: Added Indonesian translation
+
+2004-09-09 Martin Willemoes Hansen <mwh sysrq dk>
+
+ * da.po: Updated Danish translation.
+
+2004-09-06 David Lodge <dave cirt net>
+
+ * en_GB.po: Updated British translation.
+
+2004-09-03 Baris Cicek <baris teamforce name tr>
+
+ * tr.po: Updated Turkish Translation
+
+2004-08-26 Akagic Amila <bono linux org ba>
+
+ * bs.po: Added Bosnian translation.
+
2004-08-25 Gustavo Maciel Dias Vieira <gustavo sagui org>
* pt_BR.po: Updated Brazilian Portuguese translation done by
Index: po/da.po
===================================================================
RCS file: /cvs/gnome/evolution-data-server/po/da.po,v
retrieving revision 1.22.2.1
diff -u -3 -r1.22.2.1 da.po
--- po/da.po 9 Sep 2004 09:55:34 -0000 1.22.2.1
+++ po/da.po 16 Sep 2004 14:37:44 -0000
@@ -31,40 +31,40 @@
#: addressbook/backends/file/e-book-backend-file.c:442
#: addressbook/backends/groupwise/e-book-backend-groupwise.c:1855
-#: addressbook/backends/ldap/e-book-backend-ldap.c:3155
+#: addressbook/backends/ldap/e-book-backend-ldap.c:3158
#: addressbook/backends/vcf/e-book-backend-vcf.c:439
msgid "Searching..."
msgstr "Søger ..."
-#: addressbook/backends/ldap/e-book-backend-ldap.c:618
+#: addressbook/backends/ldap/e-book-backend-ldap.c:620
msgid "Using Distinguished Name (DN)"
msgstr "Benytter 'distinguished name' (DN)"
-#: addressbook/backends/ldap/e-book-backend-ldap.c:621
+#: addressbook/backends/ldap/e-book-backend-ldap.c:623
msgid "Using Email Address"
msgstr "Benytter e-post-adresse"
-#: addressbook/backends/ldap/e-book-backend-ldap.c:787
+#: addressbook/backends/ldap/e-book-backend-ldap.c:789
msgid "Reconnecting to LDAP server..."
msgstr "Gentilslutter LDAP-serveren ..."
-#: addressbook/backends/ldap/e-book-backend-ldap.c:1307
+#: addressbook/backends/ldap/e-book-backend-ldap.c:1309
msgid "Adding contact to LDAP server..."
msgstr "Føjer visitkort til LDAP-server ..."
-#: addressbook/backends/ldap/e-book-backend-ldap.c:1407
+#: addressbook/backends/ldap/e-book-backend-ldap.c:1409
msgid "Removing contact from LDAP server..."
msgstr "Fjerner visitkort fra LDAP-server ..."
-#: addressbook/backends/ldap/e-book-backend-ldap.c:1630
+#: addressbook/backends/ldap/e-book-backend-ldap.c:1632
msgid "Modifying contact from LDAP server..."
msgstr "Ã?ndrer visitkort fra LDAP-server ..."
-#: addressbook/backends/ldap/e-book-backend-ldap.c:3067
+#: addressbook/backends/ldap/e-book-backend-ldap.c:3070
msgid "Receiving LDAP search results..."
msgstr "Modtager søgeresultater fra LDAP-server ..."
-#: addressbook/backends/ldap/e-book-backend-ldap.c:3175
+#: addressbook/backends/ldap/e-book-backend-ldap.c:3178
msgid "Error performing search"
msgstr "Fejl ved søgning"
Index: po/en_GB.po
===================================================================
RCS file: /cvs/gnome/evolution-data-server/po/en_GB.po,v
retrieving revision 1.24.2.1
diff -u -3 -r1.24.2.1 en_GB.po
--- po/en_GB.po 7 Sep 2004 05:43:54 -0000 1.24.2.1
+++ po/en_GB.po 16 Sep 2004 14:37:45 -0000
@@ -1,6 +1,7 @@
# English (Commonwealth) translation
# Copyright (C) 2000 Free Software Foundation, Inc.
-# Robert Brady <rwb197 zepler org> 2000
+# Robert Brady <rwb197 zepler org>, 2000.
+# Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004.
#
msgid ""
msgstr ""
@@ -62,43 +63,72 @@
#. * function names, e.g.
#. * "e_book_add_contact" on book before
#. * "e_book_open
-#: addressbook/libebook/e-book.c:236 addressbook/libebook/e-book.c:240
-#: addressbook/libebook/e-book.c:442 addressbook/libebook/e-book.c:446
-#: addressbook/libebook/e-book.c:578 addressbook/libebook/e-book.c:582
-#: addressbook/libebook/e-book.c:782 addressbook/libebook/e-book.c:787
-#: addressbook/libebook/e-book.c:962 addressbook/libebook/e-book.c:966
-#: addressbook/libebook/e-book.c:1107 addressbook/libebook/e-book.c:1111
-#: addressbook/libebook/e-book.c:1309 addressbook/libebook/e-book.c:1313
-#: addressbook/libebook/e-book.c:1514 addressbook/libebook/e-book.c:1518
-#: addressbook/libebook/e-book.c:1741 addressbook/libebook/e-book.c:1745
-#: addressbook/libebook/e-book.c:1948 addressbook/libebook/e-book.c:1952
+#: addressbook/libebook/e-book.c:236
+#: addressbook/libebook/e-book.c:240
+#: addressbook/libebook/e-book.c:442
+#: addressbook/libebook/e-book.c:446
+#: addressbook/libebook/e-book.c:578
+#: addressbook/libebook/e-book.c:582
+#: addressbook/libebook/e-book.c:782
+#: addressbook/libebook/e-book.c:787
+#: addressbook/libebook/e-book.c:962
+#: addressbook/libebook/e-book.c:966
+#: addressbook/libebook/e-book.c:1107
+#: addressbook/libebook/e-book.c:1111
+#: addressbook/libebook/e-book.c:1309
+#: addressbook/libebook/e-book.c:1313
+#: addressbook/libebook/e-book.c:1514
+#: addressbook/libebook/e-book.c:1518
+#: addressbook/libebook/e-book.c:1741
+#: addressbook/libebook/e-book.c:1745
+#: addressbook/libebook/e-book.c:1948
+#: addressbook/libebook/e-book.c:1952
#: addressbook/libebook/e-book.c:2984
#, c-format
msgid "\"%s\" on book before \"%s\""
msgstr "\"%s\" on book before \"%s\""
-#: addressbook/libebook/e-book.c:249 addressbook/libebook/e-book.c:455
-#: addressbook/libebook/e-book.c:591 addressbook/libebook/e-book.c:797
-#: addressbook/libebook/e-book.c:976 addressbook/libebook/e-book.c:1121
-#: addressbook/libebook/e-book.c:1322 addressbook/libebook/e-book.c:1527
-#: addressbook/libebook/e-book.c:1755 addressbook/libebook/e-book.c:1961
-#: addressbook/libebook/e-book.c:2299 addressbook/libebook/e-book.c:2495
+#: addressbook/libebook/e-book.c:249
+#: addressbook/libebook/e-book.c:455
+#: addressbook/libebook/e-book.c:591
+#: addressbook/libebook/e-book.c:797
+#: addressbook/libebook/e-book.c:976
+#: addressbook/libebook/e-book.c:1121
+#: addressbook/libebook/e-book.c:1322
+#: addressbook/libebook/e-book.c:1527
+#: addressbook/libebook/e-book.c:1755
+#: addressbook/libebook/e-book.c:1961
+#: addressbook/libebook/e-book.c:2299
+#: addressbook/libebook/e-book.c:2495
msgid "book busy"
msgstr "book busy"
-#: addressbook/libebook/e-book.c:282 addressbook/libebook/e-book.c:286
-#: addressbook/libebook/e-book.c:488 addressbook/libebook/e-book.c:492
-#: addressbook/libebook/e-book.c:620 addressbook/libebook/e-book.c:624
-#: addressbook/libebook/e-book.c:826 addressbook/libebook/e-book.c:829
-#: addressbook/libebook/e-book.c:1008 addressbook/libebook/e-book.c:1011
-#: addressbook/libebook/e-book.c:1150 addressbook/libebook/e-book.c:1154
-#: addressbook/libebook/e-book.c:1358 addressbook/libebook/e-book.c:1362
-#: addressbook/libebook/e-book.c:1574 addressbook/libebook/e-book.c:1578
-#: addressbook/libebook/e-book.c:1787 addressbook/libebook/e-book.c:1791
-#: addressbook/libebook/e-book.c:1989 addressbook/libebook/e-book.c:1993
-#: addressbook/libebook/e-book.c:2240 addressbook/libebook/e-book.c:2327
-#: addressbook/libebook/e-book.c:2331 addressbook/libebook/e-book.c:2523
-#: addressbook/libebook/e-book.c:2527 addressbook/libebook/e-book.c:2993
+#: addressbook/libebook/e-book.c:282
+#: addressbook/libebook/e-book.c:286
+#: addressbook/libebook/e-book.c:488
+#: addressbook/libebook/e-book.c:492
+#: addressbook/libebook/e-book.c:620
+#: addressbook/libebook/e-book.c:624
+#: addressbook/libebook/e-book.c:826
+#: addressbook/libebook/e-book.c:829
+#: addressbook/libebook/e-book.c:1008
+#: addressbook/libebook/e-book.c:1011
+#: addressbook/libebook/e-book.c:1150
+#: addressbook/libebook/e-book.c:1154
+#: addressbook/libebook/e-book.c:1358
+#: addressbook/libebook/e-book.c:1362
+#: addressbook/libebook/e-book.c:1574
+#: addressbook/libebook/e-book.c:1578
+#: addressbook/libebook/e-book.c:1787
+#: addressbook/libebook/e-book.c:1791
+#: addressbook/libebook/e-book.c:1989
+#: addressbook/libebook/e-book.c:1993
+#: addressbook/libebook/e-book.c:2240
+#: addressbook/libebook/e-book.c:2327
+#: addressbook/libebook/e-book.c:2331
+#: addressbook/libebook/e-book.c:2523
+#: addressbook/libebook/e-book.c:2527
+#: addressbook/libebook/e-book.c:2993
#, c-format
msgid "CORBA exception making \"%s\" call"
msgstr "CORBA exception making \"%s\" call"
@@ -111,7 +141,8 @@
msgid "e_book_cancel: couldn't cancel"
msgstr "e_book_cancel: couldn't cancel"
-#: addressbook/libebook/e-book.c:2285 addressbook/libebook/e-book.c:2289
+#: addressbook/libebook/e-book.c:2285
+#: addressbook/libebook/e-book.c:2289
#, c-format
msgid "\"%s\" on book after \"%s\""
msgstr "\"%s\" on book after \"%s\""
@@ -144,10 +175,8 @@
#: addressbook/libebook/e-book.c:3191
#, c-format
-msgid ""
-"e_book_set_default_source: there was no source for uid `%s' stored in gconf."
-msgstr ""
-"e_book_set_default_source: there was no source for uid `%s' stored in gconf."
+msgid "e_book_set_default_source: there was no source for uid `%s' stored in gconf."
+msgstr "e_book_set_default_source: there was no source for uid `%s' stored in gconf."
#: addressbook/libebook/e-contact.c:100
msgid "Unique ID"
@@ -772,15 +801,18 @@
msgid "31st"
msgstr "31st"
-#: calendar/libecal/e-cal-util.c:569 calendar/libecal/e-cal-util.c:591
+#: calendar/libecal/e-cal-util.c:569
+#: calendar/libecal/e-cal-util.c:591
msgid "High"
msgstr "High"
-#: calendar/libecal/e-cal-util.c:571 calendar/libecal/e-cal-util.c:593
+#: calendar/libecal/e-cal-util.c:571
+#: calendar/libecal/e-cal-util.c:593
msgid "Normal"
msgstr "Normal"
-#: calendar/libecal/e-cal-util.c:573 calendar/libecal/e-cal-util.c:595
+#: calendar/libecal/e-cal-util.c:573
+#: calendar/libecal/e-cal-util.c:595
msgid "Low"
msgstr "Low"
@@ -929,12 +961,8 @@
#: calendar/libedata-cal/e-cal-backend-sexp.c:501
#, c-format
-msgid ""
-"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
-"\"description\", or \"location\""
-msgstr ""
-"\"%s\" expects the first argument to be either \"any\", \"summary\", or "
-"\"description\", or \"location\""
+msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\""
+msgstr "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\""
#: calendar/libedata-cal/e-cal-backend-sexp.c:624
#, c-format
@@ -943,12 +971,8 @@
#: calendar/libedata-cal/e-cal-backend-sexp.c:638
#, c-format
-msgid ""
-"\"%s\" expects all arguments to be strings or one and only one argument to "
-"be a boolean false (#f)"
-msgstr ""
-"\"%s\" expects all arguments to be strings or one and only one argument to "
-"be a boolean false (#f)"
+msgid "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
+msgstr "\"%s\" expects all arguments to be strings or one and only one argument to be a boolean false (#f)"
#: servers/groupwise/e-gw-connection.c:80
msgid "Invalid connection"
@@ -975,7 +999,7 @@
msgid "Evolution Addressbook file backend"
msgstr "Evolution Addressbook file backend"
-#. dialog display isn't working out
+# dialog display isn't working out
#: src/server.c:110
#, c-format
msgid "Multiple segmentation faults occurred; can't display error dialog\n"
@@ -2785,5 +2809,3 @@
#~ msgid "Querying authorization capabilities of \"%s\""
#~ msgstr "Querying authorisation capabilities of \"%s\""
-#~ msgid "Query authorization at \"%s\""
-#~ msgstr "Query authorisation at \"%s\""
Index: servers/groupwise/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/ChangeLog,v
retrieving revision 1.64
diff -u -3 -r1.64 ChangeLog
--- servers/groupwise/ChangeLog 27 Aug 2004 05:28:06 -0000 1.64
+++ servers/groupwise/ChangeLog 16 Sep 2004 14:37:46 -0000
@@ -1,3 +1,14 @@
+2004-09-08 Chenthill Palanisamy <pchenthill novell com>
+
+ Fixes #64062
+ * e-gw-item[ch]
+ (e_gw_item_set_is_allday_event), (e_gw_item_get_is_allday_event):
+ Added functions to handle the allday events for Appointments.
+ * e-gw-item.c
+ (e_gw_item_append_to_soap_message),(append_event_changes_to_soap_message)
+ (e_gw_item_new_from_soap_parameter): Added the support for allDay events
+ in appointments.
+
2004-08-27 Chenthill Palanisamy <pchenthill novell com>
* e-gw-item.h:
Index: servers/groupwise/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/Makefile.am,v
retrieving revision 1.8
diff -u -3 -r1.8 Makefile.am
--- servers/groupwise/Makefile.am 18 May 2004 03:29:25 -0000 1.8
+++ servers/groupwise/Makefile.am 16 Sep 2004 14:37:46 -0000
@@ -15,9 +15,9 @@
$(E_DATA_SERVER_LIBS)
soap_test_SOURCES = soap-test.c
-soap_test_LDADD = \
- $(SOUP_LIBS) \
- $(top_builddir)/servers/groupwise/libegroupwise.la \
+soap_test_LDADD = \
+ $(SOUP_LIBS) \
+ libegroupwise.la \
$(E_DATA_SERVER_LIBS)
lib_LTLIBRARIES = libegroupwise.la
Index: servers/groupwise/e-gw-item.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/e-gw-item.c,v
retrieving revision 1.45
diff -u -3 -r1.45 e-gw-item.c
--- servers/groupwise/e-gw-item.c 19 Aug 2004 10:20:03 -0000 1.45
+++ servers/groupwise/e-gw-item.c 16 Sep 2004 14:37:47 -0000
@@ -43,6 +43,7 @@
char *end_date;
char *due_date;
gboolean completed;
+ gboolean is_allday_event;
char *subject;
char *message;
char *classification;
@@ -332,6 +333,7 @@
priv->organizer = NULL;
priv->recurrence_dates = NULL;
priv->completed = FALSE;
+ priv->is_allday_event = FALSE;
priv->im_list = NULL;
priv->email_list = NULL;
priv->member_list = NULL;
@@ -1350,6 +1352,14 @@
item->priv->completed = FALSE;
g_free (value);
+ } else if (!g_ascii_strcasecmp (name, "allDayEvent")) {
+ value = soup_soap_parameter_get_string_value (child);
+ if (!g_ascii_strcasecmp (value, "1"))
+ item->priv->is_allday_event = TRUE;
+ else
+ item->priv->is_allday_event = FALSE;
+ g_free (value);
+
} else if (!g_ascii_strcasecmp (name, "status")) {
if (soup_soap_parameter_get_first_child_by_name (child, "deleted"))
item->priv->self_status = E_GW_ITEM_STAT_DECLINED;
@@ -1723,6 +1733,22 @@
item->priv->completed = new_completed;
}
+gboolean
+e_gw_item_get_is_allday_event (EGwItem *item)
+{
+ g_return_val_if_fail (E_IS_GW_ITEM (item), FALSE);
+
+ return item->priv->is_allday_event;
+}
+
+void
+e_gw_item_set_is_allday_event (EGwItem *item, gboolean allday_event)
+{
+ g_return_if_fail (E_IS_GW_ITEM (item));
+
+ item->priv->is_allday_event = allday_event;
+}
+
const char *
e_gw_item_get_accept_level (EGwItem *item)
{
@@ -1972,6 +1998,12 @@
e_gw_message_write_string_parameter (msg, "endDate", NULL, "");
e_gw_message_write_string_parameter (msg, "acceptLevel", NULL, priv->accept_level ? priv->accept_level : "");
+ if (priv->is_allday_event)
+ e_gw_message_write_string_parameter (msg, "allDayEvent", NULL, "1");
+ else
+ e_gw_message_write_string_parameter (msg, "allDayEvent", NULL ,"0");
+
+
if (priv->trigger != 0) {
alarm = g_strdup_printf ("%d", priv->trigger);
e_gw_message_write_string_parameter_with_attribute (msg, "alarm", NULL, alarm, "enabled", "true");
@@ -2146,6 +2178,8 @@
e_gw_message_write_string_parameter (msg, "endDate", NULL, priv->end_date);
}
}
+ if (g_hash_table_lookup (changes, "allDayEvent"))
+ e_gw_message_write_string_parameter (msg, "allDayEvent", NULL, priv->is_allday_event ? "1" : "0");
if (g_hash_table_lookup (changes, "message")) {
soup_soap_message_start_element (msg, "message", NULL, NULL);
if (priv->message) {
Index: servers/groupwise/e-gw-item.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/e-gw-item.h,v
retrieving revision 1.19
diff -u -3 -r1.19 e-gw-item.h
--- servers/groupwise/e-gw-item.h 27 Aug 2004 05:28:06 -0000 1.19
+++ servers/groupwise/e-gw-item.h 16 Sep 2004 14:37:47 -0000
@@ -131,6 +131,8 @@
void e_gw_item_set_place (EGwItem *item, const char *new_place);
gboolean e_gw_item_get_completed (EGwItem *item);
void e_gw_item_set_completed (EGwItem *item, gboolean new_completed);
+gboolean e_gw_item_get_is_allday_event (EGwItem *item);
+void e_gw_item_set_is_allday_event (EGwItem *item, gboolean is_allday);
char* e_gw_item_get_field_value (EGwItem *item, char *field_name);
void e_gw_item_set_field_value (EGwItem *item, char *field_name, char* field_value);
GList* e_gw_item_get_email_list (EGwItem *item);
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1365.2.9
diff -u -3 -r1.1365.2.9 ChangeLog
--- ChangeLog 14 Sep 2004 10:17:03 -0000 1.1365.2.9
+++ ChangeLog 16 Sep 2004 14:41:18 -0000
@@ -34,6 +34,15 @@
UPGRADE_VERSION to 0 because BASE_VERSION changed; base
GETTEXT_PACKAGE on BASE_VERSION
+2004-09-13 Tomasz KÅ?oczko <kloczek pld org pl>
+
+ * data/evolution.desktop.in: added missing Encoding=UTF-8 field
+ (validate desktop file).
+
+2004-09-11 Akagic Amila <bono linux org ba>
+
+ * configure.in: Added 'bs' to ALL_LINGUAS.
+
2004-08-27 JP Rosevear <jpr novell com>
* configure.in: bump version, requirements
Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1822.2.3
diff -u -3 -r1.1822.2.3 ChangeLog
--- addressbook/ChangeLog 13 Sep 2004 16:08:21 -0000 1.1822.2.3
+++ addressbook/ChangeLog 16 Sep 2004 14:41:23 -0000
@@ -18,6 +18,60 @@
* gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
link addressbook to camel.
+2004-09-13 Rodney Dawes <dobey novell com>
+
+ * gui/contact-editor/e-contact-editor.c (show_help_cb):
+ Point at the correct XML file for documentation
+
+2004-09-13 Sivaiah Nallagatla <snallagatla novell com>
+
+ * gui/contact-editor/e-contact-editor.c
+ (sensitize_address) : check for _LABEL
+ type address fields also in supported fileds
+ while sensitizing the address fields
+
+2004-09-03 JP Rosevear <jpr novell com>
+
+ Fixes #63191
+
+ * gui/contact-list-editor/contact-list-editor.glade: set the title
+ properly
+
+2004-09-08 Not Zed <NotZed Ximian com>
+
+ ** See bug #64080.
+
+ * gui/component/Makefile.am (libevolution_addressbook_la_LIBADD):
+ link addressbook to camel.
+
+2004-09-04 Sivaiah Nallagatla <snallagatla novell com>
+
+ * gui/widgets/e-addressbook-view.h : add
+ new widget variable contact_dsiplay_window to _EABView strcut
+ to store. Remove unused scrolled varible
+ * gui/widgets/e-addressbook-view.c (eab_view_init)
+ (eab_view_dispose) : initialize and unref the new widget
+ added
+ (eab_view_new) : remove the loca variable scrlled_window
+ instead use eav->contact_display_window
+ (eab_view_show_contact_preview) : show/hide contact_display_window
+ instead of contact_display
+ Fixes #64024
+
+
+2004-08-27 Not Zed <NotZed Ximian com>
+
+ ** See bug #62856 (workaround).
+
+ * gui/component/addressbook.c (addressbook_authenticate): add
+ online flag to password request.
+
+ ** See bug #64011.
+
+ * gui/component/addressbook-view.c (edit_addressbook_cb): Remove
+ double ;; in declaration section (c99 extension). From Vincent
+ Noel <vnoel cox net>.
+
2004-08-26 Hans Petter Jansson <hpj ximian com>
Really fixes #61833 and #63697.
Index: addressbook/gui/component/addressbook-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook-view.c,v
retrieving revision 1.18
diff -u -3 -r1.18 addressbook-view.c
--- addressbook/gui/component/addressbook-view.c 25 Aug 2004 10:56:21 -0000 1.18
+++ addressbook/gui/component/addressbook-view.c 16 Sep 2004 14:41:24 -0000
@@ -754,7 +754,7 @@
{
AddressbookViewPrivate *priv = view->priv;
ESource *selected_source;
- const char *uid;;
+ const char *uid;
EditorUidClosure *closure;
selected_source =
Index: addressbook/gui/component/addressbook.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook.c,v
retrieving revision 1.241
diff -u -3 -r1.241 addressbook.c
--- addressbook/gui/component/addressbook.c 12 Aug 2004 06:54:17 -0000 1.241
+++ addressbook/gui/component/addressbook.c 16 Sep 2004 14:41:24 -0000
@@ -178,7 +178,7 @@
char *prompt;
gboolean remember;
char *failed_auth;
- guint32 flags = E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET;
+ guint32 flags = E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET|E_PASSWORDS_ONLINE;
if (previous_failure) {
failed_auth = _("Failed to authenticate.\n");
Index: addressbook/gui/contact-list-editor/contact-list-editor.glade
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-list-editor/contact-list-editor.glade,v
retrieving revision 1.14
diff -u -3 -r1.14 contact-list-editor.glade
--- addressbook/gui/contact-list-editor/contact-list-editor.glade 7 Jun 2004 20:19:14 -0000 1.14
+++ addressbook/gui/contact-list-editor/contact-list-editor.glade 16 Sep 2004 14:41:25 -0000
@@ -5,7 +5,7 @@
<widget class="GtkDialog" id="contact list editor">
<property name="visible">True</property>
- <property name="title" translatable="yes">dialog1</property>
+ <property name="title" translatable="yes">Contact List Editor</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
Index: addressbook/gui/widgets/e-addressbook-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-addressbook-view.c,v
retrieving revision 1.146
diff -u -3 -r1.146 e-addressbook-view.c
--- addressbook/gui/widgets/e-addressbook-view.c 22 Jul 2004 13:18:40 -0000 1.146
+++ addressbook/gui/widgets/e-addressbook-view.c 16 Sep 2004 14:41:26 -0000
@@ -297,7 +297,7 @@
eav->model = NULL;
eav->object = NULL;
eav->widget = NULL;
- eav->scrolled = NULL;
+ eav->contact_display_window = NULL;
eav->contact_display = NULL;
eav->displayed_contact = -1;
@@ -360,6 +360,11 @@
g_list_free (eav->clipboard_contacts);
eav->clipboard_contacts = NULL;
}
+
+ if (eav->contact_display_window) {
+ g_object_unref (eav->contact_display_window);
+ eav->contact_display_window = NULL;
+ }
if (eav->invisible) {
gtk_widget_destroy (eav->invisible);
@@ -414,7 +419,6 @@
eab_view_new (void)
{
GtkWidget *widget = GTK_WIDGET (g_object_new (E_TYPE_AB_VIEW, NULL));
- GtkWidget *scrolled_window;
EABView *eav = EAB_VIEW (widget);
FilterPart *part;
@@ -481,13 +485,13 @@
gtk_widget_show (eav->widget);
eav->contact_display = eab_contact_display_new ();
- scrolled_window = gtk_scrolled_window_new (NULL, NULL);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
- gtk_container_add (GTK_CONTAINER (scrolled_window), eav->contact_display);
- gtk_container_add (GTK_CONTAINER (eav->paned), scrolled_window);
+ eav->contact_display_window = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (eav->contact_display_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (eav->contact_display_window), GTK_SHADOW_IN);
+ gtk_container_add (GTK_CONTAINER (eav->contact_display_window), eav->contact_display);
+ gtk_container_add (GTK_CONTAINER (eav->paned), eav->contact_display_window);
gtk_widget_show (eav->contact_display);
- gtk_widget_show (scrolled_window);
+ gtk_widget_show (eav->contact_display_window);
gtk_widget_show (eav->paned);
/* gtk selection crap */
@@ -1815,9 +1819,9 @@
g_return_if_fail (view && E_IS_ADDRESSBOOK_VIEW (view));
if (show)
- gtk_widget_show (view->contact_display);
+ gtk_widget_show (view->contact_display_window);
else
- gtk_widget_hide (view->contact_display);
+ gtk_widget_hide (view->contact_display_window);
}
void
Index: addressbook/gui/widgets/e-addressbook-view.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-addressbook-view.h,v
retrieving revision 1.32
diff -u -3 -r1.32 e-addressbook-view.h
--- addressbook/gui/widgets/e-addressbook-view.h 4 Jun 2004 03:28:29 -0000 1.32
+++ addressbook/gui/widgets/e-addressbook-view.h 16 Sep 2004 14:41:26 -0000
@@ -81,7 +81,7 @@
GObject *object;
GtkWidget *widget;
- GtkWidget *scrolled;
+ GtkWidget *contact_display_window;
GtkWidget *contact_display;
GtkWidget *paned;
Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2500.2.3
diff -u -3 -r1.2500.2.3 ChangeLog
--- calendar/ChangeLog 10 Sep 2004 15:58:42 -0000 1.2500.2.3
+++ calendar/ChangeLog 16 Sep 2004 14:41:31 -0000
@@ -23,6 +23,61 @@
* gui/e-cal-model-tasks.c: include missing string.h, to avoid
problems in 64 bit builds.
+2004-09-09 JP Rosevear <jpr novell com>
+
+ Fixes #65454
+
+ * gui/e-itip-control.c (class_init): only use a destroy function,
+ no finalize
+ (cleanup_ecal): util function
+ (init): use above for hash table and killed destroyed flag
+ (weren't using it anywhere)
+ (destroy): collapse finalize work into here and guard against
+ multiple destroy calls
+
+2004-09-08 JP Rosevear <jpr novell com>
+
+ Fixes #62728
+
+ * gui/e-week-view.c (e_week_view_set_week_start_day): trigger a
+ redraw when changing the start day
+
+2004-09-05 Chenthill Palanisamy <pchenthill novell com>
+
+ * gui/e-calendar-table.c
+ (e_calendar_table_show_popup_menu): Check the
+ static capability to enable or disable the assign
+ tasks in the popup menu.
+
+ * gui/dialogs/recurrence-page.c
+ (sensitize_buttons): Check for the static capability
+ to convert a existing appointment to recurrence appointment
+ for enabling or diabling the recurrence widgets.
+
+2004-08-31 Rodrigo Moya <rodrigo novell com>
+
+ Fixes #62392
+
+ * gui/alarm-notify/alarm-queue.c (display_notification): ref the
+ client's query object so that it doesn't disappear on us.
+ (tray_icon_destroyed_cb): unref the query previously ref'ed.
+
+2004-08-31 Rodrigo Moya <rodrigo novell com>
+
+ * gui/e-cal-model-tasks.c: include missing string.h, to avoid
+ problems in 64 bit builds.
+
+2004-08-27 Not Zed <NotZed Ximian com>
+
+ * common/authentication.c (auth_func_cb): constify the strings to
+ remove a warning.
+
+ ** See bug #64856 (workaround).
+
+ * common/authentication.c (auth_func_cb):
+ * gui/e-pub-utils.c(e_pub_publish): add ONLINE flag to password
+ request.
+
2004-08-28 JP Rosevear <jpr novell com>
* gui/e-itip-control.c (rsvp_clicked_cb): get the active state
Index: calendar/common/authentication.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/common/authentication.c,v
retrieving revision 1.7
diff -u -3 -r1.7 authentication.c
--- calendar/common/authentication.c 12 Aug 2004 06:55:23 -0000 1.7
+++ calendar/common/authentication.c 16 Sep 2004 14:41:31 -0000
@@ -36,8 +36,7 @@
gboolean remember;
char *password;
ESource *source;
- gchar *auth_domain;
- gchar *component_name;
+ const gchar *auth_domain, *component_name;
source = e_cal_get_source (ecal);
auth_domain = e_source_get_property (source, "auth-domain");
@@ -46,7 +45,8 @@
if (!password)
password = e_passwords_ask_password (_("Enter password"), component_name, key, prompt,
- E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember,
+ E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET|E_PASSWORDS_ONLINE,
+ &remember,
NULL);
return password;
Index: calendar/gui/e-calendar-table.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-table.c,v
retrieving revision 1.122
diff -u -3 -r1.122 e-calendar-table.c
--- calendar/gui/e-calendar-table.c 22 Jul 2004 13:09:32 -0000 1.122
+++ calendar/gui/e-calendar-table.c 16 Sep 2004 14:41:32 -0000
@@ -1133,6 +1133,9 @@
if (e_cal_get_static_capability (comp_data->client, CAL_STATIC_CAPABILITY_NO_TASK_ASSIGNMENT))
disable_mask |= MASK_ASSIGNABLE;
+ if (e_cal_get_static_capability (comp_data->client, CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK))
+ disable_mask |= MASK_ASSIGNABLE;
+
setup_popup_icons (tasks_popup_menu);
gtk_menu = e_popup_menu_create (tasks_popup_menu, disable_mask,
hide_mask, cal_table);
Index: calendar/gui/e-pub-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-pub-utils.c,v
retrieving revision 1.4
diff -u -3 -r1.4 e-pub-utils.c
--- calendar/gui/e-pub-utils.c 12 Aug 2004 06:55:23 -0000 1.4
+++ calendar/gui/e-pub-utils.c 16 Sep 2004 14:41:33 -0000
@@ -301,7 +301,7 @@
password = e_passwords_ask_password (_("Enter password"),
"Calendar", (gchar *)uri->location,
prompt,
- E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET,
+ E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET|E_PASSWORDS_ONLINE,
&remember, NULL);
g_free (prompt);
Index: calendar/gui/e-week-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view.c,v
retrieving revision 1.222
diff -u -3 -r1.222 e-week-view.c
--- calendar/gui/e-week-view.c 2 Aug 2004 07:33:38 -0000 1.222
+++ calendar/gui/e-week-view.c 16 Sep 2004 14:41:35 -0000
@@ -1863,6 +1863,9 @@
if (g_date_valid (&week_view->first_day_shown))
e_week_view_set_first_day_shown (week_view,
&week_view->first_day_shown);
+
+ gtk_widget_queue_draw (week_view->titles_canvas);
+ gtk_widget_queue_draw (week_view->main_canvas);
}
static gboolean
Index: calendar/gui/dialogs/recurrence-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/recurrence-page.c,v
retrieving revision 1.59
diff -u -3 -r1.59 recurrence-page.c
--- calendar/gui/dialogs/recurrence-page.c 22 Jun 2004 22:35:41 -0000 1.59
+++ calendar/gui/dialogs/recurrence-page.c 16 Sep 2004 14:41:37 -0000
@@ -531,6 +531,8 @@
gboolean read_only;
gint selected_rows;
RecurrencePagePrivate *priv;
+ icalcomponent *icalcomp;
+ char *uid;
priv = rpage->priv;
@@ -539,6 +541,15 @@
if (!e_cal_is_read_only (COMP_EDITOR_PAGE (rpage)->client, &read_only, NULL))
read_only = TRUE;
+
+ if (!read_only) {
+ e_cal_component_get_uid (priv->comp, &uid);
+
+ if (e_cal_get_static_capability (COMP_EDITOR_PAGE (rpage)->client, CAL_STATIC_CAPABILITY_NO_CONV_TO_RECUR) && e_cal_get_object(COMP_EDITOR_PAGE (rpage)->client, uid, NULL, &icalcomp, NULL)) {
+ read_only = TRUE;
+ icalcomponent_free (icalcomp);
+ }
+ }
if (!read_only)
sensitize_recur_widgets (rpage);
Index: camel/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/camel/ChangeLog,v
retrieving revision 1.2251
diff -u -3 -r1.2251 ChangeLog
--- camel/ChangeLog 26 Aug 2004 09:28:45 -0000 1.2251
+++ camel/ChangeLog 16 Sep 2004 14:41:40 -0000
@@ -1,15 +1,26 @@
+2004-09-03 Not Zed <NotZed Ximian com>
+
+ * camel-tcp-stream-ssl.c (stream_connect): make ssl connection
+ async and cancellable, and minor api update to async connection.
+
+2004-08-27 Not Zed <NotZed Ximian com>
+
+ ** See bug #64023.
+
+ * providers/nntp/camel-nntp-store.c (camel_nntp_try_authenticate):
+ forget the password if it was wrong.
+
2004-08-26 Sivaiah Nallagatla <snallagatla novell com>
- * provoders/groupwise/camel-gw-listner.c
+ * providers/groupwise/camel-gw-listner.c
(add_calendar_tasks_sources) : change the "CheckList" to "Tasks"
- as there is another foder called chekclist in groupwise
- not related to tasks
- Fixes #64092
+ as there is another foder called chekclist in groupwise not
+ related to tasks Fixes #64092
2004-08-25 Frederic Crozat <fcrozat mandrakesoft com>
- * camel-folder.c: (folder_getv):
- Init one variable (remove warning) and don't redefine it.
+ * camel-folder.c (folder_getv): Init one variable (remove warning)
+ and don't redefine it.
2004-08-23 Not Zed <NotZed Ximian com>
Index: camel/camel-tcp-stream-ssl.c
===================================================================
RCS file: /cvs/gnome/evolution/camel/camel-tcp-stream-ssl.c,v
retrieving revision 1.62
diff -u -3 -r1.62 camel-tcp-stream-ssl.c
--- camel/camel-tcp-stream-ssl.c 4 Jun 2004 18:04:07 -0000 1.62
+++ camel/camel-tcp-stream-ssl.c 16 Sep 2004 14:41:41 -0000
@@ -1028,7 +1028,7 @@
{
CamelTcpStreamSSL *ssl = CAMEL_TCP_STREAM_SSL (stream);
PRNetAddr netaddr;
- PRFileDesc *fd;
+ PRFileDesc *fd, *cancel_fd;
g_return_val_if_fail (host != NULL, -1);
@@ -1070,26 +1070,37 @@
fd = ssl_fd;
}
-
- if (PR_Connect (fd, &netaddr, CONNECT_TIMEOUT) == PR_FAILURE) {
+
+ cancel_fd = camel_operation_cancel_prfd(NULL);
+
+ if (PR_Connect (fd, &netaddr, cancel_fd?0:CONNECT_TIMEOUT) == PR_FAILURE) {
int errnosave;
set_errno (PR_GetError ());
- if (errno == EINPROGRESS) {
+ if (errno == EINPROGRESS || (cancel_fd && errno == ETIMEDOUT)) {
gboolean connected = FALSE;
- PRPollDesc poll;
+ PRPollDesc poll[2];
+
+ poll[0].fd = fd;
+ poll[0].in_flags = PR_POLL_WRITE | PR_POLL_EXCEPT;
+ poll[1].fd = cancel_fd;
+ poll[1].in_flags = PR_POLL_READ;
do {
- poll.fd = fd;
- poll.in_flags = PR_POLL_WRITE | PR_POLL_EXCEPT;
- poll.out_flags = 0;
-
- if (PR_Poll (&poll, 1, CONNECT_TIMEOUT) == PR_FAILURE) {
+ poll[0].out_flags = 0;
+ poll[1].out_flags = 0;
+
+ if (PR_Poll (poll, cancel_fd?2:1, CONNECT_TIMEOUT) == PR_FAILURE) {
set_errno (PR_GetError ());
goto exception;
}
- if (PR_GetConnectStatus (&poll) == PR_FAILURE) {
+ if (poll[1].out_flags == PR_POLL_READ) {
+ errno = EINTR;
+ goto exception;
+ }
+
+ if (PR_ConnectContinue(fd, poll[0].out_flags) == PR_FAILURE) {
set_errno (PR_GetError ());
if (errno != EINPROGRESS)
goto exception;
Index: camel/providers/nntp/camel-nntp-store.c
===================================================================
RCS file: /cvs/gnome/evolution/camel/providers/nntp/camel-nntp-store.c,v
retrieving revision 1.65
diff -u -3 -r1.65 camel-nntp-store.c
--- camel/providers/nntp/camel-nntp-store.c 10 Jun 2004 02:13:24 -0000 1.65
+++ camel/providers/nntp/camel-nntp-store.c 16 Sep 2004 14:41:42 -0000
@@ -1141,9 +1141,12 @@
ret = camel_nntp_raw_command(store, ex, &line, "authinfo pass %s", service->url->passwd);
if (ret != NNTP_AUTH_ACCEPTED) {
- if (ret != -1)
+ if (ret != -1) {
+ /* Need to forget the password here since we have no context on it */
+ camel_session_forget_password(session, service, NULL, "password", ex);
camel_exception_setv(ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
_("Cannot authenticate to server: %s"), line);
+ }
return -1;
}
Index: composer/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
retrieving revision 1.657
diff -u -3 -r1.657 ChangeLog
--- composer/ChangeLog 13 Aug 2004 16:27:16 -0000 1.657
+++ composer/ChangeLog 16 Sep 2004 14:41:42 -0000
@@ -1,3 +1,10 @@
+2004-09-08 Not Zed <NotZed Ximian com>
+
+ ** See bug #64454.
+
+ * mail-composer-errors.xml: add accelerators to modified message
+ dialogue.
+
2004-08-13 Radek Doulik <rodo ximian com>
* e-msg-composer.c (e_msg_composer_show_sig_file): set paragraph
Index: composer/mail-composer-errors.xml
===================================================================
RCS file: /cvs/gnome/evolution/composer/mail-composer-errors.xml,v
retrieving revision 1.5
diff -u -3 -r1.5 mail-composer-errors.xml
--- composer/mail-composer-errors.xml 18 Jun 2004 05:59:16 -0000 1.5
+++ composer/mail-composer-errors.xml 16 Sep 2004 14:41:42 -0000
@@ -37,9 +37,9 @@
<title>Warning: Modified Message</title>
<primary>Are you sure you want to discard the message, titled '{0}', you are composing?</primary>
<secondary>Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date.</secondary>
- <button label="Discard Changes" response="GTK_RESPONSE_NO"/>
+ <button label="_Discard Changes" response="GTK_RESPONSE_NO"/>
<button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
- <button label="Save Message" response="GTK_RESPONSE_YES"/>
+ <button label="_Save Message" response="GTK_RESPONSE_YES"/>
</error>
<error id="no-build-message" type="error" modal="true">
Index: composer/mail-composer-errors.xml.h
===================================================================
RCS file: /cvs/gnome/evolution/composer/mail-composer-errors.xml.h,v
retrieving revision 1.4
diff -u -3 -r1.4 mail-composer-errors.xml.h
--- composer/mail-composer-errors.xml.h 18 Jun 2004 05:59:16 -0000 1.4
+++ composer/mail-composer-errors.xml.h 16 Sep 2004 14:41:42 -0000
@@ -30,8 +30,8 @@
char *s = N_("Are you sure you want to discard the message, titled '{0}', you are composing?");
/* mail-composer:exit-unsaved secondary */
char *s = N_("Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date.");
-char *s = N_("Discard Changes");
-char *s = N_("Save Message");
+char *s = N_("_Discard Changes");
+char *s = N_("_Save Message");
/* mail-composer:no-build-message primary */
char *s = N_("Could not create message.");
/* mail-composer:no-build-message secondary */
Index: data/evolution.desktop.in.in
===================================================================
RCS file: /cvs/gnome/evolution/data/evolution.desktop.in.in,v
retrieving revision 1.7
diff -u -3 -r1.7 evolution.desktop.in.in
--- data/evolution.desktop.in.in 12 Aug 2004 21:21:13 -0000 1.7
+++ data/evolution.desktop.in.in 16 Sep 2004 14:41:42 -0000
@@ -1,4 +1,5 @@
[Desktop Entry]
+Encoding=UTF-8
_Name=Evolution
_Comment=The Evolution Groupware Suite
Exec=evolution- BASE_VERSION@
Index: e-util/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/e-util/ChangeLog,v
retrieving revision 1.481
diff -u -3 -r1.481 ChangeLog
--- e-util/ChangeLog 27 Aug 2004 00:21:33 -0000 1.481
+++ e-util/ChangeLog 16 Sep 2004 14:41:43 -0000
@@ -1,3 +1,8 @@
+2004-08-27 Not Zed <NotZed Ximian com>
+
+ * e-passwords.c (e_passwords_ask_password): return cancelled if
+ we're in an offline state.
+
2004-08-26 Rodrigo Moya <rodrigo novell com>
* eggtrayicon.[ch]: updated from libegg.
Index: e-util/e-passwords.c
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-passwords.c,v
retrieving revision 1.20
diff -u -3 -r1.20 e-passwords.c
--- e-util/e-passwords.c 25 Aug 2004 10:59:00 -0000 1.20
+++ e-util/e-passwords.c 16 Sep 2004 14:41:44 -0000
@@ -102,6 +102,7 @@
static GtkDialog *password_dialog;
static EDList request_list = E_DLIST_INITIALISER(request_list);
static int idle_id;
+static int ep_online_state = TRUE;
static char *decode_base64 (char *base64);
static int base64_encode_close(unsigned char *in, int inlen, gboolean break_lines, unsigned char *out, int *state, int *save);
@@ -538,6 +539,23 @@
}
/**
+ * e_passwords_set_online:
+ * @state:
+ *
+ * Set the offline-state of the application. This is a work-around
+ * for having the backends fully offline aware, and returns a
+ * cancellation response instead of prompting for passwords.
+ *
+ * FIXME: This is not a permanent api, review post 2.0.
+ **/
+void
+e_passwords_set_online(int state)
+{
+ ep_online_state = state;
+ /* TODO: we could check that a request is open and close it, or maybe who cares */
+}
+
+/**
* e_passwords_forget_passwords:
*
* Forgets all cached passwords, in memory and on disk.
@@ -697,6 +715,9 @@
{
char *passwd;
EPassMsg *msg = ep_msg_new(ep_ask_password);
+
+ if ((type & E_PASSWORDS_ONLINE) && !ep_online_state)
+ return NULL;
msg->title = title;
msg->component = component_name;
Index: e-util/e-passwords.h
===================================================================
RCS file: /cvs/gnome/evolution/e-util/e-passwords.h,v
retrieving revision 1.9
diff -u -3 -r1.9 e-passwords.h
--- e-util/e-passwords.h 12 Aug 2004 06:53:12 -0000 1.9
+++ e-util/e-passwords.h 16 Sep 2004 14:41:44 -0000
@@ -39,6 +39,7 @@
void e_passwords_shutdown (void);
void e_passwords_cancel(void);
+void e_passwords_set_online(int state);
void e_passwords_remember_password (const char *component, const char *key);
void e_passwords_add_password (const char *key, const char *passwd);
char *e_passwords_get_password (const char *component, const char *key);
@@ -55,6 +56,7 @@
/* option bits */
E_PASSWORDS_SECRET = 1<<8,
E_PASSWORDS_REPROMPT = 1<<9,
+ E_PASSWORDS_ONLINE = 1<<10, /* only ask if we're online */
} EPasswordsRememberType;
char * e_passwords_ask_password (const char *title,
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3444.2.5
diff -u -3 -r1.3444.2.5 ChangeLog
--- mail/ChangeLog 10 Sep 2004 03:03:19 -0000 1.3444.2.5
+++ mail/ChangeLog 16 Sep 2004 14:41:50 -0000
@@ -57,6 +57,87 @@
* message-list.c (main_folder_changed): noop if the async_event
pointer is NULL which can happen during destroy.
+2004-09-09 Jeffrey Stedfast <fejj novell com>
+
+ * mail-account-gui.c (mail_account_gui_new): If built with
+ gtkfilechooser support, we need to add a checkbox in the chooser
+ so that the user can select files or folders (allowing him to
+ choose - otherwise they won't be able to setup certain types of
+ accounts). Fixes bug #64974.
+
+2004-09-12 JP Rosevear <jpr novell com>
+
+ Fixes #65703
+
+ * em-popup.c: use proper stock icon name
+
+2004-09-08 Not Zed <NotZed Ximian com>
+
+ ** See bug #60515.
+
+ * mail-account-gui.c (sig_fill_menu): connect to the activate
+ signal for the none item.
+
+2004-09-03 Not Zed <NotZed Ximian com>
+
+ ** See bug #59717.
+
+ * mail-config.c (mail_config_check_service): Make the dialog
+ modal. Not ideal but a problem with the way the function works,
+ it should be fully async instead.
+
+2004-09-01 Jeffrey Stedfast <fejj novell com>
+
+ Fix for bug #63377 and prevention of similar cases.
+
+ * em-format.c (emf_finalise): Free the default_charset.
+ (emf_format_clone): Clone the default_charset - this prevents the
+ particular crash described in bug #63377.
+
+ * em-utils.c (em_utils_message_to_html): If source is NULL, set
+ our own default charset (from the user's gconf key) on the
+ formatter to make sure there's always a source charset for
+ conversion to UTF-8.
+
+2004-08-30 Jeffrey Stedfast <fejj novell com>
+
+ * em-folder-tree.c (emft_popup_delete_folder): Set the store and
+ full_name info on the dialog.
+ (emft_popup_delete_response): Use the requisite data stored on the
+ dialog object rather than examining the selection again. Fixes bug
+ #62665.
+
+2004-08-30 Not Zed <NotZed Ximian com>
+
+ ** See bug #64377.
+
+ * em-folder-selector.c (emfs_response): only set the uri if we
+ have one to set.
+
+ * em-folder-tree.c (em_folder_tree_finalize): Removed
+ cose using selected_path and selected_uri strings.
+ (emft_popup_new_folder): "
+ (emft_popup_copy_folder_selected): "
+ (emft_tree_selection_changed):
+ (emft_tree_row_activated): ", free paths after use.
+
+ * em-folder-selector.c (emfs_create_name_changed): free
+ get_selected_uri return.
+ (emfs_create_name_activate): "
+ (em_folder_selector_get_selected_path): handle api change, store
+ the selected_path too.
+
+ * em-folder-tree.c (em_folder_tree_get_selected_uri):
+ de-constify,and get the selection directly from the tree.
+ (em_folder_tree_get_selected_path): same.
+
+2004-08-27 Not Zed <NotZed Ximian com>
+
+ ** See bug #63456.
+
+ * message-list.c (main_folder_changed): noop if the async_event
+ pointer is NULL which can happen during destroy.
+
2004-08-27 JP Rosevear <jpr novell com>
* importers/mail-importer.c (import_folders_rec): utf8_filename
@@ -92,10 +173,12 @@
2004-08-25 Frederic Crozat <fcrozat mandrakesoft com>
- * importers/evolution-mbox-importer.c: (load_file_fn):
- * importers/evolution-outlook-importer.c: (load_file_fn):
- * importers/mail-importer.c: (import_folders_rec):
- Convert filename to UTF-8 from local encoding before displaying it.
+ * importers/evolution-mbox-importer.c (load_file_fn):
+
+ * importers/evolution-outlook-importer.c (load_file_fn):
+
+ * importers/mail-importer.c (import_folders_rec): Convert filename
+ to UTF-8 from local encoding before displaying it.
2004-08-23 Not Zed <NotZed Ximian com>
@@ -135,7 +218,7 @@
2004-08-21 Sivaiah Nallagatla <snallagatla novell com>
- * mail-erros.xml : changed the groupwise account setup error
+ * mail-erros.xml: changed the groupwise account setup error
message
2004-08-16 Not Zed <NotZed Ximian com>
Index: mail/em-popup.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-popup.c,v
retrieving revision 1.26
diff -u -3 -r1.26 em-popup.c
--- mail/em-popup.c 28 Jul 2004 14:38:50 -0000 1.26
+++ mail/em-popup.c 16 Sep 2004 14:41:53 -0000
@@ -809,7 +809,7 @@
{ EM_POPUP_BAR, "10.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE },
{ EM_POPUP_ITEM, "10.part.00", N_("_Reply to sender"), G_CALLBACK(emp_part_popup_reply_sender), NULL, "stock_mail-reply" , EM_POPUP_PART_MESSAGE },
{ EM_POPUP_ITEM, "10.part.01", N_("Reply to _List"), G_CALLBACK(emp_part_popup_reply_list), NULL, NULL, EM_POPUP_PART_MESSAGE},
- { EM_POPUP_ITEM, "10.part.03", N_("Reply to _All"), G_CALLBACK(emp_part_popup_reply_all), NULL, "stock_mail-reply_to_all", EM_POPUP_PART_MESSAGE},
+ { EM_POPUP_ITEM, "10.part.03", N_("Reply to _All"), G_CALLBACK(emp_part_popup_reply_all), NULL, "stock_mail-reply-to-all", EM_POPUP_PART_MESSAGE},
{ EM_POPUP_BAR, "20.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE },
{ EM_POPUP_ITEM, "20.part.00", N_("_Forward"), G_CALLBACK(emp_part_popup_forward), NULL, "stock_mail-forward", EM_POPUP_PART_MESSAGE },
Index: mail/em-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-utils.c,v
retrieving revision 1.50.4.1
diff -u -3 -r1.50.4.1 em-utils.c
--- mail/em-utils.c 7 Sep 2004 14:22:12 -0000 1.50.4.1
+++ mail/em-utils.c 16 Sep 2004 14:41:54 -0000
@@ -1433,10 +1433,11 @@
/**
* em_utils_message_to_html:
- * @message:
- * @source:
+ * @message:
* @credits:
* @flags: EMFormatQuote flags
+ * @len:
+ * @source:
*
* Convert a message to html, quoting if the @credits attribution
* string is given.
@@ -1462,6 +1463,7 @@
GConfClient *gconf;
char *charset;
+ /* FIXME: we should be getting this from the current view, not the global setting. */
gconf = gconf_client_get_default ();
charset = gconf_client_get_string (gconf, "/apps/evolution/mail/display/charset", NULL);
em_format_set_default_charset ((EMFormat *) emfq, charset);
Index: mail/mail-account-gui.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-account-gui.c,v
retrieving revision 1.171.14.1
diff -u -3 -r1.171.14.1 mail-account-gui.c
--- mail/mail-account-gui.c 10 Sep 2004 03:03:19 -0000 1.171.14.1
+++ mail/mail-account-gui.c 16 Sep 2004 14:41:55 -0000
@@ -30,6 +30,7 @@
#include <string.h>
#include <stdarg.h>
+#include <sys/stat.h>
#include <gconf/gconf-client.h>
@@ -44,6 +45,11 @@
#include <gtk/gtknotebook.h>
#include <gtk/gtkhbox.h>
#include <gtk/gtkdialog.h>
+#ifdef USE_GTKFILECHOOSER
+#include <gtk/gtkfilechooser.h>
+#include <gtk/gtkradiobutton.h>
+#include <libgnomeui/gnome-file-entry.h>
+#endif
#include <e-util/e-account-list.h>
#include <e-util/e-signature-list.h>
@@ -1753,10 +1759,49 @@
}
#endif
+#ifdef USE_GTKFILECHOOSER
+static void
+select_file_toggled (GtkToggleButton *toggle, GtkFileChooser *chooser)
+{
+ GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER;
+
+ if (gtk_toggle_button_get_active (toggle))
+ action = GTK_FILE_CHOOSER_ACTION_OPEN;
+
+ gtk_file_chooser_set_action (chooser, action);
+}
+
+static void
+browse_clicked (GnomeFileEntry *fentry, MailAccountGui *gui)
+{
+ GtkWidget *check;
+ struct stat st;
+ char *path;
+
+ if (GTK_IS_FILE_CHOOSER (fentry->fsw)) {
+ check = gtk_check_button_new_with_label (_("Select individual file"));
+ g_signal_connect (check, "toggled", G_CALLBACK (select_file_toggled), fentry->fsw);
+ gtk_widget_show (check);
+ gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (fentry->fsw), check);
+
+ path = gnome_file_entry_get_full_path (fentry, TRUE);
+ if (path && stat (path, &st) == 0 && S_ISREG (st.st_mode))
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE);
+ else
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE);
+ gtk_toggle_button_toggled (GTK_TOGGLE_BUTTON (check));
+ g_free (path);
+ }
+
+ g_signal_handlers_disconnect_by_func (fentry, G_CALLBACK (fentry), gui);
+}
+#endif /* USE_GTKFILECHOOSER */
+
MailAccountGui *
mail_account_gui_new (EAccount *account, EMAccountPrefs *dialog)
{
MailAccountGui *gui;
+ GtkWidget *fileentry;
g_object_ref (account);
@@ -1764,6 +1809,15 @@
gui->account = account;
gui->dialog = dialog;
gui->xml = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", NULL, NULL);
+
+#ifdef USE_GTKFILECHOOSER
+ /* KLUDGE: If this Evolution was built with GtkFileChooser support, the user
+ * won't be able to create some types of local accounts because GtkFileChooser
+ * must be set to allow selection of one or the other of file vs folder.
+ * However, some providers allow the selection of files *or* folders. */
+ fileentry = glade_xml_get_widget (gui->xml, "source_path_entry");
+ g_signal_connect_after (fileentry, "browse-clicked", G_CALLBACK (browse_clicked), gui);
+#endif
/* Management */
gui->account_name = GTK_ENTRY (glade_xml_get_widget (gui->xml, "management_name"));
Index: mail/mail-config.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-config.c,v
retrieving revision 1.310
diff -u -3 -r1.310 mail-config.c
--- mail/mail-config.c 12 Aug 2004 06:53:45 -0000 1.310
+++ mail/mail-config.c 16 Sep 2004 14:41:55 -0000
@@ -970,8 +970,12 @@
id = m->msg.seq;
e_thread_put(mail_thread_new, (EMsg *)m);
+ /* FIXME: make this use e-error.
+ * It has to be modal otherwise we can get nasty re-entrancy whilst waiting for the
+ * subthread to complete.
+ * FIXME: make this whole function async to deal with this issue */
dialog = gtk_dialog_new_with_buttons(_("Connecting to server..."), window,
- GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
NULL);
label = gtk_label_new (_("Connecting to server..."));
Index: mail/message-list.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/message-list.c,v
retrieving revision 1.397
diff -u -3 -r1.397 message-list.c
--- mail/message-list.c 18 Aug 2004 02:29:32 -0000 1.397
+++ mail/message-list.c 16 Sep 2004 14:41:59 -0000
@@ -2689,6 +2689,10 @@
CamelFolderChangeInfo *changes = (CamelFolderChangeInfo *)event_data;
CamelFolder *folder = (CamelFolder *)o;
int i;
+
+ /* may be NULL if we're in the process of being destroyed */
+ if (ml->async_event == NULL)
+ return;
d(printf("folder changed event, changes = %p\n", changes));
if (changes) {
Index: shell/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1468.2.3
diff -u -3 -r1.1468.2.3 ChangeLog
--- shell/ChangeLog 13 Sep 2004 21:48:13 -0000 1.1468.2.3
+++ shell/ChangeLog 16 Sep 2004 14:42:00 -0000
@@ -18,6 +18,28 @@
get the configuration pages, the old one didn't include version
information properly.
+2004-09-13 Sivaiah Nallagatla <snallagatla novell com>
+
+ * e-shell.c (offline_procedure_finished_cb)
+ (e_shell_go_online) : set online status
+ for e_passwords
+ see #62856 (work around)
+
+2004-09-03 Not Zed <NotZed Ximian com>
+
+ ** See bug #61285.
+
+ * e-shell-settings-dialog.c (load_pages): use a better query to
+ get the configuration pages, the old one didn't include version
+ information properly.
+
+2004-08-27 Not Zed <NotZed Ximian com>
+
+ ** See bug #62856 (workaround only)
+
+ * e-shell.c (impl_Shell_setLineStatus, e_shell_construct): set the
+ online state on e_passwords.
+
2004-08-26 Rodney Dawes <dobey novell com>
* apps_evolution_shell.schemas.in.in: Don't translate the default
Index: shell/e-shell.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell.c,v
retrieving revision 1.252
diff -u -3 -r1.252 e-shell.c
--- shell/e-shell.c 1 Aug 2004 17:58:08 -0000 1.252
+++ shell/e-shell.c 16 Sep 2004 14:42:01 -0000
@@ -32,6 +32,7 @@
#include "e-util/e-dialog-utils.h"
#include "e-util/e-bconf-map.h"
#include "e-util/e-fsutils.h"
+#include "e-util/e-passwords.h"
#include "widgets/misc/e-error.h"
#include "e-shell-constants.h"
@@ -287,6 +288,9 @@
bonobo_object = bonobo_object_from_servant (servant);
shell = E_SHELL (bonobo_object);
+ /* let the password manager know out online status */
+ e_passwords_set_online(online);
+
if (online)
e_shell_go_online (shell, NULL);
else
@@ -661,6 +665,8 @@
g_assert_not_reached ();
}
+ e_passwords_set_online(start_online);
+
if (start_online)
e_shell_go_online (shell, NULL);
@@ -1057,6 +1063,7 @@
priv->line_status = E_SHELL_LINE_STATUS_OFFLINE;
else
priv->line_status = E_SHELL_LINE_STATUS_ONLINE;
+ e_passwords_set_online (!now_offline);
g_object_unref (priv->offline_handler);
priv->offline_handler = NULL;
@@ -1142,6 +1149,7 @@
}
priv->line_status = E_SHELL_LINE_STATUS_ONLINE;
+ e_passwords_set_online (TRUE);
g_signal_emit (shell, signals[LINE_STATUS_CHANGED], 0, priv->line_status);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
