From f9c5e8a69a9714fa59090bd250ab50adc5900693 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 19 May 2007 00:56:12 +0000 Subject: [PATCH] - Update to 2.11.2 - Bump evo_major to 2.12. - Bump eds_version to 1.11.0. - Update files with new plugins and icons. - Remove patch for RH bug #190359 (fixed upstream). - Remove patch for RH bug #218801 (fixed upstream). - Remove patch for RH bug #234315 (fixed upstream). - Remove patch for RH bug #236399 (fixed upstream). - Remove patch for RH bug #236860 (fixed upstream). - Remove patch for RH bug #238551 (fixed upstream). - Remove patch for GNOME bug #373837 (fixed upstream). - Remove patch for GNOME bug #373116 (fixed upstream). - Remove patch for GNOME bug #418971 (fixed upstream). - Remove patch for GNOME bug #419469 (fixed upstream). - Remove patch for GNOME bug #419524 (fixed upstream). - Remove evolution-2.6.0-prototypes.patch (obsolete). --- .cvsignore | 2 +- evolution-2.10.0-drop-old-glib-support.patch | 39 - evolution-2.10.0-e-source-combo-box.patch | 122 +- evolution-2.10.0-shell-main-cleanups.patch | 274 -- evolution-2.10.0-use-glib-i18n.patch | 3348 ----------------- evolution-2.10.1-e-attachment-bar.patch | 11 - ...tion-2.10.1-en_CA-attribution-format.patch | 11 - evolution-2.10.1-fix-uri-handling.patch | 14 - evolution-2.10.1-saving-attachments.patch | 218 -- evolution-2.10.1-send-recv-dialog.patch | 114 +- evolution-2.7.3-filter-datespec.patch | 178 - evolution-2.8.0-fix-indic-printing.patch | 39 +- evolution-2.8.1-kill-ethread.patch | 300 +- evolution-2.9.2-gtk-font-button.patch | 153 - evolution-2.9.3-gtk-color-button.patch | 1219 ------ evolution-2.9.3-unread-messages.patch | 63 - evolution.spec | 192 +- sources | 2 +- 18 files changed, 382 insertions(+), 5917 deletions(-) delete mode 100644 evolution-2.10.0-drop-old-glib-support.patch delete mode 100644 evolution-2.10.0-shell-main-cleanups.patch delete mode 100644 evolution-2.10.0-use-glib-i18n.patch delete mode 100644 evolution-2.10.1-e-attachment-bar.patch delete mode 100644 evolution-2.10.1-en_CA-attribution-format.patch delete mode 100644 evolution-2.10.1-fix-uri-handling.patch delete mode 100644 evolution-2.10.1-saving-attachments.patch delete mode 100644 evolution-2.7.3-filter-datespec.patch delete mode 100644 evolution-2.9.2-gtk-font-button.patch delete mode 100644 evolution-2.9.3-gtk-color-button.patch delete mode 100644 evolution-2.9.3-unread-messages.patch diff --git a/.cvsignore b/.cvsignore index 8aa3781..decf6ed 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.10.1.tar.bz2 +evolution-2.11.2.tar.bz2 diff --git a/evolution-2.10.0-drop-old-glib-support.patch b/evolution-2.10.0-drop-old-glib-support.patch deleted file mode 100644 index 2ece0c8..0000000 --- a/evolution-2.10.0-drop-old-glib-support.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- evolution-2.10.0/mail/em-utils.c.drop-old-glib-support 2007-03-18 08:17:46.000000000 -0400 -+++ evolution-2.10.0/mail/em-utils.c 2007-03-18 08:24:07.000000000 -0400 -@@ -42,10 +42,6 @@ - #undef interface - #endif - --#if !GLIB_CHECK_VERSION (2, 8, 0) --#define g_access access --#endif -- - #include - #include - #include ---- evolution-2.10.0/mail/mail-config.c.drop-old-glib-support 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/mail-config.c 2007-03-18 08:24:07.000000000 -0400 -@@ -76,10 +76,6 @@ - #include "mail-mt.h" - #include "mail-tools.h" - --#if !GLIB_CHECK_VERSION (2, 8, 0) --#define g_creat creat --#endif -- - /* Note, the first element of each MailConfigLabel must NOT be translated */ - MailConfigLabel label_defaults[5] = { - { "important", N_("I_mportant"), "#ff0000" }, /* red */ ---- evolution-2.10.0/plugins/save-attachments/save-attachments.c.drop-old-glib-support 2007-03-18 08:17:29.000000000 -0400 -+++ evolution-2.10.0/plugins/save-attachments/save-attachments.c 2007-03-18 08:24:07.000000000 -0400 -@@ -32,10 +32,6 @@ - #include - #include - --#if !GLIB_CHECK_VERSION (2, 8, 0) --#define g_access access --#endif -- - #include - #include - #include diff --git a/evolution-2.10.0-e-source-combo-box.patch b/evolution-2.10.0-e-source-combo-box.patch index 43b5d69..e1d0078 100644 --- a/evolution-2.10.0-e-source-combo-box.patch +++ b/evolution-2.10.0-e-source-combo-box.patch @@ -1,9 +1,9 @@ ---- evolution-2.10.0/widgets/misc/e-pilot-settings.c.e-source-combo-box 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-pilot-settings.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/widgets/misc/e-pilot-settings.c.e-source-combo-box 2007-04-18 06:18:34.000000000 -0400 ++++ evolution-2.11.2/widgets/misc/e-pilot-settings.c 2007-05-18 15:49:15.000000000 -0400 @@ -27,7 +27,7 @@ #include - #include + #include -#include +#include #include "e-pilot-settings.h" @@ -40,8 +40,8 @@ } gboolean ---- evolution-2.10.0/plugins/itip-formatter/itip-formatter.c.e-source-combo-box 2007-02-26 04:59:58.000000000 -0500 -+++ evolution-2.10.0/plugins/itip-formatter/itip-formatter.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/plugins/itip-formatter/itip-formatter.c.e-source-combo-box 2007-04-18 06:17:20.000000000 -0400 ++++ evolution-2.11.2/plugins/itip-formatter/itip-formatter.c 2007-05-18 15:48:37.000000000 -0400 @@ -39,7 +39,7 @@ #include #include @@ -51,8 +51,8 @@ #include #include #include ---- evolution-2.10.0/plugins/itip-formatter/itip-view.c.e-source-combo-box 2007-01-03 10:34:04.000000000 -0500 -+++ evolution-2.10.0/plugins/itip-formatter/itip-view.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/plugins/itip-formatter/itip-view.c.e-source-combo-box 2007-05-13 13:41:08.000000000 -0400 ++++ evolution-2.11.2/plugins/itip-formatter/itip-view.c 2007-05-18 15:48:37.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -62,7 +62,7 @@ #include #include #include -@@ -104,8 +104,8 @@ +@@ -103,8 +103,8 @@ char *description; GtkWidget *selector_box; @@ -73,7 +73,7 @@ ESourceList *source_list; GtkWidget *rsvp_box; -@@ -1664,10 +1664,12 @@ +@@ -1671,10 +1671,12 @@ } static void @@ -89,7 +89,7 @@ g_signal_emit (view, signals[SOURCE_SELECTED], 0, source); } -@@ -1684,40 +1686,42 @@ +@@ -1691,40 +1693,42 @@ if (priv->source_list) g_object_unref (priv->source_list); @@ -149,7 +149,7 @@ } ESourceList * -@@ -1743,10 +1747,11 @@ +@@ -1750,10 +1754,11 @@ priv = view->priv; @@ -163,7 +163,7 @@ } ESource * -@@ -1759,10 +1764,11 @@ +@@ -1766,10 +1771,11 @@ priv = view->priv; @@ -177,8 +177,8 @@ } void ---- evolution-2.10.0/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-01-03 10:34:02.000000000 -0500 -+++ evolution-2.10.0/plugins/bbdb/gaimbuddies.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-05-13 13:41:06.000000000 -0400 ++++ evolution-2.11.2/plugins/bbdb/gaimbuddies.c 2007-05-18 15:48:37.000000000 -0400 @@ -44,7 +44,7 @@ #include @@ -188,8 +188,8 @@ #include #include ---- evolution-2.10.0/plugins/bbdb/bbdb.c.e-source-combo-box 2007-01-03 10:34:02.000000000 -0500 -+++ evolution-2.10.0/plugins/bbdb/bbdb.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/plugins/bbdb/bbdb.c.e-source-combo-box 2007-04-18 06:17:14.000000000 -0400 ++++ evolution-2.11.2/plugins/bbdb/bbdb.c 2007-05-18 15:48:37.000000000 -0400 @@ -40,7 +40,7 @@ #include @@ -259,8 +259,8 @@ } GtkWidget * ---- evolution-2.10.0/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box 2007-05-14 00:24:02.000000000 -0400 ++++ evolution-2.11.2/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-05-18 15:48:37.000000000 -0400 @@ -158,9 +158,9 @@ @@ -273,8 +273,8 @@ 0 0 Tue, 01 Jun 2004 18:22:38 GMT ---- evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box 2007-04-18 06:15:40.000000000 -0400 ++++ evolution-2.11.2/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-05-18 15:48:37.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -390,8 +390,8 @@ gtk_widget_set_sensitive (editor->source_menu, editor->is_new_list); gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "source-label"), editor->is_new_list); } ---- evolution-2.10.0/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-02-26 04:59:17.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/contact-editor/contact-editor.glade 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-04-18 06:15:34.000000000 -0400 ++++ evolution-2.11.2/addressbook/gui/contact-editor/contact-editor.glade 2007-05-18 15:48:37.000000000 -0400 @@ -356,9 +356,9 @@ @@ -404,8 +404,8 @@ 0 0 Tue, 13 Apr 2004 20:47:50 GMT ---- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-02-26 04:59:17.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-05-09 00:14:39.000000000 -0400 ++++ evolution-2.11.2/addressbook/gui/contact-editor/e-contact-editor.c 2007-05-18 15:48:37.000000000 -0400 @@ -46,7 +46,7 @@ #include @@ -415,7 +415,7 @@ #include -@@ -590,15 +590,16 @@ +@@ -589,15 +589,16 @@ fill_in_source_field (EContactEditor *editor) { GtkWidget *source_menu; @@ -436,7 +436,7 @@ } static void -@@ -2525,13 +2526,15 @@ +@@ -2521,13 +2522,15 @@ editor->load_book = NULL; if (status != E_BOOK_ERROR_OK || new_book == NULL) { @@ -456,7 +456,7 @@ if (new_book) g_object_unref (new_book); -@@ -2555,8 +2558,12 @@ +@@ -2551,8 +2554,12 @@ } static void @@ -470,7 +470,7 @@ cancel_load (editor); if (e_source_equal (e_book_get_source (editor->target_book), source)) -@@ -3330,8 +3337,8 @@ +@@ -3323,8 +3330,8 @@ g_signal_connect (widget, "clicked", G_CALLBACK (full_name_clicked), e_contact_editor); widget = glade_xml_get_widget(e_contact_editor->gui, "button-categories"); g_signal_connect (widget, "clicked", G_CALLBACK (categories_clicked), e_contact_editor); @@ -481,7 +481,7 @@ label = glade_xml_get_widget (e_contact_editor->gui, "where-label"); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); widget = glade_xml_get_widget (e_contact_editor->gui, "button-ok"); -@@ -3782,25 +3789,25 @@ +@@ -3775,25 +3782,25 @@ } GtkWidget * @@ -517,8 +517,8 @@ + gtk_widget_show (combo_box); + return combo_box; } ---- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-01-03 10:32:45.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-04-18 06:15:34.000000000 -0400 ++++ evolution-2.11.2/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-05-18 15:48:37.000000000 -0400 @@ -37,7 +37,7 @@ #include #include @@ -542,7 +542,7 @@ if (qa->book) { g_object_unref (qa->book); qa->book = NULL; -@@ -317,16 +321,20 @@ +@@ -316,16 +320,20 @@ gconf_client = gconf_client_get_default (); source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources"); @@ -567,8 +567,8 @@ g_object_unref (source_list); ---- evolution-2.10.0/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/memo-page.glade 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-04-18 06:18:36.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/dialogs/memo-page.glade 2007-05-18 15:48:37.000000000 -0400 @@ -141,7 +141,7 @@ @@ -578,8 +578,8 @@ 0 0 Tue, 13 Jan 2004 22:00:00 GMT ---- evolution-2.10.0/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/event-page.glade 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-04-18 06:18:36.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/dialogs/event-page.glade 2007-05-18 15:48:37.000000000 -0400 @@ -774,7 +774,7 @@ @@ -589,8 +589,8 @@ 0 0 Wed, 17 Dec 2003 18:20:26 GMT ---- evolution-2.10.0/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/task-page.glade 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-05-09 00:14:46.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/dialogs/task-page.glade 2007-05-18 15:48:37.000000000 -0400 @@ -618,7 +618,7 @@ 24 @@ -600,11 +600,11 @@ 0 0 Thu, 18 Dec 2003 01:58:48 GMT ---- evolution-2.10.0/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/memo-page.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-04-20 00:28:26.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/dialogs/memo-page.c 2007-05-18 15:48:37.000000000 -0400 @@ -35,7 +35,7 @@ #include - #include + #include #include -#include +#include @@ -631,7 +631,7 @@ priv->updating = FALSE; -@@ -844,13 +844,12 @@ +@@ -842,13 +842,12 @@ } static void @@ -649,7 +649,7 @@ if (!priv->updating) { ECal *client; -@@ -862,8 +861,9 @@ +@@ -860,8 +859,9 @@ if (client) g_object_unref (client); @@ -661,7 +661,7 @@ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, -@@ -973,7 +973,7 @@ +@@ -971,7 +971,7 @@ G_CALLBACK (categories_clicked_cb), mpage); /* Source selector */ @@ -670,7 +670,7 @@ G_CALLBACK (source_changed_cb), mpage); /* Connect the default signal handler to use to make sure the "changed" -@@ -1167,21 +1167,22 @@ +@@ -1165,21 +1165,22 @@ return dedit; } @@ -700,18 +700,18 @@ + gtk_widget_show (combo_box); + return combo_box; } ---- evolution-2.10.0/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-03-12 23:45:00.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/dialogs/event-page.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-05-09 00:14:46.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/dialogs/event-page.c 2007-05-18 15:48:37.000000000 -0400 @@ -33,7 +33,7 @@ #include - #include + #include #include -#include +#include #include "common/authentication.h" #include "e-util/e-categories-config.h" #include "e-util/e-dialog-widgets.h" -@@ -967,7 +967,6 @@ +@@ -969,7 +969,6 @@ ECalComponentDateTime start_date, end_date; const char *location, *uid = NULL; const char *categories; @@ -719,7 +719,7 @@ GSList *l; gboolean validated = TRUE; -@@ -1163,8 +1162,9 @@ +@@ -1165,8 +1164,9 @@ e_dialog_editable_set (priv->categories, categories); /* Source */ @@ -812,11 +812,11 @@ } GtkWidget *make_status_icons (void); ---- evolution-2.10.0/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/task-page.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-04-20 00:28:26.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/dialogs/task-page.c 2007-05-18 15:48:37.000000000 -0400 @@ -35,7 +35,7 @@ #include - #include + #include #include -#include +#include @@ -843,7 +843,7 @@ if (priv->is_assignment) { ECalComponentOrganizer organizer; -@@ -1617,13 +1617,12 @@ +@@ -1615,13 +1615,12 @@ } static void @@ -861,7 +861,7 @@ if (!priv->updating) { ECal *client; -@@ -1642,8 +1641,9 @@ +@@ -1640,8 +1639,9 @@ if (client) g_object_unref (client); @@ -873,7 +873,7 @@ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, -@@ -1655,7 +1655,7 @@ +@@ -1653,7 +1653,7 @@ comp_editor_notify_client_changed ( COMP_EDITOR (gtk_widget_get_toplevel (priv->main)), client); @@ -882,7 +882,7 @@ if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS) && priv->is_assignment) task_page_show_options (tpage); else -@@ -1679,7 +1679,8 @@ +@@ -1677,7 +1677,8 @@ if (!priv->sod) { priv->sod = e_sendoptions_dialog_new (); priv->sod->data->initialized = TRUE; @@ -892,7 +892,7 @@ e_sendoptions_utils_set_default_data (priv->sod, source, "task"); } -@@ -1734,7 +1735,7 @@ +@@ -1732,7 +1733,7 @@ G_CALLBACK (categories_clicked_cb), tpage); /* Source selector */ @@ -901,7 +901,7 @@ G_CALLBACK (source_changed_cb), tpage); /* Connect the default signal handler to use to make sure the "changed" -@@ -1955,21 +1956,22 @@ +@@ -1953,21 +1954,22 @@ return dedit; } @@ -931,8 +931,8 @@ + gtk_widget_show (combo_box); + return combo_box; } ---- evolution-2.10.0/calendar/gui/e-itip-control.c.e-source-combo-box 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-itip-control.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/calendar/gui/e-itip-control.c.e-source-combo-box 2007-04-20 00:28:27.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/e-itip-control.c 2007-05-18 15:48:37.000000000 -0400 @@ -44,7 +44,7 @@ #include #include diff --git a/evolution-2.10.0-shell-main-cleanups.patch b/evolution-2.10.0-shell-main-cleanups.patch deleted file mode 100644 index 2549279..0000000 --- a/evolution-2.10.0-shell-main-cleanups.patch +++ /dev/null @@ -1,274 +0,0 @@ ---- evolution-2.10.0/shell/main.c.shell-main-cleanups 2007-03-17 22:19:29.000000000 -0400 -+++ evolution-2.10.0/shell/main.c 2007-03-17 22:21:01.000000000 -0400 -@@ -88,6 +88,9 @@ - - #include "e-util/e-plugin.h" - -+#define SKIP_WARNING_DIALOG_KEY \ -+ "/apps/evolution/shell/skip_warning_dialog" -+ - static EShell *shell = NULL; - - /* Command-line options. */ -@@ -100,7 +103,7 @@ - #endif - static gboolean disable_eplugin = FALSE; - --static gint idle_cb (void *data); -+static gboolean idle_cb (gchar **uris); - - static char *default_component_id = NULL; - static char *evolution_debug_log = NULL; -@@ -133,6 +136,7 @@ - system (KILL_PROCESS_CMD " -9 evolution-data-server-1.2 2> /dev/null"); - system (KILL_PROCESS_CMD " -9 evolution-data-server-1.4 2> /dev/null"); - system (KILL_PROCESS_CMD " -9 evolution-data-server-1.6 2> /dev/null"); -+ system (KILL_PROCESS_CMD " -9 evolution-data-server-1.8 2> /dev/null"); - - system (KILL_PROCESS_CMD " -9 lt-evolution-alarm-notify 2> /dev/null"); - system (KILL_PROCESS_CMD " -9 evolution-alarm-notify 2> /dev/null"); -@@ -182,35 +186,15 @@ - - /* Warning dialog to scare people off a little bit. */ - --static void --warning_dialog_response_callback (GtkDialog *dialog, -- int button_number, -- void *data) --{ -- GtkCheckButton *dont_bother_me_again_checkbox; -- GConfClient *client; -- -- dont_bother_me_again_checkbox = GTK_CHECK_BUTTON (data); -- -- client = gconf_client_get_default (); -- gconf_client_set_bool (client, "/apps/evolution/shell/skip_warning_dialog", -- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dont_bother_me_again_checkbox)), -- NULL); -- g_object_unref (client); -- -- gtk_widget_destroy (GTK_WIDGET (dialog)); -- -- idle_cb(NULL); --} -- --static void -+static gboolean - show_development_warning(void) - { - GtkWidget *vbox; - GtkWidget *label; - GtkWidget *warning_dialog; -- GtkWidget *dont_bother_me_again_checkbox; -+ GtkWidget *checkbox; - GtkWidget *alignment; -+ gboolean skip; - char *text; - - warning_dialog = gtk_dialog_new (); -@@ -262,59 +246,58 @@ - - gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0); - -- dont_bother_me_again_checkbox = gtk_check_button_new_with_label (_("Do not tell me again")); -+ checkbox = gtk_check_button_new_with_label (_("Do not tell me again")); - - alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.0); - -- gtk_container_add (GTK_CONTAINER (alignment), dont_bother_me_again_checkbox); -+ gtk_container_add (GTK_CONTAINER (alignment), checkbox); - gtk_box_pack_start (GTK_BOX (vbox), alignment, TRUE, TRUE, 0); - - gtk_widget_show_all (warning_dialog); - -- g_signal_connect (warning_dialog, "response", -- G_CALLBACK (warning_dialog_response_callback), -- dont_bother_me_again_checkbox); -+ gtk_dialog_run (GTK_DIALOG (warning_dialog)); -+ -+ skip = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)); -+ -+ gtk_widget_destroy (warning_dialog); -+ -+ idle_cb (NULL); -+ -+ return skip; - } - - static void --destroy_config (void) -+destroy_config (GConfClient *client) - { -- GConfClient *gconf; -- -- gconf = gconf_client_get_default (); -- - /* Unset the source stuff */ -- gconf_client_unset (gconf, "/apps/evolution/calendar/sources", NULL); -- gconf_client_unset (gconf, "/apps/evolution/tasks/sources", NULL); -- gconf_client_unset (gconf, "/apps/evolution/addressbook/sources", NULL); -- gconf_client_unset (gconf, "/apps/evolution/addressbook/sources", NULL); -+ gconf_client_unset (client, "/apps/evolution/calendar/sources", NULL); -+ gconf_client_unset (client, "/apps/evolution/tasks/sources", NULL); -+ gconf_client_unset (client, "/apps/evolution/addressbook/sources", NULL); - - /* Reset the version */ -- gconf_client_set_string (gconf, "/apps/evolution/version", "1.4.0", NULL); -+ gconf_client_set_string (client, "/apps/evolution/version", "1.4.0", NULL); - - /* Clear the dir */ - system ("rm -Rf ~/.evolution"); -- -- g_object_unref (gconf); - } - - #endif /* DEVELOPMENT */ - - static void --open_uris (GNOME_Evolution_Shell corba_shell, GSList *uri_list) -+open_uris (GNOME_Evolution_Shell corba_shell, gchar **uris) - { -- GSList *p; - CORBA_Environment ev; -+ guint n_uris, ii; - -- CORBA_exception_init (&ev); -+ g_assert (uris != NULL); -+ n_uris = g_strv_length (uris); - -- for (p = uri_list; p != NULL; p = p->next) { -- const char *uri; -+ CORBA_exception_init (&ev); - -- uri = (const char *) p->data; -- GNOME_Evolution_Shell_handleURI (corba_shell, uri, &ev); -+ for (ii = 0; ii < n_uris; ii++) { -+ GNOME_Evolution_Shell_handleURI (corba_shell, uris[ii], &ev); - if (ev._major != CORBA_NO_EXCEPTION) { -- g_warning ("Invalid URI: %s", uri); -+ g_warning ("Invalid URI: %s", uris[ii]); - CORBA_exception_free (&ev); - } - } -@@ -324,23 +307,22 @@ - - /* This is for doing stuff that requires the GTK+ loop to be running already. */ - --static gint --idle_cb (void *data) -+static gboolean -+idle_cb (gchar **uris) - { -- GSList *uri_list; - GNOME_Evolution_Shell corba_shell; - CORBA_Environment ev; - EShellConstructResult result; - EShellStartupLineMode startup_line_mode; - -+ g_assert (uris == NULL || g_strv_length (uris) > 0); -+ - #ifdef KILL_PROCESS_CMD - kill_old_dataserver (); - #endif - - CORBA_exception_init (&ev); - -- uri_list = (GSList *) data; -- - if (! start_online && ! start_offline) - startup_line_mode = E_SHELL_STARTUP_LINE_MODE_CONFIG; - else if (start_online) -@@ -378,15 +360,16 @@ - } - - if (shell != NULL) { -- if (g_slist_length (uri_list) == 0) -+ if (uris != NULL) -+ open_uris (corba_shell, uris); -+ else - e_shell_create_window (shell, default_component_id, NULL); -- open_uris (corba_shell, uri_list); - } else { - CORBA_Environment ev; - - CORBA_exception_init (&ev); -- if (uri_list != NULL) -- open_uris (corba_shell, uri_list); -+ if (uris != NULL) -+ open_uris (corba_shell, uris); - else - if (default_component_id == NULL) - GNOME_Evolution_Shell_createNewWindow (corba_shell, "", &ev); -@@ -396,8 +379,6 @@ - CORBA_exception_free (&ev); - } - -- g_slist_free (uri_list); -- - CORBA_Object_release (corba_shell, &ev); - - CORBA_exception_free (&ev); -@@ -501,7 +482,6 @@ - GConfClient *client; - gboolean skip_warning_dialog; - #endif -- GSList *uri_list; - GnomeProgram *program; - GOptionContext *context; - char *filename; -@@ -543,8 +523,10 @@ - #endif - - #if DEVELOPMENT -+ client = g_conf_client_get_default (); -+ - if (force_migrate) { -- destroy_config (); -+ destroy_config (client); - } - #endif - -@@ -571,17 +553,6 @@ - if (setup_only) - exit (0); - -- uri_list = NULL; -- -- if (remaining_args != NULL) { -- const char **p; -- -- for (p = (const char**)remaining_args; *p != NULL; p++) -- uri_list = g_slist_prepend (uri_list, (char *) *p); -- } -- uri_list = g_slist_reverse (uri_list); -- -- - gnome_sound_init ("localhost"); - - if (!disable_eplugin) { -@@ -597,15 +568,20 @@ - } - - #if DEVELOPMENT -- client = gconf_client_get_default (); -- skip_warning_dialog = gconf_client_get_bool (client, "/apps/evolution/shell/skip_warning_dialog", NULL); -- g_object_unref (client); -+ skip_warning_dialog = gconf_client_get_bool ( -+ client, SKIP_WARNING_DIALOG_KEY, NULL); - - if (!skip_warning_dialog && !getenv ("EVOLVE_ME_HARDER")) -- show_development_warning(); -+ gconf_client_set_bool ( -+ client, SKIP_WARNING_DIALOG_KEY, -+ show_development_warning (), NULL); - else -+ g_idle_add ((GSourceFunc) idle_cb, remaining_args); -+ -+ g_object_unref (client); -+#else -+ g_idle_add ((GSourceFunc) idle_cb, remaining_args); - #endif -- g_idle_add (idle_cb, uri_list); - - bonobo_main (); - diff --git a/evolution-2.10.0-use-glib-i18n.patch b/evolution-2.10.0-use-glib-i18n.patch deleted file mode 100644 index 8e45357..0000000 --- a/evolution-2.10.0-use-glib-i18n.patch +++ /dev/null @@ -1,3348 +0,0 @@ ---- evolution-2.10.1/mail/message-tag-followup.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/message-tag-followup.c 2007-04-30 13:06:43.000000000 -0400 -@@ -52,7 +52,7 @@ - #include - - #include --#include -+#include - - #include "e-util/e-icon-factory.h" - #include "e-util/e-util-private.h" ---- evolution-2.10.1/mail/em-popup.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-popup.c 2007-04-30 13:06:43.000000000 -0400 -@@ -41,7 +41,7 @@ - #include - #include - #include --#include -+#include - - #include "em-popup.h" - #include "libedataserver/e-msgport.h" ---- evolution-2.10.1/mail/em-composer-utils.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/em-composer-utils.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - - #include - #include --#include -+#include - - #include "mail-mt.h" - #include "mail-ops.h" ---- evolution-2.10.1/mail/em-account-editor.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-account-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -64,7 +64,7 @@ - #include - #include - --#include -+#include - #include - #include - ---- evolution-2.10.1/mail/mail-tools.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-tools.c 2007-04-30 13:06:43.000000000 -0400 -@@ -37,7 +37,7 @@ - #include - #include - --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-folder-selection-button.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-selection-button.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - #include - - #include --#include -+#include - - #include "mail-component.h" - #include "em-folder-tree.h" ---- evolution-2.10.1/mail/em-format-hook.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-format-hook.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - - #include - --#include -+#include - - - /* class name -> klass map for EMFormat and subclasses */ ---- evolution-2.10.1/mail/em-format-quote.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-format-quote.c 2007-04-30 13:06:43.000000000 -0400 -@@ -35,7 +35,7 @@ - #include - - #include --#include -+#include - - #include "em-stripsig-filter.h" - #include "em-format-quote.h" ---- evolution-2.10.1/mail/em-utils.c.use-glib-i18n 2007-04-30 13:06:42.000000000 -0400 -+++ evolution-2.10.1/mail/em-utils.c 2007-04-30 13:06:43.000000000 -0400 -@@ -59,7 +59,7 @@ - #include - #include - #include --#include -+#include - - #include "mail-component.h" - #include "mail-mt.h" ---- evolution-2.10.1/mail/em-filter-rule.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-filter-rule.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - - #include --#include -+#include - - #include "em-filter-rule.h" - #include "em-filter-context.h" ---- evolution-2.10.1/mail/mail-component.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/mail-component.c 2007-04-30 13:06:43.000000000 -0400 -@@ -78,7 +78,7 @@ - - #include - #include
--#include -+#include - - #include - #include ---- evolution-2.10.1/mail/importers/mail-importer.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/importers/mail-importer.c 2007-04-30 13:06:43.000000000 -0400 -@@ -38,7 +38,7 @@ - - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/mail/mail-send-recv.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/mail-send-recv.c 2007-04-30 13:06:43.000000000 -0400 -@@ -39,7 +39,7 @@ - #include - #include - #include --#include -+#include - - #include "e-util/e-gtk-utils.h" - #include "libedataserver/e-account-list.h" ---- evolution-2.10.1/mail/em-format-html.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/em-format-html.c 2007-04-30 13:06:43.000000000 -0400 -@@ -51,7 +51,7 @@ - #include - #include - --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-filter-folder-element.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-filter-folder-element.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - - #include --#include -+#include - - #include "em-filter-folder-element.h" - #include "mail/em-folder-selection-button.h" ---- evolution-2.10.1/mail/em-folder-tree.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-tree.c 2007-04-30 13:06:43.000000000 -0400 -@@ -38,7 +38,7 @@ - #include - #include - #include --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-filter-editor.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-filter-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #endif - - #include --#include -+#include - - #include "e-util/e-util-private.h" - ---- evolution-2.10.1/mail/em-folder-tree-model.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-tree-model.c 2007-04-30 13:06:43.000000000 -0400 -@@ -39,7 +39,7 @@ - - #include - --#include -+#include - - #include - ---- evolution-2.10.1/mail/message-list.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/message-list.c 2007-04-30 13:06:43.000000000 -0400 -@@ -38,7 +38,7 @@ - - #include - --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-folder-properties.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-properties.c 2007-04-30 13:06:43.000000000 -0400 -@@ -44,7 +44,7 @@ - #include - #include - #include --#include -+#include - - #include "em-folder-properties.h" - #include "em-config.h" ---- evolution-2.10.1/mail/mail-ops.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/mail-ops.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - - #include --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-migrate.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-migrate.c 2007-04-30 13:06:43.000000000 -0400 -@@ -54,7 +54,7 @@ - #include - #include - --#include -+#include - - #include - #include -@@ -2645,38 +2645,34 @@ - { - GDir *dir; - const char *d; -- struct stat st; -- const GList *l; - char *local, *base; -+ const gchar * const *language_names; - - /* special-case - this means brand new install of evolution */ - /* FIXME: create default folders and stuff... */ - - d(printf("Setting up initial mail tree\n")); - -- base = g_build_filename(evolution_dir, "mail/local", NULL); -+ base = g_build_filename(evolution_dir, "mail", "local", NULL); - if (e_util_mkdir_hier(base, 0777) == -1 && errno != EEXIST) { - g_free(base); - return -1; - } - - /* e.g. try en-AU then en, etc */ -- for (l = gnome_i18n_get_language_list("LC_MESSAGES"); -- l != NULL; -- l = g_list_next(l)) { -- local = g_build_filename(EVOLUTION_PRIVDATADIR, -- "default", -- (char *)l->data, -- "mail/local", NULL); -- if (g_stat(local, &st) == 0) -- goto gotlocal; -- -- g_free(local); -- } -- -- local = g_build_filename(EVOLUTION_PRIVDATADIR, -- "default/C/mail/local", NULL); --gotlocal: -+ language_names = g_get_language_names (); -+ while (*language_names != NULL) { -+ local = g_build_filename ( -+ EVOLUTION_PRIVDATADIR, "default", -+ *language_names, "mail", "local", NULL); -+ if (g_file_test (local, G_FILE_TEST_EXISTS)) -+ break; -+ g_free (local); -+ language_names++; -+ } -+ -+ /* Make sure we found one. */ -+ g_assert (*language_names != NULL); - - dir = g_dir_open(local, 0, NULL); - if (dir) { ---- evolution-2.10.1/mail/mail-vfolder.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/mail-vfolder.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - - #include - --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-folder-selector.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-selector.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - - #include - --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-subscribe-editor.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/em-subscribe-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -44,7 +44,7 @@ - #include "mail-config.h" - - #include --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/mail-autofilter.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-autofilter.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/mail/em-format-html-display.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-format-html-display.c 2007-04-30 13:06:43.000000000 -0400 -@@ -67,7 +67,7 @@ - #include - - #include --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-account-prefs.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-account-prefs.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - #include - #include - --#include -+#include - - #include "mail-component.h" - #include "mail-config.h" ---- evolution-2.10.1/mail/mail-folder-cache.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/mail-folder-cache.c 2007-04-30 13:06:43.000000000 -0400 -@@ -37,7 +37,7 @@ - #include - - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/mail/em-format.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-format.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-vfolder-editor.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-vfolder-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #endif - - #include --#include -+#include - - #include "e-util/e-util-private.h" - ---- evolution-2.10.1/mail/mail-mt.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/mail-mt.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - - #include --#include -+#include - - #include - ---- evolution-2.10.1/mail/em-folder-utils.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-utils.c 2007-04-30 13:06:43.000000000 -0400 -@@ -37,7 +37,7 @@ - - #include - #include --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-vfolder-rule.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-vfolder-rule.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - - #include - #include --#include -+#include - - #include "camel/camel-url.h" - #include "em-vfolder-context.h" ---- evolution-2.10.1/a11y/widgets/ea-calendar-item.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 -+++ evolution-2.10.1/a11y/widgets/ea-calendar-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - #include - #include --#include -+#include - #include - #include "ea-calendar-item.h" - #include "ea-calendar-cell.h" ---- evolution-2.10.1/a11y/addressbook/ea-minicard-view.c.use-glib-i18n 2007-04-09 09:10:36.000000000 -0400 -+++ evolution-2.10.1/a11y/addressbook/ea-minicard-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -20,11 +20,10 @@ - */ - - #include --#include - #include - #include - #include --#include -+#include - #include "ea-minicard.h" - #include "ea-minicard-view.h" - #include "eab-gui-util.h" ---- evolution-2.10.1/a11y/addressbook/ea-addressbook-view.c.use-glib-i18n 2007-04-09 09:10:36.000000000 -0400 -+++ evolution-2.10.1/a11y/addressbook/ea-addressbook-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -22,7 +22,7 @@ - - #include - --#include -+#include - #include "ea-addressbook-view.h" - - static G_CONST_RETURN gchar* ea_ab_view_get_name (AtkObject *accessible); ---- evolution-2.10.1/a11y/addressbook/ea-minicard.c.use-glib-i18n 2007-04-09 09:10:36.000000000 -0400 -+++ evolution-2.10.1/a11y/addressbook/ea-minicard.c 2007-04-30 13:06:43.000000000 -0400 -@@ -22,7 +22,7 @@ - - #include - #include --#include -+#include - #include "ea-minicard.h" - #include "ea-minicard-view.h" - #include "e-minicard.h" ---- evolution-2.10.1/a11y/calendar/ea-day-view.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 -+++ evolution-2.10.1/a11y/calendar/ea-day-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include "ea-gnome-calendar.h" - #include "calendar-commands.h" - #include --#include -+#include - - static void ea_day_view_class_init (EaDayViewClass *klass); - ---- evolution-2.10.1/a11y/calendar/ea-jump-button.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 -+++ evolution-2.10.1/a11y/calendar/ea-jump-button.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include "ea-week-view.h" - #include "e-week-view.h" - #include --#include -+#include - - static void ea_jump_button_class_init (EaJumpButtonClass *klass); - ---- evolution-2.10.1/a11y/calendar/ea-cal-view-event.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 -+++ evolution-2.10.1/a11y/calendar/ea-cal-view-event.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include "ea-day-view.h" - #include "ea-week-view.h" - #include --#include -+#include - - static void ea_cal_view_event_class_init (EaCalViewEventClass *klass); - static void ea_cal_view_event_init (EaCalViewEvent *a11y); ---- evolution-2.10.1/a11y/calendar/ea-week-view.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 -+++ evolution-2.10.1/a11y/calendar/ea-week-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include "ea-gnome-calendar.h" - #include "calendar-commands.h" - #include --#include -+#include - - static void ea_week_view_class_init (EaWeekViewClass *klass); - ---- evolution-2.10.1/a11y/calendar/ea-week-view-main-item.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 -+++ evolution-2.10.1/a11y/calendar/ea-week-view-main-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include "ea-week-view.h" - #include "ea-week-view-cell.h" - #include "ea-cell-table.h" --#include -+#include - - /* EaWeekViewMainItem */ - static void ea_week_view_main_item_class_init (EaWeekViewMainItemClass *klass); ---- evolution-2.10.1/a11y/calendar/ea-day-view-main-item.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 -+++ evolution-2.10.1/a11y/calendar/ea-day-view-main-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include "ea-day-view.h" - #include "ea-day-view-cell.h" - #include "ea-cell-table.h" --#include -+#include - - /* EaDayViewMainItem */ - static void ea_day_view_main_item_class_init (EaDayViewMainItemClass *klass); ---- evolution-2.10.1/a11y/calendar/ea-gnome-calendar.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 -+++ evolution-2.10.1/a11y/calendar/ea-gnome-calendar.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - #include - #include --#include -+#include - - static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass); - ---- evolution-2.10.1/a11y/calendar/ea-cal-view.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 -+++ evolution-2.10.1/a11y/calendar/ea-cal-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include "calendar-commands.h" - #include "goto.h" - #include --#include -+#include - - static void ea_cal_view_class_init (EaCalViewClass *klass); - ---- evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-popup.c.use-glib-i18n 2007-04-09 09:10:38.000000000 -0400 -+++ evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-popup.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - - #include "a11y/gal-a11y-util.h" - #include "table/e-cell-popup.h" --#include "e-util/e-i18n.h" -+#include - - #include "gal-a11y-e-cell-popup.h" - #include "gal-a11y-e-cell-registry.h" ---- evolution-2.10.1/a11y/e-table/gal-a11y-e-cell.c.use-glib-i18n 2007-04-09 09:10:38.000000000 -0400 -+++ evolution-2.10.1/a11y/e-table/gal-a11y-e-cell.c 2007-04-30 13:06:43.000000000 -0400 -@@ -15,7 +15,7 @@ - #include "a11y/gal-a11y-util.h" - #include "table/e-table.h" - #include "table/e-tree.h" --#include "e-util/e-i18n.h" -+#include - - #include "gal-a11y-e-cell.h" - #include "gal-a11y-e-cell-vbox.h" ---- evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-toggle.c.use-glib-i18n 2007-04-09 09:10:38.000000000 -0400 -+++ evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-toggle.c 2007-04-30 13:06:43.000000000 -0400 -@@ -2,7 +2,7 @@ - - #include "table/e-cell-toggle.h" - #include "table/e-table-model.h" --#include "e-util/e-i18n.h" -+#include - - #include "gal-a11y-e-cell-toggle.h" - ---- evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-text.c.use-glib-i18n 2007-04-09 09:10:38.000000000 -0400 -+++ evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-text.c 2007-04-30 13:06:43.000000000 -0400 -@@ -14,7 +14,7 @@ - - #include "a11y/gal-a11y-util.h" - #include "table/e-cell-text.h" --#include "e-util/e-i18n.h" -+#include - - #include "gal-a11y-e-cell-text.h" - ---- evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-tree.c.use-glib-i18n 2007-04-09 09:10:38.000000000 -0400 -+++ evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-tree.c 2007-04-30 13:06:43.000000000 -0400 -@@ -14,7 +14,7 @@ - #include "table/e-cell-tree.h" - #include "table/e-table.h" - #include "table/e-tree-table-adapter.h" --#include "e-util/e-i18n.h" -+#include - - #include "gal-a11y-e-cell-tree.h" - #include "gal-a11y-e-cell-registry.h" ---- evolution-2.10.1/a11y/e-table/gal-a11y-e-table-click-to-add.c.use-glib-i18n 2007-04-09 09:10:38.000000000 -0400 -+++ evolution-2.10.1/a11y/e-table/gal-a11y-e-table-click-to-add.c 2007-04-30 13:06:43.000000000 -0400 -@@ -13,7 +13,7 @@ - #include "table/e-table-click-to-add.h" - #include "table/e-table-group.h" - #include "table/e-table-group-leaf.h" --#include "e-util/e-i18n.h" -+#include - - #include "gal-a11y-e-table-click-to-add.h" - #include "gal-a11y-e-table-click-to-add-factory.h" ---- evolution-2.10.1/filter/rule-editor.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 -+++ evolution-2.10.1/filter/rule-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - #include - --#include -+#include - - #include "e-util/e-error.h" - #include "e-util/e-util-private.h" ---- evolution-2.10.1/filter/filter-label.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 -+++ evolution-2.10.1/filter/filter-label.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/filter/filter-part.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 -+++ evolution-2.10.1/filter/filter-part.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - - #include - #include --#include -+#include - - #include "filter-part.h" - #include "rule-context.h" ---- evolution-2.10.1/filter/filter-datespec.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/filter/filter-datespec.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include - - #include --#include -+#include - #include - - #include "filter-datespec.h" ---- evolution-2.10.1/filter/rule-context.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 -+++ evolution-2.10.1/filter/rule-context.c 2007-04-30 13:06:43.000000000 -0400 -@@ -34,7 +34,7 @@ - - #include - --#include -+#include - - #include - #include ---- evolution-2.10.1/filter/filter-option.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 -+++ evolution-2.10.1/filter/filter-option.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include - - #include --#include -+#include - - #include "filter-option.h" - #include "filter-part.h" ---- evolution-2.10.1/filter/filter-file.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 -+++ evolution-2.10.1/filter/filter-file.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - - #include - --#include -+#include - #include - - #include ---- evolution-2.10.1/filter/filter-input.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 -+++ evolution-2.10.1/filter/filter-input.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include - - #include --#include -+#include - - #include "filter-input.h" - #include "libedataserver/e-sexp.h" ---- evolution-2.10.1/filter/filter-rule.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 -+++ evolution-2.10.1/filter/filter-rule.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - - #include --#include -+#include - - #include "e-util/e-error.h" - #include "filter-rule.h" ---- evolution-2.10.1/widgets/misc/e-calendar-item.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-calendar-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -43,7 +43,7 @@ - #include - #include - #include --#include -+#include - #include - #include - ---- evolution-2.10.1/widgets/misc/e-unicode.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-unicode.c 2007-04-30 13:06:43.000000000 -0400 -@@ -42,7 +42,7 @@ - - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-unicode.h" - - #define d(x) x ---- evolution-2.10.1/widgets/misc/e-task-widget.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-task-widget.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - #include - --#include -+#include - - - #define SPACING 2 ---- evolution-2.10.1/widgets/misc/e-filter-bar.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-filter-bar.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - #include - --#include -+#include - - #include "e-dropdown-button.h" - #include "e-filter-bar.h" ---- evolution-2.10.1/widgets/misc/e-dateedit.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-dateedit.c 2007-04-30 13:06:43.000000000 -0400 -@@ -58,7 +58,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/widgets/misc/e-charset-picker.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-charset-picker.c 2007-04-30 13:06:43.000000000 -0400 -@@ -37,7 +37,7 @@ - #include - #include - --#include -+#include - - #include - #include ---- evolution-2.10.1/widgets/misc/e-clipped-label.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-clipped-label.c 2007-04-30 13:06:43.000000000 -0400 -@@ -40,7 +40,7 @@ - - #include - #include --#include -+#include - - - static void e_clipped_label_class_init (EClippedLabelClass *class); ---- evolution-2.10.1/widgets/misc/e-cell-percent.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-cell-percent.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - - #include "e-cell-percent.h" - ---- evolution-2.10.1/widgets/misc/e-cell-date-edit.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-cell-date-edit.c 2007-04-30 13:06:43.000000000 -0400 -@@ -44,7 +44,7 @@ - #include
- - #include --#include -+#include - - #include - ---- evolution-2.10.1/widgets/misc/e-map.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-map.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - - #include "e-util/e-util-private.h" - #include "e-util/e-util.h" ---- evolution-2.10.1/widgets/misc/e-canvas-background.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-canvas-background.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "misc/e-canvas.h" - #include "misc/e-canvas-utils.h" ---- evolution-2.10.1/widgets/misc/e-selection-model.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-selection-model.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util-marshal.h" - #include "e-util/e-util.h" - ---- evolution-2.10.1/widgets/misc/e-selection-model-array.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-selection-model-array.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-selection-model-array.h" ---- evolution-2.10.1/widgets/misc/e-send-options.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-send-options.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include - #include - #include --#include -+#include - #include - #include - ---- evolution-2.10.1/widgets/misc/e-calendar.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-calendar.c 2007-04-30 13:06:43.000000000 -0400 -@@ -43,7 +43,7 @@ - #include - #include - #include --#include -+#include - - #define E_CALENDAR_SMALL_FONT_PTSIZE 6 - ---- evolution-2.10.1/widgets/misc/e-reflow.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-reflow.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include - - #include "text/e-text.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util-marshal.h" - #include "e-util/e-util.h" - #include "misc/e-unicode.h" ---- evolution-2.10.1/widgets/misc/e-search-bar.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-search-bar.c 2007-04-30 13:06:43.000000000 -0400 -@@ -42,7 +42,7 @@ - #include - #include - --#include -+#include - - #include - ---- evolution-2.10.1/widgets/misc/e-attachment-bar.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-attachment-bar.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - #include - - #include "e-attachment.h" ---- evolution-2.10.1/widgets/misc/e-attachment.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-attachment.c 2007-04-30 13:06:43.000000000 -0400 -@@ -51,7 +51,7 @@ - #include - #include - #include --#include -+#include - #include - - #include "e-util/e-mktemp.h" ---- evolution-2.10.1/widgets/misc/e-canvas-vbox.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-canvas-vbox.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-canvas.h" ---- evolution-2.10.1/widgets/misc/e-activity-handler.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-activity-handler.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - #include - --#include -+#include - #include - - #include ---- evolution-2.10.1/widgets/misc/e-image-chooser.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-image-chooser.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include - - #include --#include -+#include - - #include "e-image-chooser.h" - #include "e-util/e-util-marshal.h" ---- evolution-2.10.1/widgets/menus/gal-view-new-dialog.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 -+++ evolution-2.10.1/widgets/menus/gal-view-new-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - - #include "table/e-table-scrolled.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "e-util/e-util-private.h" - #include "misc/e-unicode.h" -@@ -92,7 +92,7 @@ - "gal-view-new-dialog.glade", - NULL); - -- gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); -+ gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); - g_free (filename); - dialog->gui = gui; - ---- evolution-2.10.1/widgets/menus/gal-view-factory-etable.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 -+++ evolution-2.10.1/widgets/menus/gal-view-factory-etable.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "gal-view-etable.h" ---- evolution-2.10.1/widgets/menus/gal-define-views-model.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 -+++ evolution-2.10.1/widgets/menus/gal-define-views-model.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "gal-define-views-model.h" ---- evolution-2.10.1/widgets/menus/gal-define-views-dialog.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 -+++ evolution-2.10.1/widgets/menus/gal-define-views-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - - #include "table/e-table-scrolled.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "e-util/e-util-private.h" - -@@ -80,7 +80,7 @@ - } - - /* ETable creation */ --#define SPEC "" \ -+#define SPEC "" \ - "" \ - " " \ - "" -@@ -250,7 +250,7 @@ - - dialog->collection = NULL; - -- gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); -+ gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); - g_free (filename); - dialog->gui = gui; - ---- evolution-2.10.1/widgets/menus/gal-view-instance-save-as-dialog.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 -+++ evolution-2.10.1/widgets/menus/gal-view-instance-save-as-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - - #include "table/e-table-scrolled.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util-private.h" - - #include "gal-define-views-model.h" -@@ -197,7 +197,7 @@ - - dialog->instance = NULL; - -- gui = glade_xml_new_with_domain (filename , NULL, E_I18N_DOMAIN); -+ gui = glade_xml_new_with_domain (filename , NULL, GETTEXT_PACKAGE); - g_free (filename); - dialog->gui = gui; - -@@ -235,7 +235,7 @@ - - /* For use from libglade. */ - /* ETable creation */ --#define SPEC "" \ -+#define SPEC "" \ - "" \ - " " \ - "" ---- evolution-2.10.1/widgets/menus/gal-view-instance.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 -+++ evolution-2.10.1/widgets/menus/gal-view-instance.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "e-util/e-xml-utils.h" - #include "misc/e-unicode.h" ---- evolution-2.10.1/widgets/menus/gal-view-collection.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 -+++ evolution-2.10.1/widgets/menus/gal-view-collection.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "e-util/e-xml-utils.h" - #include "misc/e-unicode.h" ---- evolution-2.10.1/widgets/menus/gal-view-menus.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 -+++ evolution-2.10.1/widgets/menus/gal-view-menus.c 2007-04-30 13:06:43.000000000 -0400 -@@ -20,7 +20,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/widgets/table/e-cell-pixbuf.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-cell-pixbuf.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - - #include - --#include "e-util/e-i18n.h" -+#include - #include - #include "e-cell-pixbuf.h" - ---- evolution-2.10.1/widgets/table/e-table-field-chooser-dialog.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-field-chooser-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-table-field-chooser-dialog.h" ---- evolution-2.10.1/widgets/table/e-table-sorter.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-sorter.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-table-sorter.h" ---- evolution-2.10.1/widgets/table/e-table-selection-model.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-selection-model.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-table-selection-model.h" ---- evolution-2.10.1/widgets/table/e-table-group-leaf.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-group-leaf.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "misc/e-canvas.h" - ---- evolution-2.10.1/widgets/table/e-table-field-chooser.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-field-chooser.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "e-util/e-util-private.h" - -@@ -156,7 +156,7 @@ - gchar *filename = g_build_filename (EVOLUTION_GLADEDIR, - "e-table-field-chooser.glade", - NULL); -- gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); -+ gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); - g_free (filename); - etfc->gui = gui; - ---- evolution-2.10.1/widgets/table/e-table-item.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -38,7 +38,7 @@ - - #include "a11y/e-table/gal-a11y-e-table-item-factory.h" - #include "a11y/e-table/gal-a11y-e-table-item.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "misc/e-canvas.h" - #include "misc/e-canvas-utils.h" ---- evolution-2.10.1/widgets/table/e-table.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - - #include "a11y/e-table/gal-a11y-e-table.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "misc/e-canvas.h" - #include "misc/e-canvas-background.h" ---- evolution-2.10.1/widgets/table/e-table-group-container.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-group-container.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - - #include "text/e-text.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "misc/e-canvas-utils.h" - #include "misc/e-canvas.h" ---- evolution-2.10.1/widgets/table/e-cell-float.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-cell-float.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-cell-float.h" ---- evolution-2.10.1/widgets/table/e-tree-scrolled.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-tree-scrolled.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-tree-scrolled.h" ---- evolution-2.10.1/widgets/table/e-table-col.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-col.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-table-col.h" ---- evolution-2.10.1/widgets/table/e-table-scrolled.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-scrolled.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - - #include "e-table.h" - #include "e-table-scrolled.h" ---- evolution-2.10.1/widgets/table/e-table-header-item.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-header-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -35,7 +35,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util-marshal.h" - #include "e-util/e-util.h" - #include "e-util/e-xml-utils.h" -@@ -1531,7 +1531,7 @@ - ((ethi->table || ethi->tree) ? 0 : 4) + - ((e_table_header_count (ethi->eth) > 1) ? 0 : 8), - ((e_table_sort_info_get_can_group (ethi->sort_info)) ? 0 : 16) + -- 128, info, E_I18N_DOMAIN); -+ 128, info, GETTEXT_PACKAGE); - - menu_item = gtk_menu_item_new_with_label (_("Sort By")); - gtk_widget_show (menu_item); -@@ -1813,7 +1813,7 @@ - ((ethi->table || ethi->tree) ? 0 : 4) + - ((e_table_header_count (ethi->eth) > 1) ? 0 : 8), - ((e_table_sort_info_get_can_group (ethi->sort_info)) ? 0 : 16) + -- 128, info, E_I18N_DOMAIN); -+ 128, info, GETTEXT_PACKAGE); - g_object_ref (popup); - gtk_object_sink (GTK_OBJECT (popup)); - g_signal_connect (popup, "selection-done", ---- evolution-2.10.1/widgets/table/e-table-field-chooser-item.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-field-chooser-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "e-util/e-xml-utils.h" - #include "misc/e-canvas.h" ---- evolution-2.10.1/widgets/table/e-table-config.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-config.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util-private.h" - #include "e-util/e-util.h" - #include "misc/e-unicode.h" -@@ -539,7 +539,7 @@ - } - } - --char *spec = "" - "" - " " -@@ -1093,14 +1093,14 @@ - g_build_filename (EVOLUTION_GLADEDIR, - "e-table-config.glade", - NULL); -- gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); -+ gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); - g_free (filename); - } else { - gchar *filename = - g_build_filename (EVOLUTION_GLADEDIR, - "e-table-config-no-group.glade", - NULL); -- gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); -+ gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); - g_free (filename); - } - ---- evolution-2.10.1/widgets/table/e-cell-text.c.use-glib-i18n 2007-04-30 13:06:42.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-cell-text.c 2007-04-30 13:06:43.000000000 -0400 -@@ -50,7 +50,7 @@ - #include "a11y/e-table/gal-a11y-e-cell-registry.h" - #include "a11y/e-table/gal-a11y-e-cell-text.h" - #include "text/e-text.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-text-event-processor.h" - #include "e-util/e-text-event-processor-emacs-like.h" - #include "e-util/e-util.h" ---- evolution-2.10.1/widgets/table/e-tree.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-tree.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - - #include "a11y/e-table/gal-a11y-e-tree.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "e-util/e-util-marshal.h" - #include "misc/e-canvas.h" ---- evolution-2.10.1/widgets/table/e-cell-number.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-cell-number.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-cell-number.h" ---- evolution-2.10.1/widgets/table/e-tree-selection-model.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-tree-selection-model.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - - #include "table/e-tree-table-adapter.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-tree-selection-model.h" ---- evolution-2.10.1/widgets/table/e-cell-combo.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-cell-combo.c 2007-04-30 13:06:43.000000000 -0400 -@@ -59,7 +59,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "misc/e-unicode.h" - ---- evolution-2.10.1/widgets/table/e-table-click-to-add.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-click-to-add.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - - #include "a11y/e-table/gal-a11y-e-table-click-to-add.h" - #include "text/e-text.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util-marshal.h" - #include "e-util/e-util.h" - #include "misc/e-canvas-utils.h" ---- evolution-2.10.1/widgets/table/e-cell-date.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-cell-date.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "misc/e-unicode.h" - ---- evolution-2.10.1/widgets/text/e-text.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/widgets/text/e-text.c 2007-04-30 13:06:43.000000000 -0400 -@@ -52,7 +52,7 @@ - #include "misc/e-canvas.h" - #include "misc/e-canvas-utils.h" - #include "misc/e-unicode.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-text-event-processor-emacs-like.h" - #include "e-util/e-util.h" - ---- evolution-2.10.1/widgets/text/e-completion-view.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/widgets/text/e-completion-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - - #include "table/e-table-scrolled.h" - #include "table/e-table-simple.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util-marshal.h" - - #include "e-completion-view.h" -@@ -623,7 +623,7 @@ - /* XXX toshok - we need to add sorting to this etable, through the use - of undisplayed fields of all the sort keys we want to use */ - static char *simple_spec = --"" -+"" - " " ---- evolution-2.10.1/widgets/text/e-entry.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/widgets/text/e-entry.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "misc/e-canvas.h" - #include "misc/e-canvas-utils.h" ---- evolution-2.10.1/plugins/calendar-file/calendar-file.c.use-glib-i18n 2007-04-09 09:09:11.000000000 -0400 -+++ evolution-2.10.1/plugins/calendar-file/calendar-file.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - #include - - GtkWidget *e_calendar_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data); ---- evolution-2.10.1/plugins/mark-all-read/mark-all-read.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/plugins/mark-all-read/mark-all-read.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/publish-calendar/publish-calendar.c.use-glib-i18n 2007-04-09 09:09:16.000000000 -0400 -+++ evolution-2.10.1/plugins/publish-calendar/publish-calendar.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/calendar-weather/calendar-weather.c.use-glib-i18n 2007-04-09 09:09:15.000000000 -0400 -+++ evolution-2.10.1/plugins/calendar-weather/calendar-weather.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/import-ics-attachments/icsimporter.c.use-glib-i18n 2007-04-09 09:09:11.000000000 -0400 -+++ evolution-2.10.1/plugins/import-ics-attachments/icsimporter.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/backup-restore/backup-restore.c.use-glib-i18n 2007-04-09 09:09:14.000000000 -0400 -+++ evolution-2.10.1/plugins/backup-restore/backup-restore.c 2007-04-30 13:06:43.000000000 -0400 -@@ -2,7 +2,7 @@ - #include - #include - #include --#include -+#include - #include "shell/es-menu.h" - - void org_gnome_backup_restore_backup (EPlugin *ep, ESMenuTargetShell *target); ---- evolution-2.10.1/plugins/backup-restore/backup.c.use-glib-i18n 2007-04-09 09:09:14.000000000 -0400 -+++ evolution-2.10.1/plugins/backup-restore/backup.c 2007-04-30 13:06:43.000000000 -0400 -@@ -8,7 +8,7 @@ - #include - #include - --#include -+#include - #include - - #define EVOLUTION "evolution-" BASE_VERSION ---- evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c.use-glib-i18n 2007-04-09 09:09:13.000000000 -0400 -+++ evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include - #include - #include --#include -+#include - #include - - #include "e-util/e-util-private.h" ---- evolution-2.10.1/plugins/default-source/default-source.c.use-glib-i18n 2007-04-09 09:09:14.000000000 -0400 -+++ evolution-2.10.1/plugins/default-source/default-source.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - #include - GtkWidget* org_gnome_default_book (EPlugin *epl, EConfigHookItemFactoryData *data); - void commit_default_calendar (EPlugin *epl, EConfigTarget *target); ---- evolution-2.10.1/plugins/subject-thread/subject-thread.c.use-glib-i18n 2007-04-09 09:09:14.000000000 -0400 -+++ evolution-2.10.1/plugins/subject-thread/subject-thread.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/calendar-http/calendar-http.c.use-glib-i18n 2007-04-09 09:09:14.000000000 -0400 -+++ evolution-2.10.1/plugins/calendar-http/calendar-http.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - #include - - GtkWidget *e_calendar_http_url (EPlugin *epl, EConfigHookItemFactoryData *data); ---- evolution-2.10.1/plugins/itip-formatter/itip-formatter.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/plugins/itip-formatter/itip-formatter.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/itip-formatter/itip-view.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/plugins/itip-formatter/itip-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/groupwise-features/share-folder-common.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/plugins/groupwise-features/share-folder-common.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/groupwise-features/junk-settings.c.use-glib-i18n 2007-04-09 09:09:12.000000000 -0400 -+++ evolution-2.10.1/plugins/groupwise-features/junk-settings.c 2007-04-30 13:06:43.000000000 -0400 -@@ -37,7 +37,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/groupwise-features/install-shared.c.use-glib-i18n 2007-04-09 09:09:12.000000000 -0400 -+++ evolution-2.10.1/plugins/groupwise-features/install-shared.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/groupwise-features/process-meeting.c.use-glib-i18n 2007-04-09 09:09:12.000000000 -0400 -+++ evolution-2.10.1/plugins/groupwise-features/process-meeting.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - #endif - - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/groupwise-features/addressbook-groupwise.c.use-glib-i18n 2007-04-09 09:09:12.000000000 -0400 -+++ evolution-2.10.1/plugins/groupwise-features/addressbook-groupwise.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - #include - #include --#include -+#include - #include - - void commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target); ---- evolution-2.10.1/plugins/groupwise-features/send-options.c.use-glib-i18n 2007-04-09 09:09:12.000000000 -0400 -+++ evolution-2.10.1/plugins/groupwise-features/send-options.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - #endif - - #include --#include -+#include - #include - #include - #include "mail/em-account-editor.h" ---- evolution-2.10.1/plugins/bbdb/gaimbuddies.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/plugins/bbdb/gaimbuddies.c 2007-04-30 13:06:43.000000000 -0400 -@@ -40,7 +40,7 @@ - #include - - #include --#include -+#include - #include - - #include ---- evolution-2.10.1/plugins/bbdb/bbdb.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/plugins/bbdb/bbdb.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #endif - - #include --#include -+#include - #include - - #include ---- evolution-2.10.1/e-util/e-categories-config.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-categories-config.c 2007-04-30 13:06:43.000000000 -0400 -@@ -10,7 +10,7 @@ - - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/e-util/e-text-event-processor.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-text-event-processor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,8 @@ - - #include - --#include "e-i18n.h" -+#include -+ - #include "e-util-marshal.h" - #include "e-text-event-processor.h" - #include "e-util.h" ---- evolution-2.10.1/e-util/e-util.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-util.c 2007-04-30 13:06:43.000000000 -0400 -@@ -1112,20 +1112,6 @@ - } - } - --char * --e_gettext (const char *msgid) --{ -- static gboolean initialized = FALSE; -- -- if (!initialized) { -- bindtextdomain (E_I18N_DOMAIN, EVOLUTION_LOCALEDIR); -- bind_textdomain_codeset (E_I18N_DOMAIN, "UTF-8"); -- initialized = TRUE; -- } -- -- return dgettext (E_I18N_DOMAIN, msgid); --} -- - cairo_font_options_t * - get_font_options () - { ---- evolution-2.10.1/e-util/e-popup.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-popup.c 2007-04-30 13:06:43.000000000 -0400 -@@ -42,7 +42,7 @@ - - #include - --#include -+#include - - #define d(x) - ---- evolution-2.10.1/e-util/e-xml-utils.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-xml-utils.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,155 +36,14 @@ - #include - - #include -+#include - #include - #include - #include - --#include "e-i18n.h" - #include "e-util.h" - #include "e-xml-utils.h" - --/* Returns the first child with the name child_name and the "lang" -- * attribute that matches the current LC_MESSAGES, or else, the first -- * child with the name child_name and no "lang" attribute. -- */ --xmlNode * --e_xml_get_child_by_name_by_lang (const xmlNode *parent, -- const xmlChar *child_name, -- const gchar *lang) --{ --#ifdef G_OS_WIN32 -- gchar *freeme = NULL; --#endif -- xmlNode *child; -- /* This is the default version of the string. */ -- xmlNode *C = NULL; -- -- g_return_val_if_fail (parent != NULL, NULL); -- g_return_val_if_fail (child_name != NULL, NULL); -- -- if (lang == NULL) { --#ifndef G_OS_WIN32 --#ifdef HAVE_LC_MESSAGES -- lang = setlocale (LC_MESSAGES, NULL); --#else -- lang = setlocale (LC_CTYPE, NULL); --#endif --#else -- lang = freeme = g_win32_getlocale (); --#endif -- } -- for (child = parent->xmlChildrenNode; child != NULL; child = child->next) { -- if (xmlStrcmp (child->name, child_name) == 0) { -- xmlChar *this_lang = xmlGetProp (child, "lang"); -- if (this_lang == NULL) { -- C = child; -- } else if (xmlStrcmp(this_lang, lang) == 0) { --#ifdef G_OS_WIN32 -- g_free (freeme); --#endif -- return child; -- } -- } -- } --#ifdef G_OS_WIN32 -- g_free (freeme); --#endif -- return C; --} -- --static xmlNode * --e_xml_get_child_by_name_by_lang_list_with_score (const xmlNode *parent, -- const gchar *name, -- const GList *lang_list, -- gint *best_lang_score) --{ -- xmlNodePtr best_node = NULL, node; -- -- for (node = parent->xmlChildrenNode; node != NULL; node = node->next) { -- xmlChar *lang; -- -- if (node->name == NULL || strcmp (node->name, name) != 0) { -- continue; -- } -- lang = xmlGetProp (node, "xml:lang"); -- if (lang != NULL) { -- const GList *l; -- gint i; -- -- for (l = lang_list, i = 0; -- l != NULL && i < *best_lang_score; -- l = l->next, i++) { -- if (strcmp ((gchar *) l->data, lang) == 0) { -- best_node = node; -- *best_lang_score = i; -- } -- } -- } else { -- if (best_node == NULL) { -- best_node = node; -- } -- } -- xmlFree (lang); -- if (*best_lang_score == 0) { -- return best_node; -- } -- } -- -- return best_node; --} -- --/* -- * e_xml_get_child_by_name_by_lang_list: -- * -- */ --xmlNode * --e_xml_get_child_by_name_by_lang_list (const xmlNode *parent, -- const gchar *name, -- const GList *lang_list) --{ -- gint best_lang_score = INT_MAX; -- -- g_return_val_if_fail (parent != NULL, NULL); -- g_return_val_if_fail (name != NULL, NULL); -- -- if (lang_list == NULL) { -- lang_list = gnome_i18n_get_language_list ("LC_MESSAGES"); -- } -- return e_xml_get_child_by_name_by_lang_list_with_score -- (parent,name, -- lang_list, -- &best_lang_score); --} -- --/* -- * e_xml_get_child_by_name_no_lang -- * -- */ --xmlNode * --e_xml_get_child_by_name_no_lang (const xmlNode *parent, const gchar *name) --{ -- xmlNodePtr node; -- -- g_return_val_if_fail (parent != NULL, NULL); -- g_return_val_if_fail (name != NULL, NULL); -- -- for (node = parent->xmlChildrenNode; node != NULL; node = node->next) { -- xmlChar *lang; -- -- if (node->name == NULL || strcmp (node->name, name) != 0) { -- continue; -- } -- lang = xmlGetProp (node, "xml:lang"); -- if (lang == NULL) { -- return node; -- } -- xmlFree (lang); -- } -- -- return NULL; --} -- - gint - e_xml_get_integer_prop_by_name (const xmlNode *parent, const xmlChar *prop_name) - { ---- evolution-2.10.1/e-util/e-config.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-config.c 2007-04-30 13:06:43.000000000 -0400 -@@ -45,7 +45,7 @@ - - #include - --#include -+#include - - #define d(x) - ---- evolution-2.10.1/e-util/e-dialog-utils.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-dialog-utils.c 2007-04-30 13:06:43.000000000 -0400 -@@ -46,7 +46,7 @@ - #include - - #include --#include -+#include - #include - - #include ---- evolution-2.10.1/e-util/e-import.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-import.c 2007-04-30 13:06:43.000000000 -0400 -@@ -45,7 +45,7 @@ - - #include - --#include -+#include - - #define d(x) - ---- evolution-2.10.1/e-util/Makefile.am.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/Makefile.am 2007-04-30 13:06:43.000000000 -0400 -@@ -108,7 +108,6 @@ - eggtrayicon.c \ - eggtrayicon.h \ - e-bit-array.c \ -- e-i18n.h \ - e-sorter.c \ - e-sorter-array.c \ - e-text-event-processor-emacs-like.c \ ---- evolution-2.10.1/e-util/e-error.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-error.c 2007-04-30 13:06:43.000000000 -0400 -@@ -37,7 +37,7 @@ - #include - #include - #include --#include -+#include - #include - - #include ---- evolution-2.10.1/e-util/e-event.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-event.c 2007-04-30 13:06:43.000000000 -0400 -@@ -42,7 +42,7 @@ - - #include - --#include -+#include - #include - - #define d(x) ---- evolution-2.10.1/e-util/e-xml-utils.h.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-xml-utils.h 2007-04-30 13:06:43.000000000 -0400 -@@ -30,18 +30,6 @@ - - G_BEGIN_DECLS - --/* lang set to NULL means use the current locale. */ --xmlNode *e_xml_get_child_by_name_by_lang (const xmlNode *parent, -- const xmlChar *child_name, -- const gchar *lang); --/* lang_list set to NULL means use the current locale. */ --xmlNode *e_xml_get_child_by_name_by_lang_list (const xmlNode *parent, -- const gchar *name, -- const GList *lang_list); --xmlNode *e_xml_get_child_by_name_no_lang (const xmlNode *parent, -- const gchar *name); -- -- - gint e_xml_get_integer_prop_by_name (const xmlNode *parent, - const xmlChar *prop_name); - gint e_xml_get_integer_prop_by_name_with_default (const xmlNode *parent, ---- evolution-2.10.1/e-util/e-i18n.h.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-i18n.h 2007-04-30 13:06:43.000000000 -0400 -@@ -1,74 +0,0 @@ --/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ --/* -- * e-i18n.h -- * Copyright 2000, 2001, Ximian, Inc. -- * -- * Authors: -- * Chris Lahey -- * -- * Copied from gnome-i18nP.h, because this header is typically not installed -- * -- * This file has to be included before any file from the GNOME libraries -- * to have this override the definitions that are pulled from the gnome-i18n.h -- * -- * the difference is that gnome-i18n.h is used for applications, and this is -- * used by libraries (because libraries have to use dcgettext instead of -- * gettext and they need to provide the translation domain, unlike apps). -- * -- * So you can just put this after you include config.h -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License, version 2, as published by the Free Software Foundation. -- * -- * This library is distributed in the hope that it will be useful, but -- * WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -- * 02111-1307, USA. -- */ -- --#ifndef __E_I18N_H__ --#define __E_I18N_H__ -- --#include -- --G_BEGIN_DECLS -- --#ifdef ENABLE_NLS -- /* this function is defined in e-util.c */ -- extern char *e_gettext (const char *msgid); --# undef _ --# ifdef GNOME_EXPLICIT_TRANSLATION_DOMAIN --/* No parentheses allowed here since that breaks string concatenation. */ --# define E_I18N_DOMAIN GNOME_EXPLICIT_TRANSLATION_DOMAIN --# else --/* No parentheses allowed here since that breaks string concatenation. */ --# define E_I18N_DOMAIN GETTEXT_PACKAGE --# endif --# define _(String) e_gettext (String) --# ifdef gettext_noop --# define N_(String) gettext_noop (String) --# else --# define N_(String) (String) --# endif --#else --/* Stubs that do something close enough. */ --# define textdomain(String) (String) --# define gettext(String) (String) --# define dgettext(Domain,Message) (Message) --# define dcgettext(Domain,Message,Type) (Message) --# define bindtextdomain(Domain,Directory) (Domain) --# define _(String) (String) --# define N_(String) (String) --/* No parentheses allowed here since that breaks string concatenation. */ --# define E_I18N_DOMAIN "" --#endif -- --G_END_DECLS -- --#endif /* __E_I18N_H__ */ ---- evolution-2.10.1/e-util/Makefile.in.use-glib-i18n 2007-04-30 13:09:50.000000000 -0400 -+++ evolution-2.10.1/e-util/Makefile.in 2007-04-30 13:10:02.000000000 -0400 -@@ -90,7 +90,7 @@ - e-html-utils.c e-icon-factory.c e-import.c e-menu.c e-mktemp.c \ - e-plugin.c e-popup.c e-print.c e-profile-event.c e-request.c \ - e-signature.c e-signature-list.c eggtrayicon.c eggtrayicon.h \ -- e-bit-array.c e-i18n.h e-sorter.c e-sorter-array.c \ -+ e-bit-array.c e-sorter.c e-sorter-array.c \ - e-text-event-processor-emacs-like.c e-text-event-processor.c \ - e-util.c e-util-private.h e-xml-utils.c e-win32-reloc.c - @OS_WIN32_TRUE@am__objects_4 = e-win32-reloc.lo -@@ -588,7 +588,6 @@ - eggtrayicon.c \ - eggtrayicon.h \ - e-bit-array.c \ -- e-i18n.h \ - e-sorter.c \ - e-sorter-array.c \ - e-text-event-processor-emacs-like.c \ ---- evolution-2.10.1/e-util/e-menu.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-menu.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - - #include - --#include -+#include - #include - - #include ---- evolution-2.10.1/addressbook/printing/e-contact-print-envelope.c.use-glib-i18n 2007-04-09 09:07:43.000000000 -0400 -+++ evolution-2.10.1/addressbook/printing/e-contact-print-envelope.c 2007-04-30 13:06:43.000000000 -0400 -@@ -22,7 +22,7 @@ - #include - #include "addressbook/printing/e-contact-print-envelope.h" - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/printing/e-contact-print.c.use-glib-i18n 2007-04-09 09:07:43.000000000 -0400 -+++ evolution-2.10.1/addressbook/printing/e-contact-print.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/component/addressbook-config.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/component/addressbook-config.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include - #include - #include --#include -+#include - - #include - ---- evolution-2.10.1/addressbook/gui/component/addressbook.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/component/addressbook.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/component/addressbook-migrate.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/component/addressbook-migrate.c 2007-04-30 13:06:43.000000000 -0400 -@@ -35,7 +35,7 @@ - - #include - #include --#include -+#include - - #include - ---- evolution-2.10.1/addressbook/gui/component/autocompletion-config.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/component/autocompletion-config.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/component/addressbook-view.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/component/addressbook-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/contact-list-editor/e-contact-list-editor.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - - #include - --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/widgets/e-minicard-view-widget.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/widgets/e-minicard-view-widget.c 2007-04-30 13:06:43.000000000 -0400 -@@ -24,7 +24,7 @@ - #include - #include - #include --#include -+#include - - #include "eab-marshal.h" - #include "e-minicard-view-widget.h" ---- evolution-2.10.1/addressbook/gui/widgets/e-addressbook-reflow-adapter.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/widgets/e-addressbook-reflow-adapter.c 2007-04-30 13:06:43.000000000 -0400 -@@ -4,7 +4,7 @@ - #include - #include - --#include -+#include - #include "eab-marshal.h" - #include "e-addressbook-reflow-adapter.h" - #include "e-addressbook-model.h" ---- evolution-2.10.1/addressbook/gui/widgets/eab-contact-display.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/widgets/eab-contact-display.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include "e-util/e-icon-factory.h" - - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/widgets/gal-view-factory-minicard.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/widgets/gal-view-factory-minicard.c 2007-04-30 13:06:43.000000000 -0400 -@@ -13,7 +13,7 @@ - #endif - - #include --#include -+#include - #include "gal-view-factory-minicard.h" - #include "gal-view-minicard.h" - ---- evolution-2.10.1/addressbook/gui/widgets/e-addressbook-view.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/widgets/e-addressbook-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -24,7 +24,7 @@ - - #include - --#include -+#include - #include - #include - #include
---- evolution-2.10.1/addressbook/gui/widgets/e-minicard.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/widgets/e-minicard.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/widgets/e-minicard-label.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/widgets/e-minicard-label.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/widgets/e-minicard-view.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/widgets/e-minicard-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - #include - #include "a11y/addressbook/ea-addressbook.h" - ---- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor-fullname.c.use-glib-i18n 2007-04-09 09:07:40.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor-fullname.c 2007-04-30 13:06:43.000000000 -0400 -@@ -24,7 +24,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-quick-add.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor-address.c.use-glib-i18n 2007-04-09 09:07:40.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor-address.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/contact-editor/eab-editor.c.use-glib-i18n 2007-04-09 09:07:40.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/contact-editor/eab-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -24,7 +24,7 @@ - - #include - #include --#include -+#include - - #include "eab-editor.h" - #include "addressbook/gui/widgets/eab-gui-util.h" ---- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor-im.c.use-glib-i18n 2007-04-09 09:07:40.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor-im.c 2007-04-30 13:06:43.000000000 -0400 -@@ -22,7 +22,7 @@ - #include - #include "e-contact-editor-im.h" - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -37,7 +37,7 @@ - #include - #include - #include --#include -+#include - #include - - #include ---- evolution-2.10.1/composer/e-msg-composer.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/composer/e-msg-composer.c 2007-04-30 13:06:43.000000000 -0400 -@@ -63,7 +63,7 @@ - - #include - #include --#include -+#include - #include - #include - ---- evolution-2.10.1/composer/e-msg-composer-select-file.c.use-glib-i18n 2007-04-09 09:09:32.000000000 -0400 -+++ evolution-2.10.1/composer/e-msg-composer-select-file.c 2007-04-30 13:06:43.000000000 -0400 -@@ -41,7 +41,7 @@ - #endif - - #include --#include -+#include - - #include "e-msg-composer-select-file.h" - #include ---- evolution-2.10.1/composer/e-msg-composer-hdrs.c.use-glib-i18n 2007-04-09 09:09:32.000000000 -0400 -+++ evolution-2.10.1/composer/e-msg-composer-hdrs.c 2007-04-30 13:06:43.000000000 -0400 -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/shell/e-shell-window.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/e-shell-window.c 2007-04-30 13:06:43.000000000 -0400 -@@ -51,7 +51,7 @@ - #include - #include - --#include -+#include - #include - - #include ---- evolution-2.10.1/shell/e-shell-utils.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/e-shell-utils.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - - #include --#include -+#include - - #include "e-util/e-util-private.h" - ---- evolution-2.10.1/shell/e-shell.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/e-shell.c 2007-04-30 13:06:43.000000000 -0400 -@@ -44,7 +44,7 @@ - #undef interface - #endif - --#include -+#include - #include - - #include ---- evolution-2.10.1/shell/e-shell-folder-title-bar.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/e-shell-folder-title-bar.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - #include - - #include "misc/e-clipped-label.h" ---- evolution-2.10.1/shell/e-shell-settings-dialog.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/e-shell-settings-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -148,9 +148,9 @@ - { - EShellSettingsDialogPrivate *priv; - Bonobo_ServerInfoList *control_list; -+ const gchar * const *language_names; - CORBA_Environment ev; -- const GList *l; -- GSList *language_list; -+ GSList *languages = NULL; - GList *page_list; - GList *p; - int i, j; -@@ -168,10 +168,9 @@ - - CORBA_exception_free (&ev); - -- /* Great, one uses GList the other GSList (!) */ -- l = gnome_i18n_get_language_list("LC_MESSAGES"); -- for (language_list=NULL;l;l=l->next) -- language_list = g_slist_append(language_list, l->data); -+ language_names = g_get_language_names (); -+ while (*language_names != NULL) -+ languages = g_list_append (languages, *language_names++); - - page_list = NULL; - for (i = 0; i < control_list->_length; i ++) { -@@ -189,8 +188,8 @@ - - info = & control_list->_buffer[i]; - -- title = bonobo_server_info_prop_lookup (info, "evolution2:config_item:title", language_list); -- description = bonobo_server_info_prop_lookup (info, "evolution2:config_item:description", language_list); -+ title = bonobo_server_info_prop_lookup (info, "evolution2:config_item:title", languages); -+ description = bonobo_server_info_prop_lookup (info, "evolution2:config_item:description", languages); - icon_path = bonobo_server_info_prop_lookup (info, "evolution2:config_item:icon_name", NULL); - type = bonobo_server_info_prop_find (info, "evolution2:config_item:type"); - priority_string = bonobo_server_info_prop_lookup (info, "evolution2:config_item:priority", NULL); -@@ -232,7 +231,7 @@ - - CORBA_exception_free (&ev); - } -- g_slist_free(language_list); -+ g_slist_free(languages); - - page_list = sort_page_list (page_list); - for (p = page_list, i = 0; p != NULL; p = p->next, i++) { ---- evolution-2.10.1/shell/e-user-creatable-items-handler.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/e-user-creatable-items-handler.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - --#include -+#include - - #include - #include ---- evolution-2.10.1/shell/main.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/shell/main.c 2007-04-30 13:06:43.000000000 -0400 -@@ -55,7 +55,7 @@ - #include - #include - --#include -+#include - #include - #include - #include ---- evolution-2.10.1/shell/evolution-shell-component-utils.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/evolution-shell-component-utils.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include "e-util/e-dialog-utils.h" - - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/shell/e-shell-window-commands.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/e-shell-window-commands.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include - - #include --#include -+#include - #include - - #include -@@ -611,10 +611,11 @@ - { - char *quickref; - GnomeVFSMimeApplication *app; -- const GList *lang_list = gnome_i18n_get_language_list ("LC_MESSAGES"); -+ const gchar * const *language_names; - -- for (; lang_list != NULL; lang_list = lang_list->next) { -- const char *lang = lang_list->data; -+ language_names = g_get_language_names (); -+ while (*language_names != NULL) { -+ const gchar *lang = *language_names++; - - /* This has to be a valid language AND a language with - * no encoding postfix. The language will come up without ---- evolution-2.10.1/shell/e-component-registry.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/e-component-registry.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - - #include - --#include -+#include - - #include - #include -@@ -146,8 +146,9 @@ - query_components (EComponentRegistry *registry) - { - Bonobo_ServerInfoList *info_list; -+ const gchar * const *language_names; - CORBA_Environment ev; -- GSList *language_list; -+ GSList *languages = NULL; - const GList *l; - char *query; - int i; -@@ -170,9 +171,9 @@ - return; - } - -- l = gnome_i18n_get_language_list("LC_MESSAGES"); -- for (language_list=NULL;l;l=l->next) -- language_list = g_slist_append(language_list, l->data); -+ language_names = g_get_language_names (); -+ while (*language_names != NULL) -+ languages = g_slist_append (languages, *language_names++); - - for (i = 0; i < info_list->_length; i++) { - const char *id; -@@ -200,13 +201,13 @@ - continue; - } - -- label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_label", language_list); -+ label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_label", languages); - -- tooltips = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_tooltips", language_list); -+ tooltips = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_tooltips", languages); - -- menu_label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_label", language_list); -+ menu_label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_label", languages); - -- menu_accelerator = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_accelerator", language_list); -+ menu_accelerator = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_accelerator", languages); - - alias = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:component_alias", NULL); - -@@ -235,7 +236,7 @@ - g_object_unref (menuicon); - bonobo_object_release_unref(iface, NULL); - } -- g_slist_free(language_list); -+ g_slist_free(languages); - - CORBA_free (info_list); - CORBA_exception_free (&ev); ---- evolution-2.10.1/shell/e-shell-importer.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/e-shell-importer.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - - #include - --#include -+#include - - #include - #include ---- evolution-2.10.1/calendar/gui/print.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/print.c 2007-04-30 13:06:43.000000000 -0400 -@@ -34,7 +34,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/calendar-view-factory.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/calendar-view-factory.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - #endif - - #include --#include -+#include - #include "calendar-view-factory.h" - #include "calendar-view.h" - ---- evolution-2.10.1/calendar/gui/itip-utils.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/itip-utils.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/alarm-notify/util.c.use-glib-i18n 2007-04-09 09:10:29.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/alarm-notify/util.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - #include - #endif - --#include -+#include - #include - #include - #include "config-data.h" ---- evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c 2007-04-30 13:06:43.000000000 -0400 -@@ -43,7 +43,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify-dialog.c.use-glib-i18n 2007-04-09 09:10:29.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - #if 0 - # include - #endif ---- evolution-2.10.1/calendar/gui/alarm-notify/notify-main.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/alarm-notify/notify-main.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-itip-control.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-itip-control.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-day-view-top-item.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-day-view-top-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #endif - - #include --#include -+#include - #include "e-util/e-categories-config.h" - #include - #include ---- evolution-2.10.1/calendar/gui/e-meeting-time-sel-item.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-meeting-time-sel-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -34,7 +34,7 @@ - - #include - #include --#include -+#include - #include "calendar-config.h" - #include "e-meeting-time-sel-item.h" - #include "e-meeting-time-sel.h" ---- evolution-2.10.1/calendar/gui/e-meeting-list-view.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-meeting-list-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/tasks-control.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/tasks-control.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-cal-model-calendar.c.use-glib-i18n 2007-04-09 09:10:34.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-cal-model-calendar.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - #endif - - #include --#include -+#include - #include "e-cal-model-calendar.h" - #include "e-cell-date-edit-text.h" - #include "itip-utils.h" ---- evolution-2.10.1/calendar/gui/dialogs/memo-editor.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/memo-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - - #include - #include --#include -+#include - - #include - #include ---- evolution-2.10.1/calendar/gui/dialogs/task-page.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/task-page.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/dialogs/alarm-list-dialog.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/alarm-list-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include "e-util/e-dialog-widgets.h" ---- evolution-2.10.1/calendar/gui/dialogs/comp-editor.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/comp-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -34,7 +34,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/dialogs/recurrence-page.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/recurrence-page.c 2007-04-30 13:06:43.000000000 -0400 -@@ -39,7 +39,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/dialogs/event-page.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/event-page.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include "common/authentication.h" ---- evolution-2.10.1/calendar/gui/dialogs/task-editor.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/task-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - - #include - #include --#include -+#include - - #include - #include ---- evolution-2.10.1/calendar/gui/dialogs/calendar-setup.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/calendar-setup.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - - #include - #include --#include -+#include - #include - #include - #include "calendar-setup.h" ---- evolution-2.10.1/calendar/gui/dialogs/recur-comp.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/recur-comp.c 2007-04-30 13:06:43.000000000 -0400 -@@ -24,7 +24,7 @@ - - #include - #include --#include -+#include - #include - #include "recur-comp.h" - ---- evolution-2.10.1/calendar/gui/dialogs/delete-comp.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/delete-comp.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - #include - #include --#include -+#include - #include - #include "e-util/e-error.h" - #include "../calendar-config.h" ---- evolution-2.10.1/calendar/gui/dialogs/comp-editor-page.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/comp-editor-page.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - #endif - - #include --#include -+#include - #include - #include - #include "comp-editor-page.h" ---- evolution-2.10.1/calendar/gui/dialogs/delete-error.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/delete-error.c 2007-04-30 13:06:43.000000000 -0400 -@@ -24,7 +24,7 @@ - - #include - #include --#include -+#include - #include - #include - #include "delete-error.h" ---- evolution-2.10.1/calendar/gui/dialogs/task-details-page.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/task-details-page.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/dialogs/cal-attachment-select-file.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/cal-attachment-select-file.c 2007-04-30 13:06:43.000000000 -0400 -@@ -45,7 +45,7 @@ - #endif - - #include --#include -+#include - - #include "cal-attachment-select-file.h" - #include ---- evolution-2.10.1/calendar/gui/dialogs/event-editor.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/event-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/dialogs/cancel-comp.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/cancel-comp.c 2007-04-30 13:06:43.000000000 -0400 -@@ -24,7 +24,7 @@ - - #include - #include --#include -+#include - #include - #include - #include "e-util/e-error.h" ---- evolution-2.10.1/calendar/gui/dialogs/comp-editor-util.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/comp-editor-util.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/dialogs/cal-prefs-dialog.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/cal-prefs-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - #include - - static const int week_start_day_map[] = { ---- evolution-2.10.1/calendar/gui/dialogs/schedule-page.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/schedule-page.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/dialogs/changed-comp.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/changed-comp.c 2007-04-30 13:06:43.000000000 -0400 -@@ -24,7 +24,7 @@ - - #include - #include --#include -+#include - #include - #include - #include "changed-comp.h" ---- evolution-2.10.1/calendar/gui/dialogs/memo-page.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/memo-page.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-meeting-time-sel.c.use-glib-i18n 2007-04-09 09:10:34.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-meeting-time-sel.c 2007-04-30 13:06:43.000000000 -0400 -@@ -51,7 +51,7 @@ - #include - #include - #include --#include -+#include - #include - - #include ---- evolution-2.10.1/calendar/gui/calendar-commands.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/calendar-commands.c 2007-04-30 13:06:43.000000000 -0400 -@@ -47,7 +47,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/memos-control.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/memos-control.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/misc.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/misc.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - #include - #include --#include "e-util/e-i18n.h" -+#include - - #include "misc.h" - ---- evolution-2.10.1/calendar/gui/e-cal-model-tasks.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-cal-model-tasks.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - #include - #include --#include -+#include - #include - #include "calendar-config.h" - #include "e-cal-model-tasks.h" ---- evolution-2.10.1/calendar/gui/e-calendar-view.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-calendar-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -37,7 +37,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-cell-date-edit-text.c.use-glib-i18n 2007-04-09 09:10:34.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-cell-date-edit-text.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-timezone-entry.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-timezone-entry.c 2007-04-30 13:06:43.000000000 -0400 -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - #include "e-timezone-entry.h" - #include - ---- evolution-2.10.1/calendar/gui/e-alarm-list.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-alarm-list.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-day-view.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-day-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -46,7 +46,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-cal-model.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-cal-model.c 2007-04-30 13:06:43.000000000 -0400 -@@ -24,7 +24,7 @@ - - #include - #include --#include -+#include - #include - #include - #include "comp-util.h" ---- evolution-2.10.1/calendar/gui/weekday-picker.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/weekday-picker.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include "weekday-picker.h" ---- evolution-2.10.1/calendar/gui/e-week-view.c.use-glib-i18n 2007-04-30 13:06:42.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-week-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -41,7 +41,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-cal-model-memos.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-cal-model-memos.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #endif - - #include --#include -+#include - #include "e-cal-model-memos.h" - #include "e-cell-date-edit-text.h" - #include "misc.h" ---- evolution-2.10.1/calendar/gui/main.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/main.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #endif - - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/cal-search-bar.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/cal-search-bar.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-day-view-time-item.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-day-view-time-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - #include - #include "e-day-view-time-item.h" - #include "calendar-config.h" ---- evolution-2.10.1/calendar/gui/e-cal-popup.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-cal-popup.c 2007-04-30 13:06:43.000000000 -0400 -@@ -39,7 +39,7 @@ - #include - #include - #include "e-util/e-util.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-mktemp.h" - #include "e-util/e-dialog-utils.h" - ---- evolution-2.10.1/calendar/gui/e-meeting-store.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-meeting-store.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #endif - - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-week-view-main-item.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-week-view-main-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - - #include - #include --#include -+#include - #include "e-week-view-main-item.h" - #include "ea-calendar.h" - ---- evolution-2.10.1/calendar/gui/gnome-cal.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/gnome-cal.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-cal-list-view.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-cal-list-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -50,7 +50,7 @@ - #include
- #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/smime/lib/e-cert-db.c.use-glib-i18n 2007-04-09 09:07:58.000000000 -0400 -+++ evolution-2.10.1/smime/lib/e-cert-db.c 2007-04-30 13:06:43.000000000 -0400 -@@ -90,7 +90,7 @@ - #include "e-util/e-dialog-utils.h" - #include "e-util/e-util-private.h" - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/smime/lib/e-cert.c.use-glib-i18n 2007-04-09 09:07:58.000000000 -0400 -+++ evolution-2.10.1/smime/lib/e-cert.c 2007-04-30 13:06:43.000000000 -0400 -@@ -62,7 +62,7 @@ - - #include - --#include -+#include - #include - #include /* for e_utf8_strftime, what about e_time_format_time? */ - ---- evolution-2.10.1/smime/lib/e-pkcs12.c.use-glib-i18n 2007-04-09 09:07:58.000000000 -0400 -+++ evolution-2.10.1/smime/lib/e-pkcs12.c 2007-04-30 13:06:43.000000000 -0400 -@@ -63,7 +63,7 @@ - #include - #include - #include --#include -+#include - #include - - #include ---- evolution-2.10.1/smime/gui/certificate-viewer.c.use-glib-i18n 2007-04-09 09:07:55.000000000 -0400 -+++ evolution-2.10.1/smime/gui/certificate-viewer.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - - #include - --#include -+#include - #include - - #include "e-util/e-util-private.h" ---- evolution-2.10.1/smime/gui/certificate-manager.c.use-glib-i18n 2007-04-09 09:07:56.000000000 -0400 -+++ evolution-2.10.1/smime/gui/certificate-manager.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - - #include - --#include -+#include - - #include - #include "evolution-config-control.h" ---- evolution-2.10.1/smime/gui/e-cert-selector.c.use-glib-i18n 2007-04-09 09:07:56.000000000 -0400 -+++ evolution-2.10.1/smime/gui/e-cert-selector.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - #include - #endif - --#include -+#include - - #include - #include ---- evolution-2.10.1/smime/gui/cert-trust-dialog.c.use-glib-i18n 2007-04-09 09:07:56.000000000 -0400 -+++ evolution-2.10.1/smime/gui/cert-trust-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - --#include -+#include - #include - - #include "e-util/e-util-private.h" ---- evolution-2.10.1/smime/gui/component.c.use-glib-i18n 2007-04-09 09:07:56.000000000 -0400 -+++ evolution-2.10.1/smime/gui/component.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - - #include - --#include -+#include - #include - - #include "ca-trust-dialog.h" ---- evolution-2.10.1/smime/gui/ca-trust-dialog.c.use-glib-i18n 2007-04-09 09:07:55.000000000 -0400 -+++ evolution-2.10.1/smime/gui/ca-trust-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - - #include - --#include -+#include - #include - - #include "e-util/e-util-private.h" ---- evolution-2.10.1/tools/killev.c.use-glib-i18n 2007-04-09 09:07:44.000000000 -0400 -+++ evolution-2.10.1/tools/killev.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - - #include - #include --#include -+#include - #include - - typedef struct { -@@ -39,7 +39,7 @@ - GPtrArray *names; - } KillevComponent; - --static GSList *languages; -+static GSList *languages = NULL; - static GHashTable *components; - - static gboolean -@@ -186,7 +186,7 @@ - int - main (int argc, char **argv) - { -- const GList *l; -+ const gchar * const *language_names; - - bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); -@@ -196,9 +196,9 @@ - GNOME_PROGRAM_STANDARD_PROPERTIES, - NULL); - -- l = gnome_i18n_get_language_list("LC_MESSAGES"); -- for (languages=NULL;l;l=l->next) -- languages = g_slist_append(languages, l->data); -+ language_names = g_get_language_names (); -+ while (*language_names != NULL) -+ languages = g_slist_append (languages, *language_names++); - - components = g_hash_table_new (g_str_hash, g_str_equal); - diff --git a/evolution-2.10.1-e-attachment-bar.patch b/evolution-2.10.1-e-attachment-bar.patch deleted file mode 100644 index fdea03a..0000000 --- a/evolution-2.10.1-e-attachment-bar.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- evolution-2.10.1/widgets/misc/e-attachment-bar.c.e-attachment-bar 2007-05-01 11:22:41.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-attachment-bar.c 2007-05-01 15:10:49.000000000 -0400 -@@ -491,6 +491,8 @@ - g_ptr_array_free (temp_arr, TRUE); - - update (bar); -+ -+ g_signal_emit (bar, signals[CHANGED], 0); - - id++; - diff --git a/evolution-2.10.1-en_CA-attribution-format.patch b/evolution-2.10.1-en_CA-attribution-format.patch deleted file mode 100644 index 663d243..0000000 --- a/evolution-2.10.1-en_CA-attribution-format.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- evolution-2.10.1/po/en_CA.po.en_CA-attribution-format 2007-04-27 22:58:06.000000000 -0400 -+++ evolution-2.10.1/po/en_CA.po 2007-04-27 22:58:36.000000000 -0400 -@@ -10992,7 +10992,7 @@ - "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} " - "${TimeZone}, ${Sender} wrote:" - msgstr "" --"On ${AbbrevWeekdayName}, ${Year}-${Day}-${Month} at ${24Hour}:${Minute} " -+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} " - "${TimeZone}, ${Sender} wrote:" - - #: ../mail/em-filter-editor.c:155 diff --git a/evolution-2.10.1-fix-uri-handling.patch b/evolution-2.10.1-fix-uri-handling.patch deleted file mode 100644 index 53fbe39..0000000 --- a/evolution-2.10.1-fix-uri-handling.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- evolution-2.10.1/calendar/gui/GNOME_Evolution_Calendar.server.in.in.fix-uri-handling 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/GNOME_Evolution_Calendar.server.in.in 2007-05-14 14:11:59.000000000 -0400 -@@ -50,9 +50,11 @@ - - - -+ - - - diff --git a/evolution-2.10.1-saving-attachments.patch b/evolution-2.10.1-saving-attachments.patch deleted file mode 100644 index 1f591f5..0000000 --- a/evolution-2.10.1-saving-attachments.patch +++ /dev/null @@ -1,218 +0,0 @@ ---- evolution-2.10.1/mail/em-utils.c.saving-attachments 2007-04-14 14:25:40.000000000 -0400 -+++ evolution-2.10.1/mail/em-utils.c 2007-04-14 15:08:50.000000000 -0400 -@@ -354,28 +354,23 @@ - - /* Saving messages... */ - --static void --emu_save_part_response(GtkWidget *filesel, int response, CamelMimePart *part) -+static const gchar * -+emu_save_get_filename_for_part (CamelMimePart *part) - { -- char *uri; -- -- if (response == GTK_RESPONSE_OK) { -- uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (filesel)); -+ const gchar *filename; - -- if (!e_file_can_save((GtkWindow *)filesel, uri)) { -- g_free(uri); -- return; -- } -- -- e_file_update_save_path(gtk_file_chooser_get_current_folder_uri( -- GTK_FILE_CHOOSER(filesel)), TRUE); -- /* FIXME: popup error if it fails? */ -- mail_save_part(part, uri, NULL, NULL, FALSE); -- g_free(uri); -+ filename = camel_mime_part_get_filename (part); -+ if (filename == NULL) { -+ if (CAMEL_IS_MIME_MESSAGE (part)) { -+ filename = camel_mime_message_get_subject ( -+ CAMEL_MIME_MESSAGE (part)); -+ if (filename == NULL) -+ filename = _("message"); -+ } else -+ filename = _("attachment"); - } - -- gtk_widget_destroy((GtkWidget *)filesel); -- camel_object_unref(part); -+ return filename; - } - - /** -@@ -387,83 +382,78 @@ - * Saves a mime part to disk (prompting the user for filename). - **/ - void --em_utils_save_part(GtkWidget *parent, const char *prompt, CamelMimePart *part) -+em_utils_save_part (GtkWidget *parent, const char *prompt, CamelMimePart *part) - { -- const char *name; -- GtkWidget *filesel; -+ GtkWidget *file_chooser; -+ const gchar *filename; -+ gchar *uri = NULL; - -- name = camel_mime_part_get_filename(part); -- if (name == NULL) { -- if (CAMEL_IS_MIME_MESSAGE(part)) { -- name = camel_mime_message_get_subject((CamelMimeMessage *)part); -- if (name == NULL) -- name = _("message"); -- } else { -- name = _("attachment"); -- } -+ filename = emu_save_get_filename_for_part (part); -+ -+ file_chooser = e_file_get_save_filesel ( -+ parent, prompt, filename, GTK_FILE_CHOOSER_ACTION_SAVE); -+ -+ if (gtk_dialog_run (GTK_DIALOG (file_chooser)) != GTK_RESPONSE_OK) -+ goto exit; -+ -+ uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (file_chooser)); -+ -+ /* XXX Would be nice to mention _why_ we can't save. */ -+ if (!e_file_can_save (GTK_WINDOW (file_chooser), uri)) { -+ g_warning ("Unable to save %s", uri); -+ goto exit; - } - -- filesel = e_file_get_save_filesel(parent, prompt, name, GTK_FILE_CHOOSER_ACTION_SAVE); -- camel_object_ref(part); -- g_signal_connect (filesel, "response", G_CALLBACK (emu_save_part_response), part); -- gtk_widget_show (filesel); -+ e_file_update_save_path ( -+ gtk_file_chooser_get_current_folder_uri ( -+ GTK_FILE_CHOOSER (file_chooser)), TRUE); -+ -+ mail_save_part (part, uri, NULL, NULL, FALSE); -+ -+exit: -+ gtk_widget_destroy (file_chooser); -+ g_free (uri); - } - --static void --emu_save_parts_response (GtkWidget *filesel, int response, GSList *parts) -+void -+em_utils_save_parts (GtkWidget *parent, const gchar *prompt, GSList *parts) - { -- GSList *selected; -- char *uri = NULL; -- if (response == GTK_RESPONSE_OK) { -- uri = gtk_file_chooser_get_current_folder_uri(GTK_FILE_CHOOSER (filesel)); -- e_file_update_save_path(uri, FALSE); -- -- for ( selected = parts; selected != NULL; selected = selected->next) { -- const char *file_name; -- char *safe_name = NULL; -- char *file_path; -- CamelMimePart *part = selected->data; -- -- file_name = camel_mime_part_get_filename(part); -- if (file_name == NULL) { -- if (CAMEL_IS_MIME_MESSAGE(part)) { -- file_name = camel_mime_message_get_subject((CamelMimeMessage *)part); -- if (file_name == NULL) -- file_name = _("message"); -- } else { -- file_name = _("attachment"); -- } -- } else { -- safe_name = g_strdup(file_name); -- em_filename_make_safe(safe_name); -- file_name = safe_name; -- } -- -- file_path = g_build_filename (uri, file_name, NULL); -- if (!e_file_check_local(file_path) || !g_file_test(file_path, (G_FILE_TEST_EXISTS)) || e_error_run(NULL, E_ERROR_ASK_FILE_EXISTS_OVERWRITE, file_name, NULL) == GTK_RESPONSE_OK) -- mail_save_part(part, file_path, NULL, NULL, FALSE); -- else -- g_warning ("Could not save %s. File already exists", file_path); -+ GtkWidget *file_chooser; -+ gchar *path_uri; -+ GSList *iter; -+ -+ file_chooser = e_file_get_save_filesel ( -+ parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); -+ -+ if (gtk_dialog_run (GTK_DIALOG (file_chooser)) != GTK_RESPONSE_OK) -+ goto exit; -+ -+ path_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (file_chooser)); -+ -+ e_file_update_save_path (path_uri, FALSE); - -- g_free (file_path); -- g_free (safe_name); -- } -+ for (iter = parts; iter != NULL; iter = iter->next) { -+ CamelMimePart *part = iter->data; -+ const gchar *filename; -+ gchar *uri; -+ -+ filename = emu_save_get_filename_for_part (part); -+ -+ uri = g_build_path ("/", path_uri, filename, NULL); -+ -+ /* XXX Would be nice to mention _why_ we can't save. */ -+ if (e_file_can_save (GTK_WINDOW (file_chooser), uri)) -+ mail_save_part (part, uri, NULL, NULL, FALSE); -+ else -+ g_warning ("Unable to save %s", uri); - - g_free (uri); -- } -- -- g_slist_free (parts); -- gtk_widget_destroy((GtkWidget *)filesel); --} -+ } - --void --em_utils_save_parts (GtkWidget *parent, const char *prompt, GSList * parts) --{ -- GtkWidget *filesel; -+ g_free (path_uri); - -- filesel = e_file_get_save_filesel (parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); -- g_signal_connect (filesel, "response", G_CALLBACK (emu_save_parts_response), parts); -- gtk_widget_show (filesel); -+exit: -+ gtk_widget_destroy (file_chooser); - } - - ---- evolution-2.10.1/mail/em-format-html-display.c.saving-attachments 2007-04-14 14:25:40.000000000 -0400 -+++ evolution-2.10.1/mail/em-format-html-display.c 2007-04-14 15:08:50.000000000 -0400 -@@ -2099,12 +2099,24 @@ - } - - static void --attachments_save_all_clicked(GtkWidget *w, EMFormatHTMLDisplay *efhd) -+attachments_save_all_clicked (GtkWidget *widget, EMFormatHTMLDisplay *efhd) - { - GSList *attachment_parts; -+ guint n_attachment_parts; - -- attachment_parts = e_attachment_bar_get_parts(E_ATTACHMENT_BAR(efhd->priv->attachment_bar)); -- em_utils_save_parts(w, _("Select folder to save all attachments..."), attachment_parts); -+ attachment_parts = e_attachment_bar_get_parts ( -+ E_ATTACHMENT_BAR (efhd->priv->attachment_bar)); -+ n_attachment_parts = g_slist_length (attachment_parts); -+ g_return_if_fail (n_attachment_parts > 0); -+ -+ if (n_attachment_parts == 1) -+ em_utils_save_part ( -+ widget, _("Save attachment as"), -+ attachment_parts->data); -+ else -+ em_utils_save_parts ( -+ widget, _("Select folder to save all attachments"), -+ attachment_parts); - } - - static void diff --git a/evolution-2.10.1-send-recv-dialog.patch b/evolution-2.10.1-send-recv-dialog.patch index 3f26184..e8fb570 100644 --- a/evolution-2.10.1-send-recv-dialog.patch +++ b/evolution-2.10.1-send-recv-dialog.patch @@ -1,10 +1,10 @@ ---- evolution-2.10.1/mail/mail-send-recv.c.send-recv-dialog 2007-05-15 14:26:24.000000000 -0400 -+++ evolution-2.10.1/mail/mail-send-recv.c 2007-05-15 14:30:51.000000000 -0400 -@@ -312,21 +312,6 @@ +--- evolution-2.11.2/mail/mail-send-recv.c.send-recv-dialog 2007-05-18 16:03:24.000000000 -0400 ++++ evolution-2.11.2/mail/mail-send-recv.c 2007-05-18 16:08:58.000000000 -0400 +@@ -362,23 +362,6 @@ return SEND_INVALID; } --gboolean +-static gboolean -dialog_map (GtkWidget *window, GdkEvent *event, GtkWidget *table) -{ - int h, w; @@ -16,66 +16,82 @@ - w = 750; - if (h > 400) - h = 400; -- gtk_widget_set_usize (window, w, h); +- gtk_widget_set_size_request (window, w, h); +- +- return FALSE; -} - static struct _send_data * build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destination) { -@@ -385,7 +370,7 @@ - +@@ -444,7 +427,7 @@ scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), -- GTK_POLICY_AUTOMATIC, -+ GTK_POLICY_NEVER, - GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_policy ( + GTK_SCROLLED_WINDOW (scrolled_window), +- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); ++ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), table); -@@ -443,6 +428,7 @@ - recv_icon = e_icon_factory_get_image ("stock_mail-receive", E_ICON_SIZE_LARGE_TOOLBAR); + gtk_scrolled_window_add_with_viewport ( + GTK_SCROLLED_WINDOW (scrolled_window), table); +@@ -504,6 +487,8 @@ + "stock_mail-receive", E_ICON_SIZE_LARGE_TOOLBAR); pretty_url = format_url (source->url, account->name); - label = (GtkLabel *)gtk_label_new (NULL); -+ gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END); - gtk_label_set_markup (label, pretty_url); + label = gtk_label_new (NULL); ++ gtk_label_set_ellipsize ( ++ GTK_LABEL (label), PANGO_ELLIPSIZE_END); + gtk_label_set_markup (GTK_LABEL (label), pretty_url); g_free (pretty_url); -@@ -457,10 +443,10 @@ - gtk_misc_set_alignment (GTK_MISC (label), 0, .5); - gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5); +@@ -522,16 +507,16 @@ -- gtk_table_attach (table, (GtkWidget *)recv_icon, 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -+ gtk_table_attach (table, (GtkWidget *)recv_icon, 0, 1, row, row+2, 0, 0, 0, 0); - gtk_table_attach (table, (GtkWidget *)label, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); -- gtk_table_attach (table, (GtkWidget *)bar, 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -- gtk_table_attach (table, (GtkWidget *)stop, 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -+ gtk_table_attach (table, (GtkWidget *)bar, 2, 3, row, row+2, 0, 0, 0, 0); -+ gtk_table_attach (table, (GtkWidget *)stop, 3, 4, row, row+2, 0, 0, 0, 0); - gtk_table_attach (table, (GtkWidget *)status_label, 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); - - info->bar = bar; -@@ -496,6 +482,7 @@ - send_icon = e_icon_factory_get_image ("stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR); + gtk_table_attach ( + GTK_TABLE (table), recv_icon, +- 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); ++ 0, 1, row, row+2, 0, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (table), label, + 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (table), progress_bar, +- 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); ++ 2, 3, row, row+2, 0, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (table), cancel_button, +- 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); ++ 3, 4, row, row+2, 0, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (table), status_label, + 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); +@@ -572,6 +557,8 @@ + "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR); pretty_url = format_url (destination, NULL); - label = (GtkLabel *)gtk_label_new (NULL); -+ gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END); - gtk_label_set_markup (label, pretty_url); + label = gtk_label_new (NULL); ++ gtk_label_set_ellipsize ( ++ GTK_LABEL (label), PANGO_ELLIPSIZE_END); + gtk_label_set_markup (GTK_LABEL (label), pretty_url); g_free (pretty_url); -@@ -508,10 +495,10 @@ - gtk_misc_set_alignment (GTK_MISC (label), 0, .5); - gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5); +@@ -587,16 +574,16 @@ -- gtk_table_attach (table, GTK_WIDGET (send_icon), 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -+ gtk_table_attach (table, GTK_WIDGET (send_icon), 0, 1, row, row+2, 0, 0, 0, 0); - gtk_table_attach (table, GTK_WIDGET (label), 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); -- gtk_table_attach (table, GTK_WIDGET (bar), 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -- gtk_table_attach (table, GTK_WIDGET (stop), 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -+ gtk_table_attach (table, GTK_WIDGET (bar), 2, 3, row, row+2, 0, 0, 0, 0); -+ gtk_table_attach (table, GTK_WIDGET (stop), 3, 4, row, row+2, 0, 0, 0, 0); - gtk_table_attach (table, GTK_WIDGET (status_label), 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); - - info->bar = bar; -@@ -526,7 +513,6 @@ + gtk_table_attach ( + GTK_TABLE (table), send_icon, +- 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); ++ 0, 1, row, row+2, 0, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (table), label, + 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (table), progress_bar, +- 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); ++ 2, 3, row, row+2, 0, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (table), cancel_button, +- 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); ++ 3, 4, row, row+2, 0, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (table), status_label, + 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); +@@ -615,7 +602,6 @@ gtk_widget_show (GTK_WIDGET (gd)); g_signal_connect (gd, "response", G_CALLBACK (dialog_response), data); diff --git a/evolution-2.7.3-filter-datespec.patch b/evolution-2.7.3-filter-datespec.patch deleted file mode 100644 index 000adb1..0000000 --- a/evolution-2.7.3-filter-datespec.patch +++ /dev/null @@ -1,178 +0,0 @@ -diff -ur evolution-2.7.3/filter/filter-datespec.c my-evolution-2.7.3/filter/filter-datespec.c ---- evolution-2.7.3/filter/filter-datespec.c 2005-08-09 17:29:27.000000000 -0600 -+++ my-evolution-2.7.3/filter/filter-datespec.c 2006-06-28 20:51:01.000000000 -0600 -@@ -61,8 +61,10 @@ - - typedef struct _timespan { - guint32 seconds; -- const char *singular; -- const char *plural; -+ const char *past_singular; -+ const char *past_plural; -+ const char *future_singular; -+ const char *future_plural; - float max; - } timespan; - -@@ -75,13 +77,13 @@ - #define ngettext(a, b) a, b - - static const timespan timespans[] = { -- { 1, ngettext("1 second ago", "%d seconds ago"), 59.0 }, -- { 60, ngettext("1 minute ago", "%d minutes ago"), 59.0 }, -- { 3600, ngettext("1 hour ago", "%d hours ago"), 23.0 }, -- { 86400, ngettext("1 day ago", "%d days ago"), 31.0 }, -- { 604800, ngettext("1 week ago", "%d weeks ago"), 52.0 }, -- { 2419200, ngettext("1 month ago", "%d months ago"), 12.0 }, -- { 31557600, ngettext("1 year ago", "%d years ago"), 1000.0 }, -+ { 1, ngettext("1 second ago", "%d seconds ago"), ngettext("1 second in the future", "%d seconds in the future"), 59.0 }, -+ { 60, ngettext("1 minute ago", "%d minutes ago"), ngettext("1 minute in the future", "%d minutes in the future"), 59.0 }, -+ { 3600, ngettext("1 hour ago", "%d hours ago"), ngettext("1 hour in the future", "%d hours in the future"), 23.0 }, -+ { 86400, ngettext("1 day ago", "%d days ago"), ngettext("1 day in the future", "%d days in the future"), 31.0 }, -+ { 604800, ngettext("1 week ago", "%d weeks ago"), ngettext("1 week in the future", "%d weeks in the future"), 52.0 }, -+ { 2419200, ngettext("1 month ago", "%d months ago"), ngettext("1 month in the future", "%d months in the future"), 12.0 }, -+ { 31557600, ngettext("1 year ago", "%d years ago"), ngettext("1 year in the future", "%d years in the future"), 1000.0 }, - }; - - /* now we let the compiler see the real function call */ -@@ -92,7 +94,7 @@ - - struct _FilterDatespecPrivate { - GtkWidget *label_button; -- GtkWidget *notebook_type, *option_type, *calendar_specify, *spin_relative, *option_relative; -+ GtkWidget *notebook_type, *option_type, *calendar_specify, *spin_relative, *option_relative, *option_past_future; - FilterDatespec_type type; - int span; - }; -@@ -264,7 +266,7 @@ - get_best_span (time_t val) - { - int i; -- -+ - for (i=N_TIMESPANS-1;i>=0;i--) { - if (val % timespans[i].seconds == 0) - return i; -@@ -302,8 +304,18 @@ - - span = get_best_span(fds->value); - count = fds->value / timespans[span].seconds; -+ sprintf(buf, ngettext(timespans[span].past_singular, timespans[span].past_plural, count), count); -+ } -+ break; -+ case FDST_X_FUTURE: -+ if (fds->value == 0) -+ label = _("now"); -+ else { -+ int span, count; - -- sprintf(buf, ngettext(timespans[span].singular, timespans[span].plural, count), count); -+ span = get_best_span(fds->value); -+ count = fds->value / timespans[span].seconds; -+ sprintf(buf, ngettext(timespans[span].future_singular, timespans[span].future_plural, count), count); - } - break; - } -@@ -329,6 +341,7 @@ - fds->value = mktime(&tm); - /* what about timezone? */ - break; } -+ case FDST_X_FUTURE: - case FDST_X_AGO: { - int val; - -@@ -349,6 +362,8 @@ - struct _FilterDatespecPrivate *p = PRIV(fds); - - p->type = fds->type==FDST_UNKNOWN ? FDST_NOW : fds->type; -+ -+ int note_type = fds->type==FDST_X_FUTURE ? FDST_X_AGO : fds->type; // FUTURE and AGO use the same notebook pages/etc. - - switch (p->type) { - case FDST_NOW: -@@ -368,11 +383,18 @@ - p->span = get_best_span(fds->value); - gtk_spin_button_set_value((GtkSpinButton*)p->spin_relative, fds->value/timespans[p->span].seconds); - gtk_option_menu_set_history((GtkOptionMenu*)p->option_relative, p->span); -+ gtk_option_menu_set_history((GtkOptionMenu*)p->option_past_future, 0); -+ break; -+ case FDST_X_FUTURE: -+ p->span = get_best_span(fds->value); -+ gtk_spin_button_set_value((GtkSpinButton*)p->spin_relative, fds->value/timespans[p->span].seconds); -+ gtk_option_menu_set_history((GtkOptionMenu*)p->option_relative, p->span); -+ gtk_option_menu_set_history((GtkOptionMenu*)p->option_past_future, 1); - break; - } - -- gtk_notebook_set_current_page ((GtkNotebook*) p->notebook_type, p->type); -- gtk_option_menu_set_history ((GtkOptionMenu*) p->option_type, p->type); -+ gtk_notebook_set_current_page ((GtkNotebook*) p->notebook_type, note_type); -+ gtk_option_menu_set_history ((GtkOptionMenu*) p->option_type, note_type); - } - - -@@ -397,6 +419,18 @@ - } - - static void -+set_option_past_future (GtkMenu *menu, FilterDatespec *fds) -+{ -+ GtkWidget *w; -+ -+ w = gtk_menu_get_active (menu); -+ if(g_list_index (GTK_MENU_SHELL (menu)->children, w) == 0) -+ fds->type = fds->priv->type = FDST_X_AGO; -+ else -+ fds->type = fds->priv->type = FDST_X_FUTURE; -+} -+ -+static void - button_clicked (GtkButton *button, FilterDatespec *fds) - { - struct _FilterDatespecPrivate *p = PRIV(fds); -@@ -424,6 +458,7 @@ - p->calendar_specify = glade_xml_get_widget (gui, "calendar_specify"); - p->spin_relative = glade_xml_get_widget (gui, "spin_relative"); - p->option_relative = glade_xml_get_widget (gui, "option_relative"); -+ p->option_past_future = glade_xml_get_widget (gui, "option_past_future"); - - set_values (fds); - -@@ -431,6 +466,8 @@ - G_CALLBACK (set_option_type), fds); - g_signal_connect (GTK_OPTION_MENU (p->option_relative)->menu, "deactivate", - G_CALLBACK (set_option_relative), fds); -+ g_signal_connect (GTK_OPTION_MENU (p->option_past_future)->menu, "deactivate", -+ G_CALLBACK (set_option_past_future), fds); - - gtk_box_pack_start ((GtkBox *) dialog->vbox, toplevel, TRUE, TRUE, 3); - -@@ -486,5 +523,8 @@ - case FDST_X_AGO: - g_string_append_printf (out, "(- (get-current-date) %d)", (int) fds->value); - break; -+ case FDST_X_FUTURE: -+ g_string_append_printf (out, "(+ (get-current-date) %d)", (int) fds->value); -+ break; - } - } -diff -ur evolution-2.7.3/filter/filter-datespec.h my-evolution-2.7.3/filter/filter-datespec.h ---- evolution-2.7.3/filter/filter-datespec.h 2002-11-01 16:22:57.000000000 -0700 -+++ my-evolution-2.7.3/filter/filter-datespec.h 2006-06-28 17:25:55.000000000 -0600 -@@ -42,6 +42,7 @@ - FDST_NOW, - FDST_SPECIFIED, - FDST_X_AGO, -+ FDST_X_FUTURE, - } FilterDatespec_type; - - struct _FilterDatespec { -@@ -52,7 +53,7 @@ - - /* either a timespan, an absolute time, or 0 - * depending on type -- the above mapping to -- * (X_AGO, SPECIFIED, NOW) -+ * (X_FUTURE, X_AGO, SPECIFIED, NOW) - */ - - time_t value; diff --git a/evolution-2.8.0-fix-indic-printing.patch b/evolution-2.8.0-fix-indic-printing.patch index 226be93..7eb8585 100644 --- a/evolution-2.8.0-fix-indic-printing.patch +++ b/evolution-2.8.0-fix-indic-printing.patch @@ -1,25 +1,16 @@ ---- evolution-2.9.91/plugins/print-message/print-message.c.fix-indic-printing 2007-02-12 01:58:01.000000000 -0500 -+++ evolution-2.9.91/plugins/print-message/print-message.c 2007-02-12 13:30:17.000000000 -0500 -@@ -83,7 +83,7 @@ - data->config = e_print_load_settings (); - data->preview = 0; - -- data->msg = e_msg_composer_get_message (composer, 1); -+ data->msg = e_msg_composer_get_message_print (composer, 1); - dialog = (GtkDialog *)e_print_get_dialog_with_config (_("Print Message"), 0, data->config); - gtk_dialog_set_default_response(dialog, GTK_RESPONSE_OK); - e_dialog_set_transient_for ((GtkWindow *) dialog, (GtkWidget *) composer); -@@ -102,7 +102,7 @@ - data->config = e_print_load_settings (); - data->preview = 0; - -- data->msg = e_msg_composer_get_message (composer, 1); -+ data->msg = e_msg_composer_get_message_print (composer, 1); +--- evolution-2.11.2/plugins/print-message/print-message.c.fix-indic-printing 2007-05-13 13:41:09.000000000 -0400 ++++ evolution-2.11.2/plugins/print-message/print-message.c 2007-05-18 15:32:12.000000000 -0400 +@@ -65,7 +65,7 @@ + EMFormatHTMLPrint *efhp; - print_response(NULL, GTK_RESPONSE_APPLY, data); - } ---- evolution-2.9.91/composer/e-msg-composer.h.fix-indic-printing 2007-01-22 10:23:06.000000000 -0500 -+++ evolution-2.9.91/composer/e-msg-composer.h 2007-02-12 13:29:24.000000000 -0500 + action = GTK_PRINT_OPERATION_ACTION_PREVIEW; +- message = e_msg_composer_get_message (composer, 1); ++ message = e_msg_composer_get_message_print (composer, 1); + + efhp = em_format_html_print_new (NULL, action); + em_format_html_print_raw_message (efhp, message); +--- evolution-2.11.2/composer/e-msg-composer.h.fix-indic-printing 2007-04-18 06:17:34.000000000 -0400 ++++ evolution-2.11.2/composer/e-msg-composer.h 2007-05-18 15:30:56.000000000 -0400 @@ -101,6 +101,8 @@ CamelMimePart *part); CamelMimeMessage *e_msg_composer_get_message (EMsgComposer *composer, @@ -29,9 +20,9 @@ CamelMimeMessage *e_msg_composer_get_message_draft (EMsgComposer *composer); void e_msg_composer_show_sig_file (EMsgComposer *composer); gboolean e_msg_composer_get_send_html (EMsgComposer *composer); ---- evolution-2.9.91/composer/e-msg-composer.c.fix-indic-printing 2007-02-12 13:29:24.000000000 -0500 -+++ evolution-2.9.91/composer/e-msg-composer.c 2007-02-12 13:29:24.000000000 -0500 -@@ -5267,6 +5267,49 @@ +--- evolution-2.11.2/composer/e-msg-composer.c.fix-indic-printing 2007-04-18 06:17:34.000000000 -0400 ++++ evolution-2.11.2/composer/e-msg-composer.c 2007-05-18 15:30:56.000000000 -0400 +@@ -5273,6 +5273,49 @@ } CamelMimeMessage * diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index 1300292..be61226 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -1,6 +1,6 @@ ---- evolution-2.10.1/mail/mail-send-recv.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-send-recv.c 2007-05-16 16:17:38.000000000 -0400 -@@ -725,23 +725,22 @@ +--- evolution-2.11.2/mail/mail-send-recv.c.kill-ethread 2007-04-20 00:28:22.000000000 -0400 ++++ evolution-2.11.2/mail/mail-send-recv.c 2007-05-18 15:34:09.000000000 -0400 +@@ -778,23 +778,22 @@ /* ********************************************************************** */ struct _refresh_folders_msg { @@ -27,8 +27,8 @@ - struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; int i; CamelFolder *folder; - -@@ -757,17 +756,14 @@ + CamelException ex = CAMEL_EXCEPTION_INITIALISER; +@@ -812,17 +811,14 @@ } static void @@ -48,7 +48,7 @@ int i; for (i=0;ifolders->len;i++) -@@ -776,11 +772,12 @@ +@@ -831,11 +827,12 @@ camel_object_unref(m->store); } @@ -66,7 +66,7 @@ }; static void -@@ -813,13 +810,13 @@ +@@ -868,13 +865,13 @@ get_folders(store, folders, info); @@ -82,9 +82,9 @@ } else { receive_done ("", data); } ---- evolution-2.10.1/mail/mail-component.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-component.c 2007-05-16 16:17:38.000000000 -0400 -@@ -965,7 +965,7 @@ +--- evolution-2.11.2/mail/mail-component.c.kill-ethread 2007-05-13 13:41:10.000000000 -0400 ++++ evolution-2.11.2/mail/mail-component.c 2007-05-18 15:34:09.000000000 -0400 +@@ -1014,7 +1014,7 @@ if (camel_url_get_param(url, "uid") != NULL) { char *curi = em_uri_to_camel(uri); @@ -93,8 +93,8 @@ g_free(curi); } else { g_warning("email uri's must include a uid parameter"); ---- evolution-2.10.1/mail/mail-ops.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-ops.c 2007-05-16 16:19:33.000000000 -0400 +--- evolution-2.11.2/mail/mail-ops.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/mail-ops.c 2007-05-18 15:34:09.000000000 -0400 @@ -75,7 +75,7 @@ /* used for both just filtering a folder + uid's, and for filtering a whole folder */ /* used both for fetching mail, and for filtering mail */ @@ -1464,7 +1464,7 @@ camel_object_ref(folder); m->uid = g_strdup(uid); @@ -1795,37 +1741,37 @@ - m->done = done; + m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; m->cancel = camel_operation_new(NULL, NULL); - e_thread_put(thread, (EMsg *)m); @@ -1514,7 +1514,7 @@ camel_object_ref(folder); m->uid = g_strdup(uid); @@ -1833,13 +1779,13 @@ - m->done = done; + m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; m->cancel = camel_operation_new(NULL, NULL); - e_thread_put(thread, (EMsg *)m); @@ -2142,8 +2142,8 @@ return id; } ---- evolution-2.10.1/mail/em-folder-utils.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-utils.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/em-folder-utils.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/em-folder-utils.c 2007-05-18 15:34:09.000000000 -0400 @@ -84,7 +84,7 @@ } @@ -2371,8 +2371,8 @@ return id; } ---- evolution-2.10.1/mail/importers/elm-importer.c.kill-ethread 2007-04-09 09:09:26.000000000 -0400 -+++ evolution-2.10.1/mail/importers/elm-importer.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/importers/elm-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 ++++ evolution-2.11.2/mail/importers/elm-importer.c 2007-05-18 15:34:09.000000000 -0400 @@ -51,7 +51,7 @@ #define d(x) x @@ -2471,8 +2471,8 @@ return id; } ---- evolution-2.10.1/mail/importers/mail-importer.c.kill-ethread 2007-04-09 09:09:26.000000000 -0400 -+++ evolution-2.10.1/mail/importers/mail-importer.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/importers/mail-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 ++++ evolution-2.11.2/mail/importers/mail-importer.c 2007-05-18 15:34:09.000000000 -0400 @@ -132,7 +132,7 @@ } @@ -2609,8 +2609,8 @@ } struct _import_folders_data { ---- evolution-2.10.1/mail/importers/pine-importer.c.kill-ethread 2007-04-09 09:09:26.000000000 -0400 -+++ evolution-2.10.1/mail/importers/pine-importer.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/importers/pine-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 ++++ evolution-2.11.2/mail/importers/pine-importer.c 2007-05-18 15:34:09.000000000 -0400 @@ -56,7 +56,7 @@ #define d(x) x @@ -2710,8 +2710,8 @@ return id; } ---- evolution-2.10.1/mail/mail-vfolder.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-vfolder.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/mail-vfolder.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/mail-vfolder.c 2007-05-18 15:34:09.000000000 -0400 @@ -21,7 +21,7 @@ */ @@ -2946,9 +2946,9 @@ from = em_uri_from_camel(cfrom); to = em_uri_from_camel(cto); ---- evolution-2.10.1/mail/em-format-html.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-format-html.c 2007-05-16 16:17:38.000000000 -0400 -@@ -166,7 +166,7 @@ +--- evolution-2.11.2/mail/em-format-html.c.kill-ethread 2007-04-20 00:28:22.000000000 -0400 ++++ evolution-2.11.2/mail/em-format-html.c 2007-05-18 15:34:09.000000000 -0400 +@@ -165,7 +165,7 @@ if (efh->priv->format_timeout_id != 0) { g_source_remove(efh->priv->format_timeout_id); efh->priv->format_timeout_id = 0; @@ -2957,7 +2957,7 @@ efh->priv->format_timeout_msg = NULL; } -@@ -1180,7 +1180,7 @@ +@@ -1179,7 +1179,7 @@ /* Sigh, this is so we have a cancellable, async rendering thread */ struct _format_msg { @@ -2966,7 +2966,7 @@ EMFormatHTML *format; EMFormat *format_source; -@@ -1190,14 +1190,15 @@ +@@ -1189,14 +1189,15 @@ CamelMimeMessage *message; }; @@ -2985,7 +2985,7 @@ struct _EMFormatHTMLJob *job; struct _EMFormatPURITree *puri_level; int cancelled = FALSE; -@@ -1282,10 +1283,9 @@ +@@ -1281,10 +1282,9 @@ ((EMFormat *)m->format)->pending_uri_level = puri_level; } @@ -2998,7 +2998,7 @@ d(printf("formatting finished\n")); m->format->load_http_now = FALSE; -@@ -1293,10 +1293,9 @@ +@@ -1292,10 +1292,9 @@ g_signal_emit_by_name(m->format, "complete"); } @@ -3011,7 +3011,7 @@ d(printf("formatter freed\n")); g_object_unref(m->format); if (m->estream) { -@@ -1312,11 +1311,12 @@ +@@ -1311,11 +1310,12 @@ g_object_unref(m->format_source); } @@ -3029,7 +3029,7 @@ }; static gboolean -@@ -1327,7 +1327,7 @@ +@@ -1326,7 +1326,7 @@ struct _EMFormatHTMLPrivate *p = efh->priv; if (m->format->html == NULL) { @@ -3038,7 +3038,7 @@ return FALSE; } -@@ -1355,7 +1355,7 @@ +@@ -1354,7 +1354,7 @@ if (m->message == NULL) { hstream = gtk_html_begin(efh->html); gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); @@ -3047,7 +3047,7 @@ p->last_part = NULL; } else { hstream = NULL; -@@ -1374,8 +1374,8 @@ +@@ -1373,8 +1373,8 @@ p->last_part = m->message; } @@ -3058,7 +3058,7 @@ } efh->priv->format_timeout_id = 0; -@@ -1399,11 +1399,11 @@ +@@ -1398,11 +1398,11 @@ d(printf(" timeout for last still active, removing ...\n")); g_source_remove(efh->priv->format_timeout_id); efh->priv->format_timeout_id = 0; @@ -3072,8 +3072,8 @@ m->format = (EMFormatHTML *)emf; g_object_ref(emf); m->format_source = emfsource; ---- evolution-2.10.1/mail/em-folder-properties.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-properties.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/em-folder-properties.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/em-folder-properties.c 2007-05-18 15:34:09.000000000 -0400 @@ -386,7 +386,7 @@ } @@ -3083,8 +3083,8 @@ else emfp_dialog_got_folder((char *)uri, folder, NULL); } ---- evolution-2.10.1/mail/em-folder-tree.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-tree.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/em-folder-tree.c.kill-ethread 2007-05-13 13:41:10.000000000 -0400 ++++ evolution-2.11.2/mail/em-folder-tree.c 2007-05-18 15:34:09.000000000 -0400 @@ -834,7 +834,7 @@ /* TODO: Merge the drop handling code/menu's into one spot using a popup target for details */ /* Drop handling */ @@ -3304,7 +3304,7 @@ }; static void -@@ -1906,7 +1898,7 @@ +@@ -1909,7 +1901,7 @@ gtk_tree_store_set((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1); @@ -3313,7 +3313,7 @@ m->root = gtk_tree_row_reference_new (model, tree_path); camel_object_ref (store); m->store = store; -@@ -1915,7 +1907,7 @@ +@@ -1918,7 +1910,7 @@ m->top = full_name; m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST; @@ -3322,9 +3322,9 @@ } static gboolean ---- evolution-2.10.1/mail/em-folder-browser.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-browser.c 2007-05-16 16:17:38.000000000 -0400 -@@ -838,7 +838,7 @@ +--- evolution-2.11.2/mail/em-folder-browser.c.kill-ethread 2007-05-13 13:41:10.000000000 -0400 ++++ evolution-2.11.2/mail/em-folder-browser.c 2007-05-18 15:34:09.000000000 -0400 +@@ -839,7 +839,7 @@ struct _setup_msg { @@ -3333,7 +3333,7 @@ CamelFolder *folder; char *query; -@@ -846,16 +846,15 @@ +@@ -847,16 +847,15 @@ GList *sources_folder; }; @@ -3353,7 +3353,7 @@ GList *l, *list = NULL; CamelFolder *folder; -@@ -866,12 +865,12 @@ +@@ -867,12 +866,12 @@ l = m->sources_uri; while (l) { d(printf(" Adding uri: %s\n", (char *)l->data)); @@ -3368,7 +3368,7 @@ } l = l->next; } -@@ -895,17 +894,13 @@ +@@ -896,17 +895,13 @@ } static void @@ -3388,7 +3388,7 @@ GList *l; camel_object_unref(m->folder); -@@ -926,11 +921,12 @@ +@@ -927,11 +922,12 @@ g_list_free(m->sources_folder); } @@ -3406,7 +3406,7 @@ }; /* sources_uri should be camel uri's */ -@@ -940,15 +936,15 @@ +@@ -941,15 +937,15 @@ struct _setup_msg *m; int id; @@ -3425,9 +3425,9 @@ return id; } ---- evolution-2.10.1/mail/message-list.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/message-list.c 2007-05-16 16:17:38.000000000 -0400 -@@ -1802,7 +1802,7 @@ +--- evolution-2.11.2/mail/message-list.c.kill-ethread 2007-05-10 05:27:32.000000000 -0400 ++++ evolution-2.11.2/mail/message-list.c 2007-05-18 15:34:09.000000000 -0400 +@@ -1801,7 +1801,7 @@ /* TODO: merge this with the folder tree stuff via empopup targets */ /* Drop handling */ struct _drop_msg { @@ -3436,7 +3436,7 @@ GdkDragContext *context; -@@ -1819,11 +1819,9 @@ +@@ -1818,11 +1818,9 @@ unsigned int aborted:1; }; @@ -3450,7 +3450,7 @@ if (m->move) return g_strdup_printf(_("Moving messages into folder %s"), m->folder->full_name); else -@@ -1831,13 +1829,11 @@ +@@ -1830,13 +1828,11 @@ } static void @@ -3466,7 +3466,7 @@ break; case DND_MESSAGE_RFC822: em_utils_selection_get_message(m->selection, m->folder); -@@ -1849,9 +1845,8 @@ +@@ -1848,9 +1844,8 @@ } static void @@ -3477,7 +3477,7 @@ gboolean success, delete; /* ?? */ -@@ -1859,7 +1854,7 @@ +@@ -1858,7 +1853,7 @@ success = FALSE; delete = FALSE; } else { @@ -3486,7 +3486,7 @@ delete = success && m->move && !m->moved; } -@@ -1867,10 +1862,8 @@ +@@ -1866,10 +1861,8 @@ } static void @@ -3498,7 +3498,7 @@ g_object_unref(m->context); camel_object_unref(m->folder); -@@ -1878,18 +1871,19 @@ +@@ -1877,18 +1870,19 @@ g_free(m->selection); } @@ -3524,7 +3524,7 @@ } static void -@@ -1916,7 +1910,7 @@ +@@ -1915,7 +1909,7 @@ struct _drop_msg *m = data; m->aborted = TRUE; @@ -3533,7 +3533,7 @@ } static EPopupItem ml_drop_popup_menu[] = { -@@ -1946,7 +1940,7 @@ +@@ -1945,7 +1939,7 @@ if (data->data == NULL || data->length == -1) return; @@ -3542,7 +3542,7 @@ m->context = context; g_object_ref(context); m->folder = ml->folder; -@@ -3676,7 +3670,7 @@ +@@ -3674,7 +3668,7 @@ /* ** REGENERATE MESSAGELIST ********************************************** */ struct _regen_list_msg { @@ -3551,7 +3551,7 @@ int complete; -@@ -3704,16 +3698,15 @@ +@@ -3702,16 +3696,15 @@ */ @@ -3571,7 +3571,7 @@ GPtrArray *uids, *uidnew, *showuids, *searchuids = NULL; CamelMessageInfo *info; int i; -@@ -3743,7 +3736,7 @@ +@@ -3741,7 +3734,7 @@ } else expr = "(match-all (not (system-flag \"deleted\")))"; } @@ -3580,7 +3580,7 @@ } else { char *expr; -@@ -3753,23 +3746,23 @@ +@@ -3751,23 +3744,23 @@ sprintf(expr, "(and (match-all (not (system-flag \"junk\")))\n %s)", m->search); } else expr = "(match-all (not (system-flag \"junk\")))"; @@ -3609,7 +3609,7 @@ if (uidnew) { MESSAGE_LIST_LOCK(m->ml, hide_lock); -@@ -3844,7 +3837,7 @@ +@@ -3842,7 +3835,7 @@ e_profile_event_emit("list.threaduids", m->folder->full_name, 0); @@ -3618,7 +3618,7 @@ /* update/build a new tree */ if (m->dotree) { if (m->tree) -@@ -3873,17 +3866,15 @@ +@@ -3871,17 +3864,15 @@ } static void @@ -3638,7 +3638,7 @@ return; if (m->ml->folder != m->folder) -@@ -3934,9 +3925,8 @@ +@@ -3932,9 +3923,8 @@ } static void @@ -3649,7 +3649,7 @@ int i; e_profile_event_emit("list.regenerated", m->folder->full_name, 0); -@@ -3964,11 +3954,12 @@ +@@ -3962,11 +3952,12 @@ g_object_unref(m->ml); } @@ -3667,7 +3667,7 @@ }; static gboolean -@@ -3978,7 +3969,7 @@ +@@ -3976,7 +3967,7 @@ m->ml->regen = g_list_prepend(m->ml->regen, m); /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ @@ -3676,7 +3676,7 @@ m->ml->regen_timeout_msg = NULL; m->ml->regen_timeout_id = 0; -@@ -3994,7 +3985,7 @@ +@@ -3992,7 +3983,7 @@ GList *l = ml->regen; while (l) { @@ -3685,7 +3685,7 @@ if (mm->cancel) camel_operation_cancel(mm->cancel); -@@ -4006,7 +3997,7 @@ +@@ -4004,7 +3995,7 @@ if (ml->regen_timeout_id) { g_source_remove(ml->regen_timeout_id); ml->regen_timeout_id = 0; @@ -3694,7 +3694,7 @@ ml->regen_timeout_msg = NULL; } } -@@ -4041,7 +4032,7 @@ +@@ -4039,7 +4030,7 @@ } #endif @@ -3703,8 +3703,8 @@ m->ml = ml; m->search = g_strdup (search); m->hideexpr = g_strdup (hideexpr); ---- evolution-2.10.1/mail/em-sync-stream.h.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-sync-stream.h 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/em-sync-stream.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/em-sync-stream.h 2007-05-18 15:34:09.000000000 -0400 @@ -29,41 +29,45 @@ #ifndef EM_SYNC_STREAM_H #define EM_SYNC_STREAM_H @@ -3781,19 +3781,19 @@ +G_END_DECLS #endif /* EM_SYNC_STREAM_H */ ---- evolution-2.10.1/mail/em-format-html-print.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-format-html-print.c 2007-05-16 16:17:38.000000000 -0400 -@@ -262,7 +262,7 @@ - g_object_ref(source); - g_object_ref(efhp); +--- evolution-2.11.2/mail/em-format-html-print.c.kill-ethread 2007-04-22 13:20:08.000000000 -0400 ++++ evolution-2.11.2/mail/em-format-html-print.c 2007-05-18 15:38:28.000000000 -0400 +@@ -224,7 +224,7 @@ + g_object_ref (efhp); -- mail_get_message(folder, uid, emfhp_got_message, efhp, mail_thread_new); -+ mail_get_message(folder, uid, emfhp_got_message, efhp, mail_msg_unordered_push); - - return 0; /* damn async ... */ + mail_get_message ( +- folder, uid, emfhp_got_message, efhp, mail_thread_new); ++ folder, uid, emfhp_got_message, efhp, mail_msg_unordered_push); } ---- evolution-2.10.1/mail/em-sync-stream.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-sync-stream.c 2007-05-16 16:17:38.000000000 -0400 + + void +--- evolution-2.11.2/mail/em-sync-stream.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/em-sync-stream.c 2007-05-18 15:34:09.000000000 -0400 @@ -25,42 +25,17 @@ #include #endif @@ -4219,8 +4219,8 @@ + g_string_free (emss->buffer, TRUE); + emss->buffer = g_string_sized_new (size); } ---- evolution-2.10.1/mail/em-subscribe-editor.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-subscribe-editor.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/em-subscribe-editor.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/em-subscribe-editor.c 2007-05-18 15:34:09.000000000 -0400 @@ -175,7 +175,7 @@ /* ** Subscribe folder operation **************************************** */ @@ -4436,8 +4436,8 @@ sub_unref(sub); } ---- evolution-2.10.1/mail/mail-mt.h.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-mt.h 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/mail-mt.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/mail-mt.h 2007-05-18 15:34:09.000000000 -0400 @@ -23,43 +23,60 @@ #ifndef _MAIL_MT #define _MAIL_MT @@ -4542,8 +4542,8 @@ /* A generic proxy event for anything that can be proxied during the life of the mailer (almost nothing) */ /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */ extern MailAsyncEvent *mail_async_event; ---- evolution-2.10.1/mail/mail-ops.h.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-ops.h 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/mail-ops.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/mail-ops.h 2007-05-18 15:34:09.000000000 -0400 @@ -30,13 +30,14 @@ #pragma } #endif /* __cplusplus */ @@ -4584,8 +4584,8 @@ /* and for a store */ int mail_get_store (const char *uri, CamelOperation *op, ---- evolution-2.10.1/mail/em-composer-utils.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-composer-utils.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/em-composer-utils.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/em-composer-utils.c 2007-05-18 15:34:09.000000000 -0400 @@ -534,7 +534,7 @@ strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { int id; @@ -4629,9 +4629,9 @@ - mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new); + mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); } ---- evolution-2.10.1/mail/mail-folder-cache.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-folder-cache.c 2007-05-16 16:17:38.000000000 -0400 -@@ -843,15 +843,14 @@ +--- evolution-2.11.2/mail/mail-folder-cache.c.kill-ethread 2007-05-09 00:14:42.000000000 -0400 ++++ evolution-2.11.2/mail/mail-folder-cache.c 2007-05-18 15:34:09.000000000 -0400 +@@ -844,15 +844,14 @@ struct _ping_store_msg { @@ -4650,7 +4650,7 @@ char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); char *msg; -@@ -862,10 +861,9 @@ +@@ -863,10 +862,9 @@ } static void @@ -4662,7 +4662,7 @@ if (CAMEL_SERVICE (m->store)->status == CAMEL_SERVICE_CONNECTED) { if (CAMEL_IS_DISCO_STORE (m->store) && -@@ -876,22 +874,21 @@ +@@ -877,22 +875,21 @@ online = TRUE; } if (online) @@ -4693,7 +4693,7 @@ }; static void -@@ -903,11 +900,11 @@ +@@ -904,11 +901,11 @@ if (CAMEL_SERVICE (store)->status != CAMEL_SERVICE_CONNECTED) return; @@ -4707,7 +4707,7 @@ } static gboolean -@@ -952,7 +949,7 @@ +@@ -953,7 +950,7 @@ int hook = 0; g_assert(CAMEL_IS_STORE(store)); @@ -4716,9 +4716,9 @@ LOCK(info_lock); ---- evolution-2.10.1/mail/em-folder-view.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-view.c 2007-05-16 16:17:38.000000000 -0400 -@@ -68,6 +68,7 @@ +--- evolution-2.11.2/mail/em-folder-view.c.kill-ethread 2007-05-10 05:27:32.000000000 -0400 ++++ evolution-2.11.2/mail/em-folder-view.c 2007-05-18 15:39:28.000000000 -0400 +@@ -69,6 +69,7 @@ #include #include @@ -4735,7 +4735,7 @@ } static void -@@ -1613,7 +1614,7 @@ +@@ -1614,7 +1615,7 @@ data->type = type; data->source = source; @@ -4744,7 +4744,7 @@ } static void -@@ -1711,7 +1712,7 @@ +@@ -1712,7 +1713,7 @@ data->type = type; data->uri = g_strdup (uri); @@ -4753,17 +4753,17 @@ } static void -@@ -2370,7 +2371,7 @@ - g_object_ref (emfv); - /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ - e_profile_event_emit("goto.load", emfv->displayed_uid, 0); +@@ -2355,7 +2356,7 @@ + emfv->priv->selected_uid); + gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); + - mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_thread_queued); + mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_msg_fast_ordered_push); } else { e_profile_event_emit("goto.empty", "", 0); g_free(emfv->priv->selected_uid); ---- evolution-2.10.1/mail/mail-session.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-session.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/mail-session.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/mail-session.c 2007-05-18 15:34:09.000000000 -0400 @@ -35,7 +35,7 @@ #include @@ -4773,7 +4773,7 @@ #include /* FIXME: this is where camel_init is defined, it shouldn't include everything else */ #include -@@ -256,21 +256,22 @@ +@@ -258,21 +258,22 @@ /* ********************************************************************** */ @@ -4800,7 +4800,7 @@ /* clicked, send back the reply */ static void -@@ -278,122 +279,116 @@ +@@ -280,122 +281,116 @@ { gtk_widget_destroy ((GtkWidget *) dialog); @@ -4980,7 +4980,7 @@ } else ret = TRUE; -@@ -533,7 +528,7 @@ +@@ -535,7 +530,7 @@ /* TODO: This is very temporary, until we have a better way to do the progress reporting, we just borrow a dummy mail-mt thread message and hook it onto out camel thread message */ @@ -4989,7 +4989,7 @@ static void *ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size) { -@@ -542,7 +537,7 @@ +@@ -544,7 +539,7 @@ /* We create a dummy mail_msg, and then copy its cancellation port over to ours, so we get cancellation and progress in common with hte existing mail code, for free */ if (msg) { @@ -4998,7 +4998,7 @@ msg->data = m; camel_operation_unref(msg->op); -@@ -555,7 +550,7 @@ +@@ -557,7 +552,7 @@ static void ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m) { @@ -5007,7 +5007,7 @@ ms_parent_class->thread_msg_free(session, m); } -@@ -678,22 +673,23 @@ +@@ -680,22 +675,23 @@ MAIL_SESSION (session)->interactive = interactive; if (!interactive) { @@ -5037,11 +5037,11 @@ } } } ---- evolution-2.10.1/mail/mail-mt.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-mt.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/mail-mt.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/mail-mt.c 2007-05-18 15:34:09.000000000 -0400 @@ -29,8 +29,8 @@ #include - #include + #include -#include #include @@ -6001,8 +6001,8 @@ } /* ******************** */ ---- evolution-2.10.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-04-09 09:09:11.000000000 -0400 -+++ evolution-2.10.1/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-04-18 06:17:14.000000000 -0400 ++++ evolution-2.11.2/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-05-18 15:34:09.000000000 -0400 @@ -44,32 +44,30 @@ @@ -6082,8 +6082,8 @@ - e_thread_put (mail_thread_new, (EMsg *) unsub); + mail_msg_unordered_push (unsub); } ---- evolution-2.10.1/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-04-09 09:09:14.000000000 -0400 -+++ evolution-2.10.1/plugins/mark-all-read/mark-all-read.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-05-14 00:24:02.000000000 -0400 ++++ evolution-2.11.2/plugins/mark-all-read/mark-all-read.c 2007-05-18 15:34:09.000000000 -0400 @@ -44,7 +44,7 @@ return; } @@ -6093,9 +6093,9 @@ } static void ---- evolution-2.10.1/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-04-09 09:09:13.000000000 -0400 -+++ evolution-2.10.1/plugins/exchange-operations/exchange-folder.c 2007-05-16 16:17:38.000000000 -0400 -@@ -134,7 +134,7 @@ +--- evolution-2.11.2/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-05-13 13:41:07.000000000 -0400 ++++ evolution-2.11.2/plugins/exchange-operations/exchange-folder.c 2007-05-18 15:34:09.000000000 -0400 +@@ -140,7 +140,7 @@ inbox_physical_uri = e_folder_get_physical_uri (inbox); /* To get the CamelStore/Folder */ @@ -6104,17 +6104,17 @@ } ---- evolution-2.10.1/plugins/save-attachments/save-attachments.c.kill-ethread 2007-04-09 09:09:15.000000000 -0400 -+++ evolution-2.10.1/plugins/save-attachments/save-attachments.c 2007-05-16 16:17:38.000000000 -0400 -@@ -407,5 +407,5 @@ +--- evolution-2.11.2/plugins/save-attachments/save-attachments.c.kill-ethread 2007-04-18 06:17:20.000000000 -0400 ++++ evolution-2.11.2/plugins/save-attachments/save-attachments.c 2007-05-18 15:34:09.000000000 -0400 +@@ -403,5 +403,5 @@ camel_object_ref(data->folder); data->uid = g_strdup(target->uids->pdata[0]); - mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new); + mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); } ---- evolution-2.10.1/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-04-09 09:09:14.000000000 -0400 -+++ evolution-2.10.1/plugins/mailing-list-actions/mailing-list-actions.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-04-18 06:17:17.000000000 -0400 ++++ evolution-2.11.2/plugins/mailing-list-actions/mailing-list-actions.c 2007-05-18 15:34:09.000000000 -0400 @@ -89,7 +89,7 @@ data->uri = strdup (sel->uri); @@ -6124,8 +6124,8 @@ } void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) ---- evolution-2.10.1/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-04-09 09:09:12.000000000 -0400 -+++ evolution-2.10.1/plugins/groupwise-features/share-folder-common.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-04-18 06:17:15.000000000 -0400 ++++ evolution-2.11.2/plugins/groupwise-features/share-folder-common.c 2007-05-18 15:34:09.000000000 -0400 @@ -121,7 +121,7 @@ } @@ -6223,8 +6223,8 @@ return id; } ---- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-04-09 09:10:29.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.h 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-04-18 06:18:37.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/alarm-notify/alarm-notify.h 2007-05-18 15:34:09.000000000 -0400 @@ -39,19 +39,6 @@ typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; @@ -6245,8 +6245,8 @@ struct _AlarmNotify { BonoboObject object; ---- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-04-09 09:10:29.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-04-18 06:18:37.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/alarm-notify/alarm-notify.c 2007-05-18 15:34:09.000000000 -0400 @@ -45,10 +45,6 @@ GMutex *mutex; }; @@ -6359,8 +6359,8 @@ } static void ---- evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-04-09 09:10:29.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-05-09 00:14:46.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/alarm-notify/alarm-queue.c 2007-05-18 15:34:09.000000000 -0400 @@ -115,9 +115,6 @@ static int tray_blink_state = FALSE; static AlarmNotify *an; @@ -6673,7 +6673,7 @@ GList *list = tray_icons_list; d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %p from tray list\n",__FILE__, __LINE__, cqa)); -@@ -1087,28 +1097,25 @@ +@@ -1089,28 +1099,25 @@ gtk_tree_selection_select_iter (sel, &iter); } } @@ -6711,7 +6711,7 @@ { GList *list = tray_icons_list; -@@ -1138,55 +1145,50 @@ +@@ -1140,55 +1147,50 @@ } else list = list->next; } @@ -6785,7 +6785,7 @@ } static void -@@ -1394,29 +1396,24 @@ +@@ -1412,29 +1414,24 @@ /* Add a new data to tray list */ static void @@ -6826,7 +6826,7 @@ } /* Performs notification of a display alarm */ -@@ -1840,21 +1837,13 @@ +@@ -1862,21 +1859,13 @@ new_midnight = time_day_end_with_zone (time (NULL), zone); if (new_midnight > midnight) { @@ -6853,7 +6853,7 @@ } return TRUE; -@@ -1985,14 +1974,15 @@ +@@ -2007,14 +1996,15 @@ } struct _alarm_client_msg { @@ -6872,7 +6872,7 @@ g_return_if_fail (alarm_queue_inited); g_return_if_fail (client != NULL); -@@ -2023,6 +2013,8 @@ +@@ -2045,6 +2035,8 @@ G_CALLBACK (cal_opened_cb), ca); } @@ -6881,7 +6881,7 @@ } /** -@@ -2042,20 +2034,13 @@ +@@ -2064,20 +2056,13 @@ void alarm_queue_add_client (ECal *client) { @@ -6907,7 +6907,7 @@ } /* Removes a component an its alarms */ -@@ -2107,11 +2092,10 @@ +@@ -2129,11 +2114,10 @@ * Removes a calendar client from the alarm queueing system. **/ static void @@ -6921,7 +6921,7 @@ g_return_if_fail (alarm_queue_inited); g_return_if_fail (client != NULL); -@@ -2148,24 +2132,20 @@ +@@ -2170,24 +2154,20 @@ g_free (ca); g_hash_table_remove (client_alarms_hash, client); diff --git a/evolution-2.9.2-gtk-font-button.patch b/evolution-2.9.2-gtk-font-button.patch deleted file mode 100644 index a218e05..0000000 --- a/evolution-2.9.2-gtk-font-button.patch +++ /dev/null @@ -1,153 +0,0 @@ ---- evolution-2.9.2/mail/em-mailer-prefs.c.gtk-font-button 2006-08-09 04:43:27.000000000 -0400 -+++ evolution-2.9.2/mail/em-mailer-prefs.c 2006-11-11 08:31:53.000000000 -0500 -@@ -36,8 +36,8 @@ - #include - - #include --#include - #include -+#include - - #include - -@@ -535,12 +535,14 @@ - } - - static void --font_changed (GnomeFontPicker *fontpicker, const char *arg1, EMMailerPrefs *prefs) -+font_changed (GtkFontButton *font_button, EMMailerPrefs *prefs) - { -- const char *key; -+ const gchar *key; -+ const gchar *font_name; - -- key = g_object_get_data ((GObject *) fontpicker, "key"); -- gconf_client_set_string (prefs->gconf, key, gnome_font_picker_get_font_name (fontpicker), NULL); -+ key = g_object_get_data (G_OBJECT (font_button), "key"); -+ font_name = gtk_font_button_get_font_name (font_button); -+ gconf_client_set_string (prefs->gconf, key, font_name, NULL); - } - - static void -@@ -841,8 +843,8 @@ - - /* Mail Fonts */ - font = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/fonts/monospace", NULL); -- prefs->font_fixed = GNOME_FONT_PICKER (glade_xml_get_widget (gui, "FontFixed")); -- gnome_font_picker_set_font_name (prefs->font_fixed, font); -+ prefs->font_fixed = GTK_FONT_BUTTON (glade_xml_get_widget (gui, "FontFixed")); -+ gtk_font_button_set_font_name (prefs->font_fixed, font); - g_free (font); - g_object_set_data ((GObject *) prefs->font_fixed, "key", "/apps/evolution/mail/display/fonts/monospace"); - g_signal_connect (prefs->font_fixed, "font-set", G_CALLBACK (font_changed), prefs); -@@ -850,8 +852,8 @@ - gtk_widget_set_sensitive ((GtkWidget *) prefs->font_fixed, FALSE); - - font = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/fonts/variable", NULL); -- prefs->font_variable = GNOME_FONT_PICKER (glade_xml_get_widget (gui, "FontVariable")); -- gnome_font_picker_set_font_name (prefs->font_variable, font); -+ prefs->font_variable = GTK_FONT_BUTTON (glade_xml_get_widget (gui, "FontVariable")); -+ gtk_font_button_set_font_name (prefs->font_variable, font); - g_free (font); - g_object_set_data ((GObject *) prefs->font_variable, "key", "/apps/evolution/mail/display/fonts/variable"); - g_signal_connect (prefs->font_variable, "font-set", G_CALLBACK (font_changed), prefs); ---- evolution-2.9.2/mail/em-mailer-prefs.h.gtk-font-button 2006-05-25 00:59:47.000000000 -0400 -+++ evolution-2.9.2/mail/em-mailer-prefs.h 2006-11-11 08:31:53.000000000 -0500 -@@ -39,7 +39,7 @@ - struct _GladeXML; - struct _GnomeColorPicker; - struct _GtkFileChooserbutton; --struct _GnomeFontPicker; -+struct _GtkFontButton; - struct _GConfClient; - struct _GtkButton; - struct _GtkTreeView; -@@ -92,8 +92,8 @@ - struct _GtkFileChooserButton *notify_sound_file; - - /* HTML Mail tab */ -- struct _GnomeFontPicker *font_variable; -- struct _GnomeFontPicker *font_fixed; -+ struct _GtkFontButton *font_variable; -+ struct _GtkFontButton *font_fixed; - struct _GtkToggleButton *font_share; - - /* Loading Images */ ---- evolution-2.9.2/mail/mail-config.glade.gtk-font-button 2006-07-19 11:26:27.000000000 -0400 -+++ evolution-2.9.2/mail/mail-config.glade 2006-11-11 08:31:53.000000000 -0500 -@@ -4700,14 +4700,14 @@ - - - -- -+ - True - True - Select HTML fixed width font -- GNOME_FONT_PICKER_MODE_FONT_INFO -+ True - True -- False -- 14 -+ False -+ False - True - - -@@ -4722,14 +4722,14 @@ - - - -- -+ - True - True - Select HTML variable width font -- GNOME_FONT_PICKER_MODE_FONT_INFO -+ True - True -- False -- 14 -+ False -+ False - True - - -@@ -8484,14 +8484,14 @@ - - - -- -+ - True - True - Select HTML fixed width font for printing -- GNOME_FONT_PICKER_MODE_FONT_INFO -+ True - True -- False -- 14 -+ False -+ False - True - - -@@ -8506,14 +8506,14 @@ - - - -- -+ - True - True - Select HTML variable width font for printing -- GNOME_FONT_PICKER_MODE_FONT_INFO -+ True - True -- False -- 14 -+ False -+ False - True - - diff --git a/evolution-2.9.3-gtk-color-button.patch b/evolution-2.9.3-gtk-color-button.patch deleted file mode 100644 index 665175b..0000000 --- a/evolution-2.9.3-gtk-color-button.patch +++ /dev/null @@ -1,1219 +0,0 @@ ---- evolution-2.9.91/mail/em-composer-prefs.c.gtk-color-button 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/em-composer-prefs.c 2007-02-12 13:32:03.000000000 -0500 -@@ -56,9 +56,8 @@ - #include - #include - #include -- -+#include - #include --#include - - #include - -@@ -545,7 +544,7 @@ - GtkTreeIter iter; - GError *err = NULL; - char **strv = NULL; -- guint r, g, b; -+ GdkColor color; - gboolean go; - char *lang; - int i; -@@ -580,21 +579,33 @@ - if (strv != NULL) - g_strfreev (strv); - -- r = gconf_client_get_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_red", NULL); -- g = gconf_client_get_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_green", NULL); -- b = gconf_client_get_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_blue", NULL); -- -- gnome_color_picker_set_i16 (GNOME_COLOR_PICKER (prefs->colour), r, g, b, 0xffff); -+ color.red = gconf_client_get_int (prefs->gconf, -+ GNOME_SPELL_GCONF_DIR "/spell_error_color_red", NULL); -+ color.green = gconf_client_get_int (prefs->gconf, -+ GNOME_SPELL_GCONF_DIR "/spell_error_color_green", NULL); -+ color.blue = gconf_client_get_int (prefs->gconf, -+ GNOME_SPELL_GCONF_DIR "/spell_error_color_blue", NULL); -+ gtk_color_button_set_color (GTK_COLOR_BUTTON (prefs->color), &color); - - prefs->spell_active = TRUE; - } - - static void --spell_color_set (GtkWidget *widget, guint r, guint g, guint b, guint a, EMComposerPrefs *prefs) -+spell_color_set (GtkColorButton *color_button, EMComposerPrefs *prefs) - { -- gconf_client_set_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_red", r, NULL); -- gconf_client_set_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_green", g, NULL); -- gconf_client_set_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_blue", b, NULL); -+ GdkColor color; -+ -+ gtk_color_button_get_color (GTK_COLOR_BUTTON (color_button), &color); -+ -+ gconf_client_set_int (prefs->gconf, -+ GNOME_SPELL_GCONF_DIR "/spell_error_color_red", -+ color.red, NULL); -+ gconf_client_set_int (prefs->gconf, -+ GNOME_SPELL_GCONF_DIR "/spell_error_color_green", -+ color.green, NULL); -+ gconf_client_set_int (prefs->gconf, -+ GNOME_SPELL_GCONF_DIR "/spell_error_color_blue", -+ color.blue, NULL); - } - - static char * -@@ -676,7 +687,7 @@ - - spell_set_ui (prefs); - -- widget = glade_xml_get_widget (prefs->gui, "colorpickerSpellCheckColor"); -+ widget = glade_xml_get_widget (prefs->gui, "colorButtonSpellCheckColor"); - g_signal_connect (widget, "color_set", G_CALLBACK (spell_color_set), prefs); - } - -@@ -922,7 +933,7 @@ - g_free (buf); - - /* Spell Checking: GNOME Spell part */ -- prefs->colour = GNOME_COLOR_PICKER (glade_xml_get_widget (gui, "colorpickerSpellCheckColor")); -+ prefs->color = GTK_COLOR_BUTTON (glade_xml_get_widget (gui, "colorButtonSpellCheckColor")); - prefs->language = GTK_TREE_VIEW (glade_xml_get_widget (gui, "listSpellCheckLanguage")); - model = gtk_list_store_new (3, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER); - gtk_tree_view_set_model (prefs->language, (GtkTreeModel *) model); -@@ -942,7 +953,7 @@ - info_pixmap = glade_xml_get_widget (gui, "pixmapSpellInfo"); - gtk_image_set_from_stock (GTK_IMAGE (info_pixmap), GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_BUTTON); - if (!spell_setup_check_options (prefs)) { -- gtk_widget_hide (GTK_WIDGET (prefs->colour)); -+ gtk_widget_hide (GTK_WIDGET (prefs->color)); - gtk_widget_hide (GTK_WIDGET (prefs->language)); - } - ---- evolution-2.9.91/mail/mail-config.glade.gtk-color-button 2007-02-12 13:32:03.000000000 -0500 -+++ evolution-2.9.91/mail/mail-config.glade 2007-02-12 13:32:03.000000000 -0500 -@@ -5138,10 +5138,9 @@ - - - -- -+ - True - True -- True - False - Pick a color - True -@@ -6079,10 +6078,9 @@ - 6 - - -- -+ - True - True -- True - False - Pick a color - True -@@ -6098,10 +6096,9 @@ - - - -- -+ - True - True -- True - False - Pick a color - True -@@ -6117,10 +6114,9 @@ - - - -- -+ - True - True -- True - False - Pick a color - True -@@ -6136,10 +6132,9 @@ - - - -- -+ - True - True -- True - False - Pick a color - True -@@ -6155,10 +6150,9 @@ - - - -- -+ - True - True -- True - False - Pick a color - True -@@ -8315,7 +8309,7 @@ - 0.5 - 0 - 0 -- colorpickerSpellCheckColor -+ colorButtonSpellCheckColor - PANGO_ELLIPSIZE_NONE - -1 - False -@@ -8329,10 +8323,9 @@ - - - -- -+ - True - True -- True - False - Pick a color - True ---- evolution-2.9.91/mail/em-mailer-prefs.h.gtk-color-button 2007-02-12 13:32:03.000000000 -0500 -+++ evolution-2.9.91/mail/em-mailer-prefs.h 2007-02-12 13:32:03.000000000 -0500 -@@ -37,7 +37,6 @@ - struct _GdkPixbuf; - struct _GtkWidget; - struct _GladeXML; --struct _GnomeColorPicker; - struct _GtkFileChooserbutton; - struct _GtkFontButton; - struct _GConfClient; -@@ -80,7 +79,7 @@ - struct _GtkSpinButton *mlimit_count; - struct _GtkOptionMenu *charset; - struct _GtkToggleButton *citation_highlight; -- struct _GnomeColorPicker *citation_color; -+ struct _GtkColorButton *citation_color; - - /* Deleting Mail */ - struct _GtkToggleButton *empty_trash; -@@ -110,7 +109,7 @@ - /* Labels and Colours tab */ - struct { - struct _GtkEntry *name; -- struct _GnomeColorPicker *color; -+ struct _GtkColorButton *color; - } labels[5]; - struct _GtkButton *restore_labels; - ---- evolution-2.9.91/mail/em-composer-prefs.h.gtk-color-button 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/em-composer-prefs.h 2007-02-12 13:32:03.000000000 -0500 -@@ -48,7 +48,6 @@ - struct _GdkPixbuf; - struct _GtkWidget; - struct _GladeXML; --struct _GnomeColorPicker; - struct _GConfClient; - struct _GtkButton; - struct _GtkTreeView; -@@ -71,7 +70,7 @@ - struct _GtkOptionMenu *charset; - - struct _GtkToggleButton *spell_check; -- struct _GnomeColorPicker *colour; -+ struct _GtkColorButton *color; - struct _GtkTreeView *language; - CORBA_sequence_GNOME_Spell_Language *language_seq; - gboolean spell_active; ---- evolution-2.9.91/mail/em-mailer-prefs.c.gtk-color-button 2007-02-12 13:32:03.000000000 -0500 -+++ evolution-2.9.91/mail/em-mailer-prefs.c 2007-02-12 13:32:03.000000000 -0500 -@@ -35,7 +35,7 @@ - #include "misc/e-charset-picker.h" - #include - --#include -+#include - #include - #include - -@@ -157,49 +157,27 @@ - - - static void --colorpicker_set_color (GnomeColorPicker *color, const char *str) -+color_button_set_color (GtkColorButton *color_button, const gchar *spec) - { -- GdkColor colour; -- guint32 rgb; -- -- gdk_color_parse (str, &colour); -- rgb = ((colour.red & 0xff00) << 8) | (colour.green & 0xff00) | ((colour.blue & 0xff00) >> 8); -- -- gnome_color_picker_set_i8 (color, (rgb & 0xff0000) >> 16, (rgb & 0xff00) >> 8, rgb & 0xff, 0xff); --} -+ GdkColor color; - --static guint32 --colorpicker_get_color (GnomeColorPicker *color) --{ -- guint8 r, g, b, a; -- guint32 rgb = 0; -- -- gnome_color_picker_get_i8 (color, &r, &g, &b, &a); -- -- rgb = r; -- rgb <<= 8; -- rgb |= g; -- rgb <<= 8; -- rgb |= b; -- -- return rgb; -+ if (gdk_color_parse (spec, &color)) -+ gtk_color_button_set_color (color_button, &color); - } - - static void --citation_color_set (GtkWidget *widget, guint r, guint g, guint b, guint a, EMMailerPrefs *prefs) -+citation_color_set (GtkColorButton *color_button, EMMailerPrefs *prefs) - { -- guint32 rgb = 0; -- char buf[20]; -- -- rgb = r & 0xff; -- rgb <<= 8; -- rgb |= g & 0xff; -- rgb <<= 8; -- rgb |= b & 0xff; -- -- sprintf (buf, "#%06x", rgb & 0xffffff); -- -- gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/display/citation_colour", buf, NULL); -+ GdkColor color; -+ gchar spec[16]; -+ -+ gtk_color_button_get_color (color_button, &color); -+ g_snprintf (spec, sizeof (spec), "#%04x%04x%04x", -+ color.red, color.green, color.blue); -+ -+ gconf_client_set_string (prefs->gconf, -+ "/apps/evolution/mail/display/citation_colour", -+ spec, NULL); - } - - static void -@@ -212,9 +190,12 @@ - int i; - - for (i = 4; i >= 0; i--) { -+ GdkColor color; -+ - cstring = gtk_entry_get_text (prefs->labels[i].name); -- rgb = colorpicker_get_color (prefs->labels[i].color); -- string = g_strdup_printf ("%s:#%06x", cstring, rgb & 0xffffff); -+ gtk_color_button_get_color (prefs->labels[i].color, &color); -+ string = g_strdup_printf ("%s:#%04x%04x%04x", cstring, -+ color.red, color.green, color.blue); - list = g_slist_prepend (list, string); - } - -@@ -249,7 +230,7 @@ - - for (i = 0; i < 5; i++) { - gtk_entry_set_text (prefs->labels[i].name, _(label_defaults[i].name)); -- colorpicker_set_color (prefs->labels[i].color, label_defaults[i].colour); -+ color_button_set_color (prefs->labels[i].color, label_defaults[i].colour); - atk_object_set_name(gtk_widget_get_accessible((GtkWidget *)prefs->labels[i].color), _(label_defaults[i].name)); - } - } -@@ -812,9 +793,9 @@ - "/apps/evolution/mail/display/mark_citations", - G_CALLBACK (toggle_button_toggled)); - -- prefs->citation_color = GNOME_COLOR_PICKER (glade_xml_get_widget (gui, "colorpickerHighlightCitations")); -+ prefs->citation_color = GTK_COLOR_BUTTON (glade_xml_get_widget (gui, "colorButtonHighlightCitations")); - buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/citation_colour", NULL); -- colorpicker_set_color (prefs->citation_color, buf ? buf : "#737373"); -+ color_button_set_color (prefs->citation_color, buf ? buf : "#737373"); - g_signal_connect (prefs->citation_color, "color-set", G_CALLBACK (citation_color_set), prefs); - if (!gconf_client_key_is_writable (prefs->gconf, "/apps/evolution/mail/display/citation_colour", NULL)) - gtk_widget_set_sensitive ((GtkWidget *) prefs->citation_color, FALSE); -@@ -935,14 +916,14 @@ - g_free (widget_name); - - widget_name = g_strdup_printf ("colorLabel%d", i); -- prefs->labels[i].color = GNOME_COLOR_PICKER (glade_xml_get_widget (gui, widget_name)); -+ prefs->labels[i].color = GTK_COLOR_BUTTON (glade_xml_get_widget (gui, widget_name)); - gtk_widget_set_sensitive ((GtkWidget *) prefs->labels[i].color, !locked); - g_free (widget_name); - - gtk_entry_set_text (prefs->labels[i].name, label->name); - g_signal_connect (prefs->labels[i].name, "changed", G_CALLBACK (label_entry_changed), prefs); - -- colorpicker_set_color (prefs->labels[i].color, label->colour); -+ color_button_set_color (prefs->labels[i].color, label->colour); - g_signal_connect (prefs->labels[i].color, "color-set", G_CALLBACK (label_color_set), prefs); - - atk_object_set_name(gtk_widget_get_accessible((GtkWidget *)prefs->labels[i].color), label->name); ---- evolution-2.9.91/filter/filter-colour.h.gtk-color-button 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/filter/filter-colour.h 2007-02-12 13:32:03.000000000 -0500 -@@ -39,7 +39,7 @@ - struct _FilterColour { - FilterElement parent_object; - -- guint16 r, g, b, a; -+ GdkColor color; - }; - - struct _FilterColourClass { ---- evolution-2.9.91/filter/filter-colour.c.gtk-color-button 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/filter/filter-colour.c 2007-02-12 13:32:03.000000000 -0500 -@@ -26,7 +26,7 @@ - #endif - - #include --#include -+#include - - #include "libedataserver/e-sexp.h" - #include "filter-colour.h" -@@ -120,13 +120,11 @@ - static int - colour_eq (FilterElement *fe, FilterElement *cm) - { -- FilterColour *fc = (FilterColour *)fe, *cc = (FilterColour *)cm; -- -- return FILTER_ELEMENT_CLASS (parent_class)->eq (fe, cm) -- && fc->r == cc->r -- && fc->g == cc->g -- && fc->b == cc->b -- && fc->a == cc->a; -+ FilterColour *fc = (FilterColour *) fe; -+ FilterColour *cc = (FilterColour *) cm; -+ -+ return FILTER_ELEMENT_CLASS (parent_class)->eq (fe, cm) -+ && gdk_color_equal (&fc->color, &cc->color); - } - - static void -@@ -139,76 +137,70 @@ - static xmlNodePtr - xml_encode (FilterElement *fe) - { -- xmlNodePtr value; - FilterColour *fc = (FilterColour *)fe; -- char hex[16]; -- -- d(printf("Encoding colour as xml\n")); -+ xmlNodePtr value; -+ gchar spec[16]; -+ -+ g_snprintf (spec, sizeof (spec), "#%04x%04x%04x", -+ fc->color.red, fc->color.green, fc->color.blue); -+ - value = xmlNewNode(NULL, "value"); - xmlSetProp(value, "name", fe->name); - xmlSetProp(value, "type", "colour"); -- -- sprintf(hex, "%04x", fc->r); -- xmlSetProp(value, "red", hex); -- sprintf(hex, "%04x", fc->g); -- xmlSetProp(value, "green", hex); -- sprintf(hex, "%04x", fc->b); -- xmlSetProp(value, "blue", hex); -- sprintf(hex, "%04x", fc->a); -- xmlSetProp(value, "alpha", hex); -- -- return value; --} -+ xmlSetProp(value, "spec", spec); - --static guint16 --get_value (xmlNodePtr node, char *name) --{ -- unsigned int ret; -- char *value; -- -- value = xmlGetProp(node, name); -- sscanf(value, "%04x", &ret); -- xmlFree(value); -- return ret; -+ return value; - } - -- - static int - xml_decode (FilterElement *fe, xmlNodePtr node) - { - FilterColour *fc = (FilterColour *)fe; -- -+ xmlChar *prop; -+ - xmlFree (fe->name); - fe->name = xmlGetProp(node, "name"); -- fc->r = get_value(node, "red"); -- fc->g = get_value(node, "green"); -- fc->b = get_value(node, "blue"); -- fc->a = get_value(node, "alpha"); -- -+ -+ prop = xmlGetProp(node, "spec"); -+ if (prop != NULL) { -+ gdk_color_parse(prop, &fc->color); -+ xmlFree (prop); -+ } else { -+ /* try reading the old RGB properties */ -+ prop = xmlGetProp(node, "red"); -+ sscanf(prop, "%" G_GINT16_MODIFIER "x", &fc->color.red); -+ xmlFree (prop); -+ prop = xmlGetProp(node, "green"); -+ sscanf(prop, "%" G_GINT16_MODIFIER "x", &fc->color.green); -+ xmlFree (prop); -+ prop = xmlGetProp(node, "blue"); -+ sscanf(prop, "%" G_GINT16_MODIFIER "x", &fc->color.blue); -+ xmlFree (prop); -+ } -+ - return 0; - } - - static void --set_colour (GnomeColorPicker *cp, guint r, guint g, guint b, guint a, FilterColour *fc) -+set_color (GtkColorButton *color_button, FilterColour *fc) - { -- fc->r = r; -- fc->g = g; -- fc->b = b; -- fc->a = a; -+ gtk_color_button_get_color (color_button, &fc->color); - } - - static GtkWidget * - get_widget (FilterElement *fe) - { - FilterColour *fc = (FilterColour *) fe; -- GnomeColorPicker *cp; -- -- cp = (GnomeColorPicker *) gnome_color_picker_new (); -- gnome_color_picker_set_i16 (cp, fc->r, fc->g, fc->b, fc->a); -- gtk_widget_show ((GtkWidget *) cp); -- g_signal_connect (cp, "color_set", G_CALLBACK (set_colour), fe); -+ GtkWidget *color_button; -+ -+ color_button = gtk_color_button_new_with_color (&fc->color); -+ gtk_widget_show (color_button); -+ -+ g_signal_connect ( -+ G_OBJECT (color_button), "color_set", -+ G_CALLBACK (set_color), fe); - -- return (GtkWidget *) cp; -+ return color_button; - } - - static void -@@ -221,9 +213,9 @@ - format_sexp (FilterElement *fe, GString *out) - { - FilterColour *fc = (FilterColour *)fe; -- char *str; -- -- str = g_strdup_printf ("#%02x%02x%02x", (fc->r >> 8) & 0xff, (fc->g >> 8) & 0xff, (fc->b >> 8) & 0xff); -- e_sexp_encode_string (out, str); -- g_free (str); -+ gchar spec[16]; -+ -+ g_snprintf (spec, sizeof (spec), "#%04x%04x%04x", -+ fc->color.red, fc->color.green, fc->color.blue); -+ e_sexp_encode_string (out, spec); - } ---- evolution-2.9.91/filter/filter-element.c.gtk-color-button 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/filter/filter-element.c 2007-02-12 13:32:03.000000000 -0500 -@@ -293,12 +293,10 @@ - } - } else if (IS_FILTER_COLOUR(se)) { - if (IS_FILTER_COLOUR(de)) { -- FilterColour *s = (FilterColour *)se, *d = (FilterColour *)de; -+ FilterColour *s = (FilterColour *)se; -+ FilterColour *d = (FilterColour *)de; - -- d->r = s->r; -- d->g = s->g; -- d->b = s->b; -- d->a = s->a; -+ d->color = s->color; - } - } else if (IS_FILTER_DATESPEC(se)) { - if (IS_FILTER_DATESPEC(de)) { ---- evolution-2.9.91/plugins/groupwise-account-setup/camel-gw-listener.c.gtk-color-button 2007-02-09 15:16:33.000000000 -0500 -+++ evolution-2.9.91/plugins/groupwise-account-setup/camel-gw-listener.c 2007-02-12 13:41:50.000000000 -0500 -@@ -212,12 +212,13 @@ - e_source_set_property (source, "use_ssl", use_ssl); - e_source_set_property (source, "offline_sync", offline_sync ? "1" : "0" ); - if (parent_id_name) { -- guint32 color; -+ char *color; - e_source_set_property (source, "parent_id_name", parent_id_name); -- color = (guint32) atoi((char *)(camel_url_get_param (url, "color"))); -- e_source_set_color (source, color); -+ color = g_strdup_printf ("#%s", camel_url_get_param (url, "color")); -+ e_source_set_color_spec (source, color); -+ g_free (color); - } else -- e_source_set_color (source, 0xEEBC60); -+ e_source_set_color_spec (source, "#EEBC60"); - e_source_group_add_source (group, source, -1); - e_source_list_sync (source_list, NULL); - ---- evolution-2.9.91/calendar/gui/tasks-component.c.gtk-color-button 2007-01-03 10:28:00.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/tasks-component.c 2007-02-12 13:32:03.000000000 -0500 -@@ -209,7 +209,7 @@ - calendar_config_set_tasks_selected (&selected); - } - -- e_source_set_color (source, 0xBECEDD); -+ e_source_set_color_spec (source, "#BECEDD"); - personal_source = source; - } - ---- evolution-2.9.91/calendar/gui/dialogs/cal-prefs-dialog.c.gtk-color-button 2007-02-12 13:32:02.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/dialogs/cal-prefs-dialog.c 2007-02-12 13:32:03.000000000 -0500 -@@ -96,21 +96,6 @@ - return glade_xml_get_widget (prefs->gui, item->label); - } - --/* Returns a pointer to a static string with an X color spec for the current -- * value of a color picker. -- */ --static const char * --spec_from_picker (GtkWidget *picker) --{ -- static char spec[8]; -- guint8 r, g, b; -- -- gnome_color_picker_get_i8 (GNOME_COLOR_PICKER (picker), &r, &g, &b, NULL); -- g_snprintf (spec, sizeof (spec), "#%02x%02x%02x", r, g, b); -- -- return spec; --} -- - static void - working_days_changed (GtkWidget *widget, CalendarPrefsDialog *prefs) - { -@@ -277,15 +262,21 @@ - } - - static void --tasks_due_today_set_color (GnomeColorPicker *picker, guint r, guint g, guint b, guint a, CalendarPrefsDialog *prefs) -+tasks_due_today_set_color (GtkColorButton *color_button, CalendarPrefsDialog *prefs) - { -- calendar_config_set_tasks_due_today_color (spec_from_picker (prefs->tasks_due_today_color)); -+ GdkColor color; -+ -+ gtk_color_button_get_color (color_button, &color); -+ calendar_config_set_tasks_due_today_color (&color); - } - - static void --tasks_overdue_set_color (GnomeColorPicker *picker, guint r, guint g, guint b, guint a, CalendarPrefsDialog *prefs) -+tasks_overdue_set_color (GtkColorButton *color_button, CalendarPrefsDialog *prefs) - { -- calendar_config_set_tasks_overdue_color (spec_from_picker (prefs->tasks_overdue_color)); -+ GdkColor color; -+ -+ gtk_color_button_get_color (color_button, &color); -+ calendar_config_set_tasks_overdue_color (&color); - } - - static void -@@ -417,22 +408,6 @@ - g_signal_connect (G_OBJECT (prefs->template_url), "changed", G_CALLBACK (template_url_changed), prefs); - } - --/* Sets the color in a color picker from an X color spec */ --static void --set_color_picker (GtkWidget *picker, const char *spec) --{ -- GdkColor color; -- -- if (!spec || !gdk_color_parse (spec, &color)) -- color.red = color.green = color.blue = 0; -- -- gnome_color_picker_set_i16 (GNOME_COLOR_PICKER (picker), -- color.red, -- color.green, -- color.blue, -- 65535); --} -- - /* Shows the current Free/Busy settings in the dialog */ - static void - show_fb_config (CalendarPrefsDialog *prefs) -@@ -449,11 +424,18 @@ - static void - show_task_list_config (CalendarPrefsDialog *prefs) - { -+ GtkColorButton *color_button; -+ GdkColor color; - CalUnits units; - gboolean hide_completed_tasks = FALSE; - -- set_color_picker (prefs->tasks_due_today_color, calendar_config_get_tasks_due_today_color ()); -- set_color_picker (prefs->tasks_overdue_color, calendar_config_get_tasks_overdue_color ()); -+ color_button = GTK_COLOR_BUTTON (prefs->tasks_due_today_color); -+ calendar_config_get_tasks_due_today_color (&color); -+ gtk_color_button_set_color (color_button, &color); -+ -+ color_button = GTK_COLOR_BUTTON (prefs->tasks_overdue_color); -+ calendar_config_get_tasks_overdue_color (&color); -+ gtk_color_button_set_color (color_button, &color); - - /* Hide Completed Tasks. */ - e_dialog_toggle_set (prefs->tasks_hide_completed, calendar_config_get_hide_completed_tasks ()); ---- evolution-2.9.91/calendar/gui/dialogs/calendar-setup.c.gtk-color-button 2007-01-03 10:27:56.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/dialogs/calendar-setup.c 2007-02-12 13:32:03.000000000 -0500 -@@ -73,44 +73,22 @@ - } - - static void --colorpicker_set_color (GnomeColorPicker *color, guint32 rgb) --{ -- gnome_color_picker_set_i8 (color, (rgb & 0xff0000) >> 16, (rgb & 0xff00) >> 8, rgb & 0xff, 0xff); --} -- --static guint32 --colorpicker_get_color (GnomeColorPicker *color) --{ -- guint8 r, g, b, a; -- guint32 rgb = 0; -- -- gnome_color_picker_get_i8 (color, &r, &g, &b, &a); -- -- rgb = r; -- rgb <<= 8; -- rgb |= g; -- rgb <<= 8; -- rgb |= b; -- -- return rgb; --} -- --static void - eccp_commit (EConfig *ec, GSList *items, void *data) - { - CalendarSourceDialog *sdialog = data; - xmlNodePtr xml; - - if (sdialog->original_source) { -- guint32 color; -+ const gchar *color_spec; - - xml = xmlNewNode (NULL, "dummy"); - e_source_dump_to_xml_node (sdialog->source, xml); - e_source_update_from_xml_node (sdialog->original_source, xml->children, NULL); - xmlFreeNode (xml); - -- if (e_source_get_color (sdialog->source, &color)) -- e_source_set_color (sdialog->original_source, color); -+ color_spec = e_source_peek_color_spec (sdialog->source); -+ if (color_spec != NULL) -+ e_source_set_color_spec (sdialog->original_source, color_spec); - } else { - e_source_group_add_source (sdialog->source_group, sdialog->source, -1); - e_source_list_sync (sdialog->source_list, NULL); -@@ -304,63 +282,80 @@ - } - - static void --color_changed (GnomeColorPicker *picker, guint r, guint g, guint b, guint a, ECalConfigTargetSource *t) -+color_changed (GtkColorButton *color_button, ECalConfigTargetSource *target) - { -- ESource *source = t->source; -- e_source_set_color (source, colorpicker_get_color (picker)); -+ ESource *source = target->source; -+ gchar color_spec[16]; -+ GdkColor color; -+ -+ gtk_color_button_get_color (color_button, &color); -+ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x", -+ color.red, color.green, color.blue); -+ e_source_set_color_spec (source, color_spec); -+} -+ -+static const gchar * -+choose_initial_color (void) -+{ -+ static const gchar *colors[] = { -+ "#BECEDD", /* 190 206 221 Blue */ -+ "#E2F0EF", /* 226 240 239 Light Blue */ -+ "#C6E2B7", /* 198 226 183 Green */ -+ "#E2F0D3", /* 226 240 211 Light Green */ -+ "#E2D4B7", /* 226 212 183 Khaki */ -+ "#EAEAC1", /* 234 234 193 Light Khaki */ -+ "#F0B8B7", /* 240 184 183 Pink */ -+ "#FED4D3", /* 254 212 211 Light Pink */ -+ "#E2C6E1", /* 226 198 225 Purple */ -+ "#F0E2EF" /* 240 226 239 Light Purple */ -+ }; -+ -+ return colors[g_random_int_range (0, G_N_ELEMENTS (colors))]; - } - - static GtkWidget * - eccp_get_source_color (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) - { - CalendarSourceDialog *sdialog = data; -- static GtkWidget *label, *picker; -- int row; -- ECalConfigTargetSource *t = (ECalConfigTargetSource *) ec->target; -- static guint32 assigned_colors[] = { -- 0xBECEDD, /* 190 206 221 Blue */ -- 0xE2F0EF, /* 226 240 239 Light Blue */ -- 0xC6E2B7, /* 198 226 183 Green */ -- 0xE2F0D3, /* 226 240 211 Light Green */ -- 0xE2D4B7, /* 226 212 183 Khaki */ -- 0xEAEAC1, /* 234 234 193 Light Khaki */ -- 0xF0B8B7, /* 240 184 183 Pink */ -- 0xFED4D3, /* 254 212 211 Light Pink */ -- 0xE2C6E1, /* 226 198 225 Purple */ -- 0xF0E2EF /* 240 226 239 Light Purple */ -- }; -- GRand *rand = g_rand_new (); -- guint32 color; -+ static GtkWidget *label, *color_button; -+ guint row = GTK_TABLE (parent)->nrows; -+ const gchar *color_spec = NULL; -+ GdkColor color; - - if (old) - gtk_widget_destroy (label); - -- row = ((GtkTable*)parent)->nrows; -+ if (sdialog->original_source) -+ color_spec = e_source_peek_color_spec (sdialog->original_source); -+ -+ if (color_spec == NULL) { -+ color_spec = choose_initial_color (); -+ e_source_set_color_spec (sdialog->source, color_spec); -+ } - -- color = assigned_colors[g_rand_int_range (rand, 0, 9)]; -- g_rand_free (rand); -+ if (!gdk_color_parse (color_spec, &color)) -+ g_warning ("Unknown color \"%s\" in calendar \"%s\"", -+ color_spec, e_source_peek_name (sdialog->source)); - - label = gtk_label_new_with_mnemonic (_("C_olor:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); -+ gtk_table_attach ( -+ GTK_TABLE (parent), label, -+ 0, 1, row, row + 1, GTK_FILL, 0, 0, 0); - gtk_widget_show (label); -- gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0); -- -- picker = gnome_color_picker_new (); -- gtk_widget_show (picker); -- gtk_label_set_mnemonic_widget (GTK_LABEL (label), picker); -- gtk_table_attach (GTK_TABLE (parent), picker, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); -- g_signal_connect (G_OBJECT (picker), "color-set", G_CALLBACK (color_changed), t); -- -- if (sdialog->original_source) -- e_source_get_color (sdialog->original_source, &color); -- else -- /* since we don't have an original source here, we want to set -- * the initial color */ -- e_source_set_color (sdialog->source, color); - -- colorpicker_set_color (GNOME_COLOR_PICKER (picker), color); -+ color_button = gtk_color_button_new_with_color (&color); -+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), color_button); -+ gtk_table_attach ( -+ GTK_TABLE (parent), color_button, -+ 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0); -+ gtk_widget_show (color_button); -+ -+ g_signal_connect ( -+ G_OBJECT (color_button), "color-set", -+ G_CALLBACK (color_changed), ec->target); - -- return picker; -+ return color_button; - } - - static ECalConfigItem eccp_items[] = { -@@ -414,7 +409,7 @@ - ECalConfigTargetSource *target; - - if (source) { -- guint32 color; -+ const gchar *color_spec; - - sdialog->original_source = source; - g_object_ref (source); -@@ -423,8 +418,9 @@ - sdialog->source = e_source_new_from_standalone_xml (xml); - g_free (xml); - -- if (e_source_get_color (source, &color)) -- e_source_set_color (sdialog->source, color); -+ color_spec = e_source_peek_color_spec (source); -+ if (color_spec != NULL) -+ e_source_set_color_spec (sdialog->source, color_spec); - } else { - GConfClient *gconf; - GSList *l, *ptr, *temp = NULL; -@@ -504,7 +500,7 @@ - ECalConfigTargetSource *target; - - if (source) { -- guint32 color; -+ const gchar *color_spec; - - sdialog->original_source = source; - g_object_ref (source); -@@ -513,8 +509,8 @@ - sdialog->source = e_source_new_from_standalone_xml (xml); - g_free (xml); - -- e_source_get_color (source, &color); -- e_source_set_color (sdialog->source, color); -+ color_spec = e_source_peek_color_spec (source); -+ e_source_set_color_spec (sdialog->source, color_spec); - } else { - GConfClient *gconf; - GSList *l, *ptr, *temp = NULL; -@@ -589,7 +585,7 @@ - ECalConfigTargetSource *target; - - if (source) { -- guint32 color; -+ const gchar *color_spec; - - sdialog->original_source = source; - g_object_ref (source); -@@ -598,8 +594,8 @@ - sdialog->source = e_source_new_from_standalone_xml (xml); - g_free (xml); - -- e_source_get_color (source, &color); -- e_source_set_color (sdialog->source, color); -+ color_spec = e_source_peek_color_spec (source); -+ e_source_set_color_spec (sdialog->source, color_spec); - } else { - GConfClient *gconf; - GSList *l; ---- evolution-2.9.91/calendar/gui/dialogs/cal-prefs-dialog.glade.gtk-color-button 2007-01-03 10:27:56.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/dialogs/cal-prefs-dialog.glade 2007-02-12 13:32:03.000000000 -0500 -@@ -1231,10 +1231,9 @@ - - - -- -+ - True - True -- True - False - Pick a color - True -@@ -1250,10 +1249,9 @@ - - - -- -+ - True - True -- True - False - Pick a color - True ---- evolution-2.9.91/calendar/gui/e-cal-model-tasks.c.gtk-color-button 2007-01-08 09:50:33.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/e-cal-model-tasks.c 2007-02-12 13:32:03.000000000 -0500 -@@ -1025,14 +1025,28 @@ - static const char * - ecmt_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data) - { -+ static gchar color_spec[16]; -+ GdkColor color; -+ - g_return_val_if_fail (E_IS_CAL_MODEL_TASKS (model), NULL); - g_return_val_if_fail (comp_data != NULL, NULL); - -+ /* XXX ECalModel's get_color_for_component() method should really -+ * get a GdkColor instead of a color specification string. */ -+ - switch (get_due_status ((ECalModelTasks *) model, comp_data)) { - case E_CAL_MODEL_TASKS_DUE_TODAY: -- return calendar_config_get_tasks_due_today_color (); -+ /* XXX ugly hack */ -+ calendar_config_get_tasks_due_today_color (&color); -+ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x", -+ color.red, color.green, color.blue); -+ return color_spec; - case E_CAL_MODEL_TASKS_DUE_OVERDUE: -- return calendar_config_get_tasks_overdue_color (); -+ /* XXX ugly hack */ -+ calendar_config_get_tasks_overdue_color (&color); -+ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x", -+ color.red, color.green, color.blue); -+ return color_spec; - case E_CAL_MODEL_TASKS_DUE_NEVER: - case E_CAL_MODEL_TASKS_DUE_FUTURE: - case E_CAL_MODEL_TASKS_DUE_COMPLETE: ---- evolution-2.9.91/calendar/gui/memos-component.c.gtk-color-button 2007-01-03 10:28:00.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/memos-component.c 2007-02-12 13:32:03.000000000 -0500 -@@ -213,7 +213,7 @@ - calendar_config_set_memos_selected (&selected); - } - -- e_source_set_color (source, 0xBECEDD); -+ e_source_set_color_spec (source, "#BECEDD"); - personal_source = source; - } - ---- evolution-2.9.91/calendar/gui/calendar-component.c.gtk-color-button 2007-01-03 10:28:00.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/calendar-component.c 2007-02-12 13:32:03.000000000 -0500 -@@ -252,7 +252,7 @@ - } - - g_free (primary_calendar); -- e_source_set_color (personal_source, 0xBECEDD); -+ e_source_set_color_spec (personal_source, "#BECEDD"); - } - - if (!on_the_web) { ---- evolution-2.9.91/calendar/gui/e-cal-model.c.gtk-color-button 2007-01-08 09:50:33.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/e-cal-model.c 2007-02-12 13:32:03.000000000 -0500 -@@ -947,7 +947,7 @@ - ecm_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data) - { - ESource *source; -- guint32 source_color; -+ const gchar *color_spec; - gint i, first_empty = 0; - static AssignedColorData assigned_colors[] = { - { "#BECEDD", NULL }, /* 190 206 221 Blue */ -@@ -965,9 +965,10 @@ - g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL); - - source = e_cal_get_source (comp_data->client); -- if (e_source_get_color (source, &source_color)) { -+ color_spec = e_source_peek_color_spec (source); -+ if (color_spec != NULL) { - g_free (comp_data->color); -- comp_data->color = g_strdup_printf ("#%06x", source_color & 0xffffff); -+ comp_data->color = g_strdup (color_spec); - return comp_data->color; - } - ---- evolution-2.9.91/calendar/gui/calendar-config.h.gtk-color-button 2007-01-03 10:28:00.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/calendar-config.h 2007-02-12 13:32:03.000000000 -0500 -@@ -31,6 +31,7 @@ - #define _CALENDAR_CONFIG_H_ - - #include -+#include - #include - #include - -@@ -201,11 +202,11 @@ - guint calendar_config_add_notification_primary_memos (GConfClientNotifyFunc func, gpointer data); - - /* Colors for the task list */ --const char *calendar_config_get_tasks_due_today_color (void); --void calendar_config_set_tasks_due_today_color (const char *color); -+void calendar_config_get_tasks_due_today_color (GdkColor *color); -+void calendar_config_set_tasks_due_today_color (GdkColor *color); - --const char *calendar_config_get_tasks_overdue_color (void); --void calendar_config_set_tasks_overdue_color (const char *color); -+void calendar_config_get_tasks_overdue_color (GdkColor *color); -+void calendar_config_set_tasks_overdue_color (GdkColor *color); - - /* Settings to hide completed tasks. */ - gboolean calendar_config_get_hide_completed_tasks (void); ---- evolution-2.9.91/calendar/gui/migration.c.gtk-color-button 2007-01-03 10:28:00.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/migration.c 2007-02-12 13:32:03.000000000 -0500 -@@ -406,7 +406,7 @@ - e_source_group_add_source (group, source, -1); - g_object_unref (source); - -- e_source_set_color (source, 0xFED4D3); -+ e_source_set_color_spec (source, "#FED4D3"); - e_source_group_set_readonly (group, TRUE); - - return group; -@@ -497,7 +497,7 @@ - } - - g_free (primary_calendar); -- e_source_set_color (source, 0xBECEDD); -+ e_source_set_color_spec (source, "#BECEDD"); - *personal_source = source; - } - -@@ -590,7 +590,7 @@ - calendar_config_set_tasks_selected (&selected); - } - -- e_source_set_color (source, 0xBECEDD); -+ e_source_set_color_spec (source, "#BECEDD"); - *personal_source = source; - } - -@@ -1098,7 +1098,7 @@ - calendar_config_set_memos_selected (&selected); - } - -- e_source_set_color (source, 0xBECEDD); -+ e_source_set_color_spec (source, "#BECEDD"); - *personal_source = source; - } - -@@ -1161,7 +1161,7 @@ - e_source_set_property (source, "use_ssl", use_ssl); - e_source_set_property (source, "offline_sync", offline_sync ? "1" : "0" ); - -- e_source_set_color (source, 0xEEBC60); -+ e_source_set_color_spec (source, "#EEBC60"); - e_source_group_add_source (group, source, -1); - - ids = gconf_client_get_list (client, CALENDAR_CONFIG_MEMOS_SELECTED_MEMOS, GCONF_VALUE_STRING, NULL); ---- evolution-2.9.91/calendar/gui/calendar-config.c.gtk-color-button 2007-01-03 10:28:00.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/calendar-config.c 2007-02-12 13:32:03.000000000 -0500 -@@ -1219,68 +1219,104 @@ - - /** - * calendar_config_get_tasks_due_today_color: -+ * @color: the location to store the color - * - * Queries the color to be used to display tasks that are due today. -- * -- * Return value: An X color specification. - **/ --const char * --calendar_config_get_tasks_due_today_color (void) -+void -+calendar_config_get_tasks_due_today_color (GdkColor *color) - { -- static char *color = NULL; -+ const gchar *key = CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR; -+ GError *error = NULL; -+ gchar *color_spec; - -- if (color) -- g_free (color); -+ g_return_if_fail (color != NULL); - -- color = gconf_client_get_string (config, CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR, NULL); -- return color; -+ color_spec = gconf_client_get_string (config, key, &error); -+ -+ if (color_spec != NULL && !gdk_color_parse (color_spec, color)) -+ g_warning ("Unknown color \"%s\"", color_spec); -+ else if (error != NULL) { -+ g_warning ("%s", error->message); -+ g_error_free (error); -+ } -+ -+ g_free (color_spec); - } - - /** - * calendar_config_set_tasks_due_today_color: -- * @color: X color specification -+ * @color: a #GdkColor - * - * Sets the color to be used to display tasks that are due today. - **/ - void --calendar_config_set_tasks_due_today_color (const char *color) -+calendar_config_set_tasks_due_today_color (GdkColor *color) - { -+ const gchar *key = CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR; -+ GError *error = NULL; -+ gchar color_spec[16]; -+ - g_return_if_fail (color != NULL); - -- gconf_client_set_string (config, CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR, color, NULL); -+ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x", -+ color->red, color->green, color->blue); -+ -+ if (!gconf_client_set_string (config, key, color_spec, &error)) { -+ g_warning ("%s", error->message); -+ g_error_free (error); -+ } - } - - /** - * calendar_config_get_tasks_overdue_color: -+ * @color: the location to store the color - * - * Queries the color to be used to display overdue tasks. -- * -- * Return value: An X color specification. - **/ --const char * --calendar_config_get_tasks_overdue_color (void) -+void -+calendar_config_get_tasks_overdue_color (GdkColor *color) - { -- static char *color = NULL; -+ const gchar *key = CALENDAR_CONFIG_TASKS_OVERDUE_COLOR; -+ GError *error = NULL; -+ gchar *color_spec; - -- if (color) -- g_free (color); -+ g_return_if_fail (color != NULL); - -- color = gconf_client_get_string (config, CALENDAR_CONFIG_TASKS_OVERDUE_COLOR, NULL); -- return color; -+ color_spec = gconf_client_get_string (config, key, &error); -+ -+ if (color_spec != NULL && !gdk_color_parse (color_spec, color)) -+ g_warning ("Unknown color \"%s\"", color_spec); -+ else if (error != NULL) { -+ g_warning ("%s", error->message); -+ g_error_free (error); -+ } -+ -+ g_free (color_spec); - } - - /** - * calendar_config_set_tasks_overdue_color: -- * @color: X color specification -+ * @color: a #GdkColor - * - * Sets the color to be used to display overdue tasks. - **/ - void --calendar_config_set_tasks_overdue_color (const char *color) -+calendar_config_set_tasks_overdue_color (GdkColor *color) - { -+ const gchar *key = CALENDAR_CONFIG_TASKS_OVERDUE_COLOR; -+ GError *error = NULL; -+ gchar color_spec[16]; -+ - g_return_if_fail (color != NULL); - -- gconf_client_set_string (config, CALENDAR_CONFIG_TASKS_OVERDUE_COLOR, color, NULL); -+ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x", -+ color->red, color->green, color->blue); -+ -+ if (!gconf_client_set_string (config, key, color_spec, &error)) { -+ g_warning ("%s", error->message); -+ g_error_free (error); -+ } - } - - /** diff --git a/evolution-2.9.3-unread-messages.patch b/evolution-2.9.3-unread-messages.patch deleted file mode 100644 index 9eb3b97..0000000 --- a/evolution-2.9.3-unread-messages.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- evolution-2.9.3/mail/em-folder-properties.c.unread-messages 2006-12-09 09:00:08.000000000 -0500 -+++ evolution-2.9.3/mail/em-folder-properties.c 2006-12-09 09:00:09.000000000 -0500 -@@ -145,27 +145,27 @@ - gtk_widget_show (table); - gtk_box_pack_start ((GtkBox *) parent, table, TRUE, TRUE, 0); - -- /* TODO: can this be done in a loop? */ - /* to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567 */ -- label = gtk_label_new (ngettext ("Total messages:", "Total messages:", prop_data->total)); -+ label = gtk_label_new (ngettext ("Unread messages:", "Unread messages:", prop_data->unread)); - gtk_widget_show (label); - gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5); - gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0); - -- sprintf(countstr, "%d", prop_data->total); -+ sprintf(countstr, "%d", prop_data->unread); - label = gtk_label_new (countstr); - gtk_widget_show (label); - gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5); - gtk_table_attach ((GtkTable *) table, label, 1, 2, row, row+1, GTK_FILL | GTK_EXPAND, 0, 0, 0); - row++; - -+ /* TODO: can this be done in a loop? */ - /* to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567 */ -- label = gtk_label_new (ngettext ("Unread messages:", "Unread messages:", prop_data->unread)); -+ label = gtk_label_new (ngettext ("Total messages:", "Total messages:", prop_data->total)); - gtk_widget_show (label); - gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5); - gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0); - -- sprintf(countstr, "%d", prop_data->unread); -+ sprintf(countstr, "%d", prop_data->total); - label = gtk_label_new (countstr); - gtk_widget_show (label); - gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5); ---- evolution-2.9.3/mail/mail-component.c.unread-messages 2006-12-09 09:00:08.000000000 -0500 -+++ evolution-2.9.3/mail/mail-component.c 2006-12-09 09:00:09.000000000 -0500 -@@ -544,6 +544,9 @@ - || g_ascii_strcasecmp(emfv->folder->full_name, ".") == 0) - bits |= 8; - -+ if (selected->len > 1) -+ g_string_append_printf(tmp, ngettext ("%d selected, ", "%d selected, ", selected->len), selected->len); -+ - if (bits == 1) - g_string_append_printf(tmp, ngettext ("%d draft", "%d drafts", visible), visible); - else if (bits == 2) -@@ -553,13 +556,11 @@ - else { - if (!emfv->hide_deleted) - visible += deleted; -+ if (unread && selected->len <= 1) -+ g_string_append_printf(tmp, ngettext ("%d unread, ", "%d unread, ", unread), unread); - g_string_append_printf(tmp, ngettext ("%d total", "%d total", visible), visible); -- if (unread && selected->len <=1) -- g_string_append_printf(tmp, ngettext (", %d unread", ", %d unread", unread), unread); - } - -- if (selected->len > 1) -- g_string_append_printf(tmp, ngettext (", %d selected", ", %d selected", selected->len), selected->len); - message_list_free_uids(emfv->list, selected); - } - diff --git a/evolution.spec b/evolution.spec index 982738c..c6fff1b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,7 +1,7 @@ %define bug_buddy_version 2.15.90 %define dbus_glib_version 0.70 %define dbus_version 0.90 -%define eds_version 1.9.4 +%define eds_version 1.11.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 1.3.6 %define gnome_pilot_version 2.0.13 @@ -18,7 +18,7 @@ %define scrollkeeper_version 0.1.4 %define soup_version 2.2.2 -%define evo_major 2.10 +%define evo_major 2.12 %define exchange_support 1 %define inline_audio_support 0 @@ -46,8 +46,8 @@ ### Abstract ### Name: evolution -Version: 2.10.1 -Release: 17%{?dist} +Version: 2.11.2 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -64,120 +64,86 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch Patch11: evolution-2.5.5.1-commit-enter-on-calendar.patch # Fix for RH bug 164957 (was for 145552): -Patch13: evolution-2.0.2-fix-145552.patch +Patch12: evolution-2.0.2-fix-145552.patch # Part of RH bug 170799: -Patch14: evolution-2.4.1-hide-switcher-buttons-by-default.patch +Patch13: evolution-2.4.1-hide-switcher-buttons-by-default.patch # Patches for conduits, based upon # rh-161817-attach-116019-conduit_pilot_link_updates.diff # (the latter patch was originally by Mark G. Adams): -# Patch15: evolution-2.5.4-fix-conduits.patch +# Patch14: evolution-2.5.4-fix-conduits.patch # Move .conduit files from share to lib (for the sake of multilib) # This patch effects other parts of evolution.spec and so is necessary # for a successful build. -Patch16: evolution-2.5.4-fix-conduit-dir.patch +Patch15: evolution-2.5.4-fix-conduit-dir.patch # Remove gnome-common macros from configure.in. # We do not ship gnome-common (or at least we're not supposed to). -Patch17: evolution-2.7.1-no-gnome-common.patch +Patch16: evolution-2.7.1-no-gnome-common.patch -#Patch18: evolution-2.7.1-notification-cleanups.patch -Patch19: evolution-2.6.0-prototypes.patch +#Patch17: evolution-2.7.1-notification-cleanups.patch # RH bug #157400 / GNOME bug #303877 -Patch20: evolution-2.7.4-candidate-window-position-task.patch +Patch18: evolution-2.7.4-candidate-window-position-task.patch # RH bug #157505 / GNOME bug #303878 -Patch21: evolution-2.7.4-candidate-window-position-calendar.patch - -# RH bug #190359 / GNOME bug #211058 -Patch22: evolution-2.7.3-filter-datespec.patch +Patch19: evolution-2.7.4-candidate-window-position-calendar.patch # RH bug #166231 / GNOME bug #264485 -Patch23: evolution-2.7.3-replicated-cjk-input.patch +Patch20: evolution-2.7.3-replicated-cjk-input.patch # RH bug #178295 / GNOME bug #348638 -Patch24: evolution-2.7.4-deleting-preedit-buffer.patch +Patch21: evolution-2.7.4-deleting-preedit-buffer.patch # RH bug #202289 -Patch25: evolution-2.7.92-fix-prgname.patch +Patch22: evolution-2.7.92-fix-prgname.patch # RH bug #161885 / GNOME bug #309166 -Patch26: evolution-2.8.0-indic-cursor-movement.patch +Patch23: evolution-2.8.0-indic-cursor-movement.patch # RH bug #202751 / GNOME bug #355766 -Patch29: evolution-2.8.0-fix-indic-printing.patch +Patch24: evolution-2.8.0-fix-indic-printing.patch # GNOME bug #362638 -Patch31: evolution-2.8.1-kill-ethread.patch +Patch25: evolution-2.8.1-kill-ethread.patch # GNOME bug #363695 -Patch32: evolution-2.9.1-kill-ememory.patch +Patch26: evolution-2.9.1-kill-ememory.patch # RH bug #176400 -Patch33: evolution-2.9.1-im-context-reset.patch +Patch27: evolution-2.9.1-im-context-reset.patch # RH bug #182247 -Patch34: evolution-2.9.1-first-ascii.patch - -# GNOME bug #373837 -Patch35: evolution-2.9.2-gtk-font-button.patch +Patch28: evolution-2.9.1-first-ascii.patch # RH bug #216537 / GNOME bug #383047 -#Patch36: evolution-2.9.3-view-attachment-uri.patch +#Patch29: evolution-2.9.3-view-attachment-uri.patch # RH bug #215478 / GNOME bug #383842 -Patch38: evolution-2.9.3-source-path-entry.patch - -# RH bug #218801 / GNOME bug #383953 -Patch39: evolution-2.9.3-unread-messages.patch +Patch30: evolution-2.9.3-source-path-entry.patch # RH bug #215467 / GNOME bug #380644 -Patch40: evolution-2.9.3-meeting-list-view.patch - -# GNOME bug #373116 -Patch41: evolution-2.9.3-gtk-color-button.patch +Patch31: evolution-2.9.3-meeting-list-view.patch # GNOME bug #218898 -Patch42: evolution-2.9.4-view-message-source.patch +Patch32: evolution-2.9.4-view-message-source.patch # GNOME bug #376991 -Patch43: evolution-2.10.0-e-passwords.patch +Patch33: evolution-2.10.0-e-passwords.patch # GNOME bug #417999 -Patch44: evolution-2.10.0-e-source-combo-box.patch - -# GNOME bug #419469 -Patch45: evolution-2.10.0-shell-main-cleanups.patch - -# GNOME bug #419524 -Patch46: evolution-2.10.0-use-glib-i18n.patch - -# GNOME bug #418971 -Patch47: evolution-2.10.0-drop-old-glib-support.patch +Patch34: evolution-2.10.0-e-source-combo-box.patch # RH bug #235878 / GNOME bug #386503 -Patch48: evolution-2.10.1-fix-help.patch - -# RH bug #234315 / GNOME bug #423766 -Patch49: evolution-2.10.1-saving-attachments.patch - -# RH bug #236860 / GNOME bug #407104 -Patch50: evolution-2.10.1-fix-uri-handling.patch - -# RH bug #236399 / GNOME bug #434019 -Patch51: evolution-2.10.1-en_CA-attribution-format.patch - -# RH bug #238551 / GNOME bug #434981 -Patch52: evolution-2.10.1-e-attachment-bar.patch +Patch35: evolution-2.10.1-fix-help.patch # RH bug #238155 / GNOME bug #427232 -Patch53: evolution-2.10.1-check-uri-before-strcmp.patch +Patch36: evolution-2.10.1-check-uri-before-strcmp.patch # RH bug #240147 / GNOME bug #335241 -Patch54: evolution-2.10.1-send-recv-dialog.patch +Patch37: evolution-2.10.1-send-recv-dialog.patch ## Dependencies ### @@ -300,44 +266,32 @@ Development files needed for building things which link against evolution. %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack %patch11 -p1 -b .commit-enter-on-calendar -%patch13 -p1 -b .fix-164957 -%patch14 -p1 -b .hide-switcher-buttons-by-default -#patch15 -p1 -b .fix-conduits # leave commented -%patch16 -p1 -b .fix-conduit-dir -%patch17 -p1 -b .no-gnome-common -#patch18 -p1 -b .notification-cleanups -%patch19 -p1 -b .prototypes -%patch20 -p1 -b .candidate-window-position-task -%patch21 -p1 -b .candidate-window-position-calendar -%patch22 -p1 -b .filter-datespec -%patch23 -p1 -b .replicated-cjk-input -%patch24 -p1 -b .deleting-preedit-buffer -%patch25 -p1 -b .fix-prgname -%patch26 -p1 -b .indic-cursor-movement -%patch29 -p1 -b .fix-indic-printing -%patch31 -p1 -b .kill-ethread -%patch32 -p1 -b .kill-ememory -%patch33 -p1 -b .im-context-reset -%patch34 -p1 -b .first-ascii -%patch35 -p1 -b .gtk-font-button -#%patch36 -p1 -b .view-attachment-uri -%patch38 -p1 -b .source-path-entry -%patch39 -p1 -b .unread-messages -%patch40 -p1 -b .meeting-list-view -%patch41 -p1 -b .gtk-color-button -%patch42 -p1 -b .view-message-source -%patch43 -p1 -b .e-passwords -%patch44 -p1 -b .e-source-combo-box -%patch45 -p1 -b .shell-main-cleanups -%patch46 -p1 -b .use-glib-i18n -%patch47 -p1 -b .drop-old-glib-support -%patch48 -p1 -b .fix-help -%patch49 -p1 -b .saving-attachments -%patch50 -p1 -b .fix-uri-handling -%patch51 -p1 -b .en_CA-attribution-format -%patch52 -p1 -b .e-attachment-bar -%patch53 -p1 -b .check-uri-before-strcmp -%patch54 -p1 -b .send-recv-dialog +%patch12 -p1 -b .fix-164957 +%patch13 -p1 -b .hide-switcher-buttons-by-default +#patch14 -p1 -b .fix-conduits # leave commented +%patch15 -p1 -b .fix-conduit-dir +%patch16 -p1 -b .no-gnome-common +#patch17 -p1 -b .notification-cleanups +%patch18 -p1 -b .candidate-window-position-task +%patch19 -p1 -b .candidate-window-position-calendar +%patch20 -p1 -b .replicated-cjk-input +%patch21 -p1 -b .deleting-preedit-buffer +%patch22 -p1 -b .fix-prgname +%patch23 -p1 -b .indic-cursor-movement +%patch24 -p1 -b .fix-indic-printing +%patch25 -p1 -b .kill-ethread +%patch26 -p1 -b .kill-ememory +%patch27 -p1 -b .im-context-reset +%patch28 -p1 -b .first-ascii +#%patch29 -p1 -b .view-attachment-uri +%patch30 -p1 -b .source-path-entry +%patch31 -p1 -b .meeting-list-view +%patch32 -p1 -b .view-message-source +%patch33 -p1 -b .e-passwords +%patch34 -p1 -b .e-source-combo-box +%patch35 -p1 -b .fix-help +%patch36 -p1 -b .check-uri-before-strcmp +%patch37 -p1 -b .send-recv-dialog mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -416,9 +370,9 @@ CFLAGS="$CFLAGS \ -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \ -DGDK_DISABLE_DEPRECATED=1 \ -DEDS_DISABLE_DEPRECATED=1 \ - -DCAMEL_DISABLE_DEPRECATED=1 \ -Wdeclaration-after-statement \ -Werror-implicit-function-declaration" +# TODO: Make -DCAMEL_DISABLE_DEPRECATED work. %endif # Temporary work-around for a bad gnome-doc-utils.make. @@ -498,6 +452,7 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution- gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-%{evo_major}.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar-%{evo_major}.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell-%{evo_major}.schemas > /dev/null +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin-%{evo_major}.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail-%{evo_major}.schemas > /dev/null %postun @@ -518,6 +473,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-%{evo_major}.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_calendar-%{evo_major}.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_shell-%{evo_major}.schemas +%{_sysconfdir}/gconf/schemas/bogo-junk-plugin-%{evo_major}.schemas %{_sysconfdir}/gconf/schemas/evolution-mail-%{evo_major}.schemas # The main executable and a symlink: @@ -539,6 +495,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/22x22/apps/evolution.png %{_datadir}/icons/hicolor/24x24/apps/evolution.png %{_datadir}/icons/hicolor/32x32/apps/evolution.png +%{_datadir}/icons/hicolor/48x48/apps/preferences-autocompletion.png +%{_datadir}/icons/hicolor/48x48/apps/preferences-calendar-and-tasks.png +%{_datadir}/icons/hicolor/48x48/apps/preferences-certificates.png +%{_datadir}/icons/hicolor/48x48/apps/preferences-composer.png +%{_datadir}/icons/hicolor/48x48/apps/preferences-mail-accounts.png +%{_datadir}/icons/hicolor/48x48/apps/preferences-mail.png %{_datadir}/icons/hicolor/scalable/apps/evolution.svg # IDL files (should this be in devel subpackage?) @@ -631,6 +593,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-audio-inline.so %endif +%{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug +%{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so + %{evo_plugin_dir}/org-gnome-calendar-file.eplug %{evo_plugin_dir}/liborg-gnome-calendar-file.so @@ -680,6 +645,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-mailing-list-actions.so %{evo_plugin_dir}/org-gnome-mailing-list-actions.xml +%{evo_plugin_dir}/org-gnome-mail-notification.eplug +%{evo_plugin_dir}/liborg-gnome-mail-notification.so + %{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 @@ -759,6 +727,24 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Fri May 18 2007 Matthew Barnes - 2.11.2-1.fc8 +- Update to 2.11.2 +- Bump evo_major to 2.12. +- Bump eds_version to 1.11.0. +- Update files with new plugins and icons. +- Remove patch for RH bug #190359 (fixed upstream). +- Remove patch for RH bug #218801 (fixed upstream). +- Remove patch for RH bug #234315 (fixed upstream). +- Remove patch for RH bug #236399 (fixed upstream). +- Remove patch for RH bug #236860 (fixed upstream). +- Remove patch for RH bug #238551 (fixed upstream). +- Remove patch for GNOME bug #373837 (fixed upstream). +- Remove patch for GNOME bug #373116 (fixed upstream). +- Remove patch for GNOME bug #418971 (fixed upstream). +- Remove patch for GNOME bug #419469 (fixed upstream). +- Remove patch for GNOME bug #419524 (fixed upstream). +- Remove evolution-2.6.0-prototypes.patch (obsolete). + * Wed May 16 2007 Matthew Barnes - 2.10.1-17.fc7 - Revise patch for GNOME bug #362638 to fix RH bug #237206 (certificate prompt causes crash, again). diff --git a/sources b/sources index 5f86cfa..f210fd0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -16051c6cbb617cb04665e402566e0976 evolution-2.10.1.tar.bz2 +7f684d90627bacd6e4a7997592112484 evolution-2.11.2.tar.bz2