rpms/evolution/FC-6 evolution-2.8.0-deprecated-gdk-font.patch, NONE, 1.1 evolution-2.8.0-more-deprecated.patch, NONE, 1.1 .cvsignore, 1.57, 1.58 evolution.spec, 1.195, 1.196 sources, 1.57, 1.58 evolution-2.7.3-filter-datespec.patch, 1.2, NONE evolution-2.7.92-chain-finalize.patch, 1.3, NONE evolution-2.7.92-deprecated-gdk.patch, 1.1, NONE evolution-2.7.92-deprecated-glib.patch, 1.1, NONE evolution-2.8.0-fix-message-deletion.patch, 1.1, NONE evolution-2.8.0-fix-missing-declarations.patch, 1.2, NONE evolution-2.8.0-search-on-folder-change.patch, 1.1, NONE evolution-2.8.0-uninstall.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Oct 19 22:09:58 UTC 2006


Author: mbarnes

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

Modified Files:
	.cvsignore evolution.spec sources 
Added Files:
	evolution-2.8.0-deprecated-gdk-font.patch 
	evolution-2.8.0-more-deprecated.patch 
Removed Files:
	evolution-2.7.3-filter-datespec.patch 
	evolution-2.7.92-chain-finalize.patch 
	evolution-2.7.92-deprecated-gdk.patch 
	evolution-2.7.92-deprecated-glib.patch 
	evolution-2.8.0-fix-message-deletion.patch 
	evolution-2.8.0-fix-missing-declarations.patch 
	evolution-2.8.0-search-on-folder-change.patch 
	evolution-2.8.0-uninstall.patch 
Log Message:

* Thu Oct 19 2006 Matthew Barnes <mbarnes at redhat.com> - 2.8.1.1-1.fc6
- Update to 2.8.1.1
- Use stricter build settings.
- Make .desktop symlinks absolute (RH bug #209322).
- Add patch for Gnome.org #357216 (deprecated GDK symbols).
- Add patch for Gnome.org #357970 (more deprecated symbols).
- Remove patch for RH bug #190359 (fixed upstream).
- Remove patch for RH bug #201307 (fixed upstream).
- Remove patch for RH bug #205576 (fixed upstream).
- Remove patch for Gnome.org bug #351332 (fixed upstream).
- Remove patch for Gnome.org bug #352450 (fixed upstream).
- Remove patch for Gnome.org bug #353472 (fixed upstream).
- Remove patch for Gnome.org bug #356811 (fixed upstream).


evolution-2.8.0-deprecated-gdk-font.patch:
 table/e-table-field-chooser-item.c |   26 +++++++++---------
 table/e-table-field-chooser-item.h |    2 -
 table/e-table-group-container.c    |   26 ++++++++++++------
 table/e-table-group-container.h    |    2 -
 table/e-table-header-item.c        |   52 ++++++++++++-------------------------
 table/e-table-header-item.h        |    2 -
 text/e-entry.c                     |   47 ---------------------------------
 7 files changed, 52 insertions(+), 105 deletions(-)

--- NEW FILE evolution-2.8.0-deprecated-gdk-font.patch ---
--- evolution-2.8.0/widgets/table/e-table-field-chooser-item.c.deprecated-gdk-font	2006-09-22 12:51:32.000000000 -0400
+++ evolution-2.8.0/widgets/table/e-table-field-chooser-item.c	2006-09-22 12:52:27.000000000 -0400
@@ -84,9 +84,9 @@
 		g_object_unref (etfci->combined_header);
 	etfci->combined_header = NULL;
 
-	if (etfci->font)
-		gdk_font_unref(etfci->font);
-	etfci->font = NULL;
+	if (etfci->font_desc)
+		pango_font_description_free (etfci->font_desc);
+	etfci->font_desc = NULL;
 
 	if (G_OBJECT_CLASS (etfci_parent_class)->dispose)
 		(*G_OBJECT_CLASS (etfci_parent_class)->dispose) (object);
@@ -219,11 +219,13 @@
 static void
 etfci_font_load (ETableFieldChooserItem *etfci)
 {
-	if (etfci->font)
-		gdk_font_unref (etfci->font);
+	GtkStyle *style;
+
+	if (etfci->font_desc)
+		pango_font_description_free (etfci->font_desc);
 
-	etfci->font = gtk_style_get_font (GTK_WIDGET(GNOME_CANVAS_ITEM(etfci)->canvas)->style);
-	gdk_font_ref(etfci->font);
+	style = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas)->style;
+	etfci->font_desc = pango_font_description_copy (style->font_desc);
 }
 
 static void
@@ -419,7 +421,7 @@
 	if (GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)-> realize)
 		(*GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->realize)(item);
 
-	if (!etfci->font)
+	if (!etfci->font_desc)
 		etfci_font_load (etfci);
 
 	etfci->drag_end_id = g_signal_connect (
@@ -436,9 +438,9 @@
 {
 	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
 
-	if (etfci->font)
-		gdk_font_unref (etfci->font);
-	etfci->font = NULL;
+	if (etfci->font_desc)
+		pango_font_description_free (etfci->font_desc);
+	etfci->font_desc = NULL;
 
 	g_signal_handler_disconnect (item->canvas, etfci->drag_end_id);
 	etfci->drag_end_id = 0;
@@ -677,7 +679,7 @@
 	
 	etfci->height = etfci->width = 0;
 
-	etfci->font = NULL;
+	etfci->font_desc = NULL;
 
 	etfci->full_header_structure_change_id = 0;
 	etfci->full_header_dimension_change_id = 0;
--- evolution-2.8.0/widgets/table/e-table-header-item.c.deprecated-gdk-font	2006-09-22 12:51:32.000000000 -0400
+++ evolution-2.8.0/widgets/table/e-table-header-item.c	2006-09-22 12:52:27.000000000 -0400
@@ -101,7 +101,7 @@
 	PROP_TABLE_HEADER,
 	PROP_FULL_HEADER,
 	PROP_DND_CODE,
-	PROP_TABLE_FONTSET,
+	PROP_TABLE_FONT_DESC,
 	PROP_SORT_INFO,
 	PROP_TABLE,
 	PROP_TREE
@@ -232,36 +232,18 @@
 }
 
 static void
-ethi_font_set (ETableHeaderItem *ethi, GdkFont *font)
+ethi_font_set (ETableHeaderItem *ethi, PangoFontDescription *font_desc)
 {
-	if (ethi->font)
-		gdk_font_unref (ethi->font);
+	if (ethi->font_desc)
+		pango_font_description_free (ethi->font_desc);
+
+	ethi->font_desc = pango_font_description_copy (font_desc);
 
-	ethi->font = font;
-	gdk_font_ref (font);
-	
 	ethi->height = e_table_header_item_get_height (ethi);
 	e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(ethi));
 }
 
 static void
-ethi_font_load (ETableHeaderItem *ethi, const char *fontname)
-{
-	GdkFont *font = NULL;
-
-	if (fontname != NULL)
-		font = gdk_fontset_load (fontname);
-
-	if (font == NULL) {
-		font = gtk_style_get_font (GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas)->style);
-		gdk_font_ref (font);
-	}
-	
-	ethi_font_set (ethi, font);
-	gdk_font_unref (font);
-}
-
-static void
 ethi_drop_table_header (ETableHeaderItem *ethi)
 {
 	GObject *header;
@@ -345,8 +327,8 @@
 		ethi->dnd_code = g_strdup (g_value_get_string (value));
 		break;
 
-	case PROP_TABLE_FONTSET:
-		ethi_font_load (ethi, g_value_get_string (value));
+	case PROP_TABLE_FONT_DESC:
+		ethi_font_set (ethi, g_value_get_boxed (value));
 		break;
 
 	case PROP_SORT_INFO:
@@ -902,8 +884,8 @@
 	if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)-> realize)
 		(*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->realize)(item);
 
