rpms/evolution/devel .cvsignore, 1.42, 1.43 evolution-2.5.4-fix-missing-declarations.patch, 1.3, 1.4 evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch, 1.1, 1.2 evolution-2.5.5.1-notification-cleanups.patch, 1.1, 1.2 evolution.spec, 1.119, 1.120 sources, 1.42, 1.43

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Jan 31 03:27:11 UTC 2006 

Author: dmalcolm

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

Modified Files:
	.cvsignore evolution-2.5.4-fix-missing-declarations.patch 
	evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch 
	evolution-2.5.5.1-notification-cleanups.patch evolution.spec 
	sources 
Log Message:
* Mon Jan 30 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.90-1
- 2.5.90
- trimmed patches 805 and 808, as parts of these got merged upstream
- trimmed and regenerated patch 806 to track upstream
- removed the mail-to-task plugin XML UI file




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	27 Jan 2006 23:58:18 -0000	1.42
+++ .cvsignore	31 Jan 2006 03:27:08 -0000	1.43
@@ -1 +1 @@
-evolution-2.5.5.1.tar.bz2
+evolution-2.5.90.tar.bz2

evolution-2.5.4-fix-missing-declarations.patch:
 e-shell.h |    1 +
 1 files changed, 1 insertion(+)

