Hello community,
here is the log from the commit of package evolution
checked in at Sat Apr 22 01:24:46 CEST 2006.
--------
--- GNOME/evolution/evolution.changes 2006-04-19 23:13:43.000000000 +0200
+++ STABLE/evolution/evolution.changes 2006-04-21 09:03:55.000000000 +0200
@@ -1,0 +2,14 @@
+Fri Apr 21 08:42:35 CEST 2006 - sragavan@novell.com
+
+- Fixes (bnc)
+ 165714 - Fixes delegation of recurring events by adding delfrom param. (Harish)
+ 166006 - Fix to remove hang while creating groupwise account (Devashish)
+
+- Fixes (bgo)
+ 317422 - Fix to events hiding due to incorrect timezone information (Chenthill)
+ 325960 - Fix to show subscribed and public folders without restarting evolution (Sushma)
+
+- fix-exchange-menuitem.diff: Changed a menu item name in exchange plugin. (Srini)
+- fix-sendrecv.diff: Change 'Send Receive' button to 'Get Mail' (Srini)
+
+-------------------------------------------------------------------
New:
----
bgo-317422-evo-incorrect-timezone-info.diff
bgo-325960-evo-foldersubscription.diff
bnc-165714-evo-delegate-multiple-events.diff
bnc-166006-evo-hang-creating-groupwise-account.patch
bnc-167313-evo-editor-dialogs-flash.diff
fix-exchange-menuitem.diff
fix-sendrecv.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evolution.spec ++++++
--- /var/tmp/diff_new_pack.5xrJtb/_old 2006-04-22 01:24:33.000000000 +0200
+++ /var/tmp/diff_new_pack.5xrJtb/_new 2006-04-22 01:24:33.000000000 +0200
@@ -21,7 +21,7 @@
Autoreqprov: on
Obsoletes: bonobo-conf
Version: 2.6.0
-Release: 26
+Release: 32
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.6/%{name}-%{version}.tar.bz2
Source1: summerdance-about2.png
@@ -77,6 +77,13 @@
Patch58: bgo-338198-evo-fix-allow-modify-ab-name.patch
Patch59: evo-gw-default-color.diff
Patch60: bgo-338876-evo-fix-new-addressbook-create-fails.diff
+Patch61: bgo-317422-evo-incorrect-timezone-info.diff
+Patch62: bgo-325960-evo-foldersubscription.diff
+Patch63: bnc-166006-evo-hang-creating-groupwise-account.patch
+Patch64: bnc-167313-evo-editor-dialogs-flash.diff
+Patch65: fix-exchange-menuitem.diff
+Patch66: fix-sendrecv.diff
+Patch67: bnc-165714-evo-delegate-multiple-events.diff
URL: http://gnome.org/projects/evolution/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: filesystem gconf2 shared-mime-info
@@ -341,6 +348,13 @@
%patch58 -p0
%patch59 -p0
%patch60 -p0
+%patch61 -p0
+%patch62 -p0
+%patch63 -p0
+%patch64 -p0
+%patch65 -p0
+%patch66 -p0
+%patch67 -p0
%build
rename no nb po/no.*
@@ -388,10 +402,10 @@
meinproc --check --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || :
done
cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} $RPM_BUILD_ROOT/opt/gnome/share/applications/
-%suse_update_desktop_file -D "evolution-2.6/evolution-2.6.xml" -G Mail evolution-email
-%suse_update_desktop_file -D "evolution-2.6/evolution-2.6.xml" evolution-addressbook
-%suse_update_desktop_file -D "evolution-2.6/evolution-2.6.xml" -G "Schedule Manager" evolution-calendar
-%suse_update_desktop_file -D "evolution-2.6/evolution-2.6.xml" -G "Task List" evolution-tasklist
+%suse_update_desktop_file -G "Mail" -D "evolution-2.6/evolution-2.6.xml?usage-mail" evolution-email
+%suse_update_desktop_file -G "Address Book" -D "evolution-2.6/evolution-2.6.xml?usage-contact" evolution-addressbook
+%suse_update_desktop_file -G "Schedule Manager" -D "evolution-2.6/evolution-2.6.xml?usage-calendar" evolution-calendar
+%suse_update_desktop_file -G "Task List" -D "evolution-2.6/evolution-2.6.xml?usage-calendar-todo" evolution-tasklist
mkdir -p $RPM_BUILD_ROOT/opt/gnome/share/pixmaps/
cp %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT/opt/gnome/share/pixmaps/
%find_lang evolution-2.6
@@ -462,6 +476,15 @@
%{prefix}/share/gnome-pilot/conduits/*.conduit
%changelog -n evolution
+* Fri Apr 21 2006 - sragavan@novell.com
+- Fixes (bnc)
+ 165714 - Fixes delegation of recurring events by adding delfrom param. (Harish)
+ 166006 - Fix to remove hang while creating groupwise account (Devashish)
+- Fixes (bgo)
+ 317422 - Fix to events hiding due to incorrect timezone information (Chenthill)
+ 325960 - Fix to show subscribed and public folders without restarting evolution (Sushma)
+- fix-exchange-menuitem.diff: Changed a menu item name in exchange plugin. (Srini)
+- fix-sendrecv.diff: Change 'Send Receive' button to 'Get Mail' (Srini)
* Wed Apr 19 2006 - fejj@suse.de
- Added bnc-159736-dbus-restart.patch to the build which replaces
survive-dbus-restarts.patch (it solves the same problem plus more
++++++ bgo-317422-evo-incorrect-timezone-info.diff ++++++
Index: calendar/gui/e-cal-model.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model.c,v
retrieving revision 1.73
diff -u -p -r1.73 e-cal-model.c
--- calendar/gui/e-cal-model.c 4 Apr 2006 02:42:59 -0000 1.73
+++ calendar/gui/e-cal-model.c 20 Apr 2006 07:13:52 -0000
@@ -2107,6 +2107,27 @@ e_cal_model_set_instance_times (ECalMode
if (start_time.zone)
zone = start_time.zone;
+ else {
+ icalparameter *param = NULL;
+ icalproperty *prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DTSTART_PROPERTY);
+
+
+ if (prop) {
+ param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER);
+
+ if (param) {
+ const char *tzid = NULL;
+ icaltimezone *st_zone = NULL;
+
+ tzid = icalparameter_get_tzid (param);
+
+ e_cal_get_timezone (comp_data->client, tzid, &st_zone, NULL);
+
+ if (st_zone)
+ zone = st_zone;
+ }
+ }
+ }
comp_data->instance_start = icaltime_as_timet_with_zone (start_time, zone);
Index: calendar/gui/e-calendar-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-view.c,v
retrieving revision 1.118
diff -u -p -r1.118 e-calendar-view.c
--- calendar/gui/e-calendar-view.c 3 Apr 2006 08:36:50 -0000 1.118
+++ calendar/gui/e-calendar-view.c 20 Apr 2006 07:13:53 -0000
@@ -2054,12 +2054,12 @@ tooltip_grab (GtkWidget *tooltip, GdkEve
}
static char *
-get_label (struct icaltimetype *tt)
+get_label (struct icaltimetype *tt, icaltimezone *f_zone, icaltimezone *t_zone)
{
char buffer[1000];
struct tm tmp_tm;
- tmp_tm = icaltimetype_to_tm (tt);
+ tmp_tm = icaltimetype_to_tm_with_zone (tt, f_zone, t_zone);
e_time_format_date_and_time (&tmp_tm,
calendar_config_get_24_hour_format (),
FALSE, FALSE,
@@ -2091,13 +2091,16 @@ e_calendar_view_get_tooltips (ECalendarV
GtkStyle *style = gtk_widget_get_default_style ();
GtkWidget *widget = (GtkWidget *) g_object_get_data (G_OBJECT (data->cal_view), "tooltip-window");
ECalComponent *newcomp = e_cal_component_new ();
- icaltimezone *zone;
+ icaltimezone *zone, *default_zone;
+ ECal *client = NULL;
/* Delete any stray tooltip if left */
if (widget)
gtk_widget_destroy (widget);
pevent = data->get_view_event (data->cal_view, data->day, data->event_num);
+ client = pevent->comp_data->client;
+ default_zone = e_calendar_view_get_timezone (data->cal_view);
clone_comp = icalcomponent_new_clone (pevent->comp_data->icalcomp);
if (!e_cal_component_set_icalcomponent (newcomp, clone_comp))
@@ -2173,19 +2176,19 @@ e_calendar_view_get_tooltips (ECalendarV
if (dtstart.tzid) {
zone = icalcomponent_get_timezone (e_cal_component_get_icalcomponent (newcomp), dtstart.tzid);
- } else {
- zone = NULL;
- }
- t_start = icaltime_as_timet_with_zone (*dtstart.value, zone);
+ if (!zone)
+ e_cal_get_timezone (client, dtstart.tzid, &zone, NULL);
+
+ if (!zone)
+ zone = default_zone;
- if (dtend.tzid) {
- zone = icalcomponent_get_timezone (e_cal_component_get_icalcomponent (newcomp), dtend.tzid);
} else {
zone = NULL;
}
+ t_start = icaltime_as_timet_with_zone (*dtstart.value, zone);
t_end = icaltime_as_timet_with_zone (*dtend.value, zone);
- tmp1 = get_label(dtstart.value);
+ tmp1 = get_label(dtstart.value, zone, default_zone);
tmp = calculate_time (t_start, t_end);
/* To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"*/
++++++ bgo-325960-evo-foldersubscription.diff ++++++
Index: plugins/exchange-operations/exchange-folder-subscription.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-folder-subscription.c,v
retrieving revision 1.8
diff -u -p -r1.8 exchange-folder-subscription.c
--- plugins/exchange-operations/exchange-folder-subscription.c 3 Feb 2006 10:27:26 -0000 1.8
+++ plugins/exchange-operations/exchange-folder-subscription.c 21 Apr 2006 04:09:05 -0000
@@ -215,6 +215,7 @@ subscribe_to_folder (GtkWidget *dialog,
g_free (folder_name);
switch (result) {
case EXCHANGE_ACCOUNT_FOLDER_OK:
+ exchange_account_rescan_tree (subscription_info->account);
break;
case EXCHANGE_ACCOUNT_FOLDER_ALREADY_EXISTS:
e_error_run (NULL, ERROR_DOMAIN ":folder-exists-error", NULL);
@@ -265,6 +266,11 @@ create_folder_subscription_dialog (Excha
GladeXML *glade_xml;
GtkWidget *dialog;
SubscriptionInfo *subscription_info;
+ int mode;
+
+ exchange_account_is_offline (account, &mode);
+ if (mode == OFFLINE_MODE)
+ return FALSE;
subscription_info = g_new0 (SubscriptionInfo, 1);
subscription_info->account = account;
++++++ bnc-165714-evo-delegate-multiple-events.diff ++++++
Index: calendar/gui/dialogs/event-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/event-page.c,v
retrieving revision 1.110.2.1
diff -u -p -r1.110.2.1 event-page.c
--- calendar/gui/dialogs/event-page.c 6 Apr 2006 08:50:49 -0000 1.110.2.1
+++ calendar/gui/dialogs/event-page.c 21 Apr 2006 06:38:00 -0000
@@ -1508,7 +1508,6 @@ event_page_fill_component (CompEditorPag
set_attendees (comp, e_meeting_store_get_attendees (priv->model));
}
-
return TRUE;
}
@@ -1856,7 +1855,8 @@ attendee_added_cb (EMeetingListView *eml
delegator = e_meeting_store_find_attendee (priv->model, delegator_id, NULL);
e_meeting_attendee_set_delto (delegator,
g_strdup (e_meeting_attendee_get_address (ia)));
-
+
+ e_meeting_attendee_set_delfrom (ia, g_strdup_printf ("MAILTO:%s", delegator_id));
gtk_widget_set_sensitive (priv->invite, FALSE);
gtk_widget_set_sensitive (priv->add, FALSE);
gtk_widget_set_sensitive (priv->edit, FALSE);
@@ -3184,7 +3184,7 @@ set_attendees (ECalComponent *comp, cons
comp_attendees = g_slist_reverse (comp_attendees);
e_cal_component_set_attendee_list (comp, comp_attendees);
-
+
for (l = comp_attendees; l != NULL; l = l->next)
g_free (l->data);
g_slist_free (comp_attendees);
++++++ bnc-166006-evo-hang-creating-groupwise-account.patch ++++++
--- ../temp/evolution/evolution-2.6.0/plugins/groupwise-account-setup/camel-gw-listener.c 2006-04-20 15:51:29.000000000 +0530
+++ plugins/groupwise-account-setup/camel-gw-listener.c 2006-04-20 14:34:38.000000000 +0530
@@ -378,13 +378,13 @@ modify_esource (const char* conf_key, Gw
adds the new account info to groupwise_accounts list */
static void
-add_calendar_tasks_sources (EAccount *account)
+add_calendar_tasks_sources (GwAccountInfo *info)
{
CamelURL *url;
- url = camel_url_new (account->source->url, NULL);
- add_esource ("/apps/evolution/calendar/sources", account->name, _("Calendar"), url);
- add_esource ("/apps/evolution/tasks/sources", account->name, _("Tasks"), url);
+ url = camel_url_new (info->source_url, NULL);
+ add_esource ("/apps/evolution/calendar/sources", info->name, _("Calendar"), url);
+ add_esource ("/apps/evolution/tasks/sources", info->name, _("Tasks"), url);
camel_url_free (url);
@@ -628,9 +628,7 @@ add_addressbook_sources (EAccount *accou
client = gconf_client_get_default ();
list = e_source_list_new_for_gconf (client, "/apps/evolution/addressbook/sources" );
group = e_source_group_new (account->name, base_uri);
- GThread *t;
- t = g_thread_create ((GThreadFunc) get_addressbook_names_from_server, account->source->url, TRUE, NULL);
- books_list = (GList *) g_thread_join (t);
+ books_list = get_addressbook_names_from_server (account->source->url);
temp_list = books_list;
if (!temp_list)
return FALSE;
@@ -685,8 +683,7 @@ add_addressbook_sources (EAccount *accou
if (!is_frequent_contacts) {
/* display warning message */
e_error_run (NULL, "addressbook:gw-book-list-init", NULL);
- }
- add_calendar_tasks_sources(account);
+ }
return TRUE;
}
@@ -833,6 +830,7 @@ account_added (EAccountList *account_lis
GwAccountInfo *info;
EAccount *parent;
+ gboolean status;
CamelURL *parent_url;
if (!is_groupwise_account (account))
@@ -851,7 +849,10 @@ account_added (EAccountList *account_lis
parent_url = camel_url_new (e_account_get_string(parent, E_ACCOUNT_SOURCE_URL), NULL);
add_proxy_sources (info, parent_url->user);
} else {
- g_thread_create ((GThreadFunc) add_addressbook_sources, account, TRUE, NULL);
+ status = add_addressbook_sources (account);
+
+ if (status)
+ add_calendar_tasks_sources (info);
}
groupwise_accounts = g_list_append (groupwise_accounts, info);
}
++++++ bnc-167313-evo-editor-dialogs-flash.diff ++++++
Index: calendar/gui/dialogs/event-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/event-editor.c,v
retrieving revision 1.79
diff -u -p -r1.79 event-editor.c
--- calendar/gui/dialogs/event-editor.c 6 Mar 2006 15:59:00 -0000 1.79
+++ calendar/gui/dialogs/event-editor.c 20 Apr 2006 05:53:31 -0000
@@ -559,8 +559,8 @@ event_editor_construct (EventEditor *ee,
gtk_object_sink (GTK_OBJECT (priv->recur_page));
gtk_container_add ((GtkContainer *) (GTK_DIALOG (priv->recur_window)->vbox),
comp_editor_page_get_widget (COMP_EDITOR_PAGE (priv->recur_page)));
- gtk_widget_show_all (priv->recur_window);
gtk_widget_hide (priv->recur_window);
+ gtk_widget_show_all (GTK_DIALOG (priv->recur_window)->vbox);
comp_editor_append_page (COMP_EDITOR (ee), COMP_EDITOR_PAGE (priv->recur_page), NULL, FALSE);
if (priv->is_meeting) {
@@ -577,8 +578,8 @@ event_editor_construct (EventEditor *ee,
g_object_ref (priv->sched_page);
gtk_object_sink (GTK_OBJECT (priv->sched_page));
gtk_container_add (GTK_CONTAINER (GTK_DIALOG(priv->sched_window)->vbox), comp_editor_page_get_widget (COMP_EDITOR_PAGE (priv->sched_page)));
- gtk_widget_show_all (priv->sched_window);
- gtk_widget_hide (priv->sched_window);
+ gtk_widget_hide (priv->sched_window);
+ gtk_widget_show_all (GTK_DIALOG(priv->sched_window)->vbox);
g_signal_connect (priv->sched_window, "response", G_CALLBACK(gtk_widget_hide), NULL);
g_signal_connect ((GtkWidget *) priv->sched_window, "delete-event", G_CALLBACK(window_delete_event), NULL);
Index: calendar/gui/dialogs/event-page.glade
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/event-page.glade,v
retrieving revision 1.37
diff -u -p -r1.37 event-page.glade
--- calendar/gui/dialogs/event-page.glade 5 Feb 2006 21:16:06 -0000 1.37
+++ calendar/gui/dialogs/event-page.glade 20 Apr 2006 05:53:33 -0000
@@ -956,7 +956,7 @@
<widget class="GtkDialog" id="alarm-dialog">
<property name="border_width">4</property>
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="title" translatable="yes">Alarms</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
Index: calendar/gui/dialogs/task-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/task-editor.c,v
retrieving revision 1.94
diff -u -p -r1.94 task-editor.c
--- calendar/gui/dialogs/task-editor.c 9 Feb 2006 04:02:49 -0000 1.94
+++ calendar/gui/dialogs/task-editor.c 20 Apr 2006 05:53:33 -0000
@@ -439,8 +439,8 @@ task_editor_construct (TaskEditor *te, E
gtk_object_sink (GTK_OBJECT (priv->task_details_page));
gtk_container_add ((GtkContainer *) GTK_DIALOG(priv->task_details_window)->vbox,
comp_editor_page_get_widget ((CompEditorPage *)priv->task_details_page));
- gtk_widget_show_all (priv->task_details_window);
- gtk_widget_hide (priv->task_details_window);
+ gtk_widget_hide (priv->task_details_window);
+ gtk_widget_show_all (GTK_DIALOG(priv->task_details_window)->vbox);
comp_editor_append_page (editor, COMP_EDITOR_PAGE (priv->task_details_page), NULL, FALSE);
if (!e_cal_is_read_only (client, &read_only, NULL))
++++++ fix-exchange-menuitem.diff ++++++
Index: plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml,v
retrieving revision 1.2
diff -u -p -r1.2 org-gnome-exchange-ab-subscription.xml
--- plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml 10 Jan 2006 18:38:04 -0000 1.2
+++ plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml 20 Apr 2006 10:18:10 -0000
@@ -1,6 +1,6 @@
<Root>
<commands>
-