-	if (!ethi->font)
-		ethi_font_set (ethi, gtk_style_get_font (GTK_WIDGET (item->canvas)->style));
+	if (!ethi->font_desc)
+		ethi_font_set (ethi, GTK_WIDGET (item->canvas)->style->font_desc);
 
 	/*
 	 * Now, configure DnD
@@ -937,7 +919,7 @@
 {
 	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
 
-	gdk_font_unref (ethi->font);
+	pango_font_description_free (ethi->font_desc);
 
 	g_signal_handler_disconnect (item->canvas, ethi->drag_motion_id);
 	g_signal_handler_disconnect (item->canvas, ethi->drag_leave_id);
@@ -1894,12 +1876,12 @@
 							      NULL,
 							      G_PARAM_READWRITE));
 
-	g_object_class_install_property (object_class, PROP_TABLE_FONTSET,
-					 g_param_spec_string ("fontset",
-							      _("Fontset"),
-							      /*_( */"XXX blurb" /*)*/,
-							      NULL,
-							      G_PARAM_WRITABLE));
+	g_object_class_install_property (object_class, PROP_TABLE_FONT_DESC,
+					 g_param_spec_boxed ("font-desc",
+							     _("Font Description"),
+							     /*_( */"XXX blurb" /*)*/,
+							     PANGO_TYPE_FONT_DESCRIPTION,
+							     G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_FULL_HEADER,
 					 g_param_spec_object ("full_header",
--- evolution-2.8.0/widgets/table/e-table-field-chooser-item.h.deprecated-gdk-font	2005-06-17 11:20:34.000000000 -0400
+++ evolution-2.8.0/widgets/table/e-table-field-chooser-item.h	2006-09-22 12:52:27.000000000 -0400
@@ -44,7 +44,7 @@
 
 	double           height, width;
 
-	GdkFont         *font;
+	PangoFontDescription *font_desc;
 
 	/*
 	 * Ids
--- evolution-2.8.0/widgets/table/e-table-group-container.h.deprecated-gdk-font	2005-06-17 11:20:34.000000000 -0400
+++ evolution-2.8.0/widgets/table/e-table-group-container.h	2006-09-22 12:52:27.000000000 -0400
@@ -57,7 +57,7 @@
 	 */
 	GnomeCanvasItem *rect;
 
-	GdkFont *font;
+	PangoFontDescription *font_desc;
 
 	gdouble width, height, minimum_width;
 
--- evolution-2.8.0/widgets/table/e-table-group-container.c.deprecated-gdk-font	2006-07-22 07:14:57.000000000 -0400
+++ evolution-2.8.0/widgets/table/e-table-group-container.c	2006-09-22 12:52:27.000000000 -0400
@@ -105,9 +105,9 @@
 	if (etgc->children)
 		e_table_group_container_list_free (etgc);
 
-	if (etgc->font)
-		gdk_font_unref (etgc->font);
-	etgc->font = NULL;
+	if (etgc->font_desc)
+		pango_font_description_free (etgc->font_desc);
+	etgc->font_desc = NULL;
 
 	if (etgc->ecol)
 		g_object_unref (etgc->ecol);
@@ -148,6 +148,7 @@
 {
 	ETableCol *col;
 	ETableSortColumn column = e_table_sort_info_grouping_get_nth(sort_info, n);
+	GtkStyle *style;
 
 	col = e_table_header_get_column_by_col_idx(full_header, column.column);
 	if (col == NULL)
@@ -161,9 +162,8 @@
 	etgc->n = n;
 	etgc->ascending = column.ascending;
 
-	etgc->font = gtk_style_get_font (GTK_WIDGET (GNOME_CANVAS_ITEM (etgc)->canvas)->style);
-	
-	gdk_font_ref (etgc->font);
+	style = GTK_WIDGET (GNOME_CANVAS_ITEM (etgc)->canvas)->style;
+	etgc->font_desc = pango_font_description_copy (style->font_desc);
 
 	etgc->open = TRUE;
 }
@@ -1006,8 +1006,18 @@
 			gdouble item_height = 0;
 			gdouble item_width = 0;
 			
-			if (etgc->font)
-				extra_height += etgc->font->ascent + etgc->font->descent + BUTTON_PADDING * 2;
+			if (etgc->font_desc) {
+				PangoContext *context;
+				PangoFontMetrics *metrics;
+
+				context = gtk_widget_get_pango_context (GTK_WIDGET (etgc));
+				metrics = pango_context_get_metrics (context, etgc->font_desc, NULL);
+				extra_height +=
+					pango_font_metrics_get_ascent (metrics) +
+					pango_font_metrics_get_descent (metrics) +
+					BUTTON_PADDING * 2;
+				pango_font_metrics_unref (metrics);
+			}
 			
 			extra_height = MAX(extra_height, BUTTON_HEIGHT + BUTTON_PADDING * 2);
 				
--- evolution-2.8.0/widgets/table/e-table-header-item.h.deprecated-gdk-font	2005-06-17 11:20:34.000000000 -0400
+++ evolution-2.8.0/widgets/table/e-table-header-item.h	2006-09-22 12:52:27.000000000 -0400
@@ -47,7 +47,7 @@
 	GdkCursor       *change_cursor;
 
 	short            height, width;
-	GdkFont         *font;
+	PangoFontDescription *font_desc;
 
 	/*
 	 * Used during resizing;  Could be shorts
--- evolution-2.8.0/widgets/text/e-entry.c.deprecated-gdk-font	2005-08-21 14:10:23.000000000 -0400
+++ evolution-2.8.0/widgets/text/e-entry.c	2006-09-22 12:52:27.000000000 -0400
@@ -70,9 +70,6 @@
 	PROP_MODEL,
 	PROP_EVENT_PROCESSOR,
 	PROP_TEXT,
-	PROP_FONT,
-        PROP_FONTSET,
-	PROP_FONT_GDK,
 	PROP_ANCHOR,
 	PROP_JUSTIFICATION,
 	PROP_X_OFFSET,
@@ -880,10 +877,6 @@
 		g_object_get_property (G_OBJECT (item), "text", value);
 		break;
 
-	case PROP_FONT_GDK:
-		g_object_get_property (G_OBJECT (item), "font_gdk", value);
-		break;
-
 	case PROP_JUSTIFICATION:
 		g_object_get_property (G_OBJECT (item), "justification", value);
 		break;
@@ -986,25 +979,6 @@
 			gtk_widget_queue_resize (widget);
 		break;
 
-	case PROP_FONT:
-		g_object_set_property (G_OBJECT (item), "font", value);
-		d(g_print("%s: font: %s\n", __FUNCTION__, g_value_get_string (value)));
-		if (entry->priv->emulate_label_resize)
-			gtk_widget_queue_resize (widget);
-		break;
-
-	case PROP_FONTSET:
-		g_object_set_property (G_OBJECT (item), "fontset", value);
-		if (entry->priv->emulate_label_resize)
-			gtk_widget_queue_resize (widget);
-		break;
-
-	case PROP_FONT_GDK:
-		g_object_set_property (G_OBJECT (item), "font_gdk", value);
-		if (entry->priv->emulate_label_resize)
-			gtk_widget_queue_resize (widget);
-		break;
-
 	case PROP_JUSTIFICATION:
 		entry->priv->justification = g_value_get_enum (value);
 		g_object_get(item,
@@ -1251,27 +1225,6 @@
 							      NULL,
 							      G_PARAM_READWRITE));
 
-	g_object_class_install_property (object_class, PROP_FONT,
-					 g_param_spec_string ("font",
-							      _( "Font" ),
-							      _( "Font" ),
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_FONTSET,
-					 g_param_spec_string ("fontset",
-							      _( "Fontset" ),
-							      _( "Fontset" ),
-							      NULL,
-							      G_PARAM_READWRITE));
-
-	g_object_class_install_property (object_class, PROP_FONT_GDK,
-					 g_param_spec_boxed ("font_gdk",
-							     _( "GDKFont" ),
-							     _( "GDKFont" ),
-							     GDK_TYPE_FONT,
-							     G_PARAM_WRITABLE));
-
 	g_object_class_install_property (object_class, PROP_JUSTIFICATION,
 					 g_param_spec_enum ("justification",
 							    _( "Justification" ),

evolution-2.8.0-more-deprecated.patch:
 addressbook/gui/contact-editor/e-contact-editor.c      |    2 
 addressbook/gui/widgets/e-minicard.c                   |    2 
 addressbook/gui/widgets/eab-contact-display.c          |    2 
 calendar/gui/dialogs/event-page.c                      |    2 
 calendar/gui/dialogs/task-page.c                       |    2 
 calendar/gui/e-alarm-list.c                            |   10 +--
 calendar/gui/e-calendar-table.c                        |    2 
 calendar/gui/e-day-view.c                              |   12 ++--
 calendar/gui/e-meeting-attendee.c                      |    2 
 calendar/gui/e-meeting-store.c                         |   12 ++--
 calendar/gui/e-meeting-time-sel-item.c                 |   16 ++---
 calendar/gui/e-meeting-time-sel.c                      |   46 ++++++++---------
 calendar/gui/e-week-view-main-item.c                   |   20 +++----
 calendar/gui/e-week-view.c                             |   46 ++++++++---------
 calendar/gui/gnome-cal.c                               |   28 +++++-----
 calendar/gui/goto.c                                    |    6 +-
 mail/em-folder-browser.c                               |    4 -
 mail/em-folder-view.c                                  |    4 -
 plugins/exchange-operations/exchange-config-listener.c |    2 
 widgets/misc/e-calendar-item.c                         |    6 --
 widgets/misc/e-canvas-background.c                     |    2 
 widgets/misc/e-colors.c                                |   13 ----
 widgets/misc/e-filter-bar.c                            |    4 -
 widgets/misc/e-search-bar.c                            |    2 
 widgets/misc/gal-combo-box.c                           |    2 
 widgets/table/e-cell-pixbuf.c                          |   17 ++----
 widgets/table/e-cell-progress.c                        |   20 +++----
 widgets/table/e-cell-text.c                            |    6 +-
 widgets/table/e-cell-toggle.c                          |   23 ++++----
 widgets/table/e-cell-tree.c                            |   44 +++++++---------
 widgets/table/e-table-col.c                            |    4 -
 widgets/table/e-table-extras.c                         |    6 +-
 widgets/table/e-table-header-item.c                    |    2 
 widgets/table/e-table-header-utils.c                   |    6 +-
 widgets/table/e-table-item.c                           |    6 +-
 widgets/table/e-table-memory-store.c                   |    4 -
 widgets/text/e-text.c                                  |    2 
 37 files changed, 184 insertions(+), 205 deletions(-)

--- NEW FILE evolution-2.8.0-more-deprecated.patch ---
--- evolution-2.8.0/mail/em-folder-view.c.more-deprecated	2006-09-26 16:15:28.000000000 -0400
+++ evolution-2.8.0/mail/em-folder-view.c	2006-09-26 16:15:28.000000000 -0400
@@ -1226,13 +1226,13 @@
 			item->visible = EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY;
 
 			gdk_color_parse(label->colour, &colour);
-			gdk_color_alloc(gdk_colormap_get_system(), &colour);
+			gdk_colormap_alloc_color(gdk_colormap_get_system(), &colour, FALSE, TRUE);
 		
 			pixmap = gdk_pixmap_new(((GtkWidget *)emfv)->window, 16, 16, -1);
 			gc = gdk_gc_new(((GtkWidget *)emfv)->window);
 			gdk_gc_set_foreground(gc, &colour);
 			gdk_draw_rectangle(pixmap, gc, TRUE, 0, 0, 16, 16);
-			gdk_gc_unref(gc);
+			g_object_unref(gc);
 
 			item->image = gtk_image_new_from_pixmap(pixmap, NULL);
 			gtk_widget_show(item->image);
--- evolution-2.8.0/mail/em-folder-browser.c.more-deprecated	2006-09-26 16:15:28.000000000 -0400
+++ evolution-2.8.0/mail/em-folder-browser.c	2006-09-26 16:15:28.000000000 -0400
@@ -325,13 +325,13 @@
 			GtkImage *image;
 			
 			gdk_color_parse(label->colour, &colour);
-			gdk_color_alloc(gdk_colormap_get_system(), &colour);
+			gdk_colormap_alloc_color(gdk_colormap_get_system(), &colour, FALSE, TRUE);
 		
 			pixmap = gdk_pixmap_new(((GtkWidget *)emfv)->window, 16, 16, -1);
 			gc = gdk_gc_new(((GtkWidget *)emfv)->window);
 			gdk_gc_set_foreground(gc, &colour);
 			gdk_draw_rectangle(pixmap, gc, TRUE, 0, 0, 16, 16);
-			gdk_gc_unref(gc); 
+			g_object_unref(gc); 
 			
 			image = gtk_image_new_from_pixmap(pixmap, NULL); */
 			str = string_without_underscores (label->name);
--- evolution-2.8.0/widgets/misc/e-canvas-background.c.more-deprecated	2006-09-26 16:15:28.000000000 -0400
+++ evolution-2.8.0/widgets/misc/e-canvas-background.c	2006-09-26 16:15:28.000000000 -0400
@@ -358,7 +358,7 @@
 {
 	ECanvasBackground *ecb = E_CANVAS_BACKGROUND (item);
 
-	gdk_gc_unref (ecb->priv->gc);
+	g_object_unref (ecb->priv->gc);
 	ecb->priv->gc = NULL;
 
 	if (GNOME_CANVAS_ITEM_CLASS (parent_class)->unrealize)
--- evolution-2.8.0/widgets/misc/e-colors.c.more-deprecated	2005-04-29 10:18:18.000000000 -0400
+++ evolution-2.8.0/widgets/misc/e-colors.c	2006-09-26 16:15:28.000000000 -0400
@@ -33,19 +33,6 @@
 
 GdkColor e_white, e_dark_gray, e_black;
 
-gulong
-e_color_alloc (gushort red, gushort green, gushort blue)
-{
-	e_color_init ();
-
-	red >>= 8;
-	green >>= 8;
-	blue >>= 8;
-	return gdk_rgb_xpixel_from_rgb (
-		((red & 0xff) << 16) | ((green & 0xff) << 8) |
-		(blue & 0xff));
-}
-
 void
 e_color_alloc_gdk (GtkWidget *widget, GdkColor *c)
 {
--- evolution-2.8.0/widgets/misc/e-search-bar.c.more-deprecated	2006-09-02 02:43:43.000000000 -0400
+++ evolution-2.8.0/widgets/misc/e-search-bar.c	2006-09-26 16:15:28.000000000 -0400
@@ -745,7 +745,7 @@
 		break;
 
 	case PROP_TEXT:
-		g_value_set_string_take_ownership (value, e_search_bar_get_text (esb));
+		g_value_take_string (value, e_search_bar_get_text (esb));
 		break;
 
 	default:
--- evolution-2.8.0/widgets/misc/e-filter-bar.c.more-deprecated	2006-08-21 02:32:18.000000000 -0400
+++ evolution-2.8.0/widgets/misc/e-filter-bar.c	2006-09-26 16:15:28.000000000 -0400
@@ -556,7 +556,7 @@
 			GString *out = g_string_new ("");
 			
 			filter_rule_build_code (efb->current_query, out);
-			g_value_set_string_take_ownership (value, out->str);
+			g_value_take_string (value, out->str);
 			g_string_free (out, FALSE);
 		} else {
 			g_value_set_string (value, NULL);
@@ -602,7 +602,7 @@
 		text[n] = '\0';
 		xmlFree (xmlbuf);
 		
-		g_value_set_string_take_ownership (value, text);
+		g_value_take_string (value, text);
 		
 		break; }
 	default:
--- evolution-2.8.0/widgets/misc/gal-combo-box.c.more-deprecated	2006-09-26 16:15:28.000000000 -0400
+++ evolution-2.8.0/widgets/misc/gal-combo-box.c	2006-09-26 16:15:28.000000000 -0400
@@ -610,7 +610,7 @@
 		gdk_draw_drawable (GDK_DRAWABLE (pixmap), gc,
 				 widget->window,
 				 0, 0, 0, 0, -1, -1);
-		gdk_gc_unref (gc);
+		g_object_unref (gc);
       
 		gtk_widget_set_usize (combo->priv->tearoff_window,
 				      widget->allocation.width,
--- evolution-2.8.0/widgets/misc/e-calendar-item.c.more-deprecated	2006-09-02 02:43:43.000000000 -0400
+++ evolution-2.8.0/widgets/misc/e-calendar-item.c	2006-09-26 16:15:28.000000000 -0400
@@ -700,11 +700,7 @@
 
 	colormap = gtk_widget_get_colormap (GTK_WIDGET (item->canvas));
 
-	for (i = 0; i < E_CALENDAR_ITEM_COLOR_LAST; i++) {
-		/* FIXME: gdk_colors_free expects gulong* here but the pixel value in GdkColor
-		   is guint32.  GDK bug?  */
-		gdk_colors_free (colormap, (gulong *) &calitem->colors[i].pixel, 1, 0);
-	}
+	gdk_colormap_free_colors (colormap, calitem->colors, E_CALENDAR_ITEM_COLOR_LAST);
 
 	if (GNOME_CANVAS_ITEM_CLASS (e_calendar_item_parent_class)->unrealize)
 		(* GNOME_CANVAS_ITEM_CLASS (e_calendar_item_parent_class)->unrealize) (item);
--- evolution-2.8.0/widgets/table/e-cell-pixbuf.c.more-deprecated	2005-06-17 11:20:34.000000000 -0400
+++ evolution-2.8.0/widgets/table/e-cell-pixbuf.c	2006-09-26 16:15:28.000000000 -0400
@@ -180,15 +180,14 @@
     }
 
 
-    gdk_pixbuf_render_to_drawable_alpha (cell_pixbuf,
-					 drawable,
-					 0, 0,
-					 real_x, real_y, 
-					 real_w, real_h,
-					 GDK_PIXBUF_ALPHA_FULL,
-					 127,
-					 GDK_RGB_DITHER_NORMAL,
-					 0, 0);
+    gdk_draw_pixbuf (drawable,
+		     NULL,
+		     cell_pixbuf,
+		     0, 0,
+		     real_x, real_y,
+		     real_w, real_h,
+		     GDK_RGB_DITHER_NORMAL,
+		     0, 0);
 }
 
 static gint
--- evolution-2.8.0/widgets/table/e-table-extras.c.more-deprecated	2005-12-10 02:32:03.000000000 -0500
+++ evolution-2.8.0/widgets/table/e-table-extras.c	2006-09-26 16:15:28.000000000 -0400
@@ -58,7 +58,7 @@
 {
 	g_free(key);
 	if (pixbuf)
-		gdk_pixbuf_unref(pixbuf);
+		g_object_unref(pixbuf);
 }
 
 static void
@@ -281,11 +281,11 @@
 		g_hash_table_remove (extras->cells, old_key);
 		g_free (old_key);
 		if (old_pixbuf)
-			gdk_pixbuf_unref (old_pixbuf);
+			g_object_unref (old_pixbuf);
 	}
 
 	if (pixbuf)
-		gdk_pixbuf_ref(pixbuf);
+		g_object_ref(pixbuf);
 	g_hash_table_insert (extras->pixbufs, g_strdup(id), pixbuf);
 }
 
--- evolution-2.8.0/widgets/table/e-table-memory-store.c.more-deprecated	2005-06-17 11:20:34.000000000 -0400
+++ evolution-2.8.0/widgets/table/e-table-memory-store.c	2006-09-26 16:15:28.000000000 -0400
@@ -47,7 +47,7 @@
 		return g_strdup (val);
 	case E_TABLE_MEMORY_STORE_COLUMN_TYPE_PIXBUF:
 		if (val)
-			gdk_pixbuf_ref ((void *) val);
+			g_object_ref ((void *) val);
 		return (void *) val;
 	case E_TABLE_MEMORY_STORE_COLUMN_TYPE_OBJECT:
 		if (val)
@@ -72,7 +72,7 @@
 		break;
 	case E_TABLE_MEMORY_STORE_COLUMN_TYPE_PIXBUF:
 		if (value)
-			gdk_pixbuf_unref (value);
+			g_object_unref (value);
 		break;
 	case E_TABLE_MEMORY_STORE_COLUMN_TYPE_OBJECT:
 		if (value)
--- evolution-2.8.0/widgets/table/e-table-item.c.more-deprecated	2006-09-26 16:15:28.000000000 -0400
+++ evolution-2.8.0/widgets/table/e-table-item.c	2006-09-26 16:15:28.000000000 -0400
@@ -1787,11 +1787,11 @@
 		}
 	}
 
