Hello community,
here is the log from the commit of package evolution
checked in at Tue May 9 00:22:08 CEST 2006.
--------
--- GNOME/evolution/evolution.changes 2006-05-02 22:16:28.000000000 +0200
+++ STABLE/evolution/evolution.changes 2006-05-05 06:28:35.000000000 +0200
@@ -1,0 +2,13 @@
+Fri May 5 06:24:24 CEST 2006 - sragavan@novell.com
+
+- Fixes (bgo)
+ 328808 - Fixes a bug where it shows empty participants (Chen)
+
+ (bnc)
+ 167330 - Fixes a bug to show alarm for groupwise (Harish)
+ 170102 - Fixes a alarm crash (Srini)
+ 168697 - Fixes a alarm crash (Srini)
+ 171592 - Fixes a alarm crash (Srini)
+ 170076 - Fixes a wrong mime lookup for a attachment (Srini)
+
+------------------------------------------------------------------
New:
----
bgo-328808-evo-blank-participants.diff
bnc-167330-evo-default-alarm.diff
bnc-170076-evo-wrong-mime-lookup.diff
bnc-170102-168697-evo-alarm-crashes.diff
bnc-171592-evo-alarm-crash.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evolution.spec ++++++
--- /var/tmp/diff_new_pack.hbM1mc/_old 2006-05-09 00:21:55.000000000 +0200
+++ /var/tmp/diff_new_pack.hbM1mc/_new 2006-05-09 00:21:55.000000000 +0200
@@ -21,7 +21,7 @@
Autoreqprov: on
Obsoletes: bonobo-conf
Version: 2.6.0
-Release: 42
+Release: 45
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
@@ -88,6 +88,11 @@
Patch69: bnc-339266-evo-folder-size-offline.diff
Patch70: nameselectorlist-enable.diff
Patch71: bnc-167638.patch
+Patch72: bgo-328808-evo-blank-participants.diff
+Patch73: bnc-167330-evo-default-alarm.diff
+Patch74: bnc-170102-168697-evo-alarm-crashes.diff
+Patch75: bnc-170076-evo-wrong-mime-lookup.diff
+Patch76: bnc-171592-evo-alarm-crash.diff
URL: http://gnome.org/projects/evolution/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: filesystem gconf2 shared-mime-info
@@ -363,6 +368,11 @@
%patch69
%patch70
%patch71
+%patch72
+%patch73
+%patch74
+%patch75
+%patch76
%build
rename no nb po/no.*
@@ -484,6 +494,15 @@
%{prefix}/share/gnome-pilot/conduits/*.conduit
%changelog -n evolution
+* Fri May 05 2006 - sragavan@novell.com
+- Fixes (bgo)
+ 328808 - Fixes a bug where it shows empty participants (Chen)
+ (bnc)
+ 167330 - Fixes a bug to show alarm for groupwise (Harish)
+ 170102 - Fixes a alarm crash (Srini)
+ 168697 - Fixes a alarm crash (Srini)
+ 171592 - Fixes a alarm crash (Srini)
+ 170076 - Fixes a wrong mime lookup for a attachment (Srini)
* Tue May 02 2006 - fejj@suse.de
- Added bnc-167638.patch: Fixes the long Evolution quit times when
the user tries to close Evolution when it is in the middle of
++++++ bgo-328808-evo-blank-participants.diff ++++++
Index: calendar/gui/e-meeting-list-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-list-view.c,v
retrieving revision 1.30
diff -u -p -r1.30 e-meeting-list-view.c
--- calendar/gui/e-meeting-list-view.c 28 Mar 2006 10:49:41 -0000 1.30
+++ calendar/gui/e-meeting-list-view.c 5 Apr 2006 12:37:10 -0000
@@ -873,3 +873,35 @@ e_meeting_list_view_set_editable (EMeeti
g_hash_table_foreach (priv->renderers, change_edit_cols_for_organizer, GINT_TO_POINTER (edit_level));
}
+ENameSelector *
+e_meeting_list_view_get_name_selector (EMeetingListView *lview)
+{
+ EMeetingListViewPrivate *priv;
+
+ g_return_val_if_fail (lview != NULL, NULL);
+ g_return_val_if_fail (E_IS_MEETING_LIST_VIEW (lview), NULL);
+
+ priv = lview->priv;
+
+ return priv->name_selector;
+}
+
+void
+e_meeting_list_view_set_name_selector (EMeetingListView *lview, ENameSelector *name_selector)
+{
+ EMeetingListViewPrivate *priv;
+
+ g_return_if_fail (lview != NULL);
+ g_return_if_fail (E_IS_MEETING_LIST_VIEW (lview));
+
+ priv = lview->priv;
+
+ if (priv->name_selector) {
+ g_object_unref (priv->name_selector);
+ priv->name_selector = NULL;
+ }
+
+ priv->name_selector = g_object_ref (name_selector);
+}
+
+
Index: calendar/gui/e-meeting-list-view.h
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-list-view.h,v
retrieving revision 1.5
diff -u -p -r1.5 e-meeting-list-view.h
--- calendar/gui/e-meeting-list-view.h 16 Jan 2006 16:22:34 -0000 1.5
+++ calendar/gui/e-meeting-list-view.h 5 Apr 2006 12:37:10 -0000
@@ -25,6 +25,7 @@
#include
#include "e-meeting-store.h"
+#include
G_BEGIN_DECLS
@@ -64,6 +65,8 @@ void e_meeting_list_view_invite_ot
void e_meeting_list_view_remove_attendee_from_name_selector (EMeetingListView *view, EMeetingAttendee *ma);
void e_meeting_list_view_add_attendee_to_name_selector (EMeetingListView *view, EMeetingAttendee *ma);
void e_meeting_list_view_set_editable (EMeetingListView *lview, gboolean set);
+ENameSelector * e_meeting_list_view_get_name_selector (EMeetingListView *lview);
+void e_meeting_list_view_set_name_selector (EMeetingListView *lview, ENameSelector *name_selector);
G_END_DECLS
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 5 Apr 2006 12:37:12 -0000
@@ -360,7 +360,7 @@ menu_action_freebusy_cmd (BonoboUICompon
const char *path)
{
EventEditor *ee = (EventEditor *) data;
-
+
gtk_widget_show (ee->priv->sched_window);
}
@@ -569,10 +569,12 @@ event_editor_construct (EventEditor *ee,
comp_editor_set_group_item (COMP_EDITOR (ee), TRUE);
if ((flags & COMP_EDITOR_USER_ORG) || (flags & COMP_EDITOR_DELEGATE)|| (flags & COMP_EDITOR_NEW_ITEM)) {
+ ENameSelector *name_selector;
+
priv->sched_window = gtk_dialog_new_with_buttons (_("Free/Busy"),
- (GtkWindow *) ee, GTK_DIALOG_MODAL,
- "gtk-close", GTK_RESPONSE_CLOSE,
- NULL);
+ (GtkWindow *) ee, GTK_DIALOG_MODAL,
+ "gtk-close", GTK_RESPONSE_CLOSE,
+ NULL);
priv->sched_page = schedule_page_new (priv->model);
g_object_ref (priv->sched_page);
gtk_object_sink (GTK_OBJECT (priv->sched_page));
@@ -582,8 +584,11 @@ event_editor_construct (EventEditor *ee,
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);
+ name_selector = event_page_get_name_selector (priv->event_page);
+ schedule_page_set_name_selector (priv->sched_page, name_selector);
comp_editor_append_page (COMP_EDITOR (ee), COMP_EDITOR_PAGE (priv->sched_page), NULL, FALSE);
- } else
+
+ } else
bonobo_ui_component_set_prop (editor->uic, "/commands/ActionFreeBusy", "hidden", "1", NULL);
event_page_set_meeting (priv->event_page, TRUE);
Index: calendar/gui/dialogs/event-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/event-page.c,v
retrieving revision 1.110
diff -u -p -r1.110 event-page.c
--- calendar/gui/dialogs/event-page.c 4 Mar 2006 10:41:20 -0000 1.110
+++ calendar/gui/dialogs/event-page.c 5 Apr 2006 12:37:15 -0000
@@ -3207,3 +3207,16 @@ event_page_get_cancel_comp (EventPage *p
return e_cal_component_clone (priv->comp);
}
+
+ENameSelector *
+event_page_get_name_selector (EventPage *epage)
+{
+ EventPagePrivate *priv;
+
+ g_return_val_if_fail (epage != NULL, NULL);
+ g_return_val_if_fail (IS_EVENT_PAGE (epage), NULL);
+
+ priv = epage->priv;
+
+ return e_meeting_list_view_get_name_selector (priv->list_view);
+}
Index: calendar/gui/dialogs/event-page.h
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/event-page.h,v
retrieving revision 1.10
diff -u -p -r1.10 event-page.h
--- calendar/gui/dialogs/event-page.h 16 Nov 2005 13:53:47 -0000 1.10
+++ calendar/gui/dialogs/event-page.h 5 Apr 2006 12:37:15 -0000
@@ -77,6 +77,7 @@ void event_page_set_view_role (EventPage
void event_page_set_view_status (EventPage *epage, gboolean state);
void event_page_set_view_type (EventPage *epage, gboolean state);
void event_page_set_view_rvsp (EventPage *epage, gboolean state);
+ENameSelector *event_page_get_name_selector (EventPage *epage);
Index: calendar/gui/dialogs/schedule-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/schedule-page.c,v
retrieving revision 1.38
diff -u -p -r1.38 schedule-page.c
--- calendar/gui/dialogs/schedule-page.c 8 Feb 2006 13:06:24 -0000 1.38
+++ calendar/gui/dialogs/schedule-page.c 5 Apr 2006 12:37:16 -0000
@@ -470,6 +470,19 @@ schedule_page_new (EMeetingStore *ems)
return spage;
}
+void
+schedule_page_set_name_selector (SchedulePage *spage, ENameSelector *name_selector)
+{
+ SchedulePagePrivate *priv;
+
+ g_return_if_fail (spage != NULL);
+ g_return_if_fail (IS_SCHEDULE_PAGE (spage));
+
+ priv = spage->priv;
+
+ e_meeting_list_view_set_name_selector (priv->sel->list_view, name_selector);
+}
+
static void
times_changed_cb (GtkWidget *widget, gpointer data)
{
Index: calendar/gui/dialogs/schedule-page.h
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/schedule-page.h,v
retrieving revision 1.5
diff -u -p -r1.5 schedule-page.h
--- calendar/gui/dialogs/schedule-page.h 30 Sep 2003 22:39:04 -0000 1.5
+++ calendar/gui/dialogs/schedule-page.h 5 Apr 2006 12:37:16 -0000
@@ -23,6 +23,7 @@
#include "../e-meeting-store.h"
#include "comp-editor-page.h"
+#include
G_BEGIN_DECLS
@@ -51,6 +52,7 @@ typedef struct {
GtkType schedule_page_get_type (void);
SchedulePage *schedule_page_construct (SchedulePage *mpage, EMeetingStore *ems);
SchedulePage *schedule_page_new (EMeetingStore *ems);
+void schedule_page_set_name_selector (SchedulePage *spage, ENameSelector *name_selector);
++++++ bnc-167330-evo-default-alarm.diff ++++++
Index: calendar/gui/apps_evolution_calendar.schemas.in.in
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/apps_evolution_calendar.schemas.in.in,v
retrieving revision 1.17
diff -u -p -r1.17 apps_evolution_calendar.schemas.in.in
--- calendar/gui/apps_evolution_calendar.schemas.in.in 30 Dec 2005 05:01:19 -0000 1.17
+++ calendar/gui/apps_evolution_calendar.schemas.in.in 25 Apr 2006 09:02:37 -0000
@@ -412,7 +412,7 @@
<applyto>/apps/evolution/calendar/other/use_default_reminder</applyto>
<owner>evolution-calendar</owner>
<type>bool</type>
- <default>false</default>
+ <default>true</default>
<locale name="C">
<short>Default appointment reminder</short>
<long>Whether to set a default reminder for appointments.</long>
++++++ bnc-170076-evo-wrong-mime-lookup.diff ++++++
Index: mail/em-popup.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-popup.c,v
retrieving revision 1.40
diff -u -p -r1.40 em-popup.c
--- mail/em-popup.c 26 Jan 2006 16:14:54 -0000 1.40
+++ mail/em-popup.c 2 May 2006 06:29:52 -0000
@@ -707,7 +707,7 @@ emp_standard_menu_factory(EPopup *emp, v
break; }
case EM_POPUP_TARGET_PART: {
EMPopupTargetPart *t = (EMPopupTargetPart *)emp->target;
- mime_type = g_strdup(t->mime_type);
+ mime_type = camel_data_wrapper_get_mime_type((CamelDataWrapper *)t->part);
filename = camel_mime_part_get_filename(t->part);
items = emp_standard_object_popups;
++++++ bnc-170102-168697-evo-alarm-crashes.diff ++++++
Index: calendar/gui/alarm-notify/alarm-queue.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-queue.c,v
retrieving revision 1.99
diff -u -p -r1.99 alarm-queue.c
--- calendar/gui/alarm-notify/alarm-queue.c 21 Apr 2006 19:38:16 -0000 1.99
+++ calendar/gui/alarm-notify/alarm-queue.c 3 May 2006 06:35:44 -0000
@@ -192,6 +192,7 @@ static void remove_client_alarms (Client
static void update_cqa (CompQueuedAlarms *cqa, ECalComponent *comp);
static void update_qa (ECalComponentAlarms *alarms, QueuedAlarm *qa);
static void tray_list_remove_cqa (CompQueuedAlarms *cqa);
+static void on_dialog_objs_removed_cb (ECal *client, GList *objects, gpointer data);
/* Alarm queue engine */
@@ -708,7 +709,7 @@ query_objects_changed_async (EThread *e,
if (!found) {
d(printf("%s:%d (query_objects_changed_async) - No Alarm found for client %d\n",__FILE__, __LINE__, ca->client));
- tray_list_remove_cqa (lookup_comp_queued_alarms (ca, l->data));
+ tray_list_remove_cqa (lookup_comp_queued_alarms (ca, id));
remove_comp (ca, id);
g_hash_table_remove (ca->uid_alarms_hash, id);
e_cal_component_free_id (id);
@@ -970,6 +971,8 @@ free_tray_icon_data (TrayIconData *tray_
g_object_unref (tray_data->client);
tray_data->client = NULL;
+ g_signal_handlers_disconnect_matched (tray_data->query, G_SIGNAL_MATCH_FUNC,
+ 0, 0, NULL, on_dialog_objs_removed_cb, NULL);
g_object_unref (tray_data->query);
tray_data->query = NULL;
++++++ bnc-171592-evo-alarm-crash.diff ++++++
Index: calendar/gui/alarm-notify/alarm-notify-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-notify-dialog.c,v
retrieving revision 1.44
diff -u -p -r1.44 alarm-notify-dialog.c
--- calendar/gui/alarm-notify/alarm-notify-dialog.c 8 Feb 2006 13:06:23 -0000 1.44
+++ calendar/gui/alarm-notify/alarm-notify-dialog.c 3 May 2006 09:28:51 -0000
@@ -140,12 +140,17 @@ dialog_response_cb (GtkDialog *dialog, g
GtkTreeModel *model = NULL;
AlarmFuncInfo *funcinfo = NULL;
GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (an->treeview));
+
+ if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
+ gtk_tree_model_get (model, &iter, ALARM_FUNCINFO_COLUMN, &funcinfo, -1);
+ }
- if (gtk_tree_selection_get_selected (selection, &model, &iter))
- gtk_tree_model_get (model, &iter, ALARM_FUNCINFO_COLUMN, &funcinfo, -1);
-
+ if (!funcinfo) {
+ GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (an->treeview));
+ gboolean valid = gtk_tree_model_get_iter_first (model, &iter);
+ gtk_tree_model_get (model, &iter, ALARM_FUNCINFO_COLUMN, &funcinfo, -1);
+ }
g_return_if_fail (funcinfo);
-
switch (response_id) {
case GTK_RESPONSE_CLOSE:
case GTK_RESPONSE_DELETE_EVENT:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...