Index: evolution-2.5.4-fix-missing-declarations.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.5.4-fix-missing-declarations.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evolution-2.5.4-fix-missing-declarations.patch	27 Jan 2006 23:58:18 -0000	1.3
+++ evolution-2.5.4-fix-missing-declarations.patch	31 Jan 2006 03:27:08 -0000	1.4
@@ -1,23 +1,3 @@
---- evolution-2.5.4/calendar/gui/e-meeting-list-view.c.fix-missing-declarations-2-5-4	2006-01-02 06:38:57.000000000 -0500
-+++ evolution-2.5.4/calendar/gui/e-meeting-list-view.c	2006-01-04 14:40:40.000000000 -0500
-@@ -45,6 +45,7 @@
- #include <misc/e-cell-renderer-combo.h>
- #include <libebook/e-destination.h>
- #include "e-select-names-renderer.h"
-+#include "itip-utils.h"
- 
- struct _EMeetingListViewPrivate {
- 	EMeetingStore *store;
---- evolution-2.5.4/plugins/publish-calendar/publish-format-fb.c.fix-missing-declarations-2-5-4	2005-12-19 05:08:10.000000000 -0500
-+++ evolution-2.5.4/plugins/publish-calendar/publish-format-fb.c	2006-01-04 14:40:40.000000000 -0500
-@@ -27,6 +27,7 @@
- #include <libedataserver/e-source-list.h>
- #include <libecal/e-cal.h>
- #include <libecal/e-cal-util.h>
-+#include <libecal/e-cal-time-util.h>
- #include <calendar/common/authentication.h>
- #include "publish-format-fb.h"
- 
 --- evolution-2.5.4/shell/e-shell.h.fix-missing-declarations-2-5-4	2006-01-04 14:44:06.000000000 -0500
 +++ evolution-2.5.4/shell/e-shell.h	2006-01-04 14:47:59.000000000 -0500
 @@ -133,6 +133,7 @@

evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch:
 a11y/calendar/ea-gnome-calendar.c    |    1 +
 mail/message-list.h                  |    2 ++
 widgets/table/e-tree-table-adapter.h |    3 ++-
 widgets/table/e-tree.h               |    2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

Index: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch	27 Jan 2006 23:58:18 -0000	1.1
+++ evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch	31 Jan 2006 03:27:08 -0000	1.2
@@ -1,63 +1,3 @@
---- evolution-2.5.5.1/calendar/gui/dialogs/comp-editor-page.h.fix-missing-declarations-2.5.5.1	2006-01-26 08:47:44.000000000 -0500
-+++ evolution-2.5.5.1/calendar/gui/dialogs/comp-editor-page.h	2006-01-26 08:48:00.000000000 -0500
-@@ -107,6 +107,10 @@
- 						    ECal           *client);
- void       comp_editor_page_set_summary            (CompEditorPage      *page,
- 						    const char          *summary);
-+void       comp_editor_page_unset_focused_widget   (CompEditorPage *page, 
-+						    GtkWidget *widget);
-+void       comp_editor_page_set_focused_widget     (CompEditorPage *page, 
-+						    GtkWidget *widget);
- void       comp_editor_page_set_dates              (CompEditorPage      *page,
- 						    CompEditorPageDates *dates);
- void       comp_editor_page_notify_changed         (CompEditorPage      *page);
---- evolution-2.5.5.1/calendar/gui/dialogs/alarm-dialog.c.fix-missing-declarations-2.5.5.1	2006-01-26 08:37:02.000000000 -0500
-+++ evolution-2.5.5.1/calendar/gui/dialogs/alarm-dialog.c	2006-01-26 08:39:20.000000000 -0500
-@@ -41,6 +41,7 @@
- #include <gtk/gtktextview.h>
- #include <gtk/gtktogglebutton.h>
- #include <libgnome/gnome-i18n.h>
-+#include <libgnomeui/gnome-file-entry.h>
- #include <bonobo/bonobo-control.h>
- #include <bonobo/bonobo-exception.h>
- #include <bonobo/bonobo-widget.h>
-@@ -855,7 +856,7 @@
- 	case E_CAL_COMPONENT_ALARM_AUDIO:
- 		dir = calendar_config_get_dir_path ();
- 		if ( dir && *dir )
--			gnome_file_entry_set_default_path (dialog->aalarm_file_entry, dir);
-+			gnome_file_entry_set_default_path ( GNOME_FILE_ENTRY(dialog->aalarm_file_entry), dir);
- 		check_custom_sound (dialog);
- 		break;
- 
---- evolution-2.5.5.1/calendar/gui/e-calendar-view.c.fix-missing-declarations-2.5.5.1	2006-01-26 08:49:54.000000000 -0500
-+++ evolution-2.5.5.1/calendar/gui/e-calendar-view.c	2006-01-26 08:53:47.000000000 -0500
-@@ -40,6 +40,7 @@
- #include <libgnome/gnome-i18n.h>
- #include <libedataserver/e-time-utils.h>
- #include <e-util/e-dialog-utils.h>
-+#include <e-util/e-error.h>
- #include <e-util/e-icon-factory.h>
- #include "e-calendar-marshal.h"
- #include <libecal/e-cal-time-util.h>
---- evolution-2.5.5.1/plugins/import-ics-attachments/icsimporter.c.fix-missing-declarations-2.5.5.1	2006-01-26 09:08:09.000000000 -0500
-+++ evolution-2.5.5.1/plugins/import-ics-attachments/icsimporter.c	2006-01-26 09:13:50.000000000 -0500
-@@ -34,6 +34,7 @@
- #include <mail/mail-mt.h>
- #include <mail/em-folder-view.h>
- #include <mail/em-format-html-display.h>
-+#include <mail/em-utils.h>
- #include "e-attachment-bar.h"
- #include <camel/camel-vee-folder.h>
- #include "e-util/e-error.h"
-@@ -45,6 +46,7 @@
- #include <libedataserverui/e-source-selector.h>
- #include <libecal/e-cal.h>
- #include <libical/icalvcal.h>
-+#include "calendar/common/authentication.h"
- 
- typedef struct {
- 	ECal *client;
 --- evolution-2.5.5.1/mail/message-list.h.fix-missing-declarations-2.5.5.1	2006-01-26 08:56:50.000000000 -0500
 +++ evolution-2.5.5.1/mail/message-list.h	2006-01-26 08:58:05.000000000 -0500
 @@ -182,6 +182,8 @@

evolution-2.5.5.1-notification-cleanups.patch:
 alarm-queue.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

Index: evolution-2.5.5.1-notification-cleanups.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.5.5.1-notification-cleanups.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.5.5.1-notification-cleanups.patch	28 Jan 2006 05:14:10 -0000	1.1
+++ evolution-2.5.5.1-notification-cleanups.patch	31 Jan 2006 03:27:08 -0000	1.2
@@ -1,6 +1,6 @@
---- evolution-2.5.5.1/calendar/gui/alarm-notify/alarm-queue.c.port-to-new-libnotify-api	2006-01-16 09:42:17.000000000 -0500
-+++ evolution-2.5.5.1/calendar/gui/alarm-notify/alarm-queue.c	2006-01-26 08:29:13.000000000 -0500
-@@ -1459,11 +1459,13 @@
+--- evolution-2.5.90/calendar/gui/alarm-notify/alarm-queue.c.notification-cleanups	2006-01-27 03:43:48.000000000 -0500
++++ evolution-2.5.90/calendar/gui/alarm-notify/alarm-queue.c	2006-01-30 21:13:58.000000000 -0500
+@@ -1229,10 +1229,11 @@
  	const char *summary, *location;
  	GtkTooltips *tooltips;
  	ECalComponentText text;
@@ -8,23 +8,12 @@
 +	char *start_str, *end_str, *alarm_str, *time_str;
  	icaltimezone *current_zone;
  	ECalComponentOrganizer organiser;
- 	char *filename;
  	char *body;
-+	GdkPixbuf *icon;
 +	NotifyNotification *n;
  	
  	comp = cqa->alarms->comp;
  	qa = lookup_queued_alarm (cqa, alarm_id);
-@@ -1471,7 +1473,7 @@
- 		return;
- 	if (!notify_is_initted ())
- 		notify_init("Evolution Alarm Notify");
--	GdkPixbuf *icon = e_icon_factory_get_icon("stock_appointment-reminder", E_ICON_SIZE_DIALOG);
-+	icon = e_icon_factory_get_icon("stock_appointment-reminder", E_ICON_SIZE_DIALOG);
- 	g_free (filename);
- 	
- 	/* get a sensible description for the event */
-@@ -1495,9 +1497,6 @@
+@@ -1262,9 +1263,6 @@
  	end_str = timet_to_str_with_zone (qa->instance->occur_end, current_zone);
  	time_str = calculate_time (qa->instance->occur_start, qa->instance->occur_end);
  
@@ -34,38 +23,27 @@
  	if (organiser.cn) {
  		if (location)
  			body = g_strdup_printf ("<b>%s</b>\n%s %s\n%s %s", organiser.cn, _("Location:"), location, start_str, time_str);
-@@ -1509,21 +1508,25 @@
- 			body = g_strdup_printf ("%s %s\n%s %s", _("Location:"), location, start_str, time_str);
- 		else
+@@ -1278,16 +1276,19 @@
  			body = g_strdup_printf ("%s %s", start_str, time_str);			
--}
-+	}
-+
-+	n = notify_notification_new (summary, body, "", NULL);
-+	if (icon) {
-+	        notify_notification_set_icon_data_from_pixbuf (n, icon);
-+		g_object_unref (G_OBJECT (icon));
-+	}
+ 	}
  