-	gdk_gc_unref (eti->fill_gc);
+	g_object_unref (eti->fill_gc);
 	eti->fill_gc = NULL;
-	gdk_gc_unref (eti->grid_gc);
+	g_object_unref (eti->grid_gc);
 	eti->grid_gc = NULL;
-	gdk_gc_unref (eti->focus_gc);
+	g_object_unref (eti->focus_gc);
 	eti->focus_gc = NULL;
 	g_object_unref (eti->stipple);
 	eti->stipple = NULL;
--- evolution-2.8.0/widgets/table/e-cell-progress.c.more-deprecated	2006-01-30 07:28:20.000000000 -0500
+++ evolution-2.8.0/widgets/table/e-cell-progress.c	2006-09-26 16:15:28.000000000 -0400
@@ -97,7 +97,7 @@
 {
 	ECellProgressView *progress_view = (ECellProgressView *) ecv;
 
-	gdk_gc_unref (progress_view->gc);
+	g_object_unref (progress_view->gc);
 	progress_view->gc = NULL;
 }
 
@@ -200,14 +200,14 @@
 
 	eprog_draw_bar(progress, progress->red, progress->green, progress->blue, value);
 
-	gdk_pixbuf_render_to_drawable_alpha (progress->image, drawable,
-					     0, 0,
-					     x, y,
-					     progress->width, progress->height,
-					     GDK_PIXBUF_ALPHA_BILEVEL,
-					     128,
-					     GDK_RGB_DITHER_NORMAL,
-					     x, y);
+	gdk_draw_pixbuf (drawable,
+			 NULL,
+			 progress->image,
+			 0, 0,
+			 x, y,
+			 progress->width, progress->height,
+			 GDK_RGB_DITHER_NORMAL,
+			 x, y);
 }
 
 static void
