Hello community,
here is the log from the commit of package evolution
checked in at Wed Apr 5 17:19:19 CEST 2006.
--------
--- GNOME/evolution/evolution.changes 2006-03-29 15:47:52.000000000 +0200
+++ evolution/evolution.changes 2006-04-05 10:42:29.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Apr 5 10:41:57 CEST 2006 - vvaradhan@novell.com
+
+- Fixes (bnc)
+ 160357 Busy serach is not working well for me - Chenthill
+ 161715 Evolution hangs when IMAP account is configured - Partha
+
+-------------------------------------------------------------------
New:
----
bnc-160357-busy-search-not-working.patch
bnc-161715-imap-lockup.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evolution.spec ++++++
--- /var/tmp/diff_new_pack.UbV44m/_old 2006-04-05 17:18:21.000000000 +0200
+++ /var/tmp/diff_new_pack.UbV44m/_new 2006-04-05 17:18:21.000000000 +0200
@@ -21,7 +21,7 @@
Autoreqprov: on
Obsoletes: bonobo-conf
Version: 2.6.0
-Release: 14
+Release: 17
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
@@ -65,6 +65,8 @@
Patch46: survive-dbus-restart.patch
Patch47: bnc-158107-no-notification-canceled-mtgs.patch
Patch48: bnc-160049-change-gw-passwd-no-auth-prompt.patch
+Patch49: bnc-160357-busy-search-not-working.patch
+Patch50: bnc-161715-imap-lockup.patch
URL: http://gnome.org/projects/evolution/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: filesystem gconf2 shared-mime-info
@@ -317,6 +319,8 @@
%patch46 -p0
%patch47 -p0
%patch48 -p0
+%patch49 -p0
+%patch50 -p0
%build
rename no nb po/no.*
@@ -438,6 +442,10 @@
%{prefix}/share/gnome-pilot/conduits/*.conduit
%changelog -n evolution
+* Wed Apr 05 2006 - vvaradhan@novell.com
+- Fixes (bnc)
+ 160357 Busy serach is not working well for me - Chenthill
+ 161715 Evolution hangs when IMAP account is configured - Partha
* Wed Mar 29 2006 - dgollub@suse.de
- removed pilot-link 0.12.0 API patch from spec file.
downgrade to pilot-link version 0.11.8 - see 161722
++++++ bnc-160357-busy-search-not-working.patch ++++++
Index: calendar/gui/e-meeting-store.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-store.c,v
retrieving revision 1.17
diff -u -p -r1.17 e-meeting-store.c
--- calendar/gui/e-meeting-store.c 8 Feb 2006 13:06:02 -0000 1.17
+++ calendar/gui/e-meeting-store.c 29 Mar 2006 09:00:32 -0000
@@ -60,6 +60,7 @@ struct _EMeetingStorePrivate {
guint callback_idle_id;
guint num_threads;
+ guint num_queries;
GAsyncQueue *async_queue;
};
@@ -611,6 +612,8 @@ ems_init (EMeetingStore *store)
priv->async_queue = g_async_queue_new ();
+ priv->num_queries = 0;
+
start_addressbook_server (store);
}
@@ -1177,6 +1180,7 @@ typedef struct {
char *email;
EMeetingAttendee *attendee;
EMeetingStoreQueueData *qdata;
+ EMeetingStore *store;
} FreeBusyAsyncData;
#define USER_SUB "%u"
@@ -1189,12 +1193,15 @@ freebusy_async (gpointer data)
EMeetingAttendee *attendee = fbd->attendee;
gchar *default_fb_uri;
static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
+ EMeetingStorePrivate *priv = fbd->store->priv;
if (fbd->client) {
/* FIXME this a work around for getting all th free busy information for the users
we should be able to get free busy asynchronously */
g_static_mutex_lock (&mutex);
+ priv->num_queries++;
e_cal_get_free_busy (fbd->client, fbd->users, fbd->startt, fbd->endt, &(fbd->fb_data), NULL);
+ priv->num_queries--;
g_static_mutex_unlock (&mutex);
g_list_foreach (fbd->users, (GFunc)g_free, NULL);
@@ -1234,9 +1241,11 @@ freebusy_async (gpointer data)
g_free (default_fb_uri);
default_fb_uri = replace_string (tmp_fb_uri, DOMAIN_SUB, split_email[1]);
+ priv->num_queries++;
gnome_vfs_async_open (&handle, default_fb_uri, GNOME_VFS_OPEN_READ,
GNOME_VFS_PRIORITY_DEFAULT, start_async_read,
fbd->qdata);
+ priv->num_queries--;
g_free (tmp_fb_uri);
g_strfreev (split_email);
@@ -1300,6 +1309,7 @@ refresh_busy_periods (gpointer data)
fbd->fb_data = NULL;
fbd->qdata = qdata;
fbd->fb_uri = priv->fb_uri;
+ fbd->store = store;
fbd->email = g_strdup (itip_strip_mailto (e_meeting_attendee_get_address (attendee)));
/* Check the server for free busy data */
@@ -1502,4 +1512,12 @@ e_meeting_store_refresh_busy_periods (EM
g_return_if_fail (E_IS_MEETING_STORE (store));
refresh_queue_add (store, row, start, end, call_back, data);
+}
+
+guint
+e_meeting_store_get_num_queries (EMeetingStore *store)
+{
+ g_return_if_fail (E_IS_MEETING_STORE (store));
+
+ return store->priv->num_queries;
}
Index: calendar/gui/e-meeting-store.h
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-store.h,v
retrieving revision 1.4
diff -u -p -r1.4 e-meeting-store.h
--- calendar/gui/e-meeting-store.h 18 Dec 2004 13:01:17 -0000 1.4
+++ calendar/gui/e-meeting-store.h 29 Mar 2006 09:00:32 -0000
@@ -106,6 +106,7 @@ void e_meeting_store_refresh_busy_period
EMeetingStoreRefreshCallback call_back,
gpointer data);
+guint e_meeting_store_get_num_queries (EMeetingStore *store);
G_END_DECLS
Index: calendar/gui/e-meeting-time-sel-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-time-sel-item.c,v
retrieving revision 1.16
diff -u -p -r1.16 e-meeting-time-sel-item.c
--- calendar/gui/e-meeting-time-sel-item.c 8 Feb 2006 13:06:02 -0000 1.16
+++ calendar/gui/e-meeting-time-sel-item.c 29 Mar 2006 09:00:32 -0000
@@ -141,6 +141,7 @@ e_meeting_time_selector_item_init (EMeet
/* Create the cursors. */
mts_item->normal_cursor = gdk_cursor_new (GDK_LEFT_PTR);
mts_item->resize_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
+ mts_item->busy_cursor = gdk_cursor_new (GDK_WATCH);
mts_item->last_cursor_set = NULL;
item->x1 = 0;
@@ -165,7 +166,11 @@ e_meeting_time_selector_item_destroy (Gt
gdk_cursor_destroy (mts_item->resize_cursor);
mts_item->resize_cursor = NULL;
}
-
+ if (mts_item->busy_cursor) {
+ gdk_cursor_destroy (mts_item->busy_cursor);
+ mts_item->busy_cursor = NULL;
+ }
+
if (GTK_OBJECT_CLASS (e_meeting_time_selector_item_parent_class)->destroy)
(*GTK_OBJECT_CLASS (e_meeting_time_selector_item_parent_class)->destroy)(object);
}
@@ -916,10 +921,13 @@ e_meeting_time_selector_item_motion_noti
x, y);
/* Determine which cursor should be used. */
- if (position == E_MEETING_TIME_SELECTOR_POS_NONE)
- cursor = mts_item->normal_cursor;
- else
+ if (position != E_MEETING_TIME_SELECTOR_POS_NONE)
cursor = mts_item->resize_cursor;
+ /* If the Main window shows busy cursor show the same */
+ else if (mts_item->mts->last_cursor_set == GDK_WATCH)
+ cursor = mts_item->busy_cursor;
+ else
+ cursor = mts_item->normal_cursor;
/* Only set the cursor if it is different to the last one we set. */
if (mts_item->last_cursor_set != cursor) {
@@ -987,4 +995,12 @@ e_meeting_time_selector_item_calculate_b
*end_x = e_meeting_time_selector_calculate_time_position (mts, &busy_periods_end) - x;
return TRUE;
+}
+
+void
+e_meeting_time_selector_item_set_normal_cursor (EMeetingTimeSelectorItem *mts_item)
+{
+ g_return_if_fail (IS_E_MEETING_TIME_SELECTOR_ITEM (mts_item));
+
+ gdk_window_set_cursor (GTK_WIDGET (GNOME_CANVAS_ITEM (mts_item)->canvas)->window, mts_item->normal_cursor);
}
Index: calendar/gui/e-meeting-time-sel-item.h
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-time-sel-item.h,v
retrieving revision 1.3
diff -u -p -r1.3 e-meeting-time-sel-item.h
--- calendar/gui/e-meeting-time-sel-item.h 27 Oct 2001 16:44:11 -0000 1.3
+++ calendar/gui/e-meeting-time-sel-item.h 29 Mar 2006 09:00:32 -0000
@@ -58,9 +58,10 @@ struct _EMeetingTimeSelectorItem
GdkGC *main_gc;
GdkGC *stipple_gc;
- /* The normal & resize cursors. */
+ /* The normal, resize & busy cursors . */
GdkCursor *normal_cursor;
GdkCursor *resize_cursor;
+ GdkCursor *busy_cursor;
/* This remembers the last cursor set on the window. */
GdkCursor *last_cursor_set;
@@ -73,6 +74,7 @@ struct _EMeetingTimeSelectorItemClass
};
GtkType e_meeting_time_selector_item_get_type (void);
+void e_meeting_time_selector_item_set_normal_cursor (EMeetingTimeSelectorItem *mts_item);
#endif /* _E_MEETING_TIME_SELECTOR_ITEM_H_ */
Index: calendar/gui/e-meeting-time-sel.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-time-sel.c,v
retrieving revision 1.74
diff -u -p -r1.74 e-meeting-time-sel.c
--- calendar/gui/e-meeting-time-sel.c 8 Feb 2006 13:06:02 -0000 1.74
+++ calendar/gui/e-meeting-time-sel.c 29 Mar 2006 09:00:32 -0000
@@ -59,6 +59,7 @@
#include