rpms/evolution/devel evolution-2.2.2-commit-enter-on-calendar.patch, 1.1, 1.2 evolution.spec, 1.106, 1.107

[fedora-cvs-commits at redhat.com]

Author: dmalcolm

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9314

Modified Files:
	evolution-2.2.2-commit-enter-on-calendar.patch evolution.spec 
Log Message:
* Mon Dec 19 2005 David Malcolm <dmalcolm at redhat.com> - 2.5.3-1
- 2.5.3
- Updated patch 106 (evolution-2.2.2-commit-enter-on-calendar.patch) so that it
  still applies cleanly



evolution-2.2.2-commit-enter-on-calendar.patch:
 e-day-view.c  |  106 ++++++++++++++++++++++++++++++++++++++--------------------
 e-week-view.c |   71 +++++++++++++++++++++++++++-----------
 2 files changed, 122 insertions(+), 55 deletions(-)

Index: evolution-2.2.2-commit-enter-on-calendar.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.2.2-commit-enter-on-calendar.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.2.2-commit-enter-on-calendar.patch	26 May 2005 05:49:00 -0000	1.1
+++ evolution-2.2.2-commit-enter-on-calendar.patch	19 Dec 2005 21:59:47 -0000	1.2
@@ -29,7 +29,7 @@
  
  			e_day_view_update_event_label (day_view, day, event_num);
  		}
-@@ -5622,44 +5630,72 @@
+@@ -5622,46 +5630,74 @@
  
  
  static gboolean
@@ -40,6 +40,8 @@
 +{
 +	gboolean retval = FALSE;
 +
++	tooltip_destroy (day_view, item);
++
 +	if (keyval == GDK_Return) {
 +		EText *text = E_TEXT (item);
 +		gint new_pos = 0;
@@ -100,8 +102,10 @@
  {
  	switch (event->type) {
 -	case GDK_KEY_PRESS:
+-		tooltip_destroy (day_view, item);
 -		if (event && event->key.keyval == GDK_Return) {
 -			day_view->resize_event_num = -1;
+-			day_view->resize_event_num = -1;
 -
 -			/* We set the keyboard focus to the EDayView, so the
 -			   EText item loses it and stops the edit. */
@@ -157,7 +161,7 @@
  
  	}
  
-@@ -2897,6 +2903,49 @@
+@@ -2897,6 +2903,51 @@
  }
  
  static gboolean
@@ -168,6 +172,8 @@
 +{
 +	gboolean retval = FALSE;
 +
++	tooltip_destroy (week_view, item);
++
 +	if (keyval == GDK_Return) {
 +		EText *text = E_TEXT (item);
 +		gint new_pos = 0;
@@ -207,11 +213,12 @@
  e_week_view_on_text_item_event (GnomeCanvasItem *item,
  				GdkEvent *gdkevent,
  				EWeekView *week_view)
-@@ -2909,25 +2958,6 @@
+@@ -2909,26 +2958,6 @@
  #endif
  
  	switch (gdkevent->type) {
 -	case GDK_KEY_PRESS:
+-		tooltip_destroy (week_view, item);
 -		if (gdkevent && gdkevent->key.keyval == GDK_Return) {
 -			/* We set the keyboard focus to the EDayView, so the
 -			   EText item loses it and stops the edit. */


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- evolution.spec	16 Dec 2005 04:03:52 -0000	1.106
+++ evolution.spec	19 Dec 2005 21:59:47 -0000	1.107
@@ -30,8 +30,8 @@
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
 Name: evolution
-Version: 2.5.2
-Release: 2
+Version: 2.5.3
+Release: 1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -486,6 +486,11 @@
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Mon Dec 19 2005 David Malcolm <dmalcolm at redhat.com> - 2.5.3-1
+- 2.5.3
+- Updated patch 106 (evolution-2.2.2-commit-enter-on-calendar.patch) so that it
+  still applies cleanly
+
 * Thu Dec 15 2005 Christopher Aillon <caillon at redhat.com> 2.5.2-2
 - Require nspr and nss instead of mozilla-nspr and mozilla-nss
 - Update no-gnome-common patch to work with standalone nss package