@@ -285,7 +285,7 @@
 {
 	ECellProgress *eprog = E_CELL_PROGRESS (object);
 	
-	gdk_pixbuf_unref (eprog->image);
+	g_object_unref (eprog->image);
 	g_free (eprog->image);
 	g_free (eprog->buffer);
 
--- evolution-2.8.0/widgets/table/e-cell-toggle.c.more-deprecated	2006-09-26 16:15:28.000000000 -0400
+++ evolution-2.8.0/widgets/table/e-cell-toggle.c	2006-09-26 16:15:28.000000000 -0400
@@ -118,7 +118,7 @@
 {
 	ECellToggleView *toggle_view = (ECellToggleView *) ecv;
 
-	gdk_gc_unref (toggle_view->gc);
+	g_object_unref (toggle_view->gc);
 	toggle_view->gc = NULL;
 }
 
@@ -169,14 +169,15 @@
 							  1,
 							  RGB_COLOR (color), RGB_COLOR (color));
 
-		gdk_pixbuf_render_to_drawable (flat, PIXMAP_CACHE (toggle_view, cache_seq, image_seq),
-					       toggle_view->gc,
-					       0, 0,
-					       0, 0,
-					       width, height,
-					       GDK_RGB_DITHER_NORMAL,
-					       0, 0);
-		gdk_pixbuf_unref (flat);
+		gdk_draw_pixbuf (PIXMAP_CACHE (toggle_view, cache_seq, image_seq),
+				 toggle_view->gc,
+				 flat,
+				 0, 0,
+				 0, 0,
+				 width, height,
+				 GDK_RGB_DITHER_NORMAL,
+				 0, 0);
+		g_object_unref (flat);
 	}
 }
 
@@ -382,7 +383,7 @@
 	int i;
 	
 	for (i = 0; i < etog->n_states; i++)
-		gdk_pixbuf_unref (etog->images [i]);
+		g_object_unref (etog->images [i]);
 
 	g_free (etog->images);
 
@@ -451,7 +452,7 @@
 
 	for (i = 0; i < n_states; i++){
 		etog->images [i] = images [i];
-		gdk_pixbuf_ref (images [i]);
+		g_object_ref (images [i]);
 
 		if (gdk_pixbuf_get_height (images [i]) > max_height)
 			max_height = gdk_pixbuf_get_height (images [i]);
--- evolution-2.8.0/widgets/table/e-table-header-utils.c.more-deprecated	2006-09-26 16:15:28.000000000 -0400
+++ evolution-2.8.0/widgets/table/e-table-header-utils.c	2006-09-26 16:15:28.000000000 -0400
@@ -187,7 +187,7 @@
 
 		tmp = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
 		if (!tmp) {
-			gdk_pixbuf_unref (fade);
+			g_object_unref (fade);
 			return NULL;
 		}
 
@@ -202,7 +202,7 @@
 					    16,
 					    color, color);
 
-		gdk_pixbuf_unref (fade);
+		g_object_unref (fade);
 	}
 
 	pixmap = gdk_pixmap_new (drawable, width, height, gdk_rgb_get_visual ()->depth);
@@ -213,7 +213,7 @@
 				      gdk_pixbuf_get_pixels (tmp),
 				      gdk_pixbuf_get_rowstride (tmp),
 				      dither_xofs, dither_yofs);
-	gdk_pixbuf_unref (tmp);
+	g_object_unref (tmp);
 
 	return pixmap;
 }
--- evolution-2.8.0/widgets/table/e-table-header-item.c.more-deprecated	2006-09-26 16:15:28.000000000 -0400
+++ evolution-2.8.0/widgets/table/e-table-header-item.c	2006-09-26 16:15:28.000000000 -0400
@@ -471,7 +471,7 @@
 	
 	pixbuf = gdk_pixbuf_new_from_xpm_data (xpm);
 	gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &bitmap, 128);
-	gdk_pixbuf_unref (pixbuf);
+	g_object_unref (pixbuf);
 
 	gtk_widget_push_colormap (gdk_rgb_get_colormap ());
 	win = gtk_window_new (GTK_WINDOW_POPUP);
--- evolution-2.8.0/widgets/table/e-cell-text.c.more-deprecated	2006-09-26 16:15:28.000000000 -0400
+++ evolution-2.8.0/widgets/table/e-cell-text.c	2006-09-26 16:15:28.000000000 -0400
@@ -408,7 +408,7 @@
 	ECellText *ect = (ECellText*) ecv->ecell;
 	GdkColormap *colormap;
 
-	gdk_gc_unref (text_view->gc);
+	g_object_unref (text_view->gc);
 	text_view->gc = NULL;
 
 	if (text_view->edit){
@@ -443,7 +443,7 @@
 	if (color != (GdkColor*) 1) {
 		gulong pix = color->pixel;
 
-		gdk_colors_free (colormap, &pix, 1, 0);
+		gdk_colormap_free_colors (colormap, color, 1);
 
 		/* This frees the memory for the GdkColor. */
 		gdk_color_free (color);
@@ -2670,7 +2670,7 @@
 		colormap = gtk_widget_get_colormap (GTK_WIDGET (cell_view->canvas));
 
 		/* Try to allocate the color. */
-		if (gdk_color_alloc (colormap, &tmp_color))
+		if (gdk_colormap_alloc_color (colormap, &tmp_color, FALSE, TRUE))
 			color = gdk_color_copy (&tmp_color);
 	}
 
--- evolution-2.8.0/widgets/table/e-cell-tree.c.more-deprecated	2006-06-05 03:45:03.000000000 -0400
+++ evolution-2.8.0/widgets/table/e-cell-tree.c	2006-09-26 16:15:28.000000000 -0400
@@ -190,7 +190,7 @@
 	/* unrealize our subcell view. */
 	e_cell_unrealize (tree_view->subcell_view);
 
-	gdk_gc_unref (tree_view->gc);
+	g_object_unref (tree_view->gc);
 	tree_view->gc = NULL;
 
 	if (parent_class->unrealize)
@@ -209,16 +209,15 @@
 	image_width = gdk_pixbuf_get_width(image);
 	image_height = gdk_pixbuf_get_height(image);
 
-	gdk_pixbuf_render_to_drawable_alpha (image,
-					     drawable,
-					     rect->x, rect->y,
-					     rect->width - image_width / 2, 
-					     rect->height - image_height / 2,
-					     image_width, image_height,
-					     GDK_PIXBUF_ALPHA_BILEVEL,
-					     128,
-					     GDK_RGB_DITHER_NORMAL,
-					     image_width, 0);
+	gdk_draw_pixbuf (drawable,
+			 NULL,
+			 image,
+			 rect->x, rect->y,
+			 rect->width - image_width / 2, 
+			 rect->height - image_height / 2,
+			 image_width, image_height,
+			 GDK_RGB_DITHER_NORMAL,
+			 image_width, 0);
 }
 
 static void
@@ -358,16 +357,15 @@
 		}
 
 		if (node_image) {
-			gdk_pixbuf_render_to_drawable_alpha (node_image,
-							     drawable,
-							     0, 0,
-							     x1 + subcell_offset,
-							     y1 + (y2 - y1) / 2 - node_image_height / 2,
-							     node_image_width, node_image_height,
-							     GDK_PIXBUF_ALPHA_BILEVEL,
-							     128,
-							     GDK_RGB_DITHER_NORMAL,
-							     node_image_width, 0);
+			gdk_draw_pixbuf (drawable,
+					 NULL,
+					 node_image,
+					 0, 0,
+					 x1 + subcell_offset,
+					 y1 + (y2 - y1) / 2 - node_image_height / 2,
+					 node_image_width, node_image_height,
+					 GDK_RGB_DITHER_NORMAL,
+					 node_image_width, 0);
 			subcell_offset += node_image_width;
 		}
 	}
@@ -808,11 +806,11 @@
 	ect->subcell = NULL;
 
 	if (ect->open_pixbuf)
-		gdk_pixbuf_unref (ect->open_pixbuf);
+		g_object_unref (ect->open_pixbuf);
 	ect->open_pixbuf = NULL;
 
 	if (ect->closed_pixbuf)
-		gdk_pixbuf_unref (ect->closed_pixbuf);
+		g_object_unref (ect->closed_pixbuf);
 	ect->closed_pixbuf = NULL;
 
 	G_OBJECT_CLASS (parent_class)->dispose (object);
--- evolution-2.8.0/widgets/table/e-table-col.c.more-deprecated	2005-06-17 11:20:34.000000000 -0400
+++ evolution-2.8.0/widgets/table/e-table-col.c	2006-09-26 16:15:28.000000000 -0400
@@ -45,7 +45,7 @@
 	etc->ecell = NULL;
 
 	if (etc->pixbuf)
-		gdk_pixbuf_unref (etc->pixbuf);
+		g_object_unref (etc->pixbuf);
 	etc->pixbuf = NULL;
 
 	if (etc->text)
@@ -232,7 +232,7 @@
 	etc->resizable = resizable;
 
 	g_object_ref (etc->ecell);
-	gdk_pixbuf_ref (etc->pixbuf);
+	g_object_ref (etc->pixbuf);
 
 	return etc;
 }
--- evolution-2.8.0/widgets/text/e-text.c.more-deprecated	2006-09-26 16:15:28.000000000 -0400
+++ evolution-2.8.0/widgets/text/e-text.c	2006-09-26 16:15:28.000000000 -0400
@@ -1264,7 +1264,7 @@
 
 	text = E_TEXT (item);
 
-	gdk_gc_unref (text->gc);
+	g_object_unref (text->gc);
 	text->gc = NULL;
 
 	gdk_cursor_unref (text->i_cursor);