--	NotifyNotification *n = notify_notification_new (summary, body, "", NULL);
--	notify_notification_set_icon_data_from_pixbuf (n, icon);
+-	NotifyNotification *n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL);
 -	if (!notify_notification_show(n, NULL))
--	    g_warning ("Could not send notification to daemon\n");	
-+ 	/* Notifications don't timeout: require explicit user action: */
-+ 	notify_notification_set_timeout (n, NOTIFY_TIMEOUT_NEVER);
++	n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL);
++
++  	/* Notifications don't timeout: require explicit user action: */
++  	notify_notification_set_timeout (n, NOTIFY_TIMEOUT_NEVER);
++
++	if (!notify_notification_show_and_forget (n, NULL))
+ 	    g_warning ("Could not send notification to daemon\n");	
  
 -	/* create the private structure */
-+	if (!notify_notification_show_and_forget (n, NULL))
-+	        g_warning ("Could not send notification to daemon\n");
-+
 +	g_free (body);
  	g_free (start_str);
  	g_free (end_str);
  	g_free (alarm_str);
  	g_free (time_str);
 -	g_free (str);
--
--
- }
- #endif
  
+ 
+ }


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- evolution.spec	28 Jan 2006 05:14:10 -0000	1.119
+++ evolution.spec	31 Jan 2006 03:27:08 -0000	1.120
@@ -37,8 +37,8 @@
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
 Name: evolution
-Version: 2.5.5.1
-Release: 2
+Version: 2.5.90
+Release: 1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -551,7 +551,6 @@
 
 %{evo_plugin_dir}/org-gnome-mail-to-task.eplug
 %{evo_plugin_dir}/liborg-gnome-mail-to-task.so
-%{evo_plugin_dir}/org-gnome-mail-to-task.xml
 
 %{evo_plugin_dir}/org-gnome-mark-all-read.eplug
 %{evo_plugin_dir}/liborg-gnome-mark-all-read.so
@@ -625,6 +624,12 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Jan 30 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.90-1
+- 2.5.90
+- trimmed patches 805 and 808, as parts of these got merged upstream
+- trimmed and regenerated patch 806 to track upstream
+- removed the mail-to-task plugin XML UI file
+
 * Sat Jan 28 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.5.1-2
 - added missing patch
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	27 Jan 2006 23:58:18 -0000	1.42
+++ sources	31 Jan 2006 03:27:08 -0000	1.43
@@ -1 +1 @@
-307c20ef482dafe90c7f55843e473cda  evolution-2.5.5.1.tar.bz2
+02751eb28ad9b31402290ed4816e5321  evolution-2.5.90.tar.bz2

More information about the fedora-cvs-commits mailing list