--- evolution-2.8.0/plugins/exchange-operations/exchange-config-listener.c.more-deprecated	2006-06-15 10:26:51.000000000 -0400
+++ evolution-2.8.0/plugins/exchange-operations/exchange-config-listener.c	2006-09-26 16:15:28.000000000 -0400
@@ -725,7 +725,7 @@
 		}
 		g_free (title);
 	}
-	else if (remember_password && !g_strcasecmp (remember_password, "false")) {
+	else if (remember_password && !g_ascii_strcasecmp (remember_password, "false")) {
 		/* get_password returns the password cached but user has not
 		 * selected remember password option, forget this password
 		 * whis is stored temporarily by e2k_validate_user(), to avoid
--- evolution-2.8.0/addressbook/gui/widgets/eab-contact-display.c.more-deprecated	2006-07-24 09:15:17.000000000 -0400
+++ evolution-2.8.0/addressbook/gui/widgets/eab-contact-display.c	2006-09-26 16:15:28.000000000 -0400
@@ -730,7 +730,7 @@
 				}
 			}
 
-			gdk_pixbuf_unref (pixbuf);
+			g_object_unref (pixbuf);
 			gtk_html_stream_printf (html_stream, "<img width=\"%d\" height=\"%d\" src=\"internal-contact-photo:\">",
 						calced_width, calced_height);
 			e_contact_photo_free (photo);
--- evolution-2.8.0/addressbook/gui/widgets/e-minicard.c.more-deprecated	2006-09-26 16:15:28.000000000 -0400
+++ evolution-2.8.0/addressbook/gui/widgets/e-minicard.c	2006-09-26 16:15:28.000000000 -0400
@@ -423,7 +423,7 @@
 	}
 
 	if (e_minicard->list_icon_pixbuf) {
-		gdk_pixbuf_unref (e_minicard->list_icon_pixbuf);
+		g_object_unref (e_minicard->list_icon_pixbuf);
 		e_minicard->list_icon_pixbuf = NULL;
 	}
 
--- evolution-2.8.0/addressbook/gui/contact-editor/e-contact-editor.c.more-deprecated	2006-07-24 09:15:17.000000000 -0400
+++ evolution-2.8.0/addressbook/gui/contact-editor/e-contact-editor.c	2006-09-26 16:15:28.000000000 -0400
@@ -2783,7 +2783,7 @@
 
 	gtk_image_set_from_pixbuf (GTK_IMAGE (preview), pixbuf);
 	if (pixbuf)
-		gdk_pixbuf_unref (pixbuf);
+		g_object_unref (pixbuf);
 }
 
 static void
--- evolution-2.8.0/calendar/gui/e-meeting-time-sel.c.more-deprecated	2006-09-26 16:15:28.000000000 -0400
+++ evolution-2.8.0/calendar/gui/e-meeting-time-sel.c	2006-09-26 16:15:28.000000000 -0400
@@ -271,7 +271,6 @@
 	GtkWidget *hbox, *vbox, *separator, *label, *table, *sw;
 	GtkWidget *alignment, *child_hbox, *arrow, *menuitem;
 	GSList *group;
-	GdkColormap *colormap;
 	guint accel_key;
 	time_t meeting_start_time;
 	struct tm *meeting_start_tm;
@@ -284,7 +283,7 @@
 	   future, in working hours. */
 	meeting_start_time = time (NULL);
 	g_date_clear (&mts->meeting_start_time.date, 1);
-	g_date_set_time (&mts->meeting_start_time.date, meeting_start_time);
+	g_date_set_time_t (&mts->meeting_start_time.date, meeting_start_time);
 	meeting_start_tm = localtime (&meeting_start_time);
 	mts->meeting_start_time.hour = meeting_start_tm->tm_hour;
 	mts->meeting_start_time.minute = meeting_start_tm->tm_min;
@@ -651,14 +650,13 @@
 	gtk_table_set_row_spacing (GTK_TABLE (mts), 4, 12);
 
 	/* Allocate the colors. */
-	colormap = gtk_widget_get_colormap (GTK_WIDGET (mts));
 	e_meeting_time_selector_alloc_named_color (mts, "snow", &mts->bg_color);
 	e_meeting_time_selector_alloc_named_color (mts, "snow3", &mts->all_attendees_bg_color);
-	gdk_color_black (colormap, &mts->grid_color);
-	gdk_color_white (colormap, &mts->grid_shadow_color);
+	e_meeting_time_selector_alloc_named_color (mts, "black", &mts->grid_color);
+	e_meeting_time_selector_alloc_named_color (mts, "white", &mts->grid_shadow_color);
 	e_meeting_time_selector_alloc_named_color (mts, "gray50", &mts->grid_unused_color);
-	gdk_color_white (colormap, &mts->stipple_bg_color);
-	gdk_color_white (colormap, &mts->attendee_list_bg_color);
+	e_meeting_time_selector_alloc_named_color (mts, "white", &mts->stipple_bg_color);
+	e_meeting_time_selector_alloc_named_color (mts, "white", &mts->attendee_list_bg_color);
 
 	e_meeting_time_selector_alloc_named_color (mts, "snow4", &mts->meeting_time_bg_color);
 	e_meeting_time_selector_alloc_named_color (mts, "yellow", &mts->busy_colors[E_MEETING_FREE_BUSY_TENTATIVE]);
@@ -866,7 +864,7 @@
 
 	mts = E_MEETING_TIME_SELECTOR (widget);
 
-	gdk_gc_unref (mts->color_key_gc);
+	g_object_unref (mts->color_key_gc);
 	mts->color_key_gc = NULL;
 
 	if (GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->unrealize)
@@ -1031,15 +1029,15 @@
 					  gint *end_hour,
 					  gint *end_minute)
 {
-	*start_year = g_date_year (&mts->meeting_start_time.date);
-	*start_month = g_date_month (&mts->meeting_start_time.date);
-	*start_day = g_date_day (&mts->meeting_start_time.date);
+	*start_year = g_date_get_year (&mts->meeting_start_time.date);
+	*start_month = g_date_get_month (&mts->meeting_start_time.date);
+	*start_day = g_date_get_day (&mts->meeting_start_time.date);
 	*start_hour = mts->meeting_start_time.hour;
 	*start_minute = mts->meeting_start_time.minute;
 
-	*end_year = g_date_year (&mts->meeting_end_time.date);
-	*end_month = g_date_month (&mts->meeting_end_time.date);
-	*end_day = g_date_day (&mts->meeting_end_time.date);
+	*end_year = g_date_get_year (&mts->meeting_end_time.date);
+	*end_month = g_date_get_month (&mts->meeting_end_time.date);
+	*end_day = g_date_get_day (&mts->meeting_end_time.date);
 	*end_hour = mts->meeting_end_time.hour;
 	*end_minute = mts->meeting_end_time.minute;
 }
@@ -1667,7 +1665,7 @@
 						   gint *hours,
 						   gint *minutes)
 {
-	*days = g_date_julian (&end->date) - g_date_julian (&start->date);
+	*days = g_date_get_julian (&end->date) - g_date_get_julian (&start->date);
 	*hours = end->hour - start->hour;
 	*minutes = end->minute - start->minute;
 	if (*minutes < 0) {
@@ -2188,7 +2186,7 @@
 	/* Date */
 	newtime = e_date_edit_get_time (E_DATE_EDIT (mts->start_date_edit));
 	g_date_clear (&mtstime.date, 1);
-	g_date_set_time (&mtstime.date, newtime);
+	g_date_set_time_t (&mtstime.date, newtime);
 
 	/* Time */
 	e_date_edit_get_time_of_day (E_DATE_EDIT (mts->start_date_edit), &hour, &minute);
@@ -2234,7 +2232,7 @@
 	/* Date */
 	newtime = e_date_edit_get_time (E_DATE_EDIT (mts->end_date_edit));
 	g_date_clear (&mtstime.date, 1);
-	g_date_set_time (&mtstime.date, newtime);
+	g_date_set_time_t (&mtstime.date, newtime);
 	if (mts->all_day)
 		g_date_add_days (&mtstime.date, 1);
 
@@ -2649,9 +2647,9 @@
 e_meeting_time_selector_update_start_date_edit (EMeetingTimeSelector *mts)
 {
 	e_date_edit_set_date_and_time_of_day (E_DATE_EDIT (mts->start_date_edit),
-					      g_date_year (&mts->meeting_start_time.date),
-					      g_date_month (&mts->meeting_start_time.date),
-					      g_date_day (&mts->meeting_start_time.date),
+					      g_date_get_year (&mts->meeting_start_time.date),
+					      g_date_get_month (&mts->meeting_start_time.date),
+					      g_date_get_day (&mts->meeting_start_time.date),
 					      mts->meeting_start_time.hour,
 					      mts->meeting_start_time.minute);
 }
@@ -2668,9 +2666,9 @@
 		g_date_subtract_days (&date, 1);
 
 	e_date_edit_set_date_and_time_of_day (E_DATE_EDIT (mts->end_date_edit),
-					      g_date_year (&date),
-					      g_date_month (&date),
-					      g_date_day (&date),
+					      g_date_get_year (&date),
+					      g_date_get_month (&date),
+					      g_date_get_day (&date),
 					      mts->meeting_end_time.hour,
 					      mts->meeting_end_time.minute);
 }
@@ -2841,7 +2839,7 @@
 
 	/* Calculate the number of days since the first date shown in the
 	   entire canvas scroll region. */
-	date_offset = g_date_julian (&mtstime->date) - g_date_julian (&mts->first_date_shown);
+	date_offset = g_date_get_julian (&mtstime->date) - g_date_get_julian (&mts->first_date_shown);
 
 	/* Calculate the x pixel coordinate of the start of the day. */
 	x = date_offset * mts->day_width;
--- evolution-2.8.0/calendar/gui/gnome-cal.c.more-deprecated	2006-09-02 02:41:31.000000000 -0400
+++ evolution-2.8.0/calendar/gui/gnome-cal.c	2006-09-26 16:48:09.000000000 -0400
@@ -604,7 +604,7 @@
 		   week start day. */
 
 		/* Get the weekday corresponding to start_time, 0 (Sun) to 6 (Sat). */
-		weekday = g_date_weekday (&date) % 7;
+		weekday = g_date_get_weekday (&date) % 7;
 
 		/* Find the first working day in the week, 0 (Sun) to 6 (Sat). */
 		first_day = (E_DAY_VIEW (priv->views[view_type])->week_start_day + 1) % 7;
@@ -641,9 +641,9 @@
 			g_date_subtract_days (&date, offset);
 		}
 
-		tt.year = g_date_year (&date);
-		tt.month = g_date_month (&date);
-		tt.day = g_date_day (&date);
+		tt.year = g_date_get_year (&date);
+		tt.month = g_date_get_month (&date);
+		tt.day = g_date_get_day (&date);
 
 		*start_time = icaltime_as_timet_with_zone (tt, priv->zone);
 		*end_time = time_add_day_with_zone (*start_time, days_shown, priv->zone);
@@ -1342,17 +1342,17 @@
 	g_date_add_days (&date, week_offset * 7);
 
 	/* Convert the old & new first days shown to julian values. */
-	old_first_day_julian = g_date_julian (&week_view->first_day_shown);
-	new_first_day_julian = g_date_julian (&date);
+	old_first_day_julian = g_date_get_julian (&week_view->first_day_shown);
+	new_first_day_julian = g_date_get_julian (&date);
 
 	/* If we are already showing the date, just return. */
 	if (old_first_day_julian == new_first_day_julian)
 		return;
 
 	/* Convert it to a time_t. */
-	start_tt.year = g_date_year (&date);
-	start_tt.month = g_date_month (&date);
-	start_tt.day = g_date_day (&date);
+	start_tt.year = g_date_get_year (&date);
+	start_tt.month = g_date_get_month (&date);
+	start_tt.day = g_date_get_day (&date);
 
 	lower = icaltime_as_timet_with_zone (start_tt, gcal->priv->zone);
 
@@ -3277,20 +3277,20 @@
 	    && !g_date_compare (&end_date, &new_end_date))
 		return;
 	
-	new_days_shown = g_date_julian (&new_end_date) - g_date_julian (&new_start_date) + 1;
+	new_days_shown = g_date_get_julian (&new_end_date) - g_date_get_julian (&new_start_date) + 1;
 
 	/* If a complete week is selected we show the Week view.
 	   Note that if weekends are compressed and the week start day is set
 	   to Sunday we don't actually show complete weeks in the Week view,
 	   so this may need tweaking. */
-	if (g_date_weekday (&new_start_date) % 7 == priv->week_start)
+	if (g_date_get_weekday (&new_start_date) % 7 == priv->week_start)
 		starts_on_week_start_day = TRUE;
 
 	/* Update selection to be in the new time range */
 	tt = icaltime_null_time ();
-	tt.year = g_date_year (&new_start_date);
-	tt.month  = g_date_month (&new_start_date);
-	tt.day = g_date_day (&new_start_date);
+	tt.year = g_date_get_year (&new_start_date);
+	tt.month  = g_date_get_month (&new_start_date);
+	tt.day = g_date_get_day (&new_start_date);
 	new_time = icaltime_as_timet_with_zone (tt, priv->zone);
 	
 	/* Switch views as appropriate, and change the number of days or weeks
--- evolution-2.8.0/calendar/gui/dialogs/event-page.c.more-deprecated	2006-09-26 16:15:28.000000000 -0400
+++ evolution-2.8.0/calendar/gui/dialogs/event-page.c	2006-09-26 16:15:28.000000000 -0400
@@ -1709,7 +1709,7 @@
 		const char *address;
 		
 		address = itip_strip_mailto (attendee->value);
-		if (address && !g_strcasecmp (ia_address, address)) {
+		if (address && !g_ascii_strcasecmp (ia_address, address)) {
 			e_cal_component_free_attendee_list (attendees);
 			return TRUE;
 		}
--- evolution-2.8.0/calendar/gui/dialogs/task-page.c.more-deprecated	2006-09-02 02:41:31.000000000 -0400
+++ evolution-2.8.0/calendar/gui/dialogs/task-page.c	2006-09-26 16:15:28.000000000 -0400
@@ -1013,7 +1013,7 @@
 		const char *address;
 		
 		address = itip_strip_mailto (attendee->value);
-		if (address && !g_strcasecmp (ia_address, address)) {
+		if (address && !g_ascii_strcasecmp (ia_address, address)) {
 			e_cal_component_free_attendee_list (attendees);
 			return TRUE;
 		}
--- evolution-2.8.0/calendar/gui/e-alarm-list.c.more-deprecated	2006-02-08 08:06:02.000000000 -0500
+++ evolution-2.8.0/calendar/gui/e-alarm-list.c	2006-09-26 16:15:28.000000000 -0400
@@ -393,31 +393,31 @@
 
 	if (duration->days >= 1) {
 		/* Translator: Entire string is like "Pop up an alert %d days before start of appointment" */
-		g_string_sprintf (string, ngettext("%d day", "%d days", duration->days), duration->days);
+		g_string_printf (string, ngettext("%d day", "%d days", duration->days), duration->days);
 		have_something = TRUE;
 	}
 
 	if (duration->weeks >= 1) {
 		/* Translator: Entire string is like "Pop up an alert %d weeks before start of appointment" */
-		g_string_sprintf (string, ngettext("%d week","%d weeks", duration->weeks), duration->weeks);
+		g_string_printf (string, ngettext("%d week","%d weeks", duration->weeks), duration->weeks);
 		have_something = TRUE;
 	}
 
 	if (duration->hours >= 1) {
 		/* Translator: Entire string is like "Pop up an alert %d hours before start of appointment" */
-		g_string_sprintf (string, ngettext("%d hour", "%d hours", duration->hours), duration->hours);
+		g_string_printf (string, ngettext("%d hour", "%d hours", duration->hours), duration->hours);
 		have_something = TRUE;
 	}
 
 	if (duration->minutes >= 1) {
 		/* Translator: Entire string is like "Pop up an alert %d minutes before start of appointment" */
-		g_string_sprintf (string, ngettext("%d minute", "%d minutes", duration->minutes), duration->minutes);
+		g_string_printf (string, ngettext("%d minute", "%d minutes", duration->minutes), duration->minutes);
 		have_something = TRUE;
 	}
 
 	if (duration->seconds >= 1) {
 		/* Translator: Entire string is like "Pop up an alert %d seconds before start of appointment" */
-		g_string_sprintf (string, ngettext("%d second", "%d seconds", duration->seconds), duration->seconds);
+		g_string_printf (string, ngettext("%d second", "%d seconds", duration->seconds), duration->seconds);
 		have_something = TRUE;
 	}
 
--- evolution-2.8.0/calendar/gui/e-meeting-attendee.c.more-deprecated	2006-02-08 08:06:02.000000000 -0500
+++ evolution-2.8.0/calendar/gui/e-meeting-attendee.c	2006-09-26 16:15:28.000000000 -0400
@@ -875,7 +875,7 @@
 	priv->has_calendar_info = TRUE;
 	priv->busy_periods_sorted = FALSE;
 
-	period_in_days = g_date_julian (&period.end.date) - g_date_julian (&period.start.date) + 1;
+	period_in_days = g_date_get_julian (&period.end.date) - g_date_get_julian (&period.start.date) + 1;
 	priv->longest_period_in_days = MAX (priv->longest_period_in_days, period_in_days);
 
 	return TRUE;
--- evolution-2.8.0/calendar/gui/e-meeting-store.c.more-deprecated	2006-04-22 00:39:20.000000000 -0400
+++ evolution-2.8.0/calendar/gui/e-meeting-store.c	2006-09-26 16:15:28.000000000 -0400
@@ -1276,17 +1276,17 @@
 		struct icaltimetype itt;
 				
 		itt = icaltime_null_time ();
-		itt.year = g_date_year (&qdata->start.date);
-		itt.month = g_date_month (&qdata->start.date);
-		itt.day = g_date_day (&qdata->start.date);
+		itt.year = g_date_get_year (&qdata->start.date);
+		itt.month = g_date_get_month (&qdata->start.date);
+		itt.day = g_date_get_day (&qdata->start.date);
 		itt.hour = qdata->start.hour;
 		itt.minute = qdata->start.minute;
 		fbd->startt = icaltime_as_timet_with_zone (itt, priv->zone);
 
 		itt = icaltime_null_time ();
-		itt.year = g_date_year (&qdata->end.date);
-		itt.month = g_date_month (&qdata->end.date);
-		itt.day = g_date_day (&qdata->end.date);
+		itt.year = g_date_get_year (&qdata->end.date);
+		itt.month = g_date_get_month (&qdata->end.date);
+		itt.day = g_date_get_day (&qdata->end.date);
 		itt.hour = qdata->end.hour;
 		itt.minute = qdata->end.minute;
 		fbd->endt = icaltime_as_timet_with_zone (itt, priv->zone);
--- evolution-2.8.0/calendar/gui/e-calendar-table.c.more-deprecated	2006-08-19 01:49:09.000000000 -0400
+++ evolution-2.8.0/calendar/gui/e-calendar-table.c	2006-09-26 16:15:28.000000000 -0400
@@ -492,7 +492,7 @@
 
 	pixbuf = e_icon_factory_get_icon ("stock_check-filled", E_ICON_SIZE_LIST);
 	e_table_extras_add_pixbuf(extras, "complete", pixbuf);
-	gdk_pixbuf_unref(pixbuf);
+	g_object_unref(pixbuf);
 
 	/* Create the table */
 
--- evolution-2.8.0/calendar/gui/e-meeting-time-sel-item.c.more-deprecated	2006-09-26 16:15:28.000000000 -0400
+++ evolution-2.8.0/calendar/gui/e-meeting-time-sel-item.c	2006-09-26 16:15:28.000000000 -0400
@@ -218,9 +218,9 @@
 
 	mts_item = E_MEETING_TIME_SELECTOR_ITEM (item);
 
-	gdk_gc_unref (mts_item->main_gc);
+	g_object_unref (mts_item->main_gc);
 	mts_item->main_gc = NULL;
-	gdk_gc_unref (mts_item->stipple_gc);
+	g_object_unref (mts_item->stipple_gc);
 	mts_item->stipple_gc = NULL;
 
 	if (GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_item_parent_class)->unrealize)
@@ -891,14 +891,14 @@
 
 	/* Set the new meeting time. */
 	e_meeting_time_selector_set_meeting_time (mts_item->mts,
-						  g_date_year (start_date),
-						  g_date_month (start_date),
-						  g_date_day (start_date),
+						  g_date_get_year (start_date),
+						  g_date_get_month (start_date),
+						  g_date_get_day (start_date),
 						  start_time.hour,
 						  start_time.minute,
-						  g_date_year (end_date),
-						  g_date_month (end_date),
-						  g_date_day (end_date),
+						  g_date_get_year (end_date),
+						  g_date_get_month (end_date),
+						  g_date_get_day (end_date),
 						  end_time.hour,
 						  end_time.minute);
 
--- evolution-2.8.0/calendar/gui/e-week-view-main-item.c.more-deprecated	2006-09-02 02:41:31.000000000 -0400
+++ evolution-2.8.0/calendar/gui/e-week-view-main-item.c	2006-09-26 16:15:28.000000000 -0400
@@ -224,8 +224,8 @@
 
 	g_return_if_fail (gc != NULL);
 
-	month = g_date_month (date);
-	day_of_month = g_date_day (date);
+	month = g_date_get_month (date);
+	day_of_month = g_date_get_day (date);
 	line_y = y + E_WEEK_VIEW_DATE_T_PAD +
 		PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
 		PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics)) +
@@ -341,9 +341,9 @@
 		/* Check if we are drawing today */		
 		tt = icaltime_from_timet_with_zone (time (NULL), FALSE,
 						    e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-		if (g_date_year (date) == tt.year 
-		    && g_date_month (date) == tt.month
-		    && g_date_day (date) == tt.day) {
+		if (g_date_get_year (date) == tt.year 
+		    && g_date_get_month (date) == tt.month
+		    && g_date_get_day (date) == tt.day) {
 			gdk_gc_set_foreground (gc, &week_view->colors[E_WEEK_VIEW_COLOR_TODAY]);
 			today = TRUE;
 		}
@@ -428,8 +428,8 @@
 
 	g_return_if_fail (gc != NULL);
 
-	month = g_date_month (date);
-	day_of_month = g_date_day (date);
+	month = g_date_get_month (date);
+	day_of_month = g_date_get_day (date);
 	line_y = y + E_WEEK_VIEW_DATE_T_PAD +
 		PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
 		PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics)) +
@@ -556,9 +556,9 @@
 		/* Check if we are drawing today */		
 		tt = icaltime_from_timet_with_zone (time (NULL), FALSE,
 						    e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-		if (g_date_year (date) == tt.year 
-		    && g_date_month (date) == tt.month
-		    && g_date_day (date) == tt.day) {
+		if (g_date_get_year (date) == tt.year 
+		    && g_date_get_month (date) == tt.month
+		    && g_date_get_day (date) == tt.day) {
 			gdk_cairo_set_source_color (cr, &week_view->colors[E_WEEK_VIEW_COLOR_TODAY]);
 			today = TRUE;
 		}
--- evolution-2.8.0/calendar/gui/e-day-view.c.more-deprecated	2006-09-26 16:15:28.000000000 -0400
+++ evolution-2.8.0/calendar/gui/e-day-view.c	2006-09-26 16:15:28.000000000 -0400
@@ -1531,7 +1531,7 @@
 
 	day_view = E_DAY_VIEW (widget);
 
-	gdk_gc_unref (day_view->main_gc);
+	g_object_unref (day_view->main_gc);
 	day_view->main_gc = NULL;
 
 	colormap = gtk_widget_get_colormap (widget);
@@ -2754,7 +2754,7 @@
 	   week start day. */
 
 	/* Get the weekday corresponding to start_time, 0 (Sun) to 6 (Sat). */
-	weekday = g_date_weekday (&date) % 7;
+	weekday = g_date_get_weekday (&date) % 7;
 
 	/* Calculate the first working day of the week, 0 (Sun) to 6 (Sat).
 	   It will automatically default to the week start day if no days
@@ -2775,9 +2775,9 @@
 		g_date_subtract_days (&date, offset);
 	}
 
-	tt.year = g_date_year (&date);
-	tt.month = g_date_month (&date);
-	tt.day = g_date_day (&date);
+	tt.year = g_date_get_year (&date);
+	tt.month = g_date_get_month (&date);
+	tt.day = g_date_get_day (&date);
 
 	return icaltime_as_timet_with_zone (tt, e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
 }
@@ -3467,7 +3467,7 @@
 	}
 
 	while (event_window && event_window != window
-	       && event_window != GDK_ROOT_PARENT()) {
+	       && event_window != gdk_get_default_root_window ()) {
 		gdk_window_get_position (event_window, &win_x, &win_y);
 		event_x += win_x;
 		event_y += win_y;
--- evolution-2.8.0/calendar/gui/e-week-view.c.more-deprecated	2006-09-26 16:15:28.000000000 -0400
+++ evolution-2.8.0/calendar/gui/e-week-view.c	2006-09-26 16:47:48.000000000 -0400
@@ -254,7 +254,7 @@
 	time_to_gdate_with_zone (&date, start_time, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
 
 	/* Calculate the weekday of the given date, 0 = Mon. */
-	weekday = g_date_weekday (&date) - 1;
+	weekday = g_date_get_weekday (&date) - 1;
 	
 	/* Convert it to an offset from the start of the display. */
 	week_start_offset = (weekday + 7 - week_view->display_start_day) % 7;
@@ -436,9 +436,9 @@
 
 	/* Recalculate the new start of the first week. We just use exactly
 	   the same time, but with the new timezone. */
-	tt.year = g_date_year (&week_view->first_day_shown);
-	tt.month = g_date_month (&week_view->first_day_shown);
-	tt.day = g_date_day (&week_view->first_day_shown);
+	tt.year = g_date_get_year (&week_view->first_day_shown);
+	tt.month = g_date_get_month (&week_view->first_day_shown);
+	tt.day = g_date_get_day (&week_view->first_day_shown);
 
 	lower = icaltime_as_timet_with_zone (tt, new_zone);
 
@@ -567,7 +567,7 @@
 	}
 	week_view->focused_jump_button = E_WEEK_VIEW_JUMP_BUTTON_NO_FOCUS;
 
-	gdk_pixbuf_unref (pixbuf);
+	g_object_unref (pixbuf);
 
 	/*
 	 * Scrollbar.
@@ -718,7 +718,7 @@
 
 	week_view = E_WEEK_VIEW (widget);
 
-	gdk_gc_unref (week_view->main_gc);
+	g_object_unref (week_view->main_gc);
 	week_view->main_gc = NULL;
 
 	colormap = gtk_widget_get_colormap (widget);
@@ -1368,16 +1368,16 @@
 	time_to_gdate_with_zone (&date, start_time, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
 
 	/* Set the selection to the given days. */
-	week_view->selection_start_day = g_date_julian (&date)
-		- g_date_julian (&week_view->base_date);
+	week_view->selection_start_day = g_date_get_julian (&date)
+		- g_date_get_julian (&week_view->base_date);
 	if (end_time == start_time
 	    || end_time <= time_add_day_with_zone (start_time, 1,
 						   e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view))))
 		week_view->selection_end_day = week_view->selection_start_day;
 	else {
 		time_to_gdate_with_zone (&end_date, end_time - 60, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-		week_view->selection_end_day = g_date_julian (&end_date)
-			- g_date_julian (&week_view->base_date);
+		week_view->selection_end_day = g_date_get_julian (&end_date)
+			- g_date_get_julian (&week_view->base_date);
 	}
 
 	/* Make sure the selection is valid. */
@@ -1411,16 +1411,16 @@
 	time_to_gdate_with_zone (&date, start_time, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
 	
 	/* Set the selection to the given days. */
-	week_view->selection_start_day = g_date_julian (&date)
-		- g_date_julian (&week_view->first_day_shown);
+	week_view->selection_start_day = g_date_get_julian (&date)
+		- g_date_get_julian (&week_view->first_day_shown);
 	if (end_time == start_time
 	    || end_time <= time_add_day_with_zone (start_time, 1,
 						   e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view))))
 		week_view->selection_end_day = week_view->selection_start_day;
 	else {
 		time_to_gdate_with_zone (&end_date, end_time - 60, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
-		week_view->selection_end_day = g_date_julian (&end_date)
-			- g_date_julian (&week_view->first_day_shown);
+		week_view->selection_end_day = g_date_get_julian (&end_date)
+			- g_date_get_julian (&week_view->first_day_shown);
 	}
 
 	/* Make sure the selection is valid. */
@@ -1510,15 +1510,15 @@
 	/* Calculate the old selection range. */
 	if (week_view->selection_start_day != -1) {
 		old_selection_start_julian =
-			g_date_julian (&week_view->base_date)
+			g_date_get_julian (&week_view->base_date)
 			+ week_view->selection_start_day;
 		old_selection_end_julian =
-			g_date_julian (&week_view->base_date)
+			g_date_get_julian (&week_view->base_date)
 			+ week_view->selection_end_day;
 	}
 
 	/* Calculate the weekday of the given date, 0 = Mon. */
-	weekday = g_date_weekday (date) - 1;
+	weekday = g_date_get_weekday (date) - 1;
 
 	/* Convert it to an offset from the start of the display. */
 	day_offset = (weekday + 7 - week_view->display_start_day) % 7;
@@ -1540,9 +1540,9 @@
 	    || g_date_compare (&week_view->first_day_shown, &base_date)) {
 		week_view->first_day_shown = base_date;
 
-		start_tt.year = g_date_year (&base_date);
-		start_tt.month = g_date_month (&base_date);
-		start_tt.day = g_date_day (&base_date);
+		start_tt.year = g_date_get_year (&base_date);
+		start_tt.month = g_date_get_month (&base_date);
+		start_tt.day = g_date_get_day (&base_date);
 
 		start_time = icaltime_as_timet_with_zone (start_tt,
 							  e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
@@ -1555,9 +1555,9 @@
 	   just select the first day. */
 	if (week_view->selection_start_day != -1) {
 		week_view->selection_start_day = old_selection_start_julian
-			- g_date_julian (&base_date);
+			- g_date_get_julian (&base_date);
 		week_view->selection_end_day = old_selection_end_julian
-			- g_date_julian (&base_date);
+			- g_date_get_julian (&base_date);
 
 		/* Make sure the selection is valid. */
 		num_days = week_view->multi_week_view
@@ -4160,7 +4160,7 @@
 					       pixbuf, NULL);
 		}
 		if (pixbuf)
-			gdk_pixbuf_unref (pixbuf);
+			g_object_unref (pixbuf);
 	}
 
 	return FALSE;
--- evolution-2.8.0/calendar/gui/goto.c.more-deprecated	2006-02-08 08:06:02.000000000 -0500
+++ evolution-2.8.0/calendar/gui/goto.c	2006-09-26 16:15:28.000000000 -0400
@@ -91,9 +91,9 @@
 	
 	e_calendar_item_get_selection (calitem, &start_date, &end_date);
 
-	tt.year = g_date_year (&start_date);
-	tt.month = g_date_month (&start_date);
-	tt.day = g_date_day (&start_date);
+	tt.year = g_date_get_year (&start_date);
+	tt.month = g_date_get_month (&start_date);
+	tt.day = g_date_get_day (&start_date);
 
 	et = icaltime_as_timet_with_zone (tt, gnome_calendar_get_timezone (dlg->gcal));
 


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-6/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	5 Sep 2006 11:48:57 -0000	1.57
+++ .cvsignore	19 Oct 2006 22:09:56 -0000	1.58
@@ -1 +1 @@
-evolution-2.8.0.tar.bz2
+evolution-2.8.1.1.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-6/evolution.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- evolution.spec	1 Oct 2006 21:16:18 -0000	1.195
+++ evolution.spec	19 Oct 2006 22:09:56 -0000	1.196
@@ -34,18 +34,16 @@
 %endif
 %define use_mozilla_nss 1
 
-# Upstream tarballs often contain instances of undeclared functions; these tend
-# to work on i386 but fail on 64-bit architectures.  Leave this on to trap the
-# warnings as errors (and ideally get the flag into the upstream build):
-%define require_function_declarations 1
+# Use stricter build settings than required by upstream.
+%define strict_build_settings 1
 
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
 ### Abstract ###
 
 Name: evolution
-Version: 2.8.0
-Release: 7%{?dist}
+Version: 2.8.1.1
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -96,39 +94,23 @@
 # RH bug #157505 / Gnome.org bug #303878
 Patch22: evolution-2.7.4-candidate-window-position-calendar.patch
 
-# RH bug #190359 / Gnome.org bug #211058
-Patch23: evolution-2.7.3-filter-datespec.patch
-
 # RH bug #166231 / Gnome.org bug #264485
-Patch24: evolution-2.7.3-replicated-cjk-input.patch
+Patch23: evolution-2.7.3-replicated-cjk-input.patch
 
 # RH bug #178295 / Gnome.org bug #348638
-Patch25: evolution-2.7.4-deleting-preedit-buffer.patch
-
-# Gnome.org bug #352450 (2 patches)
-Patch26: evolution-2.7.92-deprecated-glib.patch
-Patch27: evolution-2.7.92-deprecated-gdk.patch
+Patch24: evolution-2.7.4-deleting-preedit-buffer.patch
 
 # RH bug #202289
-Patch28: evolution-2.7.92-fix-prgname.patch
-
-# Gnome.org bug #353472
-Patch29: evolution-2.7.92-chain-finalize.patch
-
-# Gnome.org bug #351332
-Patch30: evolution-2.8.0-fix-missing-declarations.patch
-
-# RH bug #201307 / Gnome.org bug #350565
-Patch31: evolution-2.8.0-search-on-folder-change.patch
+Patch25: evolution-2.7.92-fix-prgname.patch
 
 # RH bug #161885 / Gnome.org bug #309166
-Patch32: evolution-2.8.0-indic-cursor-movement.patch
+Patch26: evolution-2.8.0-indic-cursor-movement.patch
 
-# Gnome.org bug #356811
-Patch33: evolution-2.8.0-uninstall.patch
+# Gnome.org bug #357216
+Patch27: evolution-2.8.0-deprecated-gdk-font.patch
 
-# RH bug #205576 / Gnome.org bug #352982
-Patch34: evolution-2.8.0-fix-message-deletion.patch
+# Gnome.org bug #357970
+Patch28: evolution-2.8.0-more-deprecated.patch
 
 ### Dependencies ###
 
@@ -254,18 +236,12 @@
 %patch20 -p1 -b .quit-resize-crash
 %patch21 -p1 -b .candidate-window-position-task
 %patch22 -p1 -b .candidate-window-position-calendar
-%patch23 -p1 -b .filter-datespec
-%patch24 -p1 -b .replicated-cjk-input
-%patch25 -p1 -b .deleting-preedit-buffer
-%patch26 -p1 -b .deprecated-glib
-%patch27 -p1 -b .deprecated-gdk
-%patch28 -p1 -b .fix-prgname
-%patch29 -p1 -b .chain-finalize
-%patch30 -p1 -b .fix-missing-declarations
-%patch31 -p1 -b .search-on-folder-change
-%patch32 -p1 -b .indic-cursor-movement
-%patch33 -p1 -b .uninstall
-%patch34 -p1 -b .fix-message-deletion
+%patch23 -p1 -b .replicated-cjk-input
+%patch24 -p1 -b .deleting-preedit-buffer
+%patch25 -p1 -b .fix-prgname
+%patch26 -p1 -b .indic-cursor-movement
+%patch27 -p1 -b .deprecated-gdk-font
+%patch28 -p1 -b .more-deprecated
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -325,6 +301,21 @@
 fi
 %endif
 
+# Add stricter build settings here as the source code gets cleaned up.
+# We want to make sure things like compiler warnings and avoiding deprecated
+# functions in the GNOME/GTK+ libraries stay fixed.
+#
+# Please file a bug report at bugzilla.gnome.org if these settings break
+# compilation, and encourage the upstream developers to use them.
+
+%if %{strict_build_settings}
+CFLAGS="$CFLAGS \
+	-DG_DISABLE_DEPRECATED=1 \
+	-DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+	-DGDK_DISABLE_DEPRECATED=1 \
+	-Werror-implicit-function-declaration"
+%endif
+
 # Rerun the GNU Autotools since we patched some of the input files.
 aclocal
 autoheader
@@ -377,15 +368,15 @@
 # scrollkeeper gets handled in %post
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
-# evolution is the preferred email app
-ln -sf ../desktop-menu-patches/redhat-evolution-mail.desktop \
-	$RPM_BUILD_ROOT/%{_datadir}/applications/
-ln -sf ../desktop-menu-patches/redhat-evolution-calendar.desktop \
-	$RPM_BUILD_ROOT/%{_datadir}/applications/
-ln -sf ../desktop-menu-patches/redhat-evolution-contacts.desktop \
-	$RPM_BUILD_ROOT/%{_datadir}/applications/
-ln -sf ../desktop-menu-patches/redhat-evolution-tasks.desktop \
-	$RPM_BUILD_ROOT/%{_datadir}/applications/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-mail.desktop \
+  $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-mail.desktop
+ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-calendar.desktop \
+  $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-calendar.desktop
+ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-contacts.desktop \
+  $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-contacts.desktop
+ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-tasks.desktop \
+  $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-tasks.desktop
 
 # remove upstream desktop file; use the symlinks from above (#103826)
 rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution-%{evo_major}.desktop
@@ -656,6 +647,20 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Thu Oct 19 2006 Matthew Barnes <mbarnes at redhat.com> - 2.8.1.1-1.fc6
+- Update to 2.8.1.1
+- Use stricter build settings.
+- Make .desktop symlinks absolute (RH bug #209322).
+- Add patch for Gnome.org #357216 (deprecated GDK symbols).
+- Add patch for Gnome.org #357970 (more deprecated symbols).
+- Remove patch for RH bug #190359 (fixed upstream).
+- Remove patch for RH bug #201307 (fixed upstream).
+- Remove patch for RH bug #205576 (fixed upstream).
+- Remove patch for Gnome.org bug #351332 (fixed upstream).
+- Remove patch for Gnome.org bug #352450 (fixed upstream).
+- Remove patch for Gnome.org bug #353472 (fixed upstream).
+- Remove patch for Gnome.org bug #356811 (fixed upstream).
+
 * Sun Oct 01 2006 Jesse Keating <jkeating at redhat.com> - 2.8.0-7.fc6
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-6/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	5 Sep 2006 11:48:57 -0000	1.57
+++ sources	19 Oct 2006 22:09:56 -0000	1.58
@@ -1 +1 @@
-fdcdaa4f6c11cb3b42078262838967d7  evolution-2.8.0.tar.bz2
+dcf3a8cc527a7d8b5ae0ac56d66fff64  evolution-2.8.1.1.tar.bz2


--- evolution-2.7.3-filter-datespec.patch DELETED ---


--- evolution-2.7.92-chain-finalize.patch DELETED ---


--- evolution-2.7.92-deprecated-gdk.patch DELETED ---


--- evolution-2.7.92-deprecated-glib.patch DELETED ---


--- evolution-2.8.0-fix-message-deletion.patch DELETED ---


--- evolution-2.8.0-fix-missing-declarations.patch DELETED ---


--- evolution-2.8.0-search-on-folder-change.patch DELETED ---


--- evolution-2.8.0-uninstall.patch DELETED ---




More information about the fedora-cvs-commits mailing list