diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 1521337..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -evolution-2.10.0.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..56bb02d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/evolution-*.tar.xz diff --git a/Makefile b/Makefile deleted file mode 100644 index 8a15db1..0000000 --- a/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# Makefile for source rpm: evolution -# $Id$ -NAME := evolution -SPECFILE = $(firstword $(wildcard *.spec)) - -include ../common/Makefile.common diff --git a/configurable-dbus-prefix.patch b/configurable-dbus-prefix.patch new file mode 100644 index 0000000..be23739 --- /dev/null +++ b/configurable-dbus-prefix.patch @@ -0,0 +1,42 @@ +diff -up evolution-3.48.1 evolution-3.48 +diff -up evolution-3.48.1/docs/evolution.1 evolution-3.48.1/docs/evolution +diff -up evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c.1 evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c +--- evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c.1 2023-11-27 13:12:25.099463743 -0500 ++++ evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c 2023-11-27 13:14:38.640243434 -0500 +@@ -674,7 +674,7 @@ get_source_manager_reload_command (void) + g_string_free (tmp, TRUE); + tmp = NULL; + +- base_filename = g_strdup (EDS_SOURCES_DBUS_SERVICE_NAME); ++ base_filename = g_ascii_strdown (EDS_SOURCES_DBUS_SERVICE_NAME, -1); + + if (!base_filename || !*base_filename) { + g_free (base_filename); +@@ -690,14 +690,16 @@ get_source_manager_reload_command (void) + + while (!tmp) { + const gchar *name; ++ gchar *name_down; + + name = g_dir_read_name (dir); ++ name_down = g_ascii_strdown (name, -1); + + if (!name) + break; + +- if (g_ascii_strncasecmp (name, base_filename, base_filename_len) == 0 && +- g_ascii_strncasecmp (name + strlen (name) - 8, ".service", 8) == 0) { ++ if (strstr (name_down, base_filename) != NULL && ++ strncmp (name_down + strlen (name) - 8, ".service", 8) == 0) { + gchar *filename; + + filename = g_strconcat ("$DBUSDATADIR", G_DIR_SEPARATOR_S, name, NULL); +@@ -724,6 +726,8 @@ get_source_manager_reload_command (void) + g_free (str); + } + } ++ ++ g_free (name_down); + } + + g_free (base_filename); diff --git a/evolution-1.4.4-ldap-x86_64-hack.patch b/evolution-1.4.4-ldap-x86_64-hack.patch deleted file mode 100644 index 47cafbd..0000000 --- a/evolution-1.4.4-ldap-x86_64-hack.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- evolution-1.4.4/configure.ldaphack 2003-08-05 02:06:26.000000000 -0400 -+++ evolution-1.4.4/configure 2003-08-05 02:06:45.000000000 -0400 -@@ -12135,7 +12135,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS" -+LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - /* confdefs.h. */ diff --git a/evolution-2.0.2-fix-145552.patch b/evolution-2.0.2-fix-145552.patch deleted file mode 100644 index ad2edf0..0000000 --- a/evolution-2.0.2-fix-145552.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- evolution-2.0.2/mail/em-utils.c.fix-145552 2004-09-24 11:49:29.000000000 -0400 -+++ evolution-2.0.2/mail/em-utils.c 2005-08-02 22:42:04.000000000 -0400 -@@ -1919,10 +1919,22 @@ - * try to do better with the filename check. - */ - -+ /* RH bug 145552: code based on _gnome_vfs_get_mime_type_internal: -+ * So many file types come compressed by gzip -+ * that extensions are more reliable than magic -+ * typing. If the file has a suffix, then use -+ * the type from the suffix: -+ */ - if (magic_type) { - if (name_type - && (!strcmp(magic_type, "text/plain") -- || !strcmp(magic_type, "application/octet-stream"))) -+ || !strcmp(magic_type, "application/octet-stream") -+ || !strcmp(magic_type, "application/octet-stream") -+ || !strcmp(magic_type, "application/x-ole-storage") -+ || !strcmp(magic_type, "text/xml") -+ || !strcmp(magic_type, "application/x-bzip") -+ || !strcmp(magic_type, "application/x-gzip") -+ || !strcmp(magic_type, "application/zip"))) - return name_type; - else - return magic_type; diff --git a/evolution-2.10.0-e-passwords.patch b/evolution-2.10.0-e-passwords.patch deleted file mode 100644 index 8489dee..0000000 --- a/evolution-2.10.0-e-passwords.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- evolution-2.10.0/mail/mail-session.c.e-passwords 2007-03-12 23:41:06.000000000 -0400 -+++ evolution-2.10.0/mail/mail-session.c 2007-03-12 23:41:35.000000000 -0400 -@@ -679,8 +679,6 @@ - - d(printf ("Gone non-interactive, checking for outstanding interactive tasks\n")); - -- e_passwords_cancel(); -- - /* flush/cancel pending user messages */ - while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) { - d(printf ("Flusing message request: %s\n", um->prompt)); ---- evolution-2.10.0/shell/main.c.e-passwords 2007-03-12 23:39:38.000000000 -0400 -+++ evolution-2.10.0/shell/main.c 2007-03-12 23:39:54.000000000 -0400 -@@ -565,7 +565,6 @@ - glade_init (); - e_cursors_init (); - e_icon_factory_init (); -- e_passwords_init(); - - gtk_window_set_default_icon_name ("evolution"); - ---- evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c.e-passwords 2007-03-12 23:40:22.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c 2007-03-12 23:40:36.000000000 -0400 -@@ -169,7 +169,6 @@ - - alarm_done (); - -- e_passwords_shutdown (); - gnome_sound_shutdown (); - - return 0; diff --git a/evolution-2.10.0-e-source-combo-box.patch b/evolution-2.10.0-e-source-combo-box.patch deleted file mode 100644 index 43b5d69..0000000 --- a/evolution-2.10.0-e-source-combo-box.patch +++ /dev/null @@ -1,997 +0,0 @@ ---- 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 -@@ -27,7 +27,7 @@ - - #include - #include --#include -+#include - #include "e-pilot-settings.h" - - struct _EPilotSettingsPrivate -@@ -102,7 +102,7 @@ - - lbl = gtk_label_new (_("Sync with:")); - gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5); -- priv->source = e_source_option_menu_new (source_list); -+ priv->source = e_source_combo_box_new (source_list); - gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, 0, 1); - gtk_table_attach_defaults (GTK_TABLE (ps), priv->source, 1, 2, 0, 1); - gtk_widget_show (lbl); -@@ -152,8 +152,9 @@ - g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), FALSE); - - priv = ps->priv; -- -- return e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (priv->source)); -+ -+ return e_source_combo_box_get_active ( -+ E_SOURCE_COMBO_BOX (priv->source)); - } - - void -@@ -166,7 +167,8 @@ - - priv = ps->priv; - -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source), source); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (priv->source), source); - } - - 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 -@@ -39,7 +39,7 @@ - #include - #include - #include --#include -+#include - #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 -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -104,8 +104,8 @@ - char *description; - - GtkWidget *selector_box; -- GtkWidget *esom; -- GtkWidget *esom_header; -+ GtkWidget *escb; -+ GtkWidget *escb_header; - ESourceList *source_list; - - GtkWidget *rsvp_box; -@@ -1664,10 +1664,12 @@ - } - - static void --source_selected_cb (ESourceOptionMenu *esom, ESource *source, gpointer data) -+source_changed_cb (ESourceComboBox *escb, ItipView *view) - { -- ItipView *view = data; -- -+ ESource *source; -+ -+ source = e_source_combo_box_get_active (escb); -+ - g_signal_emit (view, signals[SOURCE_SELECTED], 0, source); - } - -@@ -1684,40 +1686,42 @@ - if (priv->source_list) - g_object_unref (priv->source_list); - -- if (priv->esom) -- gtk_widget_destroy (priv->esom); -+ if (priv->escb) -+ gtk_widget_destroy (priv->escb); - - if (!source_list) { -- if (priv->esom_header) -- gtk_widget_destroy (priv->esom_header); -+ if (priv->escb_header) -+ gtk_widget_destroy (priv->escb_header); - - priv->source_list = NULL; -- priv->esom = NULL; -- priv->esom_header = NULL; -+ priv->escb = NULL; -+ priv->escb_header = NULL; - - return; - } - - priv->source_list = g_object_ref (source_list); - -- priv->esom = e_source_option_menu_new (source_list); -- gtk_widget_show (priv->esom); -- g_signal_connect (priv->esom, "source_selected", G_CALLBACK (source_selected_cb), view); -+ priv->escb = e_source_combo_box_new (source_list); -+ gtk_widget_show (priv->escb); -+ g_signal_connect ( -+ priv->escb, "changed", -+ G_CALLBACK (source_changed_cb), view); - -- if (!priv->esom_header) { -+ if (!priv->escb_header) { - if (priv->type == E_CAL_SOURCE_TYPE_EVENT) -- priv->esom_header = gtk_label_new_with_mnemonic (_("_Calendar:")); -+ priv->escb_header = gtk_label_new_with_mnemonic (_("_Calendar:")); - else if (priv->type == E_CAL_SOURCE_TYPE_TODO) -- priv->esom_header = gtk_label_new_with_mnemonic (_("_Tasks :")); -+ priv->escb_header = gtk_label_new_with_mnemonic (_("_Tasks :")); - else if (priv->type == E_CAL_SOURCE_TYPE_JOURNAL) -- priv->esom_header = gtk_label_new_with_mnemonic (_("Memos :")); -+ priv->escb_header = gtk_label_new_with_mnemonic (_("Memos :")); - -- gtk_label_set_mnemonic_widget (GTK_LABEL (priv->esom_header), priv->esom); -- gtk_widget_show (priv->esom_header); -+ gtk_label_set_mnemonic_widget (GTK_LABEL (priv->escb_header), priv->escb); -+ gtk_widget_show (priv->escb_header); - } - -- gtk_box_pack_start (GTK_BOX (priv->selector_box), priv->esom_header, FALSE, TRUE, 6); -- gtk_box_pack_start (GTK_BOX (priv->selector_box), priv->esom, FALSE, TRUE, 0); -+ gtk_box_pack_start (GTK_BOX (priv->selector_box), priv->escb_header, FALSE, TRUE, 6); -+ gtk_box_pack_start (GTK_BOX (priv->selector_box), priv->escb, FALSE, TRUE, 0); - } - - ESourceList * -@@ -1743,10 +1747,11 @@ - - priv = view->priv; - -- if (!priv->esom) -+ if (!priv->escb) - return; - -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->esom), source); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (priv->escb), source); - } - - ESource * -@@ -1759,10 +1764,11 @@ - - priv = view->priv; - -- if (!priv->esom) -+ if (!priv->escb) - return NULL; - -- return e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (priv->esom)); -+ return e_source_combo_box_get_active ( -+ E_SOURCE_COMBO_BOX (priv->escb)); - } - - 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 -@@ -44,7 +44,7 @@ - #include - - #include --#include -+#include - - #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 -@@ -40,7 +40,7 @@ - #include - - #include --#include -+#include - - #include - #include -@@ -341,7 +341,8 @@ - - gtk_widget_set_sensitive (stuff->option_menu, active); - if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL)) { -- selected_source = e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (stuff->option_menu)); -+ selected_source = e_source_combo_box_get_active ( -+ E_SOURCE_COMBO_BOX (stuff->option_menu)); - gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (selected_source), NULL); - } - } -@@ -360,7 +361,8 @@ - - gtk_widget_set_sensitive (stuff->gaim_option_menu, active); - if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL)) { -- selected_source = e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (stuff->gaim_option_menu)); -+ selected_source = e_source_combo_box_get_active ( -+ E_SOURCE_COMBO_BOX (stuff->gaim_option_menu)); - gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, e_source_get_uri (selected_source), NULL); - } - } -@@ -389,31 +391,32 @@ - static GtkWidget * - create_addressbook_option_menu (struct bbdb_stuff *stuff, int type) - { -- GtkWidget *menu; -+ GtkWidget *combo_box; - ESourceList *source_list; - char *selected_source_uri; -- ESource *selected_source; - - GConfClient *gconf = stuff->target->gconf; - - source_list = e_source_list_new_for_gconf (gconf, "/apps/evolution/addressbook/sources"); -- menu = e_source_option_menu_new (source_list); -+ combo_box = e_source_combo_box_new (source_list); - - if (type == GAIM_ADDRESSBOOK) - selected_source_uri = gconf_client_get_string (gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL); - else - selected_source_uri = gconf_client_get_string (gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL); - if (selected_source_uri != NULL) { -- selected_source = e_source_new_with_absolute_uri ("", selected_source_uri); -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (menu), selected_source); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (combo_box), -+ e_source_new_with_absolute_uri ( -+ "", selected_source_uri)); - g_free (selected_source_uri); - } - -- gtk_widget_show (menu); -+ gtk_widget_show (combo_box); - - stuff->source_list = source_list; - -- return menu; -+ return combo_box; - } - - 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 -@@ -158,9 +158,9 @@ - - - -- -+ - True -- e_contact_list_editor_create_source_option_menu -+ e_contact_list_editor_create_source_combo_box - 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 -@@ -33,7 +33,7 @@ - #include - #include - --#include -+#include - - #include - #include -@@ -78,7 +78,7 @@ - static void list_name_changed_cb (GtkWidget *w, EContactListEditor *editor); - static void list_image_changed_cb (GtkWidget *w, EContactListEditor *editor); - static void visible_addrs_toggled_cb (GtkWidget *w, EContactListEditor *editor); --static void source_selected (GtkWidget *source_option_menu, ESource *source, EContactListEditor *editor); -+static void source_changed_cb (ESourceComboBox *source_combo_box, EContactListEditor *editor); - static gboolean email_key_pressed (GtkWidget *w, GdkEventKey *event, EContactListEditor *editor); - static void email_match_selected (GtkWidget *w, EDestination *destination, EContactListEditor *editor); - -@@ -233,7 +233,7 @@ - editor->list_name_entry = glade_xml_get_widget (gui, "list-name-entry"); - editor->list_image = glade_xml_get_widget (gui, "list-image"); - editor->visible_addrs_checkbutton = glade_xml_get_widget (gui, "visible-addrs-checkbutton"); -- editor->source_menu = glade_xml_get_widget (gui, "source-option-menu-source"); -+ editor->source_menu = glade_xml_get_widget (gui, "source-combo-box-source"); - - editor->ok_button = glade_xml_get_widget (gui, "ok-button"); - editor->cancel_button = glade_xml_get_widget (gui, "cancel-button"); -@@ -276,7 +276,7 @@ - "changed", G_CALLBACK(list_image_changed_cb), editor); - - g_signal_connect (editor->source_menu, -- "source_selected", G_CALLBACK (source_selected), editor); -+ "changed", G_CALLBACK (source_changed_cb), editor); - - command_state_changed (editor); - -@@ -306,8 +306,9 @@ - if (status != E_BOOK_ERROR_OK || new_book == NULL) { - eab_load_error_dialog (NULL, e_book_get_source (new_book), status); - -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (editor->source_menu), -- e_book_get_source (editor->book)); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (editor->source_menu), -+ e_book_get_source (editor->book)); - - if (new_book) - g_object_unref (new_book); -@@ -332,8 +333,12 @@ - } - - static void --source_selected (GtkWidget *source_option_menu, ESource *source, EContactListEditor *editor) -+source_changed_cb (ESourceComboBox *source_combo_box, EContactListEditor *editor) - { -+ ESource *source; -+ -+ source = e_source_combo_box_get_active (source_combo_box); -+ - cancel_load (editor); - - if (e_source_equal (e_book_get_source (editor->book), source)) -@@ -795,28 +800,28 @@ - } - - GtkWidget * --e_contact_list_editor_create_source_option_menu (gchar *name, -- gchar *string1, gchar *string2, -- gint int1, gint int2); -+e_contact_list_editor_create_source_combo_box (gchar *name, -+ gchar *string1, gchar *string2, -+ gint int1, gint int2); - - GtkWidget * --e_contact_list_editor_create_source_option_menu (gchar *name, -- gchar *string1, gchar *string2, -- gint int1, gint int2) -+e_contact_list_editor_create_source_combo_box (gchar *name, -+ gchar *string1, gchar *string2, -+ gint int1, gint int2) - { - -- GtkWidget *menu; -+ GtkWidget *combo_box; - GConfClient *gconf_client; - ESourceList *source_list; - - gconf_client = gconf_client_get_default (); - source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources"); - -- menu = e_source_option_menu_new (source_list); -+ combo_box = e_source_combo_box_new (source_list); - g_object_unref (source_list); - -- gtk_widget_show (menu); -- return menu; -+ gtk_widget_show (combo_box); -+ return combo_box; - } - - GtkWidget * -@@ -1262,10 +1267,9 @@ - } - - if (editor->book) { -- ESource *source; -- -- source = e_book_get_source (editor->book); -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (editor->source_menu), source); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (editor->source_menu), -+ e_book_get_source (editor->book)); - 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 -@@ -356,9 +356,9 @@ - - - -- -+ - True -- e_contact_editor_create_source_option_menu -+ e_contact_editor_create_source_combo_box - 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 -@@ -46,7 +46,7 @@ - #include - - #include --#include -+#include - - #include - -@@ -590,15 +590,16 @@ - fill_in_source_field (EContactEditor *editor) - { - GtkWidget *source_menu; -- ESource *source; - - if (!editor->target_book) - return; - -- source_menu = glade_xml_get_widget (editor->gui, "source-option-menu-source"); -- source = e_book_get_source (editor->target_book); -+ source_menu = glade_xml_get_widget ( -+ editor->gui, "source-combo-box-source"); - -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (source_menu), source); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (source_menu), -+ e_book_get_source (editor->target_book)); - } - - static void -@@ -2525,13 +2526,15 @@ - editor->load_book = NULL; - - if (status != E_BOOK_ERROR_OK || new_book == NULL) { -- GtkWidget *source_option_menu; -+ GtkWidget *source_combo_box; - - eab_load_error_dialog (NULL, e_book_get_source (new_book), status); - -- source_option_menu = glade_xml_get_widget (editor->gui, "source-option-menu-source"); -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (source_option_menu), -- e_book_get_source (editor->target_book)); -+ source_combo_box = glade_xml_get_widget ( -+ editor->gui, "source-combo-box-source"); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (source_combo_box), -+ e_book_get_source (editor->target_book)); - - if (new_book) - g_object_unref (new_book); -@@ -2555,8 +2558,12 @@ - } - - static void --source_selected (GtkWidget *source_option_menu, ESource *source, EContactEditor *editor) -+source_changed (ESourceComboBox *source_combo_box, EContactEditor *editor) - { -+ ESource *source; -+ -+ source = e_source_combo_box_get_active (source_combo_box); -+ - cancel_load (editor); - - if (e_source_equal (e_book_get_source (editor->target_book), source)) -@@ -3330,8 +3337,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); -- widget = glade_xml_get_widget (e_contact_editor->gui, "source-option-menu-source"); -- g_signal_connect (widget, "source_selected", G_CALLBACK (source_selected), e_contact_editor); -+ widget = glade_xml_get_widget (e_contact_editor->gui, "source-combo-box-source"); -+ g_signal_connect (widget, "changed", G_CALLBACK (source_changed), e_contact_editor); - 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 @@ - } - - GtkWidget * --e_contact_editor_create_source_option_menu (gchar *name, -- gchar *string1, gchar *string2, -- gint int1, gint int2); -+e_contact_editor_create_source_combo_box (gchar *name, -+ gchar *string1, gchar *string2, -+ gint int1, gint int2); - - GtkWidget * --e_contact_editor_create_source_option_menu (gchar *name, -- gchar *string1, gchar *string2, -- gint int1, gint int2) -+e_contact_editor_create_source_combo_box (gchar *name, -+ gchar *string1, gchar *string2, -+ gint int1, gint int2) - { -- GtkWidget *menu; -+ GtkWidget *combo_box; - GConfClient *gconf_client; - ESourceList *source_list; - - gconf_client = gconf_client_get_default (); - source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources"); - -- menu = e_source_option_menu_new (source_list); -+ combo_box = e_source_combo_box_new (source_list); - g_object_unref (source_list); - -- gtk_widget_show (menu); -- return menu; -+ 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 -@@ -37,7 +37,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include "e-contact-editor.h" -@@ -267,8 +267,12 @@ - } - - static void --source_selected (GtkWidget *source_option_menu, ESource *source, QuickAdd *qa) -+source_changed (ESourceComboBox *source_combo_box, QuickAdd *qa) - { -+ ESource *source; -+ -+ source = e_source_combo_box_get_active (source_combo_box); -+ - if (qa->book) { - g_object_unref (qa->book); - qa->book = NULL; -@@ -317,16 +321,20 @@ - - gconf_client = gconf_client_get_default (); - source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources"); -- qa->option_menu = e_source_option_menu_new (source_list); -+ qa->option_menu = e_source_combo_box_new (source_list); - book = e_book_new_default_addressbook (NULL); -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (qa->option_menu), e_book_get_source(book)); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (qa->option_menu), -+ e_book_get_source (book)); - if (qa->book) { - g_object_unref (qa->book); - qa->book = NULL; - } - qa->book = book ; -- source_selected(qa->option_menu, e_source_option_menu_peek_selected ((ESourceOptionMenu *)qa->option_menu), qa); -- g_signal_connect (qa->option_menu, "source_selected", G_CALLBACK (source_selected), qa); -+ source_changed (E_SOURCE_COMBO_BOX (qa->option_menu), qa); -+ g_signal_connect ( -+ qa->option_menu, "changed", -+ G_CALLBACK (source_changed), qa); - - 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 -@@ -141,7 +141,7 @@ - - - True -- memo_page_create_source_option_menu -+ memo_page_create_source_combo_box - 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 -@@ -774,7 +774,7 @@ - - - True -- event_page_create_source_option_menu -+ event_page_create_source_combo_box - 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 -@@ -618,7 +618,7 @@ - - 24 - True -- task_page_create_source_option_menu -+ task_page_create_source_combo_box - 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 -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -339,7 +339,6 @@ - ECalComponentDateTime d; - GSList *l; - const char *categories; -- ESource *source; - - mpage = MEMO_PAGE (page); - priv = mpage->priv; -@@ -432,8 +431,9 @@ - } - - /* Source */ -- source = e_cal_get_source (page->client); -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), source); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (priv->source_selector), -+ e_cal_get_source (page->client)); - - priv->updating = FALSE; - -@@ -844,13 +844,12 @@ - } - - static void --source_changed_cb (GtkWidget *widget, ESource *source, gpointer data) -+source_changed_cb (ESourceComboBox *source_combo_box, MemoPage *mpage) - { -- MemoPage *mpage; -- MemoPagePrivate *priv; -+ MemoPagePrivate *priv = mpage->priv; -+ ESource *source; - -- mpage = MEMO_PAGE (data); -- priv = mpage->priv; -+ source = e_source_combo_box_get_active (source_combo_box); - - if (!priv->updating) { - ECal *client; -@@ -862,8 +861,9 @@ - if (client) - g_object_unref (client); - -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), -- e_cal_get_source (COMP_EDITOR_PAGE (mpage)->client)); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (priv->source_selector), -+ e_cal_get_source (COMP_EDITOR_PAGE (mpage)->client)); - - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, - GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, -@@ -973,7 +973,7 @@ - G_CALLBACK (categories_clicked_cb), mpage); - - /* Source selector */ -- g_signal_connect((priv->source_selector), "source_selected", -+ g_signal_connect((priv->source_selector), "changed", - G_CALLBACK (source_changed_cb), mpage); - - /* Connect the default signal handler to use to make sure the "changed" -@@ -1167,21 +1167,22 @@ - return dedit; - } - --GtkWidget *memo_page_create_source_option_menu (void); -+GtkWidget *memo_page_create_source_combo_box (void); - - GtkWidget * --memo_page_create_source_option_menu (void) -+memo_page_create_source_combo_box (void) - { -- GtkWidget *menu; -+ GtkWidget *combo_box; - GConfClient *gconf_client; - ESourceList *source_list; - - gconf_client = gconf_client_get_default (); -- source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/memos/sources"); -+ source_list = e_source_list_new_for_gconf ( -+ gconf_client, "/apps/evolution/memos/sources"); - -- menu = e_source_option_menu_new (source_list); -+ combo_box = e_source_combo_box_new (source_list); - g_object_unref (source_list); - -- gtk_widget_show (menu); -- return menu; -+ 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 -@@ -33,7 +33,7 @@ - #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 @@ - ECalComponentDateTime start_date, end_date; - const char *location, *uid = NULL; - const char *categories; -- ESource *source; - GSList *l; - gboolean validated = TRUE; - -@@ -1163,8 +1162,9 @@ - e_dialog_editable_set (priv->categories, categories); - - /* Source */ -- source = e_cal_get_source (page->client); -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), source); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (priv->source_selector), -+ e_cal_get_source (page->client)); - - e_cal_component_get_uid (comp, &uid); - if (!(COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE) -@@ -2566,7 +2566,8 @@ - - if (!priv->sod) { - priv->sod = e_sendoptions_dialog_new (); -- source = e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (priv->source_selector)); -+ source = e_source_combo_box_get_active ( -+ E_SOURCE_COMBO_BOX (priv->source_selector)); - e_sendoptions_utils_set_default_data (priv->sod, source, "calendar"); - priv->sod->data->initialized = TRUE; - } -@@ -2595,13 +2596,12 @@ - } - - static void --source_changed_cb (GtkWidget *widget, ESource *source, gpointer data) -+source_changed_cb (ESourceComboBox *source_combo_box, EventPage *epage) - { -- EventPage *epage; -- EventPagePrivate *priv; -+ EventPagePrivate *priv = epage->priv; -+ ESource *source; - -- epage = EVENT_PAGE (data); -- priv = epage->priv; -+ source = e_source_combo_box_get_active (source_combo_box); - - if (!priv->updating) { - ECal *client; -@@ -2620,8 +2620,9 @@ - if (client) - g_object_unref (client); - -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), -- e_cal_get_source (COMP_EDITOR_PAGE (epage)->client)); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (priv->source_selector), -+ e_cal_get_source (COMP_EDITOR_PAGE (epage)->client)); - - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, - GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, -@@ -2847,7 +2848,7 @@ - G_CALLBACK (categories_clicked_cb), epage); - - /* Source selector */ -- g_signal_connect((priv->source_selector), "source_selected", -+ g_signal_connect((priv->source_selector), "changed", - G_CALLBACK (source_changed_cb), epage); - /* Alarms */ - priv->alarm_list_store = e_alarm_list_new (); -@@ -3148,23 +3149,24 @@ - return w; - } - --GtkWidget *event_page_create_source_option_menu (void); -+GtkWidget *event_page_create_source_combo_box (void); - - GtkWidget * --event_page_create_source_option_menu (void) -+event_page_create_source_combo_box (void) - { -- GtkWidget *menu; -+ GtkWidget *combo_box; - GConfClient *gconf_client; - ESourceList *source_list; - - gconf_client = gconf_client_get_default (); -- source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/calendar/sources"); -+ source_list = e_source_list_new_for_gconf ( -+ gconf_client, "/apps/evolution/calendar/sources"); - -- menu = e_source_option_menu_new (source_list); -+ combo_box = e_source_combo_box_new (source_list); - g_object_unref (source_list); - -- gtk_widget_show (menu); -- return menu; -+ gtk_widget_show (combo_box); -+ return combo_box; - } - - 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 -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include "common/authentication.h" -@@ -513,7 +513,6 @@ - icalcomponent *icalcomp; - const char *categories, *uid; - icaltimezone *zone, *default_zone; -- ESource *source; - - tpage = TASK_PAGE (page); - priv = tpage->priv; -@@ -657,8 +656,9 @@ - e_dialog_editable_set (priv->categories, categories); - - /* Source */ -- source = e_cal_get_source (page->client); -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), source); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (priv->source_selector), -+ e_cal_get_source (page->client)); - - if (priv->is_assignment) { - ECalComponentOrganizer organizer; -@@ -1617,13 +1617,12 @@ - } - - static void --source_changed_cb (GtkWidget *widget, ESource *source, gpointer data) -+source_changed_cb (ESourceComboBox *source_combo_box, TaskPage *tpage) - { -- TaskPage *tpage; -- TaskPagePrivate *priv; -+ TaskPagePrivate *priv = tpage->priv; -+ ESource *source; - -- tpage = TASK_PAGE (data); -- priv = tpage->priv; -+ source = e_source_combo_box_get_active (source_combo_box); - - if (!priv->updating) { - ECal *client; -@@ -1642,8 +1641,9 @@ - if (client) - g_object_unref (client); - -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), -- e_cal_get_source (COMP_EDITOR_PAGE (tpage)->client)); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (priv->source_selector), -+ e_cal_get_source (COMP_EDITOR_PAGE (tpage)->client)); - - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, - GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, -@@ -1655,7 +1655,7 @@ - comp_editor_notify_client_changed ( - COMP_EDITOR (gtk_widget_get_toplevel (priv->main)), - client); -- field_changed_cb (widget, data); -+ field_changed_cb (GTK_WIDGET (source_combo_box), tpage); - 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 @@ - if (!priv->sod) { - priv->sod = e_sendoptions_dialog_new (); - priv->sod->data->initialized = TRUE; -- source = e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (priv->source_selector)); -+ source = e_source_combo_box_get_active ( -+ E_SOURCE_COMBO_BOX (priv->source_selector)); - e_sendoptions_utils_set_default_data (priv->sod, source, "task"); - } - -@@ -1734,7 +1735,7 @@ - G_CALLBACK (categories_clicked_cb), tpage); - - /* Source selector */ -- g_signal_connect((priv->source_selector), "source_selected", -+ g_signal_connect((priv->source_selector), "source_changed", - G_CALLBACK (source_changed_cb), tpage); - - /* Connect the default signal handler to use to make sure the "changed" -@@ -1955,21 +1956,22 @@ - return dedit; - } - --GtkWidget *task_page_create_source_option_menu (void); -+GtkWidget *task_page_create_source_combo_box (void); - - GtkWidget * --task_page_create_source_option_menu (void) -+task_page_create_source_combo_box (void) - { -- GtkWidget *menu; -+ GtkWidget *combo_box; - GConfClient *gconf_client; - ESourceList *source_list; - - gconf_client = gconf_client_get_default (); -- source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/tasks/sources"); -+ source_list = e_source_list_new_for_gconf ( -+ gconf_client, "/apps/evolution/tasks/sources"); - -- menu = e_source_option_menu_new (source_list); -+ combo_box = e_source_combo_box_new (source_list); - g_object_unref (source_list); - -- gtk_widget_show (menu); -- return menu; -+ 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 -@@ -44,7 +44,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -226,13 +226,13 @@ - } EItipControlFindData; - - static void --source_selected_cb (ESourceOptionMenu *esom, ESource *source, gpointer data) -+source_changed_cb (ESourceComboBox *escb, EItipControl *itip) - { -- EItipControl *itip = data; -- EItipControlPrivate *priv; -- -- priv = itip->priv; -+ EItipControlPrivate *priv = itip->priv; -+ ESource *source; - -+ source = e_source_combo_box_get_active (escb); -+ - if (priv->ok) - gtk_widget_set_sensitive (priv->ok, FALSE); - -@@ -273,7 +273,7 @@ - cleanup: - if (fd->count == 0) { - if (fd->show_selector && !priv->current_ecal && priv->vbox) { -- GtkWidget *esom; -+ GtkWidget *escb; - char *uid; - - switch (priv->type) { -@@ -297,17 +297,17 @@ - if (!source) - source = e_source_list_peek_source_any (priv->source_lists[priv->type]); - -- esom = e_source_option_menu_new (priv->source_lists[priv->type]); -- g_signal_connect_object (esom, "source_selected", -- G_CALLBACK (source_selected_cb), -- fd->itip, 0); -+ escb = e_source_combo_box_new (priv->source_lists[priv->type]); -+ g_signal_connect_object ( -+ escb, "changed", -+ G_CALLBACK (source_changed_cb), fd->itip, 0); - -- gtk_box_pack_start (GTK_BOX (priv->vbox), esom, FALSE, TRUE, 0); -- gtk_widget_show (esom); -+ gtk_box_pack_start (GTK_BOX (priv->vbox), escb, FALSE, TRUE, 0); -+ gtk_widget_show (escb); - - /* FIXME What if there is no source? */ - if (source) -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (esom), source); -+ e_source_combo_box_set_active (E_SOURCE_COMBO_BOX (escb), source); - } else { - /* FIXME Display error message to user */ - } diff --git a/evolution-2.4.1-hide-switcher-buttons-by-default.patch b/evolution-2.4.1-hide-switcher-buttons-by-default.patch deleted file mode 100644 index bada5b5..0000000 --- a/evolution-2.4.1-hide-switcher-buttons-by-default.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- evolution-2.4.1/shell/apps_evolution_shell.schemas.in.in.hide-switcher-buttons-by-default 2005-10-26 16:21:15.000000000 -0400 -+++ evolution-2.4.1/shell/apps_evolution_shell.schemas.in.in 2005-10-26 16:21:22.000000000 -0400 -@@ -99,7 +99,7 @@ - /apps/evolution/shell/view_defaults/buttons_visible - evolution - bool -- TRUE -+ FALSE - - Window buttons are visible - Whether the window buttons should be visible. diff --git a/evolution-2.5.4-fix-conduit-dir.patch b/evolution-2.5.4-fix-conduit-dir.patch deleted file mode 100644 index cba890a..0000000 --- a/evolution-2.5.4-fix-conduit-dir.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- evolution-2.9.5/addressbook/conduit/Makefile.am.fix-conduit-dir 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.9.5/addressbook/conduit/Makefile.am 2007-01-21 22:05:23.000000000 -0500 -@@ -28,7 +28,7 @@ - -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ - $< > $@ - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-address-$(BASE_VERSION).conduit - - BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.9.5/addressbook/conduit/Makefile.in.fix-conduit-dir 2007-01-21 22:05:44.000000000 -0500 -+++ evolution-2.9.5/addressbook/conduit/Makefile.in 2007-01-21 22:06:04.000000000 -0500 -@@ -459,7 +459,7 @@ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS) - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-address-$(BASE_VERSION).conduit - BUILT_SOURCES = $(conduit_DATA) - CLEANFILES = $(BUILT_SOURCES) ---- evolution-2.9.5/calendar/conduits/todo/Makefile.am.fix-conduit-dir 2007-01-03 10:34:54.000000000 -0500 -+++ evolution-2.9.5/calendar/conduits/todo/Makefile.am 2007-01-21 22:05:23.000000000 -0500 -@@ -24,7 +24,7 @@ - -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ - $< > $@ - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-todo-$(BASE_VERSION).conduit - - BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.9.5/calendar/conduits/todo/Makefile.in.fix-conduit-dir 2007-01-21 22:06:31.000000000 -0500 -+++ evolution-2.9.5/calendar/conduits/todo/Makefile.in 2007-01-21 22:06:39.000000000 -0500 -@@ -454,7 +454,7 @@ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(EVOLUTION_CALENDAR_CONDUIT_LIBS) - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-todo-$(BASE_VERSION).conduit - BUILT_SOURCES = $(conduit_DATA) - CLEANFILES = $(BUILT_SOURCES) ---- evolution-2.9.5/calendar/conduits/memo/Makefile.am.fix-conduit-dir 2007-01-03 10:34:54.000000000 -0500 -+++ evolution-2.9.5/calendar/conduits/memo/Makefile.am 2007-01-21 22:05:23.000000000 -0500 -@@ -24,7 +24,7 @@ - -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ - $< > $@ - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-memo-$(BASE_VERSION).conduit - - BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.9.5/calendar/conduits/memo/Makefile.in.fix-conduit-dir 2007-01-21 22:06:46.000000000 -0500 -+++ evolution-2.9.5/calendar/conduits/memo/Makefile.in 2007-01-21 22:06:54.000000000 -0500 -@@ -454,7 +454,7 @@ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(EVOLUTION_CALENDAR_CONDUIT_LIBS) - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-memo-$(BASE_VERSION).conduit - BUILT_SOURCES = $(conduit_DATA) - CLEANFILES = $(BUILT_SOURCES) ---- evolution-2.9.5/calendar/conduits/calendar/Makefile.am.fix-conduit-dir 2007-01-03 10:34:54.000000000 -0500 -+++ evolution-2.9.5/calendar/conduits/calendar/Makefile.am 2007-01-21 22:05:23.000000000 -0500 -@@ -24,7 +24,7 @@ - -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ - $< > $@ - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-calendar-$(BASE_VERSION).conduit - - BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.9.5/calendar/conduits/calendar/Makefile.in.fix-conduit-dir 2007-01-21 22:06:15.000000000 -0500 -+++ evolution-2.9.5/calendar/conduits/calendar/Makefile.in 2007-01-21 22:06:23.000000000 -0500 -@@ -456,7 +456,7 @@ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(EVOLUTION_CALENDAR_CONDUIT_LIBS) - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-calendar-$(BASE_VERSION).conduit - BUILT_SOURCES = $(conduit_DATA) - CLEANFILES = $(BUILT_SOURCES) diff --git a/evolution-2.5.4-fix-conduits.patch b/evolution-2.5.4-fix-conduits.patch deleted file mode 100644 index d718ee2..0000000 --- a/evolution-2.5.4-fix-conduits.patch +++ /dev/null @@ -1,515 +0,0 @@ ---- evolution-2.5.4/addressbook/conduit/address-conduit.c.fix-conduits 2005-12-08 03:15:02.000000000 -0500 -+++ evolution-2.5.4/addressbook/conduit/address-conduit.c 2006-01-10 19:33:44.000000000 -0500 -@@ -462,14 +462,19 @@ - { - static char buff[ 4096 ]; - struct Address addr; -+ pi_buffer_t piBuf; - - if (remote == NULL) { - sprintf (buff, "[NULL]"); - return buff; - } - -+ piBuf.data = remote->record; -+ piBuf.allocated = remote->length; -+ piBuf.used = remote->length; -+ - memset (&addr, 0, sizeof (struct Address)); -- unpack_Address (&addr, remote->record, remote->length); -+ unpack_Address (&addr, &piBuf, address_v1); - - g_snprintf (buff, 4096, "['%s' '%s' '%s']", - addr.entry[entryLastname] ? -@@ -791,7 +796,8 @@ - EAddrConduitContext *ctxt) - { - GnomePilotRecord p; -- static char record[0xffff]; -+ static unsigned char record[0xffff]; -+ pi_buffer_t piBuf; - - g_assert (local->addr != NULL ); - -@@ -803,9 +809,17 @@ - p.archived = local->local.archived; - p.secret = local->local.secret; - -+ memset (&piBuf, 0, sizeof (piBuf)); -+ memset (record, 0, sizeof (record)); -+ pack_Address (local->addr, &piBuf, address_v1); -+ - /* Generate pilot record structure */ -+ if (piBuf.used > 0) -+ memcpy (record, piBuf.data, piBuf.used); - p.record = record; -- p.length = pack_Address (local->addr, p.record, 0xffff); -+ p.length = piBuf.used; -+ if (piBuf.data) -+ free (piBuf.data); - - return p; - } -@@ -834,16 +848,16 @@ - */ - if (local->local.ID != 0) { - struct Address addr; -- char record[0xffff]; -+ pi_buffer_t *buffer = pi_buffer_new (0xffff); - int cat = 0; - - if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, - ctxt->dbi->db_handle, -- local->local.ID, &record, -- NULL, NULL, NULL, &cat) > 0) { -+ local->local.ID, buffer, -+ NULL, NULL, &cat) > 0) { - local->local.category = cat; - memset (&addr, 0, sizeof (struct Address)); -- unpack_Address (&addr, record, 0xffff); -+ unpack_Address (&addr, buffer, address_v1); - for (i = 0; i < 5; i++) { - if (addr.entry[entryPhone1 + i]) - local->addr->entry[entryPhone1 + i] = -@@ -858,6 +872,8 @@ - } - free_Address (&addr); - } -+ -+ pi_buffer_free (buffer); - } - - local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME)); -@@ -1019,10 +1035,16 @@ - EContactField next_mail, next_home, next_work, next_fax; - EContactField next_other, next_main, next_pager, next_mobile; - int i; -+ pi_buffer_t piBuf; - - g_return_val_if_fail(remote!=NULL,NULL); - memset (&address, 0, sizeof (struct Address)); -- unpack_Address (&address, remote->record, remote->length); -+ -+ piBuf.data = remote->record; -+ piBuf.allocated = remote->length; -+ piBuf.used = remote->length; -+ -+ unpack_Address (&address, &piBuf, address_v1); - - if (in_contact == NULL) - contact = e_contact_new (); -@@ -1212,7 +1234,7 @@ - EBookQuery *query; - GList *l; - int len; -- unsigned char *buf; -+ pi_buffer_t *buffer; - char *filename; - char *change_id; - char *auth; -@@ -1302,9 +1324,9 @@ - gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records); - gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records); - -- buf = (unsigned char*)g_malloc (0xffff); -+ buffer = pi_buffer_new (0xffff); - len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -- (unsigned char *)buf, 0xffff); -+ -1, buffer); - - if (len < 0) { - WARN (_("Could not read pilot's Address application block")); -@@ -1313,8 +1335,8 @@ - _("Could not read pilot's Address application block")); - return -1; - } -- unpack_AddressAppInfo (&(ctxt->ai), buf, len); -- g_free (buf); -+ unpack_AddressAppInfo (&(ctxt->ai), buffer->data, len); -+ pi_buffer_free (buffer); - - check_for_slow_setting (conduit, ctxt); - if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot ---- evolution-2.5.4/calendar/conduits/calendar/calendar-conduit.c.fix-conduits 2006-01-02 06:38:57.000000000 -0500 -+++ evolution-2.5.4/calendar/conduits/calendar/calendar-conduit.c 2006-01-10 19:33:44.000000000 -0500 -@@ -413,14 +413,20 @@ - { - static char buff[ 4096 ]; - struct Appointment appt; -+ pi_buffer_t piBuf; - - if (remote == NULL) { - sprintf (buff, "[NULL]"); - return buff; - } - -+ -+ piBuf.data = remote->record; -+ piBuf.allocated = remote->length; -+ piBuf.used = remote->length; -+ - memset (&appt, 0, sizeof (struct Appointment)); -- unpack_Appointment (&appt, remote->record, remote->length); -+ unpack_Appointment (&appt, &piBuf, datebook_v1); - - g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']", - mktime (&appt.begin), -@@ -818,7 +824,8 @@ - ECalConduitContext *ctxt) - { - GnomePilotRecord p; -- static char record[0xffff]; -+ static unsigned char record[0xffff]; -+ pi_buffer_t piBuf; - - g_assert (local->comp != NULL); - g_assert (local->appt != NULL ); -@@ -829,9 +836,17 @@ - p.archived = local->local.archived; - p.secret = local->local.secret; - -+ memset (&piBuf, 0, sizeof (piBuf)); -+ memset (record, 0, sizeof (record)); -+ pack_Appointment (local->appt, &piBuf, datebook_v1); -+ - /* Generate pilot record structure */ -+ if (piBuf.used > 0) -+ memcpy (record, piBuf.data, piBuf.used); - p.record = record; -- p.length = pack_Appointment (local->appt, p.record, 0xffff); -+ p.length = piBuf.used; -+ if (piBuf.data) -+ free (piBuf.data); - - return p; - } -@@ -867,22 +882,24 @@ - * we don't overwrite them - */ - if (local->local.ID != 0) { -- struct Appointment appt; -- char record[0xffff]; -+ struct Appointment appt; -+ pi_buffer_t *buffer = pi_buffer_new (0xffff); - int cat = 0; - - if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, - ctxt->dbi->db_handle, -- local->local.ID, &record, -- NULL, NULL, NULL, &cat) > 0) { -+ local->local.ID, buffer, -+ NULL, NULL, &cat) > 0) { - local->local.category = cat; - memset (&appt, 0, sizeof (struct Appointment)); -- unpack_Appointment (&appt, record, 0xffff); -+ unpack_Appointment (&appt, buffer, datebook_v1); - local->appt->alarm = appt.alarm; - local->appt->advance = appt.advance; - local->appt->advanceUnits = appt.advanceUnits; - free_Appointment (&appt); - } -+ -+ pi_buffer_free (buffer); - } - - /* STOP: don't replace these with g_strdup, since free_Appointment -@@ -1140,11 +1157,17 @@ - GSList *edl = NULL; - char *txt; - int pos, i; -+ pi_buffer_t piBuf; - - g_return_val_if_fail (remote != NULL, NULL); - -+ -+ piBuf.data = remote->record; -+ piBuf.allocated = remote->length; -+ piBuf.used = remote->length; -+ - memset (&appt, 0, sizeof (struct Appointment)); -- unpack_Appointment (&appt, remote->record, remote->length); -+ unpack_Appointment (&appt, &piBuf, datebook_v1); - - if (in_comp == NULL) { - comp = e_cal_component_new (); -@@ -1409,7 +1432,7 @@ - GnomePilotConduitSyncAbs *abs_conduit; - GList *removed = NULL, *added = NULL, *l; - int len; -- unsigned char *buf; -+ pi_buffer_t *buffer; - char *filename, *change_id; - icalcomponent *icalcomp; - gint num_records, add_records = 0, mod_records = 0, del_records = 0; -@@ -1521,9 +1544,9 @@ - gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records); - gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records); - -- buf = (unsigned char*)g_malloc (0xffff); -+ buffer = pi_buffer_new (0xffff); - len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -- (unsigned char *)buf, 0xffff); -+ -1, buffer); - - if (len < 0) { - WARN (_("Could not read pilot's Calendar application block")); -@@ -1532,8 +1555,8 @@ - _("Could not read pilot's Calendar application block")); - return -1; - } -- unpack_AppointmentAppInfo (&(ctxt->ai), buf, len); -- g_free (buf); -+ unpack_AppointmentAppInfo (&(ctxt->ai), buffer->data, len); -+ pi_buffer_free (buffer); - - check_for_slow_setting (conduit, ctxt); - if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot ---- evolution-2.5.4/calendar/conduits/todo/todo-conduit.c.fix-conduits 2005-12-08 03:15:03.000000000 -0500 -+++ evolution-2.5.4/calendar/conduits/todo/todo-conduit.c 2006-01-10 19:33:44.000000000 -0500 -@@ -402,14 +402,19 @@ - { - static char buff[ 4096 ]; - struct ToDo todo; -+ pi_buffer_t piBuf; - - if (remote == NULL) { - sprintf (buff, "[NULL]"); - return buff; - } - -+ piBuf.data = remote->record; -+ piBuf.allocated = remote->length; -+ piBuf.used = remote->length; -+ - memset (&todo, 0, sizeof (struct ToDo)); -- unpack_ToDo (&todo, remote->record, remote->length); -+ unpack_ToDo (&todo, &piBuf, todo_v1); - - g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s' %d]", - todo.indefinite, -@@ -594,7 +599,8 @@ - EToDoConduitContext *ctxt) - { - GnomePilotRecord p; -- static char record[0xffff]; -+ static unsigned char record[0xffff]; -+ pi_buffer_t piBuf; - - g_assert (local->comp != NULL); - g_assert (local->todo != NULL ); -@@ -607,9 +613,17 @@ - p.archived = local->local.archived; - p.secret = local->local.secret; - -+ memset (&piBuf, 0, sizeof (piBuf)); -+ memset (record, 0, sizeof (record)); -+ pack_ToDo (local->todo, &piBuf, todo_v1); -+ - /* Generate pilot record structure */ -+ if (piBuf.used > 0) -+ memcpy (record, piBuf.data, piBuf.used); - p.record = record; -- p.length = pack_ToDo (local->todo, p.record, 0xffff); -+ p.length = piBuf.used; -+ if (piBuf.data) -+ free (piBuf.data); - - return p; - } -@@ -696,15 +710,17 @@ - - /* Don't overwrite the category */ - if (local->local.ID != 0) { -- char record[0xffff]; -+ pi_buffer_t *buffer = pi_buffer_new (0xffff); - int cat = 0; - - if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, - ctxt->dbi->db_handle, -- local->local.ID, &record, -- NULL, NULL, NULL, &cat) > 0) { -+ local->local.ID, buffer, -+ NULL, NULL, &cat) > 0) { - local->local.category = cat; - } -+ -+ pi_buffer_free (buffer); - } - - /* -@@ -859,12 +875,17 @@ - icaltimezone *utc_zone; - int priority; - char *txt; -+ pi_buffer_t piBuf; - char *category; - - g_return_val_if_fail (remote != NULL, NULL); - -+ piBuf.data = remote->record; -+ piBuf.allocated = remote->length; -+ piBuf.used = remote->length; -+ - memset (&todo, 0, sizeof (struct ToDo)); -- unpack_ToDo (&todo, remote->record, remote->length); -+ unpack_ToDo (&todo, &piBuf, todo_v1); - - utc_zone = icaltimezone_get_utc_timezone (); - now = icaltime_from_timet_with_zone (time (NULL), FALSE, -@@ -1014,7 +1035,7 @@ - GnomePilotConduitSyncAbs *abs_conduit; - GList *l; - int len; -- unsigned char *buf; -+ pi_buffer_t *buffer; - char *filename, *change_id; - icalcomponent *icalcomp; - gint num_records, add_records = 0, mod_records = 0, del_records = 0; -@@ -1104,9 +1125,9 @@ - g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n", - num_records, add_records, mod_records, del_records); - -- buf = (unsigned char*)g_malloc (0xffff); -+ buffer = pi_buffer_new (0xffff); - len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -- (unsigned char *)buf, 0xffff); -+ -1, buffer); - - if (len < 0) { - WARN (_("Could not read pilot's ToDo application block")); -@@ -1115,8 +1136,8 @@ - _("Could not read pilot's ToDo application block")); - return -1; - } -- unpack_ToDoAppInfo (&(ctxt->ai), buf, len); -- g_free (buf); -+ unpack_ToDoAppInfo (&(ctxt->ai), buffer->data, len); -+ pi_buffer_free (buffer); - - lastDesktopUniqueID = 128; - ---- evolution-2.5.4/calendar/conduits/memo/memo-conduit.c.fix-conduits 2006-01-10 22:52:28.000000000 -0500 -+++ evolution-2.5.4/calendar/conduits/memo/memo-conduit.c 2006-01-10 23:11:47.000000000 -0500 -@@ -331,14 +331,19 @@ - { - static char buff[ 64 ]; - struct Memo memo; -+ pi_buffer_t piBuf; - - if (remote == NULL) { - sprintf (buff, "[NULL]"); - return buff; - } - -+ piBuf.data = remote->record; -+ piBuf.allocated = remote->length; -+ piBuf.used = remote->length; -+ - memset (&memo, 0, sizeof (struct Memo)); -- unpack_Memo (&memo, remote->record, remote->length); -+ unpack_Memo (&memo, &piBuf, memo_v1); - - g_snprintf (buff, 64, "['%s']", - memo.text ? -@@ -451,7 +456,8 @@ - EMemoConduitContext *ctxt) - { - GnomePilotRecord p; -- static char record[0xffff]; -+ static unsigned char record[0xffff]; -+ pi_buffer_t piBuf; - - g_assert (local->comp != NULL); - g_assert (local->memo != NULL ); -@@ -466,8 +472,14 @@ - - /* Generate pilot record structure */ - p.record = record; -- p.length = pack_Memo (local->memo, p.record, 0xffff); -- -+ memset (&piBuf, 0, sizeof (piBuf)); -+ memset (record, 0, sizeof (record)); -+ p.length = pack_Memo (local->memo, &piBuf, memo_v1); -+ if (piBuf.used > 0) -+ memcpy (record, piBuf.data, piBuf.used); -+ p.length = piBuf.used; -+ if (piBuf.data) -+ free (piBuf.data); - return p; - } - -@@ -568,16 +580,17 @@ - - /* Don't overwrite the category */ - if (local->local.ID != 0) { -- char record[0xffff]; -+ pi_buffer_t *buffer = pi_buffer_new (0xffff); - int cat = 0; - - LOG(fprintf(stderr, "local_record_from_comp: calling dlp_ReadRecordById\n")); - if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, - ctxt->dbi->db_handle, -- local->local.ID, &record, -- NULL, NULL, NULL, &cat) > 0) { -+ local->local.ID, buffer, -+ NULL, NULL, &cat) > 0) { - local->local.category = cat; - } -+ pi_buffer_free (buffer); - LOG(fprintf(stderr, "local_record_from_comp: done calling dlp_ReadRecordById\n")); - } - -@@ -699,6 +712,7 @@ - { - ECalComponent *comp; - struct Memo memo; -+ pi_buffer_t piBuf; - struct icaltimetype now; - icaltimezone *utc_zone; - char *txt, *txt2, *txt3; -@@ -707,8 +721,12 @@ - - g_return_val_if_fail (remote != NULL, NULL); - -+ piBuf.data = remote->record; -+ piBuf.allocated = remote->length; -+ piBuf.used = remote->length; -+ - memset (&memo, 0, sizeof (struct Memo)); -- unpack_Memo (&memo, remote->record, remote->length); -+ unpack_Memo (&memo, &piBuf, memo_v1); - - utc_zone = icaltimezone_get_utc_timezone (); - now = icaltime_from_timet_with_zone (time (NULL), FALSE, -@@ -836,7 +854,7 @@ - GnomePilotConduitSyncAbs *abs_conduit; - GList *l; - int len; -- unsigned char *buf; -+ pi_buffer_t *buffer; - char *filename, *change_id; - icalcomponent *icalcomp; - gint num_records, add_records = 0, mod_records = 0, del_records = 0; -@@ -929,9 +947,9 @@ - g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n", - num_records, add_records, mod_records, del_records); - -- buf = (unsigned char*)g_malloc (0xffff); -+ buffer = pi_buffer_new (0xffff); - len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -- (unsigned char *)buf, 0xffff); -+ -1, buffer); - - if (len < 0) { - WARN (_("Could not read pilot's Memo application block")); -@@ -940,8 +958,8 @@ - _("Could not read pilot's Memo application block")); - return -1; - } -- unpack_MemoAppInfo (&(ctxt->ai), buf, len); -- g_free (buf); -+ unpack_MemoAppInfo (&(ctxt->ai), buffer->data, len); -+ pi_buffer_free (buffer); - - lastDesktopUniqueID = 128; - diff --git a/evolution-2.5.5.1-commit-enter-on-calendar.patch b/evolution-2.5.5.1-commit-enter-on-calendar.patch deleted file mode 100644 index 84e58f2..0000000 --- a/evolution-2.5.5.1-commit-enter-on-calendar.patch +++ /dev/null @@ -1,242 +0,0 @@ ---- evolution-2.5.5.1/calendar/gui/e-day-view.c.commit-enter-on-calendar 2006-01-16 09:42:17.000000000 -0500 -+++ evolution-2.5.5.1/calendar/gui/e-day-view.c 2006-01-25 23:48:24.000000000 -0500 -@@ -334,6 +334,10 @@ - gint event_num, - gchar *initial_text); - static void e_day_view_stop_editing_event (EDayView *day_view); -+static gboolean e_day_view_text_keypress (GnomeCanvasItem *item, -+ guint keyval, -+ guint state, -+ EDayView *day_view); - static gboolean e_day_view_on_text_item_event (GnomeCanvasItem *item, - GdkEvent *event, - EDayView *day_view); -@@ -4484,6 +4488,8 @@ - G_CALLBACK (e_day_view_on_text_item_event), day_view); - g_signal_emit_by_name (G_OBJECT(day_view), - "event_added", event); -+ g_signal_connect (event->canvas_item, "keypress", -+ G_CALLBACK (e_day_view_text_keypress), day_view); - - e_day_view_update_long_event_label (day_view, event_num); - } -@@ -4667,6 +4673,8 @@ - G_CALLBACK (e_day_view_on_text_item_event), day_view); - g_signal_emit_by_name (G_OBJECT(day_view), - "event_added", event); -+ g_signal_connect (event->canvas_item, "keypress", -+ G_CALLBACK (e_day_view_text_keypress), day_view); - - e_day_view_update_event_label (day_view, day, event_num); - } -@@ -5824,46 +5832,74 @@ - } - - static gboolean -+e_day_view_text_keypress (GnomeCanvasItem *item, -+ guint keyval, -+ guint state, -+ EDayView *day_view) -+{ -+ gboolean retval = FALSE; -+ -+ tooltip_destroy (day_view, item); -+ -+ if (keyval == GDK_Return) { -+ EText *text = E_TEXT (item); -+ gint new_pos = 0; -+ -+ /* -+ * HACK: last character which should be \n needs to be deleted -+ * here so that GDK_Return was already processed on EText -+ * before E_TEXT_KEYPRESS event is emitted. -+ */ -+ if (text->selection_end >= 1) -+ new_pos = text->selection_end - 1; -+ -+ text->selection_end = e_text_model_validate_position (text->model, new_pos); -+ e_text_delete_selection (text); -+ -+ day_view->resize_event_num = -1; -+ -+ /* We set the keyboard focus to the EDayView, so the -+ EText item loses it and stops the edit. */ -+ gtk_widget_grab_focus (GTK_WIDGET (day_view)); -+ -+ /* Stop the signal last or we will also stop any -+ other events getting to the EText item. */ -+ gtk_signal_emit_stop_by_name (GTK_OBJECT (item), -+ "event"); -+ -+ retval = TRUE; -+ } else if (keyval == GDK_Escape) { -+ cancel_editing (day_view); -+ gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event"); -+ /* focus should go to day view when stop editing */ -+ gtk_widget_grab_focus (GTK_WIDGET (day_view)); -+ -+ retval = TRUE; -+ } else if ((keyval == GDK_Up) -+ && (state & GDK_SHIFT_MASK) -+ && (state & GDK_CONTROL_MASK) -+ && !(state & GDK_MOD1_MASK)) { -+ e_day_view_change_event_end_time_up (day_view); -+ -+ retval = TRUE; -+ } else if ((keyval == GDK_Down) -+ && (state & GDK_SHIFT_MASK) -+ && (state & GDK_CONTROL_MASK) -+ && !(state & GDK_MOD1_MASK)) { -+ e_day_view_change_event_end_time_down (day_view); -+ -+ retval = TRUE; -+ } -+ -+ return retval; -+} -+ -+static gboolean - e_day_view_on_text_item_event (GnomeCanvasItem *item, - GdkEvent *event, - EDayView *day_view) - { - switch (event->type) { -- case GDK_KEY_PRESS: -- tooltip_destroy (day_view, item); -- if (event && event->key.keyval == GDK_Return) { -- day_view->resize_event_num = -1; -- day_view->resize_event_num = -1; -- -- /* We set the keyboard focus to the EDayView, so the -- EText item loses it and stops the edit. */ -- gtk_widget_grab_focus (GTK_WIDGET (day_view)); -- -- /* Stop the signal last or we will also stop any -- other events getting to the EText item. */ -- gtk_signal_emit_stop_by_name (GTK_OBJECT (item), -- "event"); -- return TRUE; -- } else if (event->key.keyval == GDK_Escape) { -- cancel_editing (day_view); -- gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event"); -- /* focus should go to day view when stop editing */ -- gtk_widget_grab_focus (GTK_WIDGET (day_view)); -- return TRUE; -- } else if ((event->key.keyval == GDK_Up) -- && (event->key.state & GDK_SHIFT_MASK) -- && (event->key.state & GDK_CONTROL_MASK) -- && !(event->key.state & GDK_MOD1_MASK)) { -- e_day_view_change_event_end_time_up (day_view); -- return TRUE; -- } else if ((event->key.keyval == GDK_Down) -- && (event->key.state & GDK_SHIFT_MASK) -- && (event->key.state & GDK_CONTROL_MASK) -- && !(event->key.state & GDK_MOD1_MASK)) { -- e_day_view_change_event_end_time_down (day_view); -- return TRUE; -- } -- break; - case GDK_2BUTTON_PRESS: - #if 0 - g_print ("Item got double-click\n"); ---- evolution-2.5.5.1/calendar/gui/e-week-view.c.commit-enter-on-calendar 2006-01-16 09:42:17.000000000 -0500 -+++ evolution-2.5.5.1/calendar/gui/e-week-view.c 2006-01-25 23:46:43.000000000 -0500 -@@ -175,6 +175,10 @@ - const gchar *uid, - EWeekViewForeachEventCallback callback, - gpointer data); -+static gboolean e_week_view_text_keypress (GnomeCanvasItem *item, -+ guint keyval, -+ guint state, -+ EWeekView *week_view); - static gboolean e_week_view_on_text_item_event (GnomeCanvasItem *item, - GdkEvent *event, - EWeekView *week_view); -@@ -2771,6 +2775,8 @@ - week_view); - g_signal_emit_by_name (G_OBJECT(week_view), - "event_added", event); -+ g_signal_connect (span->text_item, "keypress", -+ G_CALLBACK (e_week_view_text_keypress), week_view); - - } - -@@ -3028,6 +3034,51 @@ - } - - static gboolean -+e_week_view_text_keypress (GnomeCanvasItem *item, -+ guint keyval, -+ guint state, -+ EWeekView *week_view) -+{ -+ gboolean retval = FALSE; -+ -+ tooltip_destroy (week_view, item); -+ -+ if (keyval == GDK_Return) { -+ EText *text = E_TEXT (item); -+ gint new_pos = 0; -+ -+ /* -+ * HACK: last charater which should be \n needs to be deleted -+ * here so that GDK_Return was already processed on EText -+ * before E_TEXT_KEYPRESS event is emitted. -+ */ -+ if (text->selection_end >= 1) -+ new_pos = text->selection_end - 1; -+ -+ text->selection_end = e_text_model_validate_position (text->model, new_pos); -+ e_text_delete_selection (text); -+ -+ /* We set the keyboard focus to the EDayView, so the -+ EText item loses it and stops the edit. */ -+ gtk_widget_grab_focus (GTK_WIDGET (week_view)); -+ -+ /* Stop the signal last or we will also stop any -+ other events getting to the EText item. */ -+ gtk_signal_emit_stop_by_name (GTK_OBJECT (item), -+ "event"); -+ retval = TRUE; -+ } else if (keyval == GDK_Escape) { -+ cancel_editing (week_view); -+ gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event"); -+ /* focus should go to week view when stop editing */ -+ gtk_widget_grab_focus (GTK_WIDGET (week_view)); -+ retval = TRUE; -+ } -+ -+ return retval; -+} -+ -+static gboolean - e_week_view_on_text_item_event (GnomeCanvasItem *item, - GdkEvent *gdkevent, - EWeekView *week_view) -@@ -3044,26 +3095,6 @@ - #endif - - switch (gdkevent->type) { -- case GDK_KEY_PRESS: -- tooltip_destroy (week_view, item); -- if (gdkevent && gdkevent->key.keyval == GDK_Return) { -- /* We set the keyboard focus to the EDayView, so the -- EText item loses it and stops the edit. */ -- gtk_widget_grab_focus (GTK_WIDGET (week_view)); -- -- /* Stop the signal last or we will also stop any -- other events getting to the EText item. */ -- gtk_signal_emit_stop_by_name (GTK_OBJECT (item), -- "event"); -- return TRUE; -- } else if (gdkevent->key.keyval == GDK_Escape) { -- cancel_editing (week_view); -- gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event"); -- /* focus should go to week view when stop editing */ -- gtk_widget_grab_focus (GTK_WIDGET (week_view)); -- return TRUE; -- } -- break; - case GDK_2BUTTON_PRESS: - if (!e_week_view_find_event_from_item (week_view, item, - &event_num, &span_num)) diff --git a/evolution-2.6.0-prototypes.patch b/evolution-2.6.0-prototypes.patch deleted file mode 100644 index 16fe7ab..0000000 --- a/evolution-2.6.0-prototypes.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- evolution-2.6.0/calendar/gui/dialogs/event-page.c.prototypes 2006-03-14 01:00:04.000000000 -0500 -+++ evolution-2.6.0/calendar/gui/dialogs/event-page.c 2006-03-14 01:00:21.000000000 -0500 -@@ -59,6 +59,8 @@ - #include "event-page.h" - #include "e-send-options-utils.h" - -+GtkWidget *alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store); -+ - - - /* Private part of the EventPage structure */ ---- evolution-2.6.0/calendar/gui/dialogs/cal-prefs-dialog.c.prototypes 2006-03-13 14:14:07.000000000 -0500 -+++ evolution-2.6.0/calendar/gui/dialogs/cal-prefs-dialog.c 2006-03-13 14:14:24.000000000 -0500 -@@ -32,6 +32,7 @@ - #include "../calendar-config.h" - #include "cal-prefs-dialog.h" - #include -+#include - #include - #include - #include diff --git a/evolution-2.7.1-no-gnome-common.patch b/evolution-2.7.1-no-gnome-common.patch deleted file mode 100644 index 513a16c..0000000 --- a/evolution-2.7.1-no-gnome-common.patch +++ /dev/null @@ -1,156 +0,0 @@ ---- evolution-2.9.5/configure.no-gnome-common 2007-01-21 22:00:01.000000000 -0500 -+++ evolution-2.9.5/configure 2007-01-21 22:00:53.000000000 -0500 -@@ -30764,141 +30764,6 @@ - - - -- # Check whether --enable-compile-warnings or --disable-compile-warnings was given. --if test "${enable_compile_warnings+set}" = set; then -- enableval="$enable_compile_warnings" -- --else -- enable_compile_warnings="yes" --fi; -- -- warnCFLAGS= -- if test "x$GCC" != xyes; then -- enable_compile_warnings=no -- fi -- -- warning_flags= -- realsave_CFLAGS="$CFLAGS" -- -- case "$enable_compile_warnings" in -- no) -- warning_flags= -- ;; -- minimum) -- warning_flags="-Wall" -- ;; -- yes) -- warning_flags="-Wall -Wmissing-prototypes" -- ;; -- maximum|error) -- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" -- CFLAGS="$warning_flags $CFLAGS" -- for option in -Wno-sign-compare; do -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $option" -- echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 --echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6 -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- has_option=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --has_option=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- CFLAGS="$SAVE_CFLAGS" -- echo "$as_me:$LINENO: result: $has_option" >&5 --echo "${ECHO_T}$has_option" >&6 -- if test $has_option = yes; then -- warning_flags="$warning_flags $option" -- fi -- unset has_option -- unset SAVE_CFLAGS -- done -- unset option -- if test "$enable_compile_warnings" = "error" ; then -- warning_flags="$warning_flags -Werror" -- fi -- ;; -- *) -- { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 --echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} -- { (exit 1); exit 1; }; } -- ;; -- esac -- CFLAGS="$realsave_CFLAGS" -- echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 --echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6 -- echo "$as_me:$LINENO: result: $warning_flags" >&5 --echo "${ECHO_T}$warning_flags" >&6 -- -- # Check whether --enable-iso-c or --disable-iso-c was given. --if test "${enable_iso_c+set}" = set; then -- enableval="$enable_iso_c" -- --else -- enable_iso_c=no --fi; -- -- echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 --echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6 -- complCFLAGS= -- if test "x$enable_iso_c" != "xno"; then -- if test "x$GCC" = "xyes"; then -- case " $CFLAGS " in -- *\ \ -ansi\ \ *) ;; -- *) complCFLAGS="$complCFLAGS -ansi" ;; -- esac -- case " $CFLAGS " in -- *\ \ -pedantic\ \ *) ;; -- *) complCFLAGS="$complCFLAGS -pedantic" ;; -- esac -- fi -- fi -- echo "$as_me:$LINENO: result: $complCFLAGS" >&5 --echo "${ECHO_T}$complCFLAGS" >&6 -- -- WARN_CFLAGS="$warning_flags $complCFLAGS" -- -- --CFLAGS="$CFLAGS $WARN_CFLAGS" - case $CFLAGS in - *-Wall*) - # Turn off the annoying "comparison between signed and unsigned" ---- evolution-2.9.5/configure.in.no-gnome-common 2007-01-08 11:54:43.000000000 -0500 -+++ evolution-2.9.5/configure.in 2007-01-21 21:57:28.000000000 -0500 -@@ -1133,9 +1133,6 @@ - dnl ************************* - dnl CFLAGS and LIBS and stuff - dnl ************************* -- --GNOME_COMPILE_WARNINGS(yes) --CFLAGS="$CFLAGS $WARN_CFLAGS" - case $CFLAGS in - *-Wall*) - # Turn off the annoying "comparison between signed and unsigned" diff --git a/evolution-2.7.1-notification-cleanups.patch b/evolution-2.7.1-notification-cleanups.patch deleted file mode 100644 index 1fb6841..0000000 --- a/evolution-2.7.1-notification-cleanups.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- evolution-2.7.2.1/calendar/gui/alarm-notify/alarm-queue.c.notification-cleanups 2006-04-22 00:39:20.000000000 -0400 -+++ evolution-2.7.2.1/calendar/gui/alarm-notify/alarm-queue.c 2006-05-23 16:04:23.000000000 -0400 -@@ -1566,10 +1566,11 @@ - const char *summary, *location; - GtkTooltips *tooltips; - ECalComponentText text; -- char *str, *start_str, *end_str, *alarm_str, *time_str; -+ char *start_str, *end_str, *alarm_str, *time_str; - icaltimezone *current_zone; - ECalComponentOrganizer organiser; - char *body; -+ NotifyNotification *n; - - d(printf("%s:%d (popup_notification)\n",__FILE__, __LINE__)); - -@@ -1601,9 +1602,6 @@ - end_str = timet_to_str_with_zone (qa->instance->occur_end, current_zone); - time_str = calculate_time (qa->instance->occur_start, qa->instance->occur_end); - -- str = g_strdup_printf ("%s %s", -- start_str, time_str); -- - if (organiser.cn) { - if (location) - body = g_strdup_printf ("%s\n%s %s\n%s %s", organiser.cn, _("Location:"), location, start_str, time_str); -@@ -1617,16 +1615,21 @@ - body = g_strdup_printf ("%s %s", start_str, time_str); - } - -- NotifyNotification *n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL); -- if (!notify_notification_show(n, NULL)) -+ n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL); -+ -+ /* Notifications don't timeout: require explicit user action: */ -+ notify_notification_set_timeout (n, NOTIFY_EXPIRES_NEVER); -+ -+ if (!notify_notification_show (n, NULL)) - g_warning ("Could not send notification to daemon\n"); - -- /* create the private structure */ -+ g_object_unref (n); -+ -+ g_free (body); - g_free (start_str); - g_free (end_str); - g_free (alarm_str); - g_free (time_str); -- g_free (str); - - - } 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.7.3-replicated-cjk-input.patch b/evolution-2.7.3-replicated-cjk-input.patch deleted file mode 100644 index 5501bae..0000000 --- a/evolution-2.7.3-replicated-cjk-input.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- evolution-2.7.3/widgets/text/e-text.c.replicated_cjk_input 2006-07-06 09:57:22.000000000 -0400 -+++ evolution-2.7.3/widgets/text/e-text.c 2006-07-06 09:58:27.000000000 -0400 -@@ -1498,7 +1498,8 @@ - } - - -- insert_preedit_text (text); -+ if (text->im_context_signals_registered) -+ insert_preedit_text (text); - - if (!pango_layout_get_text (text->layout)) - return; -@@ -2212,7 +2213,8 @@ - G_SIGNAL_MATCH_DATA, - 0, 0, NULL, - NULL, save_text); -- save_text->im_context_signals_registered = FALSE; -+ save_text->im_context_signals_registered = FALSE; -+ reset_layout (save_text); - } - - if (text->im_context) { diff --git a/evolution-2.7.4-candidate-window-position-calendar.patch b/evolution-2.7.4-candidate-window-position-calendar.patch deleted file mode 100644 index f8f4e59..0000000 --- a/evolution-2.7.4-candidate-window-position-calendar.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- evolution-2.7.4/widgets/text/e-text.h.cal 2006-07-13 10:15:56.000000000 -0400 -+++ evolution-2.7.4/widgets/text/e-text.h 2006-07-13 10:18:20.000000000 -0400 -@@ -109,6 +109,7 @@ - - const gchar *text; /* Text to display --- from the ETextModel */ - gint preedit_len; /* preedit length to display */ -+ gint preedit_pos; /* preedit cursor position */ - PangoLayout *layout; - int num_lines; /* Number of lines of text */ - ---- evolution-2.7.4/widgets/text/e-text.c.cal 2006-07-13 10:15:51.000000000 -0400 -+++ evolution-2.7.4/widgets/text/e-text.c 2006-07-13 10:18:20.000000000 -0400 -@@ -132,6 +132,7 @@ - - static void reset_layout_attrs (EText *text); - -+static void update_im_cursor_position (EText *text); - #if 0 - /* GtkEditable Methods */ - static void e_text_editable_do_insert_text (GtkEditable *editable, -@@ -325,6 +326,8 @@ - pango_layout_set_attributes (text->layout, attrs); - pango_attr_list_unref (attrs); - } -+ -+ update_im_cursor_position (text); - } - - if (preedit_string) -@@ -3723,6 +3726,7 @@ - text->model = e_text_model_new (); - text->text = e_text_model_get_text (text->model); - text->preedit_len = 0; -+ text->preedit_pos = 0; - text->layout = NULL; - - text->revert = NULL; -@@ -3840,17 +3844,71 @@ - } - } - -+/* -+ * Fetch cursor location into Strong or Weak positions so as to -+ * display the preedit candidate selection window in the right place -+ */ -+static void -+e_text_get_cursor_locations (EText *text, -+ GdkRectangle *strong_pos, -+ GdkRectangle *weak_pos) -+{ -+ double x1, y1; -+ PangoRectangle pango_strong_pos; -+ PangoRectangle pango_weak_pos; -+ int cx, cy; -+ gint index; -+ -+ gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (text), &x1, &y1, NULL, NULL); -+ -+ gnome_canvas_get_scroll_offsets (GNOME_CANVAS (GNOME_CANVAS_ITEM (text)->canvas), &cx, &cy); -+ -+ index = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text; -+ -+ pango_layout_get_cursor_pos (text->layout, index + text->preedit_pos, -+ strong_pos ? &pango_strong_pos : NULL, -+ weak_pos ? &pango_weak_pos : NULL); -+ -+ if (strong_pos) { -+ strong_pos->x = x1 - cx - text->xofs_edit + pango_strong_pos.x / PANGO_SCALE; -+ strong_pos->y = y1 - cy - text->yofs_edit + pango_strong_pos.y / PANGO_SCALE; -+ strong_pos->width = 0; -+ strong_pos->height = pango_strong_pos.height / PANGO_SCALE; -+ } -+ -+ if (weak_pos) { -+ weak_pos->x = x1 - cx - text->xofs_edit + pango_weak_pos.x / PANGO_SCALE; -+ weak_pos->y = y1 - cy - text->yofs_edit + pango_weak_pos.y / PANGO_SCALE; -+ weak_pos->width = 0; -+ weak_pos->height = pango_weak_pos.height / PANGO_SCALE; -+ } -+} -+ -+/* Update IM's cursor position to display candidate selection window */ -+static void -+update_im_cursor_position (EText *text) -+{ -+ GdkRectangle area; -+ -+ e_text_get_cursor_locations (text, &area, NULL); -+ -+ gtk_im_context_set_cursor_location (text->im_context, &area); -+} -+ - static void - e_text_preedit_changed_cb (GtkIMContext *context, -- EText *etext) -+ EText *etext) - { - gchar *preedit_string = NULL; -+ gint cursor_pos; - - gtk_im_context_get_preedit_string (context, &preedit_string, -- NULL, NULL); -+ NULL, &cursor_pos); - -+ cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1)); - etext->preedit_len = strlen (preedit_string); -- g_free (preedit_string); -+ etext->preedit_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string; -+ g_free (preedit_string); - - g_signal_emit (etext, e_text_signals[E_TEXT_KEYPRESS], 0, 0, 0); - } diff --git a/evolution-2.7.4-candidate-window-position-task.patch b/evolution-2.7.4-candidate-window-position-task.patch deleted file mode 100644 index 4ccaa5f..0000000 --- a/evolution-2.7.4-candidate-window-position-task.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- evolution-2.7.4/widgets/table/e-cell-text.c.task 2006-07-13 10:56:19.000000000 -0400 -+++ evolution-2.7.4/widgets/table/e-cell-text.c 2006-07-13 10:56:27.000000000 -0400 -@@ -199,6 +199,7 @@ - gboolean im_context_signals_registered; - - guint16 preedit_length; /* length of preedit string, in bytes */ -+ gint preedit_pos; /* position of preedit cursor */ - - ECellActions actions; - }; -@@ -222,6 +223,7 @@ - static void _insert (ECellTextView *text_view, char *string, int value); - static void _delete_selection (ECellTextView *text_view); - static PangoAttrList* build_attr_list (ECellTextView *text_view, int row, int text_length); -+static void update_im_cursor_location (ECellTextView *tv); - - static ECellClass *parent_class; - -@@ -560,6 +562,9 @@ - if (preedit_attrs) - pango_attr_list_unref (preedit_attrs); - pango_attr_list_unref (attrs); -+ -+ update_im_cursor_location (text_view); -+ - return layout; - } - -@@ -1863,6 +1868,66 @@ - /* IM Context Callbacks */ - - static void -+e_cell_text_get_cursor_locations (ECellTextView *tv, -+ GdkRectangle *strong_pos, -+ GdkRectangle *weak_pos) -+{ -+ GdkRectangle area; -+ CellEdit *edit=tv->edit; -+ ECellView *cell_view = (ECellView *)tv; -+ ETableItem *item = E_TABLE_ITEM ((cell_view)->e_table_item_view); -+ GnomeCanvasItem *parent_item = GNOME_CANVAS_ITEM (item)->parent; -+ PangoRectangle pango_strong_pos; -+ PangoRectangle pango_weak_pos; -+ gint x, y, col, row; -+ gdouble x1,y1; -+ gint cx, cy; -+ gint index; -+ -+ row = edit->row; -+ col = edit->view_col; -+ -+ e_table_item_get_cell_geometry (item, &row, &col, -+ &x, &y, NULL, &area.height); -+ -+ gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (parent_item), &x1, &y1, NULL, NULL); -+ -+ gnome_canvas_get_scroll_offsets (GNOME_CANVAS (GNOME_CANVAS_ITEM (parent_item)->canvas), &cx, &cy); -+ -+ index = edit->selection_end + edit->preedit_pos; -+ -+ pango_layout_get_cursor_pos (edit->layout, -+ index, -+ strong_pos ? &pango_strong_pos : NULL, -+ weak_pos ? &pango_weak_pos : NULL); -+ -+ if (strong_pos) { -+ strong_pos->x = x + x1 - cx - edit->xofs_edit + pango_strong_pos.x / PANGO_SCALE; -+ strong_pos->y = y + y1 - cy - edit->yofs_edit + pango_strong_pos.y / PANGO_SCALE; -+ strong_pos->width = 0; -+ strong_pos->height = pango_strong_pos.height / PANGO_SCALE; -+ } -+ -+ if (weak_pos) { -+ weak_pos->x = x + x1 - cx - edit->xofs_edit + pango_weak_pos.x / PANGO_SCALE; -+ weak_pos->y = y + y1 - cy - edit->yofs_edit + pango_weak_pos.y / PANGO_SCALE; -+ weak_pos->width = 0; -+ weak_pos->height = pango_weak_pos.height / PANGO_SCALE; -+ } -+} -+ -+static void -+update_im_cursor_location (ECellTextView *tv) -+{ -+ CellEdit *edit=tv->edit; -+ GdkRectangle area; -+ -+ e_cell_text_get_cursor_locations (tv, &area, NULL); -+ -+ gtk_im_context_set_cursor_location (edit->im_context, &area); -+} -+ -+static void - e_cell_text_preedit_changed_cb (GtkIMContext *context, - ECellTextView *tv) - { -@@ -1871,10 +1936,12 @@ - CellEdit *edit=tv->edit; - gtk_im_context_get_preedit_string (edit->im_context, &preedit_string, - NULL, &cursor_pos); -- -+ - edit->preedit_length = strlen (preedit_string); -- cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1)); -+ cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1)); -+ edit->preedit_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string; - g_free (preedit_string); -+ - ect_queue_redraw (tv, edit->view_col, edit->row); - } - diff --git a/evolution-2.7.4-deleting-preedit-buffer.patch b/evolution-2.7.4-deleting-preedit-buffer.patch deleted file mode 100644 index 17e1945..0000000 --- a/evolution-2.7.4-deleting-preedit-buffer.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- evolution-2.7.90/widgets/text/e-text.c.deleting-preedit-buffer 2006-07-26 10:16:02.000000000 -0400 -+++ evolution-2.7.90/widgets/text/e-text.c 2006-07-26 10:25:29.000000000 -0400 -@@ -284,7 +284,7 @@ - PangoAttrList *preedit_attrs = NULL; - gchar *preedit_string = NULL; - GString *tmp_string = g_string_new (NULL); -- gint length = 0, cpos = 0, preedit_length = 0; -+ gint length = 0, cpos = 0; - gboolean new_attrs = FALSE; - - if (text->layout == NULL || !GTK_IS_IM_CONTEXT (text->im_context)) -@@ -295,19 +295,15 @@ - - g_string_prepend_len (tmp_string, text->text,length); - -- if (text->preedit_len) -- gtk_im_context_get_preedit_string (text->im_context, -- &preedit_string, &preedit_attrs, -- NULL); -+ /* we came into this function only when text->preedit_len was not 0 -+ so we can saftely fetch the preedit string */ -+ gtk_im_context_get_preedit_string (text->im_context, &preedit_string, &preedit_attrs, NULL); - - if (preedit_string && g_utf8_validate (preedit_string, -1, NULL)) -- text->preedit_len = preedit_length = strlen (preedit_string); -- else -- text->preedit_len = preedit_length = 0; -- -- cpos = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text; -+ { -+ text->preedit_len = strlen (preedit_string); -+ cpos = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text; - -- if (preedit_length) { - g_string_insert (tmp_string, cpos, preedit_string); - - reset_layout_attrs (text); -@@ -320,15 +316,17 @@ - - pango_layout_set_text (text->layout, tmp_string->str, tmp_string->len); - -- pango_attr_list_splice (attrs, preedit_attrs, cpos, preedit_length); -+ pango_attr_list_splice (attrs, preedit_attrs, cpos, text->preedit_len); - - if (new_attrs) { - pango_layout_set_attributes (text->layout, attrs); - pango_attr_list_unref (attrs); -- } -+ } - - update_im_cursor_position (text); - } -+ else -+ text->preedit_len = 0; - - if (preedit_string) - g_free (preedit_string); -@@ -385,9 +383,12 @@ - pango_attr_list_insert_before (attrs, attr); - } - } -+ - pango_layout_set_attributes (text->layout, attrs); -+ - if (attrs) - pango_attr_list_unref (attrs); -+ - calc_height (text); - } - -@@ -1510,9 +1511,14 @@ - } - } - -- -- if (text->im_context_signals_registered) -- insert_preedit_text (text); -+ /* Insert preedit text only when im_context signals are connected & text->preedit_len is not zero */ -+ if (text->im_context_signals_registered && text->preedit_len) -+ insert_preedit_text (text); -+ -+ /* Need to reset the layout to cleanly clear the preedit buffer -+ * when typing in CJK & using backspace on the preedit */ -+ if(!text->preedit_len) -+ reset_layout (text); - - if (!pango_layout_get_text (text->layout)) - return; -@@ -2220,11 +2226,12 @@ - */ - - if (save_text && save_text->im_context) { -+ gtk_im_context_focus_out(save_text->im_context); - g_signal_handlers_disconnect_matched (save_text->im_context, - G_SIGNAL_MATCH_DATA, - 0, 0, NULL, - NULL, save_text); -- save_text->im_context_signals_registered = FALSE; -+ save_text->im_context_signals_registered = FALSE; - reset_layout (save_text); - } - -@@ -2240,6 +2247,7 @@ - G_CALLBACK (e_text_delete_surrounding_cb), text); - text->im_context_signals_registered = TRUE; - } -+ gtk_im_context_focus_in(text->im_context); - } - start_editing (text); - text->show_cursor = FALSE; /* so we'll redraw and the cursor will be shown */ diff --git a/evolution-2.7.92-fix-prgname.patch b/evolution-2.7.92-fix-prgname.patch deleted file mode 100644 index 98689f4..0000000 --- a/evolution-2.7.92-fix-prgname.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- evolution-2.7.92/shell/main.c.fix-prgname 2006-08-28 11:04:44.000000000 -0400 -+++ evolution-2.7.92/shell/main.c 2006-08-28 11:04:56.000000000 -0400 -@@ -516,7 +516,7 @@ - - g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); - -- program = gnome_program_init (PACKAGE "-" BASE_VERSION, VERSION, LIBGNOMEUI_MODULE, argc, argv, -+ program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, - GNOME_PROGRAM_STANDARD_PROPERTIES, - GNOME_PARAM_GOPTION_CONTEXT, context, - GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"), diff --git a/evolution-2.8.0-fix-indic-printing.patch b/evolution-2.8.0-fix-indic-printing.patch deleted file mode 100644 index 226be93..0000000 --- a/evolution-2.8.0-fix-indic-printing.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- 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); - - 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 -@@ -101,6 +101,8 @@ - CamelMimePart *part); - CamelMimeMessage *e_msg_composer_get_message (EMsgComposer *composer, - gboolean save_html_object_data); -+CamelMimeMessage *e_msg_composer_get_message_print (EMsgComposer *composer, -+ gboolean save_html_object_data); - 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 @@ - } - - CamelMimeMessage * -+e_msg_composer_get_message_print (EMsgComposer *composer, gboolean save_html_object_data) -+{ -+ EMsgComposer *temp_composer; -+ CamelMimeMessage *msg; -+ GString *flags; -+ -+ msg = build_message (composer, save_html_object_data); -+ temp_composer = e_msg_composer_new_with_message (msg); -+ camel_object_unref (msg); -+ -+ /* build flags string */ -+ flags = g_string_sized_new (128); -+ if (temp_composer->priv->send_html) -+ g_string_append (flags, "text/html"); -+ else -+ g_string_append (flags, "text/plain"); -+ if (temp_composer->priv->pgp_sign) -+ g_string_append (flags, ", pgp-sign"); -+ if (temp_composer->priv->pgp_encrypt) -+ g_string_append (flags, ", pgp-encrypt"); -+ if (temp_composer->priv->smime_sign) -+ g_string_append (flags, ", smime-sign"); -+ if (temp_composer->priv->smime_encrypt) -+ g_string_append (flags, ", smime-encrypt"); -+ -+ /* override composer flags */ -+ temp_composer->priv->send_html = TRUE; -+ temp_composer->priv->pgp_sign = FALSE; -+ temp_composer->priv->pgp_encrypt = FALSE; -+ temp_composer->priv->smime_sign = FALSE; -+ temp_composer->priv->smime_encrypt = FALSE; -+ -+ msg = build_message (temp_composer, save_html_object_data); -+ camel_medium_set_header (CAMEL_MEDIUM (msg), -+ "X-Evolution-Format", flags->str); -+ -+ e_msg_composer_delete (temp_composer); -+ g_string_free (flags, TRUE); -+ -+ return msg; -+} -+ -+CamelMimeMessage * - e_msg_composer_get_message_draft (EMsgComposer *composer) - { - CamelMimeMessage *msg; diff --git a/evolution-2.8.0-indic-cursor-movement.patch b/evolution-2.8.0-indic-cursor-movement.patch deleted file mode 100644 index 6e5a95f..0000000 --- a/evolution-2.8.0-indic-cursor-movement.patch +++ /dev/null @@ -1,117 +0,0 @@ ---- evolution-2.8.0/widgets/text/e-text.c.indic-cursor-movement 2006-09-13 14:53:39.000000000 -0400 -+++ evolution-2.8.0/widgets/text/e-text.c 2006-09-13 14:53:48.000000000 -0400 -@@ -2876,6 +2876,76 @@ - } - } - -+ -+ -+/* direction = TRUE (move forward), FALSE (move backward) -+ Any error shall return length(text->text) or 0 or text->selection_end (as deemed fit) */ -+static int -+_get_updated_position (EText *text, gboolean direction) -+{ -+ PangoLogAttr *log_attrs = NULL; -+ gint n_attrs; -+ char *p = NULL; -+ gint new_pos = 0; -+ gint length = 0; -+ -+ /* Basic sanity test, return whatever position we are currently at. */ -+ g_return_val_if_fail (text->layout != NULL, text->selection_end); -+ -+ length = g_utf8_strlen (text->text, -1); -+ -+ /* length checks to make sure we are not wandering off into nonexistant memory... */ -+ if((text->selection_end >= length) && (TRUE == direction)) /* forward */ -+ return length; -+ /* checking for -ve value wont hurt! */ -+ if((text->selection_end <= 0) && (FALSE == direction)) /* backward */ -+ return 0; -+ -+ /* check for validness of full text->text */ -+ if(!g_utf8_validate(text->text, -1, NULL)) -+ return text->selection_end; -+ -+ /* get layout's PangoLogAttr to facilitate moving when moving across grapheme cluster as in indic langs */ -+ pango_layout_get_log_attrs (text->layout, &log_attrs, &n_attrs); -+ -+ /* Fetch the current char index in the line & keep moving -+ forward until we can display cursor */ -+ p = g_utf8_offset_to_pointer (text->text, text->selection_end); -+ -+ new_pos = text->selection_end; -+ while(1) -+ { -+ /* check before moving forward/backwards if we have more chars to move or not */ -+ if(TRUE == direction) -+ p = g_utf8_next_char (p); -+ else -+ p = g_utf8_prev_char (p); -+ -+ /* validate the new string & return with original position if check fails */ -+ if(!g_utf8_validate (p, -1, NULL)) -+ break; /* will return old value of new_pos */ -+ -+ new_pos = g_utf8_pointer_to_offset (text->text, p); -+ -+ /* if is_cursor_position is set, cursor can appear in front of character. -+ i.e. this is a grapheme boundary AND make some sanity checks */ -+ if((new_pos >=0) && (new_pos < n_attrs) && (log_attrs[new_pos].is_cursor_position)) -+ break; -+ else if((new_pos < 0) || (new_pos >= n_attrs)) -+ { -+ new_pos = text->selection_end; -+ break; -+ } -+ } -+ -+ if(log_attrs) -+ g_free(log_attrs); -+ -+ return new_pos; -+} -+ -+ -+ - static int - _get_position(EText *text, ETextEventProcessorCommand *command) - { -@@ -2951,15 +3021,14 @@ - if (text->selection_end >= length) - new_pos = length; - else -- new_pos = text->selection_end + 1; -- -+ new_pos = _get_updated_position(text, TRUE); /* get updated position to display cursor */ -+ - break; - - case E_TEP_BACKWARD_CHARACTER: - new_pos = 0; -- if (text->selection_end >= 1) { -- new_pos = text->selection_end - 1; -- } -+ if (text->selection_end >= 1) -+ new_pos = _get_updated_position(text, FALSE); /* get updated position to display cursor */ - - break; - -@@ -3341,6 +3410,7 @@ - if (!text->layout) - create_layout (text); - -+ /* We move cursor only if scroll is TRUE */ - if (scroll && !text->button_down) { - /* XXX do we really need the @trailing logic here? if - we don't we can scrap the loop and just use -@@ -3349,7 +3419,9 @@ - int selection_index; - PangoLayoutIter *iter = pango_layout_get_iter (text->layout); - -+ /* check if we are using selection_start or selection_end for moving? */ - selection_index = use_start ? text->selection_start : text->selection_end; -+ - /* convert to a byte index */ - selection_index = g_utf8_offset_to_pointer (text->text, selection_index) - text->text; - diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch deleted file mode 100644 index 1a02390..0000000 --- a/evolution-2.8.1-kill-ethread.patch +++ /dev/null @@ -1,2019 +0,0 @@ ---- evolution-2.9.91/mail/mail-send-recv.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/mail-send-recv.c 2007-02-15 16:04:42.000000000 -0500 -@@ -819,7 +819,7 @@ - m->folders = folders; - m->info = sinfo; - -- e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - } else { - receive_done ("", data); - } ---- evolution-2.9.91/mail/mail-component.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/mail-component.c 2007-02-15 16:04:42.000000000 -0500 -@@ -965,7 +965,7 @@ - if (camel_url_get_param(url, "uid") != NULL) { - char *curi = em_uri_to_camel(uri); - -- mail_get_folder(curi, 0, handleuri_got_folder, url, mail_thread_new); -+ mail_get_folder(curi, 0, handleuri_got_folder, url, mail_msg_unordered_push); - g_free(curi); - } else { - g_warning("email uri's must include a uid parameter"); ---- evolution-2.9.91/mail/mail-ops.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/mail-ops.c 2007-02-15 16:04:42.000000000 -0500 -@@ -221,7 +221,7 @@ - camel_filter_driver_remove_rule_by_name (m->driver, "new-mail-notification"); - } - -- e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - } - - /* convenience functions for it */ -@@ -426,7 +426,7 @@ - if (status) - camel_filter_driver_set_status_func (fm->driver, status, status_data); - -- e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - } - - /* ********************************************************************** */ -@@ -839,7 +839,7 @@ - m->driver = camel_session_get_filter_driver (session, type, NULL); - camel_filter_driver_set_folder_func (m->driver, get_folder, get_data); - -- e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - } - - /* ** APPEND MESSAGE TO FOLDER ******************************************** */ -@@ -921,7 +921,7 @@ - m->done = done; - m->data = data; - -- e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - } - - /* ** TRANSFER MESSAGES **************************************************** */ -@@ -1036,7 +1036,7 @@ - m->done = done; - m->data = data; - -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); - } - - /* ** SCAN SUBFOLDERS ***************************************************** */ -@@ -1124,7 +1124,7 @@ - m->data = data; - id = m->msg.seq; - -- e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - - return id; - } -@@ -1250,7 +1250,7 @@ - int - mail_get_folder (const char *uri, guint32 flags, - void (*done)(char *uri, CamelFolder *folder, void *data), -- void *data, EThread *thread) -+ void *data, MailMsgDispatchFunc dispatch) - { - struct _get_folder_msg *m; - int id; -@@ -1262,7 +1262,7 @@ - m->done = done; - - id = m->msg.seq; -- e_thread_put(thread, (EMsg *)m); -+ dispatch ((mail_msg_t *) m); - return id; - } - -@@ -1340,7 +1340,7 @@ - m->done = done; - - id = m->msg.seq; -- e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - return id; - } - -@@ -1437,7 +1437,7 @@ - m->data = data; - m->done = done; - -- e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - } - - /* ** SYNC FOLDER ********************************************************* */ -@@ -1498,7 +1498,7 @@ - m->data = data; - m->done = done; - -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); - } - - /* ** SYNC STORE ********************************************************* */ -@@ -1568,7 +1568,7 @@ - m->data = data; - m->done = done; - -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); - } - - /* ******************************************************************************** */ -@@ -1604,7 +1604,7 @@ - m->data = data; - m->done = done; - -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); - } - - /* ******************************************************************************** */ -@@ -1640,7 +1640,7 @@ - m->data = data; - m->done = done; - -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); - } - - /* ******************************************************************************** */ -@@ -1723,7 +1723,7 @@ - m->data = data; - m->done = done; - -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); - } - - /* ** GET MESSAGE(s) ***************************************************** */ -@@ -1783,7 +1783,7 @@ - void - mail_get_message(CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, const char *uid, - CamelMimeMessage *msg, void *data), -- void *data, EThread *thread) -+ void *data, MailMsgDispatchFunc dispatch) - { - struct _get_message_msg *m; - -@@ -1795,7 +1795,7 @@ - m->done = done; - m->cancel = camel_operation_new(NULL, NULL); - -- e_thread_put(thread, (EMsg *)m); -+ dispatch ((mail_msg_t *) m); - } - - typedef void (*get_done)(CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *); -@@ -1821,7 +1821,7 @@ - mail_get_message; it adds an exception argument to the callback */ - void - mail_get_messagex(CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *), -- void *data, EThread *thread) -+ void *data, MailMsgDispatchFunc dispatch) - { - struct _get_message_msg *m; - -@@ -1833,7 +1833,7 @@ - m->done = done; - m->cancel = camel_operation_new(NULL, NULL); - -- e_thread_put(thread, (EMsg *)m); -+ dispatch ((mail_msg_t *) m); - } - - /* ********************************************************************** */ -@@ -1920,7 +1920,7 @@ - m->data = data; - m->done = done; - -- e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - } - - /* ** SAVE MESSAGES ******************************************************* */ -@@ -2063,7 +2063,7 @@ - m->done = done; - - id = m->msg.seq; -- e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - - return id; - } -@@ -2156,7 +2156,7 @@ - m->readonly = readonly; - - id = m->msg.seq; -- e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - - return id; - } -@@ -2240,7 +2240,7 @@ - m->data = data; - m->done = done; - -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); - } - - /* ** GO OFFLINE ***************************************************** */ -@@ -2345,7 +2345,7 @@ - m->done = done; - - id = m->msg.seq; -- e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - - return id; - } -@@ -2433,7 +2433,7 @@ - m->data = data; - - id = m->msg.seq; -- e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - - return id; - } ---- evolution-2.9.91/mail/em-folder-utils.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/em-folder-utils.c 2007-02-15 16:04:42.000000000 -0500 -@@ -260,7 +260,7 @@ - m->delete = delete; - seq = m->msg.seq; - -- e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - - return seq; - } -@@ -652,7 +652,7 @@ - g_free (namebuf); - - id = m->msg.seq; -- e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - - return id; - } ---- evolution-2.9.91/mail/importers/elm-importer.c.kill-ethread 2007-01-03 10:27:16.000000000 -0500 -+++ evolution-2.9.91/mail/importers/elm-importer.c 2007-02-15 16:04:42.000000000 -0500 -@@ -312,7 +312,7 @@ - - id = m->msg.seq; - -- e_thread_put(mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push ((mail_msg_t *) m); - - return id; - } ---- evolution-2.9.91/mail/importers/mail-importer.c.kill-ethread 2007-01-03 10:27:16.000000000 -0500 -+++ evolution-2.9.91/mail/importers/mail-importer.c 2007-02-15 16:04:42.000000000 -0500 -@@ -329,7 +329,7 @@ - } - - id = m->msg.seq; -- e_thread_put(mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push ((mail_msg_t *) m); - - return id; - } ---- evolution-2.9.91/mail/importers/pine-importer.c.kill-ethread 2007-01-03 10:27:16.000000000 -0500 -+++ evolution-2.9.91/mail/importers/pine-importer.c 2007-02-15 16:04:42.000000000 -0500 -@@ -350,7 +350,7 @@ - - id = m->msg.seq; - -- e_thread_put(mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push ((mail_msg_t *) m); - - return id; - } ---- evolution-2.9.91/mail/mail-vfolder.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/mail-vfolder.c 2007-02-15 16:04:42.000000000 -0500 -@@ -188,7 +188,7 @@ - m->sources_folder = sources_folder; - - id = m->msg.seq; -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); - - return id; - } -@@ -323,7 +323,7 @@ - m->remove = remove; - - id = m->msg.seq; -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); - - return id; - } -@@ -447,7 +447,7 @@ - return; - } - -- g_assert(pthread_equal(pthread_self(), mail_gui_thread)); -+ g_assert(mail_in_main_thread()); - - is_ignore = uri_is_ignore(store, curi); - -@@ -540,7 +540,7 @@ - - d(printf ("Deleting uri to check: %s\n", uri)); - -- g_assert (pthread_equal(pthread_self(), mail_gui_thread)); -+ g_assert (mail_in_main_thread()); - - changed = g_string_new (""); - -@@ -615,7 +615,7 @@ - if (context == NULL || uri_is_spethal(store, cfrom) || uri_is_spethal(store, cto)) - return; - -- g_assert(pthread_equal(pthread_self(), mail_gui_thread)); -+ g_assert(mail_in_main_thread()); - - from = em_uri_from_camel(cfrom); - to = em_uri_from_camel(cto); ---- evolution-2.9.91/mail/em-format-html.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/em-format-html.c 2007-02-15 16:04:42.000000000 -0500 -@@ -1374,7 +1374,7 @@ - } - - efh->priv->format_id = m->msg.seq; -- e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - } - - efh->priv->format_timeout_id = 0; ---- evolution-2.9.91/mail/em-folder-properties.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/em-folder-properties.c 2007-02-15 16:04:42.000000000 -0500 -@@ -379,7 +379,7 @@ - } - - if (folder == NULL) -- mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_thread_new); -+ mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_msg_unordered_push); - else - emfp_dialog_got_folder((char *)uri, folder, NULL); - } ---- evolution-2.9.91/mail/em-folder-tree.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/em-folder-tree.c 2007-02-15 16:04:42.000000000 -0500 -@@ -966,7 +966,7 @@ - tree_drag_data_action(struct _DragDataReceivedAsync *m) - { - m->move = m->action == GDK_ACTION_MOVE; -- e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - } - - static void -@@ -1891,7 +1891,7 @@ - m->top = full_name; - m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST; - -- e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - } - - static gboolean ---- evolution-2.9.91/mail/em-folder-browser.c.kill-ethread 2007-02-12 05:37:31.000000000 -0500 -+++ evolution-2.9.91/mail/em-folder-browser.c 2007-02-15 16:04:42.000000000 -0500 -@@ -948,7 +948,7 @@ - m->sources_folder = sources_folder; - - id = m->msg.seq; -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); - - return id; - } ---- evolution-2.9.91/mail/message-list.c.kill-ethread 2007-01-18 07:31:51.000000000 -0500 -+++ evolution-2.9.91/mail/message-list.c 2007-02-15 16:04:42.000000000 -0500 -@@ -1888,7 +1888,7 @@ - ml_drop_action(struct _drop_msg *m) - { - m->move = m->action == GDK_ACTION_MOVE; -- e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - } - - static void -@@ -3922,7 +3922,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 */ -- e_thread_put (mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push ((mail_msg_t *) m); - - m->ml->regen_timeout_msg = NULL; - m->ml->regen_timeout_id = 0; ---- evolution-2.9.91/mail/em-format-html-print.c.kill-ethread 2007-02-12 01:58:01.000000000 -0500 -+++ evolution-2.9.91/mail/em-format-html-print.c 2007-02-15 16:04:42.000000000 -0500 -@@ -262,7 +262,7 @@ - g_object_ref(source); - 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 ... */ - } ---- evolution-2.9.91/mail/em-sync-stream.c.kill-ethread 2007-02-09 15:16:33.000000000 -0500 -+++ evolution-2.9.91/mail/em-sync-stream.c 2007-02-15 16:04:42.000000000 -0500 -@@ -268,7 +268,7 @@ - if (emss->cancel) - return -1; - -- if (pthread_equal(pthread_self(), mail_gui_thread)) { -+ if (mail_in_main_thread ()) { - EMSS_CLASS(emss)->sync_write(stream, buffer, n); - #ifdef LOG_STREAM - if (p->logfd) -@@ -298,7 +298,7 @@ - if (emss->cancel) - return -1; - -- if (pthread_equal(pthread_self(), mail_gui_thread)) -+ if (mail_in_main_thread ()) - return ((EMSyncStreamClass *)(((CamelObject *)emss)->klass))->sync_flush(stream); - else - sync_op(emss, EMSS_FLUSH, NULL, 0); -@@ -316,7 +316,7 @@ - - d(printf("%p: closing stream\n", stream)); - -- if (pthread_equal(pthread_self(), mail_gui_thread)) { -+ if (mail_in_main_thread ()) { - #ifdef LOG_STREAM - if (emss->priv->logfd) { - fclose(emss->priv->logfd); ---- evolution-2.9.91/mail/em-subscribe-editor.c.kill-ethread 2007-01-08 11:35:48.000000000 -0500 -+++ evolution-2.9.91/mail/em-subscribe-editor.c 2007-02-15 16:04:42.000000000 -0500 -@@ -229,7 +229,7 @@ - next = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe); - if (next) { - next->sub->subscribe_id = next->msg.seq; -- e_thread_put(mail_thread_new, (EMsg *)next); -+ mail_msg_unordered_push ((mail_msg_t *) next); - } else { - /* should it go off the model instead? */ - sub_selection_changed(gtk_tree_view_get_selection(m->sub->tree), m->sub); -@@ -270,7 +270,7 @@ - if (sub->subscribe_id == -1) { - sub->subscribe_id = id; - d(printf("running subscribe folder '%s'\n", spath)); -- e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - } else { - d(printf("queueing subscribe folder '%s'\n", spath)); - e_dlist_addtail(&sub->subscribe, (EDListNode *)m); -@@ -443,7 +443,7 @@ - - id = m->msg.seq; - -- e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - return id; - } - ---- evolution-2.9.91/mail/mail-mt.h.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/mail-mt.h 2007-02-15 16:04:42.000000000 -0500 -@@ -33,6 +33,7 @@ - EMsg msg; /* parent type */ - struct _mail_msg_op *ops; /* operation functions */ - unsigned int seq; /* seq number for synchronisation */ -+ gint priority; /* priority (default = 0) */ - CamelOperation *cancel; /* a cancellation/status handle */ - CamelException ex; /* an initialised camel exception, upto the caller to use this */ - struct _mail_msg_priv *priv; /* private for internal use */ -@@ -51,6 +52,8 @@ - void mail_msg_init(void); - void mail_msg_cleanup (void); - -+gboolean mail_in_main_thread (void); -+ - /* allocate a new message */ - void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size); - void mail_msg_free(void *msg); -@@ -60,6 +63,14 @@ - void mail_msg_wait_all(void); - int mail_msg_active(unsigned int msgid); - -+/* dispatch a message */ -+void mail_msg_main_loop_push (mail_msg_t *msg); -+void mail_msg_unordered_push (mail_msg_t *msg); -+void mail_msg_fast_ordered_push (mail_msg_t *msg); -+void mail_msg_slow_ordered_push (mail_msg_t *msg); -+ -+typedef void (*MailMsgDispatchFunc) (mail_msg_t *msg); -+ - /* To implement the stop button */ - void *mail_cancel_hook_add(GDestroyNotify func, void *data); - void mail_cancel_hook_remove(void *handle); -@@ -112,24 +123,6 @@ - void mail_enable_stop(void); - void mail_disable_stop(void); - --/* a message port that receives messages in the gui thread, used for sending port */ --extern EMsgPort *mail_gui_port; --/* a message port that receives messages in the gui thread, used for the reply port */ --extern EMsgPort *mail_gui_reply_port; -- --/* some globally available threads */ --#ifndef G_OS_WIN32 --extern EThread *mail_thread_queued; /* for operations that can (or should) be queued */ --#else --EThread *mail_win32_get_mail_thread_queued (void); --#define mail_thread_queued mail_win32_get_mail_thread_queued () --#endif --extern EThread *mail_thread_new; /* for operations that should run in a new thread each time */ --extern EThread *mail_thread_queued_slow; /* for operations that can (or should) be queued, but take a long time */ -- --/* The main thread. */ --extern pthread_t mail_gui_thread; -- - /* 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.9.91/mail/mail-ops.h.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/mail-ops.h 2007-02-15 16:04:42.000000000 -0500 -@@ -30,6 +30,8 @@ - #pragma } - #endif /* __cplusplus */ - -+#include "mail-mt.h" -+ - #include "camel/camel-store.h" - #include "camel/camel-folder.h" - #include "camel/camel-filter-driver.h" -@@ -55,12 +57,12 @@ - void mail_get_message (CamelFolder *folder, const char *uid, - void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data), - void *data, -- EThread *thread); -+ MailMsgDispatchFunc dispatch); - - void - mail_get_messagex(CamelFolder *folder, const char *uid, - void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *), -- void *data, EThread *thread); -+ void *data, MailMsgDispatchFunc dispatch); - - /* get several messages */ - void mail_get_messages (CamelFolder *folder, GPtrArray *uids, -@@ -70,7 +72,7 @@ - /* same for a folder */ - int mail_get_folder (const char *uri, guint32 flags, - void (*done) (char *uri, CamelFolder *folder, void *data), void *data, -- EThread *thread); -+ MailMsgDispatchFunc dispatch); - - /* and for a store */ - int mail_get_store (const char *uri, CamelOperation *op, ---- evolution-2.9.91/mail/em-composer-utils.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/em-composer-utils.c 2007-02-15 16:04:42.000000000 -0500 -@@ -534,7 +534,7 @@ - strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { - int id; - -- id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_thread_new); -+ id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_msg_unordered_push); - mail_msg_wait (id); - - if (!folder || !account->enabled) { -@@ -1085,7 +1085,7 @@ - g_return_if_fail (CAMEL_IS_FOLDER (folder)); - g_return_if_fail (uid != NULL); - -- mail_get_message (folder, uid, redirect_msg, NULL, mail_thread_new); -+ mail_get_message (folder, uid, redirect_msg, NULL, mail_msg_unordered_push); - } - - static void -@@ -1116,7 +1116,7 @@ - } - - if (msg == NULL) { -- mail_get_messagex(folder, uid, emu_handle_receipt_message, NULL, mail_thread_new); -+ mail_get_messagex(folder, uid, emu_handle_receipt_message, NULL, mail_msg_unordered_push); - camel_message_info_free(info); - return; - } -@@ -1916,7 +1916,7 @@ - rd->source = source; - if (rd->source) - g_object_ref(rd->source); -- mail_get_message(folder, uid, reply_to_message, rd, mail_thread_new); -+ mail_get_message(folder, uid, reply_to_message, rd, mail_msg_unordered_push); - - return; - } -@@ -2088,5 +2088,5 @@ - g_return_if_fail (CAMEL_IS_FOLDER (folder)); - g_return_if_fail (uid != NULL); - -- 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.9.91/mail/mail-folder-cache.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/mail-folder-cache.c 2007-02-15 16:04:42.000000000 -0500 -@@ -907,7 +907,7 @@ - m->store = store; - camel_object_ref (store); - -- e_thread_put (mail_thread_queued_slow, (EMsg *) m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); - } - - static gboolean -@@ -952,7 +952,7 @@ - int hook = 0; - - g_assert(CAMEL_IS_STORE(store)); -- g_assert(pthread_equal(pthread_self(), mail_gui_thread)); -+ g_assert(mail_in_main_thread()); - - LOCK(info_lock); - ---- evolution-2.9.91/mail/em-folder-view.c.kill-ethread 2007-02-12 01:58:01.000000000 -0500 -+++ evolution-2.9.91/mail/em-folder-view.c 2007-02-15 16:04:42.000000000 -0500 -@@ -693,7 +693,7 @@ - static void - emfv_set_folder_uri(EMFolderView *emfv, const char *uri) - { -- mail_get_folder(uri, 0, emfv_got_folder, emfv, mail_thread_queued); -+ mail_get_folder(uri, 0, emfv_got_folder, emfv, mail_msg_fast_ordered_push); - } - - static void -@@ -1611,7 +1611,7 @@ - data->type = type; - data->source = source; - -- mail_get_message (folder, uid, filter_type_got_message, data, mail_thread_new); -+ mail_get_message (folder, uid, filter_type_got_message, data, mail_msg_unordered_push); - } - - static void -@@ -1709,7 +1709,7 @@ - data->type = type; - data->uri = g_strdup (uri); - -- mail_get_message (folder, uid, vfolder_type_got_message, data, mail_thread_new); -+ mail_get_message (folder, uid, vfolder_type_got_message, data, mail_msg_unordered_push); - } - - static void -@@ -2369,7 +2369,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); -- 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.9.91/mail/mail-session.c.kill-ethread 2007-02-15 16:04:42.000000000 -0500 -+++ evolution-2.9.91/mail/mail-session.c 2007-02-15 16:04:42.000000000 -0500 -@@ -374,7 +374,7 @@ - if (cancel) - user_message_reply = e_msgport_new (); - m = mail_msg_new (&user_message_op, user_message_reply, sizeof (*m)); -- m->ismain = pthread_equal(pthread_self(), mail_gui_thread); -+ m->ismain = mail_in_main_thread(); - m->type = type; - m->prompt = g_strdup(prompt); - m->allow_cancel = cancel; -@@ -382,9 +382,7 @@ - if (m->ismain) - do_user_message((struct _mail_msg *)m); - else { -- extern EMsgPort *mail_gui_port2; -- -- e_msgport_put(mail_gui_port2, (EMsg *)m); -+ mail_msg_main_loop_push((mail_msg_t *) m); - } - - if (cancel) { ---- evolution-2.9.91/mail/mail-mt.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/mail-mt.c 2007-02-15 16:28:12.000000000 -0500 -@@ -82,12 +82,8 @@ - static pthread_mutex_t mail_msg_lock = PTHREAD_MUTEX_INITIALIZER; - static pthread_cond_t mail_msg_cond = PTHREAD_COND_INITIALIZER; - --pthread_t mail_gui_thread; -- - MailAsyncEvent *mail_async_event; - --static void mail_msg_destroy(EThread *e, EMsg *msg, void *data); -- - void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size) - { - struct _mail_msg *msg; -@@ -112,7 +108,6 @@ - fprintf(log, "Logging async operations\n"); - - if (log_locks) { -- fprintf(log, "Logging lock operations, mail_gui_thread = %" G_GINT64_MODIFIER "x\n\n", e_util_pthread_id(mail_gui_thread)); - fprintf(log, "%" G_GINT64_MODIFIER "x: lock mail_msg_lock\n", e_util_pthread_id(pthread_self())); - } - } else { -@@ -308,9 +303,8 @@ - void mail_msg_wait(unsigned int msgid) - { - struct _mail_msg *m; -- int ismain = pthread_equal(pthread_self(), mail_gui_thread); - -- if (ismain) { -+ if (mail_in_main_thread ()) { - MAIL_MT_LOCK(mail_msg_lock); - m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); - while (m) { -@@ -347,9 +341,7 @@ - - void mail_msg_wait_all(void) - { -- int ismain = pthread_equal(pthread_self(), mail_gui_thread); -- -- if (ismain) { -+ if (mail_in_main_thread ()) { - MAIL_MT_LOCK(mail_msg_lock); - while (g_hash_table_size(mail_msg_active_table) > 0) { - MAIL_MT_UNLOCK(mail_msg_lock); -@@ -420,241 +412,193 @@ - MAIL_MT_UNLOCK(mail_msg_lock); - } - --EMsgPort *mail_gui_port; --static GIOChannel *mail_gui_channel; --static guint mail_gui_watch; -- --/* TODO: Merge these, gui_port2 doesn't do any mail_msg processing on the request (replies, forwards, frees) */ --EMsgPort *mail_gui_port2; --static GIOChannel *mail_gui_channel2; --static guint mail_gui_watch2; -- --EMsgPort *mail_gui_reply_port; --static GIOChannel *mail_gui_reply_channel; -- --/* a couple of global threads available */ --#ifdef G_OS_WIN32 --#undef mail_thread_queued --static --#endif --EThread *mail_thread_queued; /* for operations that can (or should) be queued */ --EThread *mail_thread_queued_slow; /* for operations that can (or should) be queued, but take a long time */ --EThread *mail_thread_new; /* for operations that should run in a new thread each time */ -- --#ifdef G_OS_WIN32 --EThread * --mail_win32_get_mail_thread_queued (void) -+#define PERIODIC_RATE_HZ 10 -+static guint periodic_source_id = 0; -+static GAsyncQueue *main_loop_queue = NULL; -+static GAsyncQueue *msg_reply_queue = NULL; -+static GThread *main_thread = NULL; -+ -+static void -+periodic_cleanup (void) - { -- return mail_thread_queued; -+ periodic_source_id = 0; -+ -+ g_assert (main_loop_queue != NULL); -+ g_async_queue_unref (main_loop_queue); -+ main_loop_queue = NULL; -+ -+ g_assert (msg_reply_queue != NULL); -+ g_async_queue_unref (msg_reply_queue); -+ msg_reply_queue = NULL; - } --#endif - - static gboolean --mail_msgport_replied(GIOChannel *source, GIOCondition cond, void *d) -+periodic_processing (void) - { -- EMsgPort *port = (EMsgPort *)d; -- mail_msg_t *m; -+ mail_msg_t *msg; - -- while (( m = (mail_msg_t *)e_msgport_get(port))) { -+ g_assert (main_loop_queue != NULL); -+ g_assert (msg_reply_queue != NULL); - --#ifdef MALLOC_CHECK -- checkmem(m); -- checkmem(m->cancel); -- checkmem(m->priv); --#endif -- --#ifdef LOG_OPS -- if (log_ops) -- fprintf(log, "%p: Replied to GUI thread (exception `%s'\n", m, -- camel_exception_get_description(&m->ex)?camel_exception_get_description(&m->ex):"None"); --#endif -+ /* check the main loop queue */ -+ while ((msg = g_async_queue_try_pop (main_loop_queue)) != NULL) { -+ -+ /* If the message has a reply_port, it must also have a -+ * receive_msg() callback. The receive_msg() callback is -+ * responsible for issuing the reply, and the recipient of -+ * the reply is responsible for freeing the message. */ -+ if (msg->msg.reply_port != NULL) { -+ g_assert (msg->ops->receive_msg != NULL); -+ msg->ops->receive_msg (msg); -+ } else { -+ if (msg->ops->receive_msg != NULL) -+ msg->ops->receive_msg (msg); -+ if (msg->ops->reply_msg != NULL) -+ msg->ops->reply_msg (msg); -+ mail_msg_free (msg); -+ } -+ } - -- if (m->ops->reply_msg) -- m->ops->reply_msg(m); -- mail_msg_check_error(m); -- mail_msg_free(m); -+ /* check the reply queue */ -+ while ((msg = g_async_queue_try_pop (msg_reply_queue)) != NULL) { -+ if (msg->ops->reply_msg != NULL) -+ msg->ops->reply_msg (msg); -+ mail_msg_check_error (msg); -+ mail_msg_free (msg); - } - - return TRUE; - } - --static gboolean --mail_msgport_received(GIOChannel *source, GIOCondition cond, void *d) -+static void -+mail_msg_proxy (mail_msg_t *msg) - { -- EMsgPort *port = (EMsgPort *)d; -- mail_msg_t *m; -+ if (msg->ops->describe_msg != NULL) { -+ gchar *text = msg->ops->describe_msg (msg, FALSE); -+ camel_operation_register (msg->cancel); -+ camel_operation_start (msg->cancel, "%s", text); -+ g_free (text); -+ } -+ -+ if (msg->ops->receive_msg != NULL) { -+ mail_enable_stop (); -+ msg->ops->receive_msg (msg); -+ mail_disable_stop (); -+ } -+ -+ if (msg->ops->describe_msg != NULL) { -+ camel_operation_end (msg->cancel); -+ camel_operation_unregister (msg->cancel); -+ MAIL_MT_LOCK (mail_msg_lock); -+ camel_operation_unref (msg->cancel); -+ msg->cancel = NULL; -+ MAIL_MT_UNLOCK (mail_msg_lock); -+ } - -- while (( m = (mail_msg_t *)e_msgport_get(port))) { --#ifdef MALLOC_CHECK -- checkmem(m); -- checkmem(m->cancel); -- checkmem(m->priv); --#endif -+ g_async_queue_push (msg_reply_queue, msg); -+} - --#ifdef LOG_OPS -- if (log_ops) -- fprintf(log, "%p: Received at GUI thread\n", m); --#endif -+void -+mail_msg_cleanup (void) -+{ -+ GSource *source; - -- if (m->ops->receive_msg) -- m->ops->receive_msg(m); -- if (m->msg.reply_port) -- e_msgport_reply((EMsg *)m); -- else { -- if (m->ops->reply_msg) -- m->ops->reply_msg(m); -- mail_msg_free(m); -- } -- } -+ mail_msg_wait_all(); - -- return TRUE; -+ /* stop periodic processing */ -+ source = g_main_context_find_source_by_id ( -+ g_main_context_default (), periodic_source_id); -+ g_assert (source != NULL); -+ g_source_destroy (source); - } - --/* Test code, lighterwight, more configurable calls */ --static gboolean --mail_msgport_received2(GIOChannel *source, GIOCondition cond, void *d) -+void -+mail_msg_init (void) - { -- EMsgPort *port = (EMsgPort *)d; -- mail_msg_t *m; -+ main_loop_queue = g_async_queue_new (); -+ msg_reply_queue = g_async_queue_new (); - -- while (( m = (mail_msg_t *)e_msgport_get(port))) { --#ifdef LOG_OPS -- if (log_ops) -- fprintf(log, "%p: Received at GUI2 thread\n", m); --#endif -+ /* start periodic processing */ -+ periodic_source_id = g_timeout_add_full ( -+ G_PRIORITY_DEFAULT, -+ 1000 / PERIODIC_RATE_HZ, -+ (GSourceFunc) periodic_processing, NULL, -+ (GDestroyNotify) periodic_cleanup); - -- if (m->ops->receive_msg) -- m->ops->receive_msg(m); -- else -- mail_msg_free(m); -- } -+ mail_msg_active_table = g_hash_table_new (NULL, NULL); -+ main_thread = g_thread_self (); - -- return TRUE; -+ mail_async_event = mail_async_event_new (); - } - -- --static void --mail_msg_destroy(EThread *e, EMsg *msg, void *data) -+static gint -+mail_msg_compare (const mail_msg_t *msg1, const mail_msg_t *msg2) - { -- mail_msg_t *m = (mail_msg_t *)msg; -+ gint priority1 = msg1->priority; -+ gint priority2 = msg2->priority; - --#ifdef MALLOC_CHECK -- checkmem(m); -- checkmem(m->cancel); -- checkmem(m->priv); --#endif -+ if (priority1 == priority2) -+ return 0; - -- mail_msg_free(m); -+ return (priority1 < priority2) ? 1 : -1; - } - --static void --mail_msg_received(EThread *e, EMsg *msg, void *data) -+static gpointer -+create_thread_pool (gpointer data) - { -- mail_msg_t *m = (mail_msg_t *)msg; -+ GThreadPool *thread_pool; -+ gint max_threads = GPOINTER_TO_INT (data); - --#ifdef MALLOC_CHECK -- checkmem(m); -- checkmem(m->cancel); -- checkmem(m->priv); --#endif -+ /* once created, run forever */ -+ thread_pool = g_thread_pool_new ( -+ (GFunc) mail_msg_proxy, NULL, max_threads, FALSE, NULL); -+ g_thread_pool_set_sort_function ( -+ thread_pool, (GCompareDataFunc) mail_msg_compare, NULL); - -- if (m->ops->describe_msg) { -- char *text = m->ops->describe_msg(m, FALSE); -+ return thread_pool; -+} - --#ifdef LOG_OPS -- if (log_ops) -- fprintf(log, "%p: Received at thread %" G_GINT64_MODIFIER "x: '%s'\n", m, e_util_pthread_id(pthread_self()), text); --#endif -+void -+mail_msg_main_loop_push (mail_msg_t *msg) -+{ -+ g_async_queue_push_sorted (main_loop_queue, msg, -+ (GCompareDataFunc) mail_msg_compare, NULL); -+} - -- d(printf("message received at thread\n")); -- camel_operation_register(m->cancel); -- camel_operation_start(m->cancel, "%s", text); -- g_free(text); -- } --#ifdef LOG_OPS -- else -- if (log_ops) -- fprintf(log, "%p: Received at thread %" G_GINT64_MODIFIER "x\n", m, e_util_pthread_id(pthread_self())); --#endif -+void -+mail_msg_unordered_push (mail_msg_t *msg) -+{ -+ static GOnce once = G_ONCE_INIT; - -- if (m->ops->receive_msg) { -- mail_enable_stop(); -- m->ops->receive_msg(m); -- mail_disable_stop(); -- } -+ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (10)); - -- if (m->ops->describe_msg) { -- camel_operation_end(m->cancel); -- camel_operation_unregister(m->cancel); -- MAIL_MT_LOCK(mail_msg_lock); -- camel_operation_unref(m->cancel); -- m->cancel = NULL; -- MAIL_MT_UNLOCK(mail_msg_lock); -- } -+ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); - } - --void mail_msg_cleanup(void) -+void -+mail_msg_fast_ordered_push (mail_msg_t *msg) - { -- mail_msg_wait_all(); -- -- e_thread_destroy(mail_thread_queued_slow); -- e_thread_destroy(mail_thread_queued); -- e_thread_destroy(mail_thread_new); -+ static GOnce once = G_ONCE_INIT; - -- g_io_channel_unref(mail_gui_channel); -- g_io_channel_unref(mail_gui_reply_channel); -+ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); - -- e_msgport_destroy(mail_gui_port); -- e_msgport_destroy(mail_gui_reply_port); -+ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); - } - --static guint --em_channel_setup(EMsgPort **port, GIOChannel **channel, GIOFunc func) -+void -+mail_msg_slow_ordered_push (mail_msg_t *msg) - { -- GSource *source; -- guint id; -+ static GOnce once = G_ONCE_INIT; - -- *port = e_msgport_new(); --#ifndef G_OS_WIN32 -- *channel = g_io_channel_unix_new(e_msgport_fd(*port)); --#else -- *channel = g_io_channel_win32_new_socket(e_msgport_fd(*port)); --#endif -- source = g_io_create_watch(*channel, G_IO_IN); -- g_source_set_callback(source, (GSourceFunc)func, *port, NULL); -- g_source_set_can_recurse(source, FALSE); -- id = g_source_attach(source, NULL); -- g_source_unref(source); -+ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); - -- return id; -+ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); - } - --void mail_msg_init(void) -+gboolean -+mail_in_main_thread (void) - { -- em_channel_setup(&mail_gui_reply_port, &mail_gui_reply_channel, mail_msgport_replied); -- mail_gui_watch = em_channel_setup(&mail_gui_port, &mail_gui_channel, mail_msgport_received); -- mail_gui_watch2 = em_channel_setup(&mail_gui_port2, &mail_gui_channel2, mail_msgport_received2); -- -- mail_thread_queued = e_thread_new(E_THREAD_QUEUE); -- e_thread_set_msg_destroy(mail_thread_queued, mail_msg_destroy, 0); -- e_thread_set_msg_received(mail_thread_queued, mail_msg_received, 0); -- e_thread_set_reply_port(mail_thread_queued, mail_gui_reply_port); -- -- mail_thread_queued_slow = e_thread_new(E_THREAD_QUEUE); -- e_thread_set_msg_destroy(mail_thread_queued_slow, mail_msg_destroy, 0); -- e_thread_set_msg_received(mail_thread_queued_slow, mail_msg_received, 0); -- e_thread_set_reply_port(mail_thread_queued_slow, mail_gui_reply_port); -- -- mail_thread_new = e_thread_new(E_THREAD_NEW); -- e_thread_set_msg_destroy(mail_thread_new, mail_msg_destroy, 0); -- e_thread_set_msg_received(mail_thread_new, mail_msg_received, 0); -- e_thread_set_reply_port(mail_thread_new, mail_gui_reply_port); -- e_thread_set_queue_limit(mail_thread_new, 10); -- -- mail_msg_active_table = g_hash_table_new(NULL, NULL); -- mail_gui_thread = pthread_self(); -- -- mail_async_event = mail_async_event_new(); -+ return (g_thread_self () == main_thread); - } - - /* ********************************************************************** */ -@@ -723,7 +667,6 @@ - { - struct _proxy_msg *m; - int id; -- int ismain = pthread_equal(pthread_self(), mail_gui_thread); - - /* we dont have a reply port for this, we dont care when/if it gets executed, just queue it */ - m = mail_msg_new(&async_event_op, NULL, sizeof(*m)); -@@ -743,12 +686,12 @@ - /* We use an idle function instead of our own message port only because the - gui message ports's notification buffer might overflow and deadlock us */ - if (type == MAIL_ASYNC_GUI) { -- if (ismain) -+ if (mail_in_main_thread ()) - g_idle_add(idle_async_event, m); - else -- e_msgport_put(mail_gui_port, (EMsg *)m); -+ mail_msg_main_loop_push((mail_msg_t *) m); - } else -- e_thread_put(mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push ((mail_msg_t *) m); - - return id; - } -@@ -842,6 +785,9 @@ - m->ret = m->func(p1, p2, i1, p3, p4, p5); - break; - } -+ -+ if (mm->msg.reply_port != NULL) -+ e_msgport_reply ((EMsg *) mm); - } - - static struct _mail_msg_op mail_call_op = { -@@ -857,11 +803,10 @@ - void *ret; - va_list ap; - EMsgPort *reply = NULL; -- int ismain = pthread_equal(pthread_self(), mail_gui_thread); - - va_start(ap, func); - -- if (!ismain) -+ if (!mail_in_main_thread ()) - reply = e_msgport_new(); - - m = mail_msg_new(&mail_call_op, reply, sizeof(*m)); -@@ -869,8 +814,8 @@ - m->func = func; - G_VA_COPY(m->ap, ap); - -- if (!ismain) { -- e_msgport_put(mail_gui_port, (EMsg *)m); -+ if (reply != NULL) { -+ mail_msg_main_loop_push((mail_msg_t *) m); - e_msgport_wait(reply); - e_msgport_destroy(reply); - } else { -@@ -909,7 +854,7 @@ - busy_state++; - if (busy_state == 1) { - m = mail_msg_new(&set_busy_op, NULL, sizeof(*m)); -- e_msgport_put(mail_gui_port, (EMsg *)m); -+ mail_msg_main_loop_push((mail_msg_t *) m); - } - MAIL_MT_UNLOCK(status_lock); - } -@@ -922,7 +867,7 @@ - busy_state--; - if (busy_state == 0) { - m = mail_msg_new(&set_busy_op, NULL, sizeof(*m)); -- e_msgport_put(mail_gui_port, (EMsg *)m); -+ mail_msg_main_loop_push((mail_msg_t *) m); - } - MAIL_MT_UNLOCK(status_lock); - } -@@ -947,7 +892,7 @@ - char *out, *p, *o, c; - int pc; - -- g_assert (pthread_equal(mail_gui_thread, pthread_self ())); -+ g_assert (mail_in_main_thread ()); - - MAIL_MT_LOCK (mail_msg_lock); - -@@ -1055,7 +1000,7 @@ - } - m->pc = pc; - m->data = data; -- e_msgport_put(mail_gui_port, (EMsg *)m); -+ mail_msg_main_loop_push((mail_msg_t *) m); - } - - /* ******************** */ ---- evolution-2.9.91/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-01-03 10:27:06.000000000 -0500 -+++ evolution-2.9.91/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-02-15 16:04:42.000000000 -0500 -@@ -108,5 +108,5 @@ - unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t)); - unsub->uri = g_strdup (target->uri); - -- e_thread_put (mail_thread_new, (EMsg *) unsub); -+ mail_msg_unordered_push ((mail_msg_t *) unsub); - } ---- evolution-2.9.91/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-01-03 10:27:08.000000000 -0500 -+++ evolution-2.9.91/plugins/mark-all-read/mark-all-read.c 2007-02-15 16:04:42.000000000 -0500 -@@ -44,7 +44,7 @@ - return; - } - -- mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_thread_new); -+ mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_msg_unordered_push); - } - - static void ---- evolution-2.9.91/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-01-03 10:27:08.000000000 -0500 -+++ evolution-2.9.91/plugins/exchange-operations/exchange-folder.c 2007-02-15 16:04:42.000000000 -0500 -@@ -134,7 +134,7 @@ - inbox_physical_uri = e_folder_get_physical_uri (inbox); - - /* To get the CamelStore/Folder */ -- mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_thread_new); -+ mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_msg_unordered_push); - - - } ---- evolution-2.9.91/plugins/save-attachments/save-attachments.c.kill-ethread 2007-02-09 15:16:33.000000000 -0500 -+++ evolution-2.9.91/plugins/save-attachments/save-attachments.c 2007-02-15 16:04:42.000000000 -0500 -@@ -407,5 +407,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.9.91/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-01-03 10:27:09.000000000 -0500 -+++ evolution-2.9.91/plugins/mailing-list-actions/mailing-list-actions.c 2007-02-15 16:04:42.000000000 -0500 -@@ -89,7 +89,7 @@ - data->uri = strdup (sel->uri); - - mail_get_message (sel->folder, (const char*) g_ptr_array_index (sel->uids, 0), -- emla_list_action_do, data, mail_thread_new); -+ emla_list_action_do, data, mail_msg_unordered_push); - } - - void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) ---- evolution-2.9.91/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-01-03 10:27:07.000000000 -0500 -+++ evolution-2.9.91/plugins/groupwise-features/share-folder-common.c 2007-02-15 16:04:42.000000000 -0500 -@@ -239,7 +239,7 @@ - m->done = done; - g_free (namebuf); - id = m->msg.seq; -- e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push ((mail_msg_t *) m); - - return id; - } ---- evolution-2.9.91/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-01-03 10:27:57.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/alarm-notify/alarm-notify.h 2007-02-15 16:04:42.000000000 -0500 -@@ -39,19 +39,6 @@ - - typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; - --typedef struct _AlarmMsg AlarmMsg; --typedef struct _AlarmMsgPrivate AlarmMsgPrivate; -- --struct _AlarmMsg { -- EMsg msg; -- -- void (*receive_msg)(EThread *e, struct _AlarmMsg *msg, void *data); /* message received */ -- void *data; -- -- /* Private Usage */ -- struct _AlarmMsgPrivate *priv; --}; -- - struct _AlarmNotify { - BonoboObject object; - ---- evolution-2.9.91/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-01-03 10:27:57.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/alarm-notify/alarm-notify.c 2007-02-15 16:04:42.000000000 -0500 -@@ -45,10 +45,6 @@ - GMutex *mutex; - }; - --EThread *alarm_operation_thread; /* for operations that can (or should) be queued */ --EMsgPort *alarm_reply_port; --static GIOChannel *alarm_reply_channel; -- - #define d(x) x - - -@@ -286,72 +282,12 @@ - g_mutex_free (priv->mutex); - g_free (priv); - -- e_thread_destroy(alarm_operation_thread); -- g_io_channel_unref(alarm_reply_channel); -- e_msgport_destroy(alarm_reply_port); - if (G_OBJECT_CLASS (parent_class)->finalize) - (* G_OBJECT_CLASS (parent_class)->finalize) (object); - } - - - --static guint --alarm_channel_setup(EMsgPort **port, GIOChannel **channel, GIOFunc func) --{ -- GSource *source; -- guint id; -- -- d (printf("%s:%d (alarm_channel_setup) - Channel Setup\n ", __FILE__, __LINE__)); -- *port = e_msgport_new(); --#ifndef G_OS_WIN32 -- *channel = g_io_channel_unix_new(e_msgport_fd(*port)); --#else -- *channel = g_io_channel_win32_new_socket(e_msgport_fd(*port)); --#endif -- source = g_io_create_watch(*channel, G_IO_IN); -- g_source_set_callback(source, (GSourceFunc)func, *port, NULL); -- g_source_set_can_recurse(source, FALSE); -- id = g_source_attach(source, NULL); -- g_source_unref(source); -- -- return id; --} -- --static void --alarm_msg_destroy(EThread *e, EMsg *msg, void *data) --{ -- AlarmMsg *m = (AlarmMsg *)msg; -- -- /* Free the private */ -- g_free (m->data); /* Mostly it is a structure allocated as a carrier*/ -- g_free (m); --} -- --static gboolean --alarm_msgport_replied(GIOChannel *source, GIOCondition cond, void *d) --{ -- EMsgPort *port = (EMsgPort *)d; -- EMsg *m; -- -- while (( m = e_msgport_get(port))) { -- d (printf("%s:%d (alarm_msgport_replied) - %p: Replied to GUI thread\n", __FILE__, __LINE__, m)); -- alarm_msg_destroy(NULL, m, NULL); -- } -- -- return TRUE; --} -- --static void --alarm_msg_received(EThread *e, EMsg *msg, void *data) --{ -- AlarmMsg *m = (AlarmMsg *)msg; -- -- d(printf("%s:%d (alarm_msg_received) - %p: Received at thread %" G_GINT64_MODIFIER "x\n", __FILE__, __LINE__, m, e_util_pthread_id(pthread_self()))); -- if (m->receive_msg) { -- m->receive_msg (e, m, data); -- } --} -- - /** - * alarm_notify_new: - * -@@ -363,23 +299,10 @@ - AlarmNotify * - alarm_notify_new (void) - { -- AlarmNotify *an; -- -- d (printf("%s:%d (alarm_notify_new) - Alarm Notify New \n ", __FILE__, __LINE__)); -- -- /* Create a thread for alarm queue operation*/ -- alarm_channel_setup(&alarm_reply_port, &alarm_reply_channel, alarm_msgport_replied); -- -- alarm_operation_thread = e_thread_new(E_THREAD_QUEUE); -- e_thread_set_msg_destroy(alarm_operation_thread, alarm_msg_destroy, 0); -- e_thread_set_msg_received(alarm_operation_thread, alarm_msg_received, 0); -- e_thread_set_reply_port(alarm_operation_thread, alarm_reply_port); -- -- an = g_object_new (TYPE_ALARM_NOTIFY, -- "poa", bonobo_poa_get_threaded (ORBIT_THREAD_HINT_PER_REQUEST, NULL), -- NULL); -- -- return an; -+ return g_object_new (TYPE_ALARM_NOTIFY, -+ "poa", bonobo_poa_get_threaded ( -+ ORBIT_THREAD_HINT_PER_REQUEST, NULL), -+ NULL); - } - - static void ---- evolution-2.9.91/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-01-03 10:27:57.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/alarm-notify/alarm-queue.c 2007-02-15 16:04:42.000000000 -0500 -@@ -115,9 +115,6 @@ - static int tray_blink_state = FALSE; - static AlarmNotify *an; - --/* Main Tasks thread for dealing with the global structures */ --extern EThread *alarm_operation_thread; -- - /* Structure that stores a client we are monitoring */ - typedef struct { - /* Monitored client */ -@@ -199,6 +196,40 @@ - static void load_alarms_for_today (ClientAlarms *ca); - static void midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data); - -+/* Simple asynchronous message dispatcher */ -+ -+typedef struct _Message Message; -+typedef void (*MessageFunc) (Message *msg); -+ -+struct _Message { -+ MessageFunc func; -+}; -+ -+static void -+message_proxy (Message *msg) -+{ -+ g_return_if_fail (msg->func != NULL); -+ -+ msg->func (msg); -+} -+ -+static gpointer -+create_thread_pool (void) -+{ -+ /* once created, run forever */ -+ return g_thread_pool_new ((GFunc) message_proxy, NULL, 1, FALSE, NULL); -+} -+ -+static void -+message_push (Message *msg) -+{ -+ static GOnce once = G_ONCE_INIT; -+ -+ g_once (&once, (GThreadFunc) create_thread_pool, NULL); -+ -+ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); -+} -+ - /* Queues an alarm trigger for midnight so that we can load the next day's worth - * of alarms. - */ -@@ -237,47 +268,41 @@ - } - - struct _midnight_refresh_msg { -+ Message header; - gboolean remove; - }; - - /* Loads the alarms for the new day every midnight */ - static void --midnight_refresh_async (EThread *e, AlarmMsg *msg, void *data) -+midnight_refresh_async (struct _midnight_refresh_msg *msg) - { -- struct _midnight_refresh_msg *list = msg->data; -- - d(printf("%s:%d (midnight_refresh_async) \n",__FILE__, __LINE__)); - - /* Re-load the alarms for all clients */ - g_hash_table_foreach (client_alarms_hash, add_client_alarms_cb, NULL); - - /* Re-schedule the midnight update */ -- if (list->remove && midnight_refresh_id != NULL) { -+ if (msg->remove && midnight_refresh_id != NULL) { - d(printf("%s:%d (midnight_refresh_async) - Reschedule the midnight update \n",__FILE__, __LINE__)); - alarm_remove (midnight_refresh_id); - midnight_refresh_id = NULL; - } - - queue_midnight_refresh (); -+ -+ g_slice_free (struct _midnight_refresh_msg, msg); - } - - static void - midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data) - { -- AlarmMsg *msg; -- struct _midnight_refresh_msg *list; -- -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = midnight_refresh_async; -- -- list = malloc (sizeof (struct _midnight_refresh_msg)); -+ struct _midnight_refresh_msg *msg; - -- list->remove = TRUE; -- msg->data = list; -+ msg = g_slice_new (struct _midnight_refresh_msg); -+ msg->header.func = (MessageFunc) midnight_refresh_async; -+ msg->remove = TRUE; - -- d(printf("%s:%d (midnight_refresh_cb) - Invoking task for midnight refresh\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - /* Looks up a client in the client alarms hash table */ -@@ -636,6 +661,7 @@ - * alarms. - */ - struct _query_msg { -+ Message header; - ECal *client; - GList *objects; - gpointer data; -@@ -669,7 +695,7 @@ - } - - static void --query_objects_changed_async (EThread *e, AlarmMsg *msg, void *data) -+query_objects_changed_async (struct _query_msg *msg) - { - ClientAlarms *ca; - time_t from, day_end; -@@ -678,13 +704,12 @@ - icaltimezone *zone; - CompQueuedAlarms *cqa; - GList *l; -- struct _query_msg *list = msg->data; - ECal *client; - GList *objects; - -- client = list->client; -- ca = list->data; -- objects = list->objects; -+ client = msg->client; -+ ca = msg->data; -+ objects = msg->objects; - - from = config_data_get_last_notification_time (); - if (from == -1) -@@ -773,43 +798,38 @@ - comp = NULL; - } - g_list_free (objects); -+ -+ g_slice_free (struct _query_msg, msg); - } - - static void - query_objects_changed_cb (ECal *client, GList *objects, gpointer data) - { -- AlarmMsg *msg; -- struct _query_msg *list; -+ struct _query_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = query_objects_changed_async; -- list = malloc (sizeof (struct _query_msg)); -- list->client = client; -- list->objects = duplicate_ical (objects); -- list->data = data; -- msg->data = list; -- -- d(printf("%s:%d (query_objects_changed_cb) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ msg = g_slice_new (struct _query_msg); -+ msg->header.func = (MessageFunc) query_objects_changed_async; -+ msg->client = client; -+ msg->objects = duplicate_ical (objects); -+ msg->data = data; - -+ message_push ((Message *) msg); - } - - /* Called when a calendar component is removed; we must delete its corresponding - * alarms. - */ - static void --query_objects_removed_async (EThread *e, AlarmMsg *msg, void *data) -+query_objects_removed_async (struct _query_msg *msg) - { - ClientAlarms *ca; - GList *l; -- struct _query_msg *list = msg->data; - ECal *client; - GList *objects; - -- client = list->client; -- ca = list->data; -- objects = list->objects; -+ client = msg->client; -+ ca = msg->data; -+ objects = msg->objects; - - d(printf("%s:%d (query_objects_removed_async) - Removing %d objects\n",__FILE__, __LINE__, g_list_length(objects))); - -@@ -822,27 +842,22 @@ - } - - g_list_free (objects); -+ -+ g_slice_free (struct _query_msg, msg); - } - - static void - query_objects_removed_cb (ECal *client, GList *objects, gpointer data) - { -- AlarmMsg *msg; -- struct _query_msg *list; -- -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = query_objects_removed_async; -- -- list = malloc (sizeof (struct _query_msg)); -- list->client = client; -- list->objects = duplicate_ecal (objects); -- list->data = data; -- msg->data = list; -+ struct _query_msg *msg; - -- d(printf("%s:%d (query_objects_removed_cb) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ msg = g_slice_new (struct _query_msg); -+ msg->header.func = (MessageFunc) query_objects_removed_async; -+ msg->client = client; -+ msg->objects = duplicate_ecal (objects); -+ msg->data = data; - -+ message_push ((Message *) msg); - } - - -@@ -989,20 +1004,19 @@ - } - - static void --on_dialog_objs_removed_async (EThread *e, AlarmMsg *msg, void *data) -+on_dialog_objs_removed_async (struct _query_msg *msg) - { - const char *our_uid; - GList *l; - TrayIconData *tray_data; -- struct _query_msg *list = msg->data; - ECal *client; - GList *objects; - - d(printf("%s:%d (on_dialog_objs_removed_async)\n",__FILE__, __LINE__)); - -- client = list->client; -- tray_data = list->data; -- objects = list->objects; -+ client = msg->client; -+ tray_data = msg->data; -+ objects = msg->objects; - - e_cal_component_get_uid (tray_data->comp, &our_uid); - g_return_if_fail (our_uid && *our_uid); -@@ -1020,37 +1034,33 @@ - tray_data = NULL; - } - } -+ -+ g_slice_free (struct _query_msg, msg); - } - - static void - on_dialog_objs_removed_cb (ECal *client, GList *objects, gpointer data) - { -- AlarmMsg *msg; -- struct _query_msg *list; -+ struct _query_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = on_dialog_objs_removed_async; -- -- list = malloc (sizeof (struct _query_msg)); -- list->client = client; -- list->objects = objects; -- list->data = data; -- msg->data = list; -+ msg = g_slice_new (struct _query_msg); -+ msg->header.func = (MessageFunc) on_dialog_objs_removed_async; -+ msg->client = client; -+ msg->objects = objects; -+ msg->data = data; - -- d(printf("%s:%d (on_dialog_objs_removed_cb) - Posting a task \n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - struct _tray_cqa_msg { -+ Message header; - CompQueuedAlarms *cqa; - }; - - static void --tray_list_remove_cqa_async(EThread *e, AlarmMsg *msg, void *data) -+tray_list_remove_cqa_async (struct _tray_cqa_msg *msg) - { -- struct _tray_cqa_msg *tmsg = msg->data; -- CompQueuedAlarms *cqa = tmsg->cqa; -+ CompQueuedAlarms *cqa = msg->cqa; - 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 @@ - gtk_tree_selection_select_iter (sel, &iter); - } - } -+ -+ g_slice_free (struct _tray_cqa_msg, msg); - } - - static void - tray_list_remove_cqa (CompQueuedAlarms *cqa) - { -- AlarmMsg *msg; -- struct _tray_cqa_msg *list; -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = tray_list_remove_cqa_async; -- -- list = malloc (sizeof (struct _tray_cqa_msg)); -- list->cqa = cqa; -- msg->data = list; -+ struct _tray_cqa_msg *msg; -+ -+ msg = g_slice_new (struct _tray_cqa_msg); -+ msg->header.func = (MessageFunc) tray_list_remove_cqa_async; -+ msg->cqa = cqa; - -- d(printf("%s:%d (tray_list_remove_cqa) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - /* Callback used from the alarm notify dialog */ - static void --tray_list_remove_async(EThread *e, AlarmMsg *msg, void *data) -+tray_list_remove_async (Message *msg) - { - GList *list = tray_icons_list; - -@@ -1138,55 +1145,50 @@ - } else - list = list->next; - } -+ -+ g_slice_free (Message, msg); - } - - static void --tray_list_remove_icons () -+tray_list_remove_icons (void) - { -- AlarmMsg *msg; -- -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = tray_list_remove_async; -+ Message *msg; - -- msg->data = NULL; -+ msg = g_slice_new (Message); -+ msg->func = tray_list_remove_async; - -- d(printf("%s:%d (tray_list_remove_icons) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push (msg); - } - - struct _tray_msg { -+ Message header; - TrayIconData *data; - }; - - static void --tray_list_remove_data_async(EThread *e, AlarmMsg *msg, void *data) -+tray_list_remove_data_async (struct _tray_msg *msg) - { -- struct _tray_msg *tmsg = msg->data; -- TrayIconData *tray_data = tmsg->data; -+ TrayIconData *tray_data = msg->data; - - d(printf("%s:%d (tray_list_remove_data_async) - Removing %p from tray list\n",__FILE__, __LINE__, tray_data)); - - tray_icons_list = g_list_remove_all (tray_icons_list, tray_data); - free_tray_icon_data (tray_data); - tray_data = NULL; -+ -+ g_slice_free (struct _tray_msg, msg); - } - - static void - tray_list_remove_data (TrayIconData *data) - { -- AlarmMsg *msg; -- struct _tray_msg *list; -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = tray_list_remove_data_async; -- -- list = malloc (sizeof (struct _tray_msg)); -- list->data = data; -- msg->data = list; -+ struct _tray_msg *msg; -+ -+ msg = g_slice_new (struct _tray_msg); -+ msg->header.func = (MessageFunc) tray_list_remove_data_async; -+ msg->data = data; - -- d(printf("%s:%d (tray_list_remove_data) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - static void -@@ -1394,29 +1396,24 @@ - /* Add a new data to tray list */ - - static void --tray_list_add_async (EThread *e, AlarmMsg *msg, void *data) -+tray_list_add_async (struct _tray_msg *msg) - { -- struct _tray_msg *list = msg->data; -- d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, list->data)); -- tray_icons_list = g_list_prepend (tray_icons_list, list->data); -+ d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, msg->data)); -+ tray_icons_list = g_list_prepend (tray_icons_list, msg->data); -+ -+ g_slice_free (struct _tray_msg, msg); - } - - static void - tray_list_add_new (TrayIconData *data) - { -- AlarmMsg *msg; -- struct _tray_msg *list; -+ struct _tray_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = tray_list_add_async; -- -- list = malloc (sizeof (struct _tray_msg)); -- list->data = data; -- msg->data = list; -- -- d(printf("%s:%d (tray_list_add_new) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ msg = g_slice_new (struct _tray_msg); -+ msg->header.func = (MessageFunc) tray_list_add_async; -+ msg->data = data; -+ -+ message_push ((Message *) msg); - } - - /* Performs notification of a display alarm */ -@@ -1840,21 +1837,13 @@ - new_midnight = time_day_end_with_zone (time (NULL), zone); - - if (new_midnight > midnight) { -- AlarmMsg *msg; -- struct _midnight_refresh_msg *list; -- -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = midnight_refresh_async; -- -- list = malloc (sizeof (struct _midnight_refresh_msg)); -+ struct _midnight_refresh_msg *msg; - -- list->remove = FALSE; -- /* We dont need it. So set it to NULL */ -- msg->data = list; -+ msg = g_slice_new (struct _midnight_refresh_msg); -+ msg->header.func = (MessageFunc) midnight_refresh_async; -+ msg->remove = FALSE; - -- d(printf("%s:%d (check_midnight_refresh) - Posting a task to refresh\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - return TRUE; -@@ -1985,14 +1974,15 @@ - } - - struct _alarm_client_msg { -+ Message header; - ECal *client; - }; - --static void alarm_queue_add_async (EThread *e, AlarmMsg *msg, void *data) -+static void -+alarm_queue_add_async (struct _alarm_client_msg *msg) - { - ClientAlarms *ca; -- struct _alarm_client_msg *list = msg->data; -- ECal *client = list->client; -+ ECal *client = msg->client; - - g_return_if_fail (alarm_queue_inited); - g_return_if_fail (client != NULL); -@@ -2023,6 +2013,8 @@ - G_CALLBACK (cal_opened_cb), - ca); - } -+ -+ g_slice_free (struct _alarm_client_msg, msg); - } - - /** -@@ -2042,20 +2034,13 @@ - void - alarm_queue_add_client (ECal *client) - { -- AlarmMsg *msg; -- struct _alarm_client_msg *list; -+ struct _alarm_client_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = alarm_queue_add_async; -- -- list = malloc (sizeof (struct _alarm_client_msg)); -- list->client = client; -- g_object_ref (client); -- msg->data = list; -+ msg = g_slice_new (struct _alarm_client_msg); -+ msg->header.func = (MessageFunc) alarm_queue_add_async; -+ msg->client = g_object_ref (client); - -- d(printf("%s:%d (alarm_queue_add_client) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - /* Removes a component an its alarms */ -@@ -2107,11 +2092,10 @@ - * Removes a calendar client from the alarm queueing system. - **/ - static void --alarm_queue_remove_async (EThread *e, AlarmMsg *msg, void *data) -+alarm_queue_remove_async (struct _alarm_client_msg *msg) - { - ClientAlarms *ca; -- struct _alarm_client_msg *list = msg->data; -- ECal *client = list->client; -+ ECal *client = msg->client; - - g_return_if_fail (alarm_queue_inited); - g_return_if_fail (client != NULL); -@@ -2148,24 +2132,20 @@ - g_free (ca); - - g_hash_table_remove (client_alarms_hash, client); -+ -+ g_slice_free (struct _alarm_client_msg, msg); - } - - void - alarm_queue_remove_client (ECal *client) - { -- AlarmMsg *msg; -- struct _alarm_client_msg *list; -+ struct _alarm_client_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = alarm_queue_remove_async; -- -- list = malloc (sizeof (struct _alarm_client_msg)); -- list->client = client; -- msg->data = list; -+ msg = g_slice_new (struct _alarm_client_msg); -+ msg->header.func = (MessageFunc) alarm_queue_remove_async; -+ msg->client = client; - -- d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - /* Update non-time related variables for various structures on modification of an existing component diff --git a/evolution-2.9.1-first-ascii.patch b/evolution-2.9.1-first-ascii.patch deleted file mode 100644 index 7fffebe..0000000 --- a/evolution-2.9.1-first-ascii.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- evolution-2.9.1/calendar/gui/e-day-view.c.first-ascii 2006-11-06 11:25:23.000000000 -0500 -+++ evolution-2.9.1/calendar/gui/e-day-view.c 2006-11-06 11:34:32.000000000 -0500 -@@ -333,7 +333,7 @@ - static void e_day_view_start_editing_event (EDayView *day_view, - gint day, - gint event_num, -- gchar *initial_text); -+ GdkEventKey *key_event); - static void e_day_view_stop_editing_event (EDayView *day_view); - static gboolean e_day_view_text_keypress (GnomeCanvasItem *item, - guint keyval, -@@ -6012,7 +6012,6 @@ - ECalModel *model; - ECalComponent *comp; - gint day, event_num; -- gchar *initial_text; - guint keyval; - gboolean stop_emission; - time_t dtstart, dtend; -@@ -6153,15 +6152,12 @@ - - /* We only want to start an edit with a return key or a simple - character. */ -- if (keyval == GDK_Return) { -- initial_text = NULL; -- } else if (((keyval >= 0x20) && (keyval <= 0xFF) -- && (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))) -- || (event->length == 0) -- || (keyval == GDK_Tab)) { -+ if ((keyval != GDK_Return) && -+ (((keyval >= 0x20) && (keyval <= 0xFF) -+ && (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))) -+ || (event->length == 0) -+ || (keyval == GDK_Tab))) - return FALSE; -- } else -- initial_text = e_utf8_from_gtk_event_key (widget, event->keyval, event->string); - - /* Add a new event covering the selected range */ - icalcomp = e_cal_model_create_component_with_defaults (model); -@@ -6207,15 +6203,11 @@ - gtk_widget_queue_draw (day_view->main_canvas); - - if (e_day_view_find_event_from_uid (day_view, ecal, uid, NULL, &day, &event_num)) { -- e_day_view_start_editing_event (day_view, day, event_num, -- initial_text); -+ e_day_view_start_editing_event (day_view, day, event_num, event); - } else { - g_warning ("Couldn't find event to start editing.\n"); - } - -- if (initial_text) -- g_free (initial_text); -- - g_object_unref (comp); - - return TRUE; -@@ -6897,7 +6889,7 @@ - e_day_view_start_editing_event (EDayView *day_view, - gint day, - gint event_num, -- gchar *initial_text) -+ GdkEventKey *key_event) - { - EDayViewEvent *event; - ETextEventProcessor *event_processor = NULL; -@@ -6937,10 +6929,20 @@ - rid of the start and end times. */ - e_canvas_item_grab_focus (event->canvas_item, TRUE); - -- if (initial_text) { -- gnome_canvas_item_set (event->canvas_item, -- "text", initial_text, -- NULL); -+ if (key_event) { -+ if (gtk_im_context_filter_keypress (((EText *)(event->canvas_item))->im_context, key_event)) { -+ ((EText *)(event->canvas_item))->need_im_reset = TRUE; -+ } -+ else { -+ char *initial_text; -+ -+ initial_text = e_utf8_from_gtk_event_key (GTK_WIDGET (day_view), key_event->keyval, key_event->string); -+ gnome_canvas_item_set (event->canvas_item, -+ "text", initial_text, -+ NULL); -+ if (initial_text) -+ g_free (initial_text); -+ } - } - - /* Try to move the cursor to the end of the text. */ diff --git a/evolution-2.9.1-im-context-reset.patch b/evolution-2.9.1-im-context-reset.patch deleted file mode 100644 index 76e9d98..0000000 --- a/evolution-2.9.1-im-context-reset.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- evolution-2.9.1/calendar/gui/e-day-view.c.im-context-reset 2006-11-06 10:14:26.000000000 -0500 -+++ evolution-2.9.1/calendar/gui/e-day-view.c 2006-11-06 10:15:39.000000000 -0500 -@@ -6928,6 +6928,9 @@ - if (!event->canvas_item) - return; - -+ /* Reset IM context. */ -+ gtk_im_context_reset (E_TEXT (event->canvas_item)->im_context); -+ - /* We must grab the focus before setting the initial text, since - grabbing the focus will result in a call to - e_day_view_on_editing_started(), which will reset the text to get diff --git a/evolution-2.9.1-kill-ememory.patch b/evolution-2.9.1-kill-ememory.patch deleted file mode 100644 index de2da1d..0000000 --- a/evolution-2.9.1-kill-ememory.patch +++ /dev/null @@ -1,299 +0,0 @@ ---- evolution-2.9.1/mail/message-list.c.ememory 2006-10-25 11:11:34.000000000 -0400 -+++ evolution-2.9.1/mail/message-list.c 2006-10-25 11:15:12.000000000 -0400 -@@ -412,70 +412,28 @@ - return info; - } - --static const char * --get_normalised_string (MessageList *message_list, CamelMessageInfo *info, int col) -+static const gchar * -+get_normalised_string (MessageList *message_list, const gchar *string) - { -- const char *string, *str; -- char *normalised; -- EPoolv *poolv; -- int index; -- -- switch (col) { -- case COL_SUBJECT_NORM: -- string = camel_message_info_subject (info); -- index = NORMALISED_SUBJECT; -- break; -- case COL_FROM_NORM: -- string = camel_message_info_from (info); -- index = NORMALISED_FROM; -- break; -- case COL_TO_NORM: -- string = camel_message_info_to (info); -- index = NORMALISED_TO; -- break; -- default: -- string = NULL; -- index = NORMALISED_LAST; -- g_assert_not_reached (); -- } -- -- /* slight optimisation */ -- if (string == NULL || string[0] == '\0') -+ GHashTable *hash_table = message_list->normalised_hash; -+ GStringChunk *string_chunk = message_list->string_chunk; -+ gchar *collation_key, *temp; -+ -+ if (string == NULL || *string == '\0') - return ""; -- -- poolv = g_hash_table_lookup (message_list->normalised_hash, camel_message_info_uid (info)); -- if (poolv == NULL) { -- poolv = e_poolv_new (NORMALISED_LAST); -- g_hash_table_insert (message_list->normalised_hash, (char *) camel_message_info_uid (info), poolv); -- } else { -- str = e_poolv_get (poolv, index); -- if (*str) -- return str; -- } -- -- if (col == COL_SUBJECT_NORM) { -- const unsigned char *subject; -- -- subject = (const unsigned char *) string; -- while (!g_ascii_strncasecmp (subject, "Re:", 3)) { -- subject += 3; -- -- /* jump over any spaces */ -- while (*subject && isspace ((int) *subject)) -- subject++; -- } -- -- /* jump over any spaces */ -- while (*subject && isspace ((int) *subject)) -- subject++; -- -- string = (const char *) subject; -- } -- -- normalised = g_utf8_collate_key (string, -1); -- e_poolv_set (poolv, index, normalised, TRUE); -- -- return e_poolv_get (poolv, index); -+ -+ collation_key = g_hash_table_lookup (hash_table, string); -+ if (collation_key != NULL) -+ return collation_key; -+ -+ temp = g_utf8_collate_key (string, -1); -+ collation_key = g_string_chunk_insert_const (string_chunk, temp); -+ g_free (temp); -+ -+ temp = g_string_chunk_insert_const (string_chunk, string); -+ g_hash_table_insert (hash_table, temp, collation_key); -+ -+ return collation_key; - } - - static void -@@ -1283,12 +1241,23 @@ - str = camel_message_info_from (msg_info); - return (void *)(str ? str : ""); - case COL_FROM_NORM: -- return (void *) get_normalised_string (message_list, msg_info, col); -+ str = camel_message_info_from (msg_info); -+ return (void *) get_normalised_string (message_list, str); - case COL_SUBJECT: - str = camel_message_info_subject (msg_info); - return (void *)(str ? str : ""); - case COL_SUBJECT_NORM: -- return (void *) get_normalised_string (message_list, msg_info, col); -+ str = camel_message_info_subject (msg_info); -+ while (str != NULL && *str != '\0') { -+ /* skip over spaces and reply prefixes */ -+ if (g_ascii_strncasecmp (str, "Re:", 3) == 0) -+ str += 3; -+ else if (g_ascii_isspace (*str)) -+ str++; -+ else -+ break; -+ } -+ return (void *) get_normalised_string (message_list, str); - case COL_SENT: { - ETreePath child; - -@@ -1312,7 +1281,8 @@ - str = camel_message_info_to (msg_info); - return (void *)(str ? str : ""); - case COL_TO_NORM: -- return (void *) get_normalised_string (message_list, msg_info, col); -+ str = camel_message_info_to (str); -+ return (void *) get_normalised_string (message_list, str); - case COL_SIZE: - return GINT_TO_POINTER (camel_message_info_size(msg_info)); - case COL_DELETED: -@@ -2023,9 +1993,10 @@ - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (message_list), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - - message_list->normalised_hash = g_hash_table_new (g_str_hash, g_str_equal); -+ message_list->string_chunk = g_string_chunk_new (1024); - - message_list->hidden = NULL; -- message_list->hidden_pool = NULL; -+ message_list->hidden_string_chunk = NULL; - message_list->hide_before = ML_HIDE_NONE_START; - message_list->hide_after = ML_HIDE_NONE_END; - -@@ -2054,14 +2025,6 @@ - g_signal_connect (((GtkScrolledWindow *) message_list)->vscrollbar, "value-changed", G_CALLBACK (ml_scrolled), message_list); - } - --static gboolean --normalised_free (gpointer key, gpointer value, gpointer user_data) --{ -- e_poolv_destroy (value); -- -- return TRUE; --} -- - static void - message_list_destroy(GtkObject *object) - { -@@ -2127,17 +2090,17 @@ - MessageList *message_list = MESSAGE_LIST (object); - struct _MessageListPrivate *p = message_list->priv; - -- g_hash_table_foreach (message_list->normalised_hash, (GHFunc) normalised_free, NULL); - g_hash_table_destroy (message_list->normalised_hash); -+ g_string_chunk_free (message_list->string_chunk); - - if (message_list->thread_tree) - camel_folder_thread_messages_unref(message_list->thread_tree); - - if (message_list->hidden) { - g_hash_table_destroy(message_list->hidden); -- e_mempool_destroy(message_list->hidden_pool); -+ g_string_chunk_free(message_list->hidden_string_chunk); - message_list->hidden = NULL; -- message_list->hidden_pool = NULL; -+ message_list->hidden_string_chunk = NULL; - } - - g_free(message_list->search); -@@ -2940,17 +2903,6 @@ - d(printf("changed = %d added = %d removed = %d\n", - changes->uid_changed->len, changes->uid_added->len, changes->uid_removed->len)); - -- for (i = 0; i < changes->uid_removed->len; i++) { -- /* uncache the normalised strings for these uids */ -- EPoolv *poolv; -- -- poolv = g_hash_table_lookup (ml->normalised_hash, changes->uid_removed->pdata[i]); -- if (poolv != NULL) { -- g_hash_table_remove (ml->normalised_hash, changes->uid_removed->pdata[i]); -- e_poolv_destroy (poolv); -- } -- } -- - /* check if the hidden state has changed, if so modify accordingly, then regenerate */ - if (ml->hidejunk || ml->hidedeleted) - mail_folder_hide_by_flag (folder, ml, &changes, (ml->hidejunk ? CAMEL_MESSAGE_JUNK : 0) | (ml->hidedeleted ? CAMEL_MESSAGE_DELETED : 0)); -@@ -3028,7 +2980,11 @@ - } - - /* reset the normalised sort performance hack */ -- g_hash_table_foreach_remove (message_list->normalised_hash, normalised_free, NULL); -+ /* XXX GLib 2.12 added g_hash_table_remove_all() */ -+ g_hash_table_destroy (message_list->normalised_hash); -+ message_list->normalised_hash = g_hash_table_new (g_str_hash, g_str_equal); -+ g_string_chunk_free (message_list->string_chunk); -+ message_list->string_chunk = g_string_chunk_new (1024); - - mail_regen_cancel(message_list); - -@@ -3479,14 +3435,14 @@ - MESSAGE_LIST_LOCK (ml, hide_lock); - if (ml->hidden == NULL) { - ml->hidden = g_hash_table_new (g_str_hash, g_str_equal); -- ml->hidden_pool = e_mempool_new (512, 256, E_MEMPOOL_ALIGN_BYTE); -+ ml->hidden_string_chunk = g_string_chunk_new (512); - } - -- uid = e_mempool_strdup (ml->hidden_pool, uids->pdata[i]); -+ uid = g_string_chunk_insert (ml->hidden_string_chunk, uids->pdata[i]); - g_hash_table_insert (ml->hidden, uid, uid); - for ( ; i < uids->len; i++) { - if (g_hash_table_lookup (ml->uid_nodemap, uids->pdata[i])) { -- uid = e_mempool_strdup (ml->hidden_pool, uids->pdata[i]); -+ uid = g_string_chunk_insert (ml->hidden_string_chunk, uids->pdata[i]); - g_hash_table_insert (ml->hidden, uid, uid); - } - } -@@ -3507,9 +3463,9 @@ - MESSAGE_LIST_LOCK (ml, hide_lock); - if (ml->hidden) { - g_hash_table_destroy (ml->hidden); -- e_mempool_destroy (ml->hidden_pool); -+ g_string_chunk_free (ml->hidden_string_chunk); - ml->hidden = NULL; -- ml->hidden_pool = NULL; -+ ml->hidden_string_chunk = NULL; - } - ml->hide_before = ML_HIDE_NONE_START; - ml->hide_after = ML_HIDE_NONE_END; -@@ -3545,9 +3501,9 @@ - MESSAGE_LIST_LOCK(ml, hide_lock); - if (ml->hidden) { - g_hash_table_destroy (ml->hidden); -- e_mempool_destroy (ml->hidden_pool); -+ g_string_chunk_free (ml->hidden_string_chunk); - ml->hidden = NULL; -- ml->hidden_pool = NULL; -+ ml->hidden_string_chunk = NULL; - } - ml->hide_before = ML_HIDE_NONE_START; - ml->hide_after = ML_HIDE_NONE_END; -@@ -3558,7 +3514,7 @@ - camel_file_util_decode_fixed_int32 (in, &version); - if (version == HIDE_STATE_VERSION) { - ml->hidden = g_hash_table_new(g_str_hash, g_str_equal); -- ml->hidden_pool = e_mempool_new(512, 256, E_MEMPOOL_ALIGN_BYTE); -+ ml->hidden_string_chunk = g_string_chunk_new(512); - camel_file_util_decode_fixed_int32 (in, &lower); - ml->hide_before = lower; - camel_file_util_decode_fixed_int32 (in, &upper); -@@ -3567,7 +3523,7 @@ - char *olduid, *uid; - - if (camel_file_util_decode_string (in, &olduid) != -1) { -- uid = e_mempool_strdup(ml->hidden_pool, olduid); -+ uid = g_string_chunk_insert(ml->hidden_string_chunk, olduid); - g_free (olduid); - g_hash_table_insert(ml->hidden, uid, uid); - } -@@ -3717,12 +3673,12 @@ - - if (m->ml->hidden == NULL) { - m->ml->hidden = g_hash_table_new (g_str_hash, g_str_equal); -- m->ml->hidden_pool = e_mempool_new (512, 256, E_MEMPOOL_ALIGN_BYTE); -+ m->ml->hidden_string_chunk = g_string_chunk_new (512); - } - - for (i = 0; i < uidnew->len; i++) { - if (g_hash_table_lookup (m->ml->hidden, uidnew->pdata[i]) == 0) { -- char *uid = e_mempool_strdup (m->ml->hidden_pool, uidnew->pdata[i]); -+ char *uid = g_string_chunk_insert (m->ml->hidden_string_chunk, uidnew->pdata[i]); - g_hash_table_insert (m->ml->hidden, uid, uid); - } - } ---- evolution-2.9.1/mail/message-list.h.ememory 2006-09-28 04:56:51.000000000 -0400 -+++ evolution-2.9.1/mail/message-list.h 2006-10-25 11:15:12.000000000 -0400 -@@ -102,11 +102,12 @@ - GHashTable *uid_nodemap; /* uid (from info) -> tree node mapping */ - - GHashTable *normalised_hash; -+ GStringChunk *string_chunk; - - /* UID's to hide. Keys in the mempool */ - /* IMPORTANT: You MUST have obtained the hide lock, to operate on this data */ - GHashTable *hidden; -- struct _EMemPool *hidden_pool; -+ GStringChunk *hidden_string_chunk; - int hide_unhidden; /* total length, before hiding */ - int hide_before, hide_after; /* hide ranges of messages */ - 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-meeting-list-view.patch b/evolution-2.9.3-meeting-list-view.patch deleted file mode 100644 index 9b87a14..0000000 --- a/evolution-2.9.3-meeting-list-view.patch +++ /dev/null @@ -1,86 +0,0 @@ ---- evolution-2.9.3/calendar/gui/e-meeting-list-view.c.meeting-list-view 2006-12-11 23:13:47.000000000 -0500 -+++ evolution-2.9.3/calendar/gui/e-meeting-list-view.c 2006-12-11 23:14:17.000000000 -0500 -@@ -623,18 +623,45 @@ - - } - -+void -+attendee_added_cb (EMeetingStore *store, GtkTreePath *path, -+ GtkTreeIter *iter, EMeetingListView *view) -+{ -+ EMeetingAttendee *attendee; -+ gint row; -+ -+ /* Add the new attendee to the name selector. */ -+ row = gtk_tree_path_get_indices (path) [0]; -+ attendee = e_meeting_store_find_attendee_at_row (store, row); -+ e_meeting_list_view_add_attendee_to_name_selector (view, attendee); -+} -+ -+void -+attendee_deleted_cb (EMeetingStore *store, GtkTreePath *path, -+ EMeetingListView *view) -+{ -+ EMeetingAttendee *attendee; -+ gint row; -+ -+ /* Remove the old attendee from the name selector. */ -+ row = gtk_tree_path_get_indices (path) [0]; -+ attendee = e_meeting_store_find_attendee_at_row (store, row); -+ e_meeting_list_view_remove_attendee_from_name_selector (view, attendee); -+} - - EMeetingListView * - e_meeting_list_view_new (EMeetingStore *store) - { -- EMeetingListView *view = g_object_new (E_TYPE_MEETING_LIST_VIEW, NULL); -+ EMeetingListView *view; - GtkTreeSelection *selection; - -- if (view) { -- view->priv->store = store; -- gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL (store)); -- build_table (view); -- } -+ view = g_object_new (E_TYPE_MEETING_LIST_VIEW, NULL); -+ view->priv->store = store; -+ gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL (store)); -+ build_table (view); -+ -+ g_signal_connect (store, "row-inserted", G_CALLBACK (attendee_added_cb), view); -+ g_signal_connect (store, "row-deleted", G_CALLBACK (attendee_deleted_cb), view); - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(view)); - g_signal_connect (selection, "changed", G_CALLBACK (row_activated_cb), view); ---- evolution-2.9.3/calendar/gui/e-meeting-store.c.meeting-list-view 2006-12-04 10:44:42.000000000 -0500 -+++ evolution-2.9.3/calendar/gui/e-meeting-store.c 2006-12-11 23:14:17.000000000 -0500 -@@ -794,14 +794,13 @@ - } - - if (row != -1) { -- -- g_ptr_array_remove_index (store->priv->attendees, row); -- g_object_unref (attendee); -- - path = gtk_tree_path_new (); - gtk_tree_path_append_index (path, row); - gtk_tree_model_row_deleted (GTK_TREE_MODEL (store), path); - gtk_tree_path_free (path); -+ -+ g_ptr_array_remove_index (store->priv->attendees, row); -+ g_object_unref (attendee); - } - } - -@@ -815,10 +814,10 @@ - - for (i = 0; i < store->priv->attendees->len; i++) { - EMeetingAttendee *attendee = g_ptr_array_index (store->priv->attendees, i); -- g_object_unref (attendee); - - gtk_tree_model_row_deleted (GTK_TREE_MODEL (store), path); - gtk_tree_path_next (path); -+ g_object_unref (attendee); - } - - g_ptr_array_set_size (store->priv->attendees, 0); diff --git a/evolution-2.9.3-source-path-entry.patch b/evolution-2.9.3-source-path-entry.patch deleted file mode 100644 index 2a6337a..0000000 --- a/evolution-2.9.3-source-path-entry.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- evolution-2.9.3/mail/mail-config.glade.source-path-entry 2006-12-08 20:15:16.000000000 -0500 -+++ evolution-2.9.3/mail/mail-config.glade 2006-12-08 20:16:13.000000000 -0500 -@@ -1343,7 +1343,7 @@ - - True - Mailbox location -- GTK_FILE_CHOOSER_ACTION_OPEN -+ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER - True - False - False -@@ -1354,7 +1354,6 @@ - 2 - 2 - 3 -- fill - - - 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-2.9.3-view-attachment-uri.patch b/evolution-2.9.3-view-attachment-uri.patch deleted file mode 100644 index a506488..0000000 --- a/evolution-2.9.3-view-attachment-uri.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- evolution-2.9.3/mail/mail-ops.c.view-attachment-uri 2006-12-06 10:26:24.000000000 -0500 -+++ evolution-2.9.3/mail/mail-ops.c 2006-12-06 11:16:46.000000000 -0500 -@@ -2089,21 +2089,23 @@ - save_part_save (struct _mail_msg *mm) - { - struct _save_part_msg *m = (struct _save_part_msg *)mm; -+ mode_t mode = S_IRUSR | S_IRGRP | S_IROTH; -+ int flags = O_WRONLY | O_CREAT | O_TRUNC; - CamelDataWrapper *content; - CamelStream *stream; -- -- if(!m->readonly){ -- if (!(stream = camel_stream_vfs_new_with_uri (m->path, O_WRONLY | O_CREAT | O_TRUNC, 0644))) { -- camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM, -- _("Cannot create output file: %s:\n %s"), -- m->path, g_strerror (errno)); -- return; -- } -- } else if (!(stream = camel_stream_vfs_new_with_uri (m->path, O_WRONLY | O_CREAT | O_TRUNC, 0444))) { -+ gchar *uri; -+ -+ uri = g_filename_to_uri (m->path, NULL, NULL); -+ -+ if (!m->readonly) -+ mode |= S_IWUSR; -+ -+ stream = camel_stream_vfs_new_with_uri (uri, flags, mode); -+ if (stream == NULL) { - camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM, - _("Cannot create output file: %s:\n %s"), - m->path, g_strerror (errno)); -- return; -+ goto exit; - } - - content = camel_medium_get_content_object (CAMEL_MEDIUM (m->part)); -@@ -2115,6 +2117,9 @@ - g_strerror (errno)); - - camel_object_unref (stream); -+ -+exit: -+ g_free (uri); - } - - static void diff --git a/evolution-2.9.4-view-message-source.patch b/evolution-2.9.4-view-message-source.patch deleted file mode 100644 index bd0ed6d..0000000 --- a/evolution-2.9.4-view-message-source.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- evolution-2.9.4/mail/em-format-html.c.view-message-source 2006-12-20 10:51:00.000000000 -0500 -+++ evolution-2.9.4/mail/em-format-html.c 2006-12-21 10:08:02.000000000 -0500 -@@ -1872,7 +1872,7 @@ - filtered_stream = camel_stream_filter_new_with_stream ((CamelStream *) stream); - html_filter = camel_mime_filter_tohtml_new (CAMEL_MIME_FILTER_TOHTML_CONVERT_NL - | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES -- | CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT, 0); -+ | CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT, 0); - camel_stream_filter_add(filtered_stream, html_filter); - camel_object_unref(html_filter); - diff --git a/evolution.spec b/evolution.spec index e71cc44..527cd79 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,2073 +1,603 @@ -%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 gnome_doc_utils_version 0.8.0 -%define gnome_icon_theme_version 1.3.6 -%define gnome_pilot_version 2.0.13 -%define gnomevfs2_version 2.4 -%define gtkhtml_version 3.13.92 +%undefine __cmake_in_source_build + +%global _changelog_trimtime %(date +%s -d "1 year ago") +%global _python_bytecompile_extra 0 + +# correct Obsoletes for evolution-tests when this is changed +%global enable_installed_tests 0 + +%global tnef_support 0 +%if 0%{?fedora} +%global tnef_support 1 +%endif + +%define glib2_version 2.66 +%define gtk3_version 3.22 +%define gnome_autoar_version 0.1.1 +%define gnome_desktop_version 2.91.3 %define intltool_version 0.35.5 +%define libgweather_version 3.91 +%define geocode_glib_version 3.26.3 +%define sqlite_version 3.7.17 +%define libsoup_version 3.1.1 +%define webkit2gtk_version 2.34.0 + +%define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 -%define libbonoboui_version 2.4.2 -%define libgnomeprint22_version 2.8.0 -%define libgnomeprintui22_version 2.2.1 -%define orbit2_version 2.9.8 -%define pilot_link_version 2:0.12.1 -%define redhat_menus_version 5.0.4 -%define scrollkeeper_version 0.1.4 -%define soup_version 2.2.2 +%define last_evo_nm_version 3.5.0 +%define last_evo_perl_version 3.21.90 -%define evo_major 2.10 - -%define exchange_support 1 -%define inline_audio_support 0 %define ldap_support 1 %define libnotify_support 1 -%define krb5_support 1 -%define nntp_support 1 -%ifnarch s390 s390x -%define nm_support 1 -%else -%define nm_support 0 -%endif -%ifarch s390 s390x -%define pilot_support 0 -%else -%define pilot_support 1 -%endif -%define use_mozilla_nss 1 +%define libpst_support 1 -# Use stricter build settings than required by upstream. -%define strict_build_settings 1 +# Coverity scan can override this to 0, to skip checking in gtk-doc generated code +%{!?with_docs: %global with_docs 1} -%define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins +%if 0%{?flatpak} +%global with_docs 0 +%endif + +%define evo_plugin_dir %{_libdir}/evolution/plugins ### Abstract ### Name: evolution -Version: 2.10.0 +Version: 3.59.1 Release: 2%{?dist} -License: GPL -Group: Applications/Productivity -Summary: GNOME's next-generation groupware suite -URL: http://www.gnome.org/projects/evolution/ -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Source: evolution-%{version}.tar.bz2 +Summary: Mail and calendar client for GNOME +License: GPL-2.0-or-later AND GFDL-1.3-or-later +URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home +Source: http://download.gnome.org/sources/%{name}/3.59/%{name}-%{version}.tar.xz +Source1: flatpak-evolution-fix-service-names.sh +Source2: flatpak-evolution-wrapper.sh.in -### Patches ### +# 0-99: General patches +# enable corresponding autopatch below to make them applied -# bad hack -Patch10: evolution-1.4.4-ldap-x86_64-hack.patch +# 100-199: Flatpak-specific patches +# https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/144 +Patch100: configurable-dbus-prefix.patch -# Fix for RH bug #154360: -Patch11: evolution-2.5.5.1-commit-enter-on-calendar.patch +# Approximate version number +Provides: bundled(libgnomecanvas) = 2.30.0 -# Fix for RH bug 164957 (was for 145552): -Patch13: evolution-2.0.2-fix-145552.patch +Obsoletes: anjal <= %{last_anjal_version} +Obsoletes: libgal2 <= %{last_libgal2_version} +Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} +Obsoletes: evolution-perl < %{last_evo_perl_version} +Obsoletes: evolution-rss < 3.45.2 -# Part of RH bug 170799: -Patch14: evolution-2.4.1-hide-switcher-buttons-by-default.patch +%if !%{enable_installed_tests} +Obsoletes: evolution-tests <= 3.31.1 +%endif -# 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 - -# 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 - -# 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 - -#Patch18: evolution-2.7.1-notification-cleanups.patch -Patch19: evolution-2.6.0-prototypes.patch - -# RH bug #157400 / GNOME bug #303877 -Patch20: 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 - -# RH bug #166231 / GNOME bug #264485 -Patch23: evolution-2.7.3-replicated-cjk-input.patch - -# RH bug #178295 / GNOME bug #348638 -Patch24: evolution-2.7.4-deleting-preedit-buffer.patch - -# RH bug #202289 -Patch25: evolution-2.7.92-fix-prgname.patch - -# RH bug #161885 / GNOME bug #309166 -Patch26: evolution-2.8.0-indic-cursor-movement.patch - -# RH bug #202751 / GNOME bug #355766 -Patch29: evolution-2.8.0-fix-indic-printing.patch - -# GNOME bug #362638 -Patch31: evolution-2.8.1-kill-ethread.patch - -# GNOME bug #363695 -Patch32: evolution-2.9.1-kill-ememory.patch - -# RH bug #176400 -Patch33: 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 - -# RH bug #216537 / GNOME bug #383047 -#Patch36: 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 - -# 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 - -# GNOME bug #218898 -Patch42: evolution-2.9.4-view-message-source.patch - -# GNOME bug #376991 -Patch43: evolution-2.10.0-e-passwords.patch - -# GNOME bug #417999 -Patch44: evolution-2.10.0-e-source-combo-box.patch +%global eds_version %{version} ## Dependencies ### -Requires(post): GConf2 -Requires(post): scrollkeeper >= %{scrollkeeper_version} -Requires(postun): scrollkeeper >= %{scrollkeeper_version} - -Requires: ORBit2 >= %{orbit2_version} -Requires: dbus >= %{dbus_version} -Requires: evolution-data-server >= %{eds_version} -Requires: gnome-icon-theme >= %{gnome_icon_theme_version} -Requires: gnome-spell >= 1.0.2 -Requires: gnome-vfs2 >= %{gnomevfs2_version} -Requires: gnutls -Requires: gtk2 >= 2.4.0 -Requires: libbonoboui >= %{libbonoboui_version} -Requires: libgnomeprint22 >= %{libgnomeprint22_version} -Requires: libgnomeprintui22 >= %{libgnomeprintui22_version} -Requires: libsoup >= %{soup_version} -Requires: redhat-menus >= %{redhat_menus_version} -Requires: spamassassin - -%if %{libnotify_support} -Requires: libnotify >= 0.4 +%if ! 0%{?flatpak} +Requires: %{_bindir}/killall +Requires: gvfs %endif - -Obsoletes: libgal2 <= %{last_libgal2_version} +Requires: evolution-data-server >= %{eds_version} +Requires: gspell +Requires: highlight +Requires: %{name}-langpacks = %{version}-%{release} ### Build Dependencies ### -BuildRequires: GConf2-devel -BuildRequires: ORBit2-devel >= %{orbit2_version} -BuildRequires: atk-devel -BuildRequires: autoconf >= 2.59 -BuildRequires: automake >= 1.9 -BuildRequires: bison -BuildRequires: byacc -BuildRequires: dbus-devel >= %{dbus_version} -BuildRequires: dbus-glib-devel >= %{dbus_glib_version} -BuildRequires: desktop-file-utils -BuildRequires: evolution-data-server-devel >= %{eds_version} -BuildRequires: flex +%if ! 0%{?flatpak} +BuildRequires: %{_bindir}/killall +%endif +BuildRequires: cmake +BuildRequires: gcc BuildRequires: gettext -BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} -BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version} -BuildRequires: gnutls-devel +%if %{with_docs} BuildRequires: gtk-doc -BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} +%endif +BuildRequires: highlight BuildRequires: intltool >= %{intltool_version} -BuildRequires: libbonobo-devel >= 2.0 -BuildRequires: libbonoboui-devel >= %{libbonoboui_version} -BuildRequires: libgnomecanvas-devel >= 2.0 -BuildRequires: libgnomeprint22-devel >= %{libgnomeprint22_version} -BuildRequires: libgnomeprintui22-devel >= %{libgnomeprintui22_version} -BuildRequires: libgnomeui-devel >= 2.0 -BuildRequires: libsoup-devel >= %{soup_version} -BuildRequires: libtool >= 1.5 -BuildRequires: libxml2-devel +BuildRequires: itstool BuildRequires: pkgconfig +BuildRequires: yelp-tools -%if %{use_mozilla_nss} -BuildRequires: nspr-devel -BuildRequires: nss-devel -%else -BuildRequires: openssl-devel +BuildRequires: pkgconfig(atk) +BuildRequires: pkgconfig(cairo-gobject) +BuildRequires: pkgconfig(camel-1.2) >= %{eds_version} +BuildRequires: pkgconfig(enchant-2) +BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version} +BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gnome-autoar-0) >= %{gnome_autoar_version} +BuildRequires: pkgconfig(gnome-autoar-gtk-0) >= %{gnome_autoar_version} +BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version} +BuildRequires: pkgconfig(gsettings-desktop-schemas) +BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} +BuildRequires: pkgconfig(gspell-1) +BuildRequires: pkgconfig(gweather4) >= %{libgweather_version} +BuildRequires: pkgconfig(geocode-glib-2.0) >= %{geocode_glib_version} +BuildRequires: pkgconfig(iso-codes) +BuildRequires: pkgconfig(libcanberra-gtk3) +BuildRequires: pkgconfig(libcmark) +BuildRequires: pkgconfig(libebackend-1.2) >= %{eds_version} +BuildRequires: pkgconfig(libebook-1.2) >= %{eds_version} +BuildRequires: pkgconfig(libecal-2.0) >= %{eds_version} +BuildRequires: pkgconfig(libedataserver-1.2) >= %{eds_version} +BuildRequires: pkgconfig(libedataserverui-1.2) >= %{eds_version} +BuildRequires: pkgconfig(libsoup-3.0) >= %{libsoup_version} +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(nspr) +BuildRequires: pkgconfig(nss) +BuildRequires: pkgconfig(shared-mime-info) +BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version} +BuildRequires: pkgconfig(webkit2gtk-4.1) >= %{webkit2gtk_version} +BuildRequires: pkgconfig(webkit2gtk-web-extension-4.1) >= %{webkit2gtk_version} + +%if %{tnef_support} +BuildRequires: pkgconfig(libytnef) %endif -%if %{inline_audio_support} -# audio-inline plugin requires gstreamer to build: -BuildRequires: gstreamer08-devel -%endif - -%if %{ldap_support} -BuildRequires: openldap-devel >= 2.0.11 -%endif - -%if %{pilot_support} -BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version} -# bleah, gnome-pilot really sucks this in, but then I have to have an explicit -# versioning for gnome-pilot when it changes less than pilot-link itself -BuildRequires: pilot-link-devel >= %{pilot_link_version} -Requires: gnome-pilot >= %{gnome_pilot_version} -%endif - -%if %{krb5_support} -BuildRequires: krb5-devel -# tweak for krb5 1.2 vs 1.3 -%define krb5dir /usr/kerberos -#define krb5dir `pwd`/krb5-fakeprefix -%endif - -%if %{nm_support} -BuildRequires: NetworkManager-glib-devel +%if %{ldap_support} +BuildRequires: openldap-devel >= 2.0.11 %endif %if %{libnotify_support} -BuildRequires: libnotify-devel +BuildRequires: pkgconfig(libnotify) +%endif + +%if %{libpst_support} +BuildRequires: pkgconfig(libpst) %endif %description Evolution is the GNOME mailer, calendar, contact manager and -communications tool. The tools which make up Evolution will -be tightly integrated with one another and act as a seamless +communications tool. The components which make up Evolution +are tightly integrated with one another and act as a seamless personal information-management tool. %package devel -Group: Development/Libraries -Summary: Development files for building against evolution -Requires: %{name} = %{version} -Requires: evolution-data-server-devel >= %{eds_version} -Requires: gtkhtml3-devel >= %{gtkhtml_version} -Requires: libsoup-devel >= %{soup_version} +Summary: Development files for building against %{name} +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig(camel-1.2) >= %{eds_version} +Requires: pkgconfig(enchant-2) +Requires: pkgconfig(gtk+-3.0) >= %{gtk3_version} +Requires: pkgconfig(gspell-1) +Requires: pkgconfig(gweather4) >= %{libgweather_version} +Requires: pkgconfig(libebackend-1.2) >= %{eds_version} +Requires: pkgconfig(libebook-1.2) >= %{eds_version} +Requires: pkgconfig(libecal-2.0) >= %{eds_version} +Requires: pkgconfig(libedataserver-1.2) >= %{eds_version} +Requires: pkgconfig(libsoup-3.0) >= %{libsoup_version} +Requires: pkgconfig(libxml-2.0) Obsoletes: libgal2-devel <= %{last_libgal2_version} %description devel -Development files needed for building things which link against evolution. +Development files needed for building things which link against %{name}. + +%if %{with_docs} + +%package devel-docs +Summary: Developer documentation for Evolution +Requires: devhelp +Requires: %{name}-devel = %{version}-%{release} +BuildArch: noarch + +%description devel-docs +This package contains developer documentation for Evolution. + +%endif + +%package langpacks +Summary: Translations for %{name} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + +%description langpacks +This package contains translations for %{name}. + +%if %{with_docs} +%package help +Summary: Help files for %{name} +Requires: %{name} = %{version}-%{release} +Requires: yelp +BuildArch: noarch + +%description help +This package contains user documentation for %{name}. +%endif + +%package bogofilter +Summary: Bogofilter plugin for Evolution +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: bogofilter + +%description bogofilter +This package contains the plugin to filter junk mail using Bogofilter. + +%package spamassassin +Summary: SpamAssassin plugin for Evolution +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: spamassassin + +%description spamassassin +This package contains the plugin to filter junk mail using SpamAssassin. + +%if %{libpst_support} +%package pst +Summary: PST importer plugin for Evolution +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description pst +This package contains the plugin to import Microsoft Personal Storage Table +(PST) files used by Microsoft Outlook and Microsoft Exchange. +%endif + +%if %{enable_installed_tests} +%package tests +Summary: Tests for the %{name} package +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: python2-behave +Requires: python2-dogtail + +%description tests +The %{name}-tests package contains tests that can be used to verify +the functionality of the installed %{name} package. +%endif %prep -%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 +%autosetup -p1 -S gendiff -N -mkdir -p krb5-fakeprefix/include -mkdir -p krb5-fakeprefix/lib -mkdir -p krb5-fakeprefix/%{_lib} +# General patches +# %%autopatch -p1 -m 0 -M 99 + +# Flatpak-specific patches +%if 0%{?flatpak} +%autopatch -p1 -m 100 -M 199 +%endif + +# Remove the welcome email from Novell +for inbox in src/mail/default/*/Inbox; do + echo -n "" > $inbox +done + +%if 0%{?flatpak} +mv data/org.gnome.Evolution.desktop.in.in data/org.gnome.Evolution.desktop.in.i +cat data/org.gnome.Evolution.desktop.in.i | sed -e "s/Icon=evolution/Icon=org.gnome.Evolution/" >data/org.gnome.Evolution.desktop.in.in +%endif %build + # define all of our flags, this is kind of ugly :( %if %{ldap_support} -%define ldap_flags --with-openldap=yes +%define ldap_flags -DWITH_OPENLDAP=ON %else -%define ldap_flags --without-openldap +%define ldap_flags -DWITH_OPENLDAP=OFF %endif -%if %{pilot_support} -%define pilot_flags --enable-pilot-conduits=yes -%else -%define pilot_flags --enable-pilot-conduits=no -%endif +%define ssl_flags -DENABLE_SMIME=ON -%if %{krb5_support} -%define krb5_flags --with-krb5=%{krb5dir} -%else -%define krb5_flags --without-krb5 -%endif - -%if %{nntp_support} -%define nntp_flags --enable-nntp=yes -%else -%define nntp_flags --enable-nntp=no -%endif - -%if %{use_mozilla_nss} -%define ssl_flags --enable-nss=yes --enable-smime=yes -%else -%define ssl_flags --enable-openssl=yes -%endif - -%if %{use_mozilla_nss} -if ! pkg-config --exists nss; then +if ! pkg-config --exists nss; then echo "Unable to find suitable version of mozilla nss to use!" exit 1 fi -%endif -%if %{exchange_support} -%define exchange_flags --enable-exchange=yes +%if %{with_docs} +%define gtkdoc_flags -DENABLE_GTK_DOC=ON -DWITH_HELP=ON %else -%define exchange_flags --enable-exchange=no +%define gtkdoc_flags -DENABLE_GTK_DOC=OFF -DWITH_HELP=OFF %endif -CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS -CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare"; export CFLAGS -%if ! %{use_mozilla_nss} -if pkg-config openssl ; then - CFLAGS="$CFLAGS `pkg-config --cflags openssl`" - LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`" -fi +%if %{enable_installed_tests} +%define tests_flags -DENABLE_INSTALLED_TESTS=ON +%else +%define tests_flags -DENABLE_INSTALLED_TESTS=OFF %endif -# Add stricter build settings here as the source code gets cleaned up. -# We want to make sure things like compiler warnings and avoiding deprecated -# functions in the GNOME/GTK+ libraries stay fixed. -# -# Please file a bug report at bugzilla.gnome.org if these settings break -# compilation, and encourage the upstream developers to use them. - -%if %{strict_build_settings} -CFLAGS="$CFLAGS \ - -DG_DISABLE_DEPRECATED=1 \ - -DPANGO_DISABLE_DEPRECATED=1 \ - -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \ - -DGDK_DISABLE_DEPRECATED=1 \ - -DEDS_DISABLE_DEPRECATED=1 \ - -Werror-implicit-function-declaration" +%if %{tnef_support} +%global tnef_flags -DENABLE_YTNEF=ON +%else +%global tnef_flags -DENABLE_YTNEF=OFF %endif -# Rerun the GNU Autotools since we patched some of the input files. -# Disable portability checking to keep automake 1.10 quiet. -autoreconf --force --warnings=no-portability +%if 0%{?flatpak} +%global temp_home "-DTEMP_HOME=1" +%else +%global temp_home "" +%endif -%configure \ - --disable-scrollkeeper \ - --enable-gtk-doc \ - --enable-ipv6 \ - --enable-file-locking=fcntl --enable-dot-locking=no \ - --with-sub-version=" (%{version}-%{release})" \ - --with-kde-applnk-path=no \ - --enable-file-chooser=yes \ - %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags %exchange_flags \ - --enable-plugins=all -export tagname=CC -make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED -fno-strict-aliasing" +CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations %temp_home" +export CFLAGS + +%cmake -DENABLE_MAINTAINER_MODE=OFF \ + -DVERSION_SUBSTRING=" (%{version}-%{release})" \ + %ldap_flags %ssl_flags %gtkdoc_flags %tests_flags %tnef_flags \ + -DENABLE_PLUGINS=all \ + %if 0%{?flatpak} + "-DWITH_WMCLASS_OVERRIDE=evolution.bin" \ + %endif + -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \ + -DLIB_INSTALL_DIR:PATH=%{_libdir} \ + -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \ + -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \ + %if "%{?_lib}" == "lib64" + -DLIB_SUFFIX=64 \ + %endif + %{nil} + +%cmake_build + +%if %{with_docs} + +# Replace identical images in the help by links. +# This reduces the RPM size by several megabytes. +helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name} +for f in $helpdir/C/figures/*.png; do + b="$(basename $f)" + for d in $helpdir/*; do + if [ -d "$d" -a "$d" != "$helpdir/C" ]; then + g="$d/figures/$b" + if [ -f "$g" ]; then + if cmp -s $f $g; then + rm "$g"; ln -s "../../C/figures/$b" "$g" + fi + fi + fi + done +done + +# %%{with_docs} +%endif %install -rm -rf $RPM_BUILD_ROOT -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -export tagname=CC -make LIBTOOL=/usr/bin/libtool DESTDIR=$RPM_BUILD_ROOT install -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL +%cmake_install -# remove libtool archives for importers and the like -find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \; - -# remove statically built libraries: -find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; - -# pilot conduits static and libtool bits should go away too -rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.a -rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la - -# remove additional things we don't want -%if ! %{inline_audio_support} -%{__rm} -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-audio-inline.eplug \ - $RPM_BUILD_ROOT%{evo_plugin_dir}/liborg-gnome-audio-inline.so +%if 0%{?flatpak} +%{S:1} <%{S:2} >flatpak-evolution-wrapper.sh +chmod a+x flatpak-evolution-wrapper.sh +mv $RPM_BUILD_ROOT%{_bindir}/evolution $RPM_BUILD_ROOT%{_bindir}/evolution.bin +cp flatpak-evolution-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/evolution %endif -# scrollkeeper gets handled in %post -rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper +%find_lang evolution --all-name --with-gnome -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-mail.desktop \ - $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-mail.desktop -ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-calendar.desktop \ - $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-calendar.desktop -ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-contacts.desktop \ - $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-contacts.desktop -ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-tasks.desktop \ - $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-tasks.desktop +grep "%{_datadir}/locale" evolution.lang > translations.lang +%if %{with_docs} +grep -v "%{_datadir}/locale" evolution.lang > help.lang +%endif -# remove upstream desktop file; use the symlinks from above (#103826) -rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution.desktop +%ldconfig_scriptlets -rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys -rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime +%files +%license COPYING +%doc AUTHORS NEWS README.md +%{_mandir}/man1/* -# evolution link -ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution +# GSettings schemas: +%{_datadir}/GConf/gsettings/evolution.convert -for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do - sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile -done -%find_lang evolution-%{evo_major} +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.addressbook.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.calendar.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.mail.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.importer.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.text-highlight.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.attachment-reminder.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.autocontacts.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.email-custom-header.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.external-editor.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.face-picture.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.itip.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.prefer-plain.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.publish-calendar.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.sender-validator.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.templates.gschema.xml -%post -/sbin/ldconfig -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -SCHEMAS="apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas apps_evolution_addressbook-%{evo_major}.schemas apps_evolution_calendar-%{evo_major}.schemas apps_evolution_shell-%{evo_major}.schemas evolution-mail-%{evo_major}.schemas" -for S in $SCHEMAS; do - gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null -done -scrollkeeper-update -q - -%postun -/sbin/ldconfig -scrollkeeper-update -q - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -f evolution-%{evo_major}.lang -%defattr(-, root, root) -%doc AUTHORS COPYING ChangeLog INSTALL NEWS README - -# GConf schemas: -%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas -%{_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/evolution-mail-%{evo_major}.schemas - -# The main executable and a symlink: -%{_bindir}/evolution-%{evo_major} +# The main executable %{_bindir}/evolution -# Desktop files: -%{_datadir}/applications/redhat-evolution-mail.desktop -%{_datadir}/applications/redhat-evolution-calendar.desktop -%{_datadir}/applications/redhat-evolution-contacts.desktop -%{_datadir}/applications/redhat-evolution-tasks.desktop +%if 0%{?flatpak} +%{_bindir}/evolution.bin +%endif -# Online help: -%{_datadir}/gnome/help/evolution -%{_datadir}/omf/evolution +%{_datadir}/metainfo/org.gnome.Evolution.metainfo.xml + +# Desktop files: +%{_datadir}/applications/org.gnome.Evolution.desktop # Icons: -%{_datadir}/icons/hicolor/16x16/apps/evolution.png -%{_datadir}/icons/hicolor/22x22/apps/evolution.png -%{_datadir}/icons/hicolor/24x24/apps/evolution.png -%{_datadir}/icons/hicolor/32x32/apps/evolution.png -%{_datadir}/icons/hicolor/scalable/apps/evolution.svg - -# IDL files (should this be in devel subpackage?) -%{_datadir}/idl/evolution-%{evo_major} +%{_datadir}/icons/hicolor/16x16/apps/* +%{_datadir}/icons/hicolor/22x22/apps/* +%{_datadir}/icons/hicolor/24x24/apps/* +%{_datadir}/icons/hicolor/32x32/apps/* +%{_datadir}/icons/hicolor/48x48/apps/* +%{_datadir}/icons/hicolor/scalable/apps/* # The main data directory # (have not attempted to split this up into an explicit list) %dir %{_datadir}/evolution -%{_datadir}/evolution/%{evo_major} +%{_datadir}/evolution -# Bonobo components: -%{_libdir}/bonobo/servers/GNOME_Evolution_Addressbook_%{evo_major}.server -%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_%{evo_major}.server -%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_%{evo_major}.server -%{_libdir}/bonobo/servers/GNOME_Evolution_Mail_%{evo_major}.server -%{_libdir}/bonobo/servers/GNOME_Evolution_Shell_%{evo_major}.server +# Modules: %dir %{_libdir}/evolution -%dir %{_libdir}/evolution/%{evo_major} -%dir %{_libdir}/evolution/%{evo_major}/components -%{_libdir}/evolution/%{evo_major}/components/libevolution-addressbook.so -%{_libdir}/evolution/%{evo_major}/components/libevolution-calendar.so -%{_libdir}/evolution/%{evo_major}/components/libevolution-mail.so +%dir %{_libdir}/evolution/modules +%{_libdir}/evolution/modules/module-accounts-window.so +%{_libdir}/evolution/modules/module-addressbook.so +%{_libdir}/evolution/modules/module-appearance-settings.so +%{_libdir}/evolution/modules/module-backup-restore.so +%{_libdir}/evolution/modules/module-book-config-carddav.so +%{_libdir}/evolution/modules/module-book-config-google.so +%{_libdir}/evolution/modules/module-book-config-ldap.so +%{_libdir}/evolution/modules/module-book-config-local.so +%{_libdir}/evolution/modules/module-cal-config-caldav.so +%{_libdir}/evolution/modules/module-cal-config-contacts.so +%{_libdir}/evolution/modules/module-cal-config-google.so +%{_libdir}/evolution/modules/module-cal-config-local.so +%{_libdir}/evolution/modules/module-cal-config-weather.so +%{_libdir}/evolution/modules/module-cal-config-webcal.so +%{_libdir}/evolution/modules/module-cal-config-webdav-notes.so +%{_libdir}/evolution/modules/module-calendar.so +%{_libdir}/evolution/modules/module-composer-autosave.so +%{_libdir}/evolution/modules/module-composer-to-meeting.so +%{_libdir}/evolution/modules/module-config-lookup.so +%{_libdir}/evolution/modules/module-contact-photos.so +%{_libdir}/evolution/modules/module-gravatar.so +%{_libdir}/evolution/modules/module-itip-formatter.so +%{_libdir}/evolution/modules/module-mail-config.so +%{_libdir}/evolution/modules/module-mail.so +%{_libdir}/evolution/modules/module-mailto-handler.so +%{_libdir}/evolution/modules/module-mdn.so +%{_libdir}/evolution/modules/module-offline-alert.so +%{_libdir}/evolution/modules/module-prefer-plain.so +%{_libdir}/evolution/modules/module-plugin-lib.so +%{_libdir}/evolution/modules/module-plugin-manager.so +%{_libdir}/evolution/modules/module-rss.so +%{_libdir}/evolution/modules/module-settings.so +%{_libdir}/evolution/modules/module-startup-wizard.so +%{_libdir}/evolution/modules/module-text-highlight.so +%{_libdir}/evolution/modules/module-vcard-inline.so +%{_libdir}/evolution/modules/module-webkit-editor.so +%{_libdir}/evolution/modules/module-webkit-inspector.so + +%if %{tnef_support} +%{_libdir}/evolution/modules/module-tnef-attachment.so +%endif + +%{_libdir}/evolution-data-server/camel-providers/libcamelrss.so +%{_libdir}/evolution-data-server/camel-providers/libcamelrss.urls +%{_libdir}/evolution-data-server/ui-modules/module-evolution-alarm-notify.so # Shared libraries: -%{_libdir}/evolution/%{evo_major}/libeabutil.so.* -%{_libdir}/evolution/%{evo_major}/libeconduit.so.* -%{_libdir}/evolution/%{evo_major}/libecontacteditor.so.* -%{_libdir}/evolution/%{evo_major}/libecontactlisteditor.so.* -%{_libdir}/evolution/%{evo_major}/libefilterbar.so.* -%{_libdir}/evolution/%{evo_major}/libemiscwidgets.so.* -%{_libdir}/evolution/%{evo_major}/libeshell.so.* -%{_libdir}/evolution/%{evo_major}/libessmime.so.* -%{_libdir}/evolution/%{evo_major}/libetable.so.* -%{_libdir}/evolution/%{evo_major}/libetext.so.* -%{_libdir}/evolution/%{evo_major}/libetimezonedialog.so.* -%{_libdir}/evolution/%{evo_major}/libeutil.so.* -%{_libdir}/evolution/%{evo_major}/libevolution-a11y.so.* -%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-a11y.so.* -%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-importers.so.* -%{_libdir}/evolution/%{evo_major}/libevolution-calendar-a11y.so.* -%{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so.* -%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so.* -%{_libdir}/evolution/%{evo_major}/libevolution-smime.so.* -%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so.* -%{_libdir}/evolution/%{evo_major}/libfilter.so.* -%{_libdir}/evolution/%{evo_major}/libmenus.so.* +%{_libdir}/evolution/libevolution-mail-composer.so +%{_libdir}/evolution/libeabutil.so +%{_libdir}/evolution/libeabwidgets.so +%{_libdir}/evolution/libecontacteditor.so +%{_libdir}/evolution/libecontactlisteditor.so +%{_libdir}/evolution/libecontactprint.so +%{_libdir}/evolution/libemail-engine.so +%{_libdir}/evolution/libevcardeditor.so +%{_libdir}/evolution/libevolution-mail-formatter.so +%{_libdir}/evolution/libevolution-shell.so +%{_libdir}/evolution/libessmime.so +%{_libdir}/evolution/libevolution-util.so +%{_libdir}/evolution/libevolution-addressbook-importers.so +%{_libdir}/evolution/libevolution-calendar.so +%{_libdir}/evolution/libevolution-calendar-importers.so +%{_libdir}/evolution/libevolution-mail-importers.so +%{_libdir}/evolution/libevolution-mail.so +%{_libdir}/evolution/libevolution-rss-common.so +%{_libdir}/evolution/libevolution-smime.so +%{_libdir}/evolution/libgnomecanvas.so + +# WebKit2 Extensions +%{_libdir}/evolution/web-extensions/libewebextension.so +%{_libdir}/evolution/web-extensions/webkit-editor/module-webkit-editor-webextension.so # Various libexec programs: %dir %{_libexecdir}/evolution -%dir %{_libexecdir}/evolution/%{evo_major} -%{_libexecdir}/evolution/%{evo_major}/csv2vcard -%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean -%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export -%{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify -%{_libexecdir}/evolution/%{evo_major}/killev - -# Various conduits for gnome-pilot: -%if %{pilot_support} -%dir %{_libdir}/evolution/%{evo_major}/conduits - -%{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so -%{_libdir}/gnome-pilot/conduits/e-address-%{evo_major}.conduit - -%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so -%{_libdir}/gnome-pilot/conduits/e-calendar-%{evo_major}.conduit - -%{_libdir}/evolution/%{evo_major}/conduits/libememo_conduit.so -%{_libdir}/gnome-pilot/conduits/e-memo-%{evo_major}.conduit - -%{_libdir}/evolution/%{evo_major}/conduits/libetodo_conduit.so -%{_libdir}/gnome-pilot/conduits/e-todo-%{evo_major}.conduit -%endif +%{_libexecdir}/evolution/evolution-backup +%{_libexecdir}/evolution/killev # The plugin directory: %dir %{evo_plugin_dir} # The various plugins follow; they are all part of the main package: -# (note that there are various resources such as glade and pixmap files that -# are built as part of specific plugins but which are currently packaged using +# (note that there are various resources such as ui and pixmap files that +# are built as part of specific plugins but which are currently packaged using # globs above; the purpose of the separation below is to be more explicit about # which plugins we ship) -%{evo_plugin_dir}/org-gnome-mail-account-disable.eplug -%{evo_plugin_dir}/libmail-account-disable.so +%{evo_plugin_dir}/org-gnome-evolution-attachment-reminder.eplug +%{evo_plugin_dir}/liborg-gnome-evolution-attachment-reminder.so -%{evo_plugin_dir}/org-gnome-addressbook-file.eplug -%{evo_plugin_dir}/liborg-gnome-addressbook-file.so - -%if %{inline_audio_support} -%{evo_plugin_dir}/org-gnome-audio-inline.eplug -%{evo_plugin_dir}/liborg-gnome-audio-inline.so -%endif - -%{evo_plugin_dir}/org-gnome-calendar-file.eplug -%{evo_plugin_dir}/liborg-gnome-calendar-file.so - -%{evo_plugin_dir}/org-gnome-calendar-http.eplug -%{evo_plugin_dir}/liborg-gnome-calendar-http.so - -%{evo_plugin_dir}/org-gnome-calendar-weather.eplug -%{evo_plugin_dir}/liborg-gnome-calendar-weather.so - -%{evo_plugin_dir}/org-gnome-copy-tool.eplug -%{evo_plugin_dir}/liborg-gnome-copy-tool.so - -%{evo_plugin_dir}/org-gnome-default-mailer.eplug -%{evo_plugin_dir}/liborg-gnome-default-mailer.so - -%{evo_plugin_dir}/org-gnome-default-source.eplug -%{evo_plugin_dir}/liborg-gnome-default-source.so +%{evo_plugin_dir}/org-gnome-email-custom-header.eplug +%{evo_plugin_dir}/liborg-gnome-email-custom-header.so %{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug %{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so -%{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug -%{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so +%{evo_plugin_dir}/org-gnome-external-editor.eplug +%{evo_plugin_dir}/liborg-gnome-external-editor.so -%{evo_plugin_dir}/org-gnome-exchange-operations.eplug -%{evo_plugin_dir}/liborg-gnome-exchange-operations.so -%{evo_plugin_dir}/org-gnome-exchange-ab-subscription.xml -%{evo_plugin_dir}/org-gnome-exchange-cal-subscription.xml -%{evo_plugin_dir}/org-gnome-exchange-tasks-subscription.xml -%{evo_plugin_dir}/org-gnome-folder-permissions.xml -%{evo_plugin_dir}/org-gnome-folder-subscription.xml - -%{evo_plugin_dir}/org-gnome-groupwise-features.eplug -%{evo_plugin_dir}/liborg-gnome-groupwise-features.so -%{evo_plugin_dir}/org-gnome-compose-send-options.xml - -%{evo_plugin_dir}/org-gnome-gw-account-setup.eplug -%{evo_plugin_dir}/liborg-gnome-gw-account-setup.so - -%{evo_plugin_dir}/org-gnome-imap-features.eplug -%{evo_plugin_dir}/liborg-gnome-imap-features.so - -%{evo_plugin_dir}/org-gnome-itip-formatter.eplug -%{evo_plugin_dir}/liborg-gnome-itip-formatter.so +%{evo_plugin_dir}/org-gnome-face.eplug +%{evo_plugin_dir}/liborg-gnome-face.so %{evo_plugin_dir}/org-gnome-mailing-list-actions.eplug %{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 - -%{evo_plugin_dir}/org-gnome-mark-all-read.eplug -%{evo_plugin_dir}/liborg-gnome-mark-all-read.so - -%{evo_plugin_dir}/org-gnome-mark-calendar-offline.eplug -%{evo_plugin_dir}/liborg-gnome-mark-calendar-offline.so - -%{evo_plugin_dir}/org-gnome-new-mail-notify.eplug -%{evo_plugin_dir}/liborg-gnome-new-mail-notify.so - -%{evo_plugin_dir}/org-gnome-plugin-manager.eplug -%{evo_plugin_dir}/liborg-gnome-plugin-manager.so -%{evo_plugin_dir}/org-gnome-plugin-manager.xml %{evo_plugin_dir}/org-gnome-prefer-plain.eplug %{evo_plugin_dir}/liborg-gnome-prefer-plain.so -%{evo_plugin_dir}/org-gnome-print-message.eplug -%{evo_plugin_dir}/liborg-gnome-print-message.so -%{evo_plugin_dir}/org-gnome-print-message.xml - -%{evo_plugin_dir}/org-gnome-sa-junk-plugin.eplug -%{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so +%{evo_plugin_dir}/org-gnome-publish-calendar.eplug +%{evo_plugin_dir}/liborg-gnome-publish-calendar.so %{evo_plugin_dir}/org-gnome-save-calendar.eplug %{evo_plugin_dir}/liborg-gnome-save-calendar.so -%{evo_plugin_dir}/org-gnome-select-one-source.eplug -%{evo_plugin_dir}/liborg-gnome-select-one-source.so +%{evo_plugin_dir}/org-gnome-evolution-sender-validation.eplug +%{evo_plugin_dir}/liborg-gnome-evolution-sender-validation.so -%{evo_plugin_dir}/org-gnome-subject-thread.eplug -%{evo_plugin_dir}/liborg-gnome-subject-thread.so +%{evo_plugin_dir}/org-gnome-templates.eplug +%{evo_plugin_dir}/liborg-gnome-templates.so -%{evo_plugin_dir}/org-gnome-evolution-hula-account-setup.eplug -%{evo_plugin_dir}/liborg-gnome-evolution-hula-account-setup.so +%{evo_plugin_dir}/org-gnome-dbx-import.eplug +%{evo_plugin_dir}/liborg-gnome-dbx-import.so -%{evo_plugin_dir}/org-gnome-publish-calendar.eplug -%{evo_plugin_dir}/liborg-gnome-publish-calendar.so -%{evo_plugin_dir}/org-gnome-publish-calendar.xml -%{evo_plugin_dir}/publish-calendar.glade - -%{evo_plugin_dir}/org-gnome-evolution-caldav.eplug -%{evo_plugin_dir}/liborg-gnome-evolution-caldav.so - -%{evo_plugin_dir}/org-gnome-evolution-mail-attachments-import-ics.eplug -%{evo_plugin_dir}/liborg-gnome-evolution-mail-attachments-import-ics.so %files devel -%defattr(-, root, root) -%{_includedir}/evolution-%{evo_major} -%{_libdir}/pkgconfig/evolution-plugin-%{evo_major}.pc -%{_libdir}/pkgconfig/evolution-shell-%{evo_major}.pc -%{_libdir}/evolution/%{evo_major}/libeabutil.so -%{_libdir}/evolution/%{evo_major}/libeconduit.so -%{_libdir}/evolution/%{evo_major}/libecontacteditor.so -%{_libdir}/evolution/%{evo_major}/libecontactlisteditor.so -%{_libdir}/evolution/%{evo_major}/libefilterbar.so -%{_libdir}/evolution/%{evo_major}/libemiscwidgets.so -%{_libdir}/evolution/%{evo_major}/libeshell.so -%{_libdir}/evolution/%{evo_major}/libessmime.so -%{_libdir}/evolution/%{evo_major}/libetable.so -%{_libdir}/evolution/%{evo_major}/libetext.so -%{_libdir}/evolution/%{evo_major}/libetimezonedialog.so -%{_libdir}/evolution/%{evo_major}/libeutil.so -%{_libdir}/evolution/%{evo_major}/libevolution-a11y.so -%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-a11y.so -%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-importers.so -%{_libdir}/evolution/%{evo_major}/libevolution-calendar-a11y.so -%{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so -%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so -%{_libdir}/evolution/%{evo_major}/libevolution-smime.so -%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so -%{_libdir}/evolution/%{evo_major}/libfilter.so -%{_libdir}/evolution/%{evo_major}/libmenus.so +%{_includedir}/evolution +%{_libdir}/pkgconfig/evolution-calendar-3.0.pc +%{_libdir}/pkgconfig/evolution-mail-3.0.pc +%{_libdir}/pkgconfig/evolution-shell-3.0.pc +%{_libdir}/pkgconfig/libemail-engine.pc + +%if %{with_docs} + +%files devel-docs +%doc %{_datadir}/gtk-doc/html/evolution-mail-composer +%doc %{_datadir}/gtk-doc/html/evolution-mail-engine +%doc %{_datadir}/gtk-doc/html/evolution-mail-formatter +%doc %{_datadir}/gtk-doc/html/evolution-shell +%doc %{_datadir}/gtk-doc/html/evolution-util + +%endif + +%files langpacks -f translations.lang + +%if %{with_docs} +%files help -f help.lang +%endif + +%files bogofilter +%{_libdir}/evolution/modules/module-bogofilter.so +%{_datadir}/metainfo/org.gnome.Evolution-bogofilter.metainfo.xml + +%files spamassassin +%{_libdir}/evolution/modules/module-spamassassin.so +%{_datadir}/metainfo/org.gnome.Evolution-spamassassin.metainfo.xml + +%if %{libpst_support} +%files pst +%{_datadir}/metainfo/org.gnome.Evolution-pst.metainfo.xml +%{evo_plugin_dir}/org-gnome-pst-import.eplug +%{evo_plugin_dir}/liborg-gnome-pst-import.so +%endif + +%if %{enable_installed_tests} +%files tests +%{_libexecdir}/%{name}/installed-tests +%{_datadir}/installed-tests +%endif %changelog -* Wed Mar 14 2007 Matthew Barnes - 2.10.0-2.fc7 -- Add patch for GNOME bug #417999 (use ESourceComboBox). - -* Mon Mar 12 2007 Matthew Barnes - 2.10.0-1.fc7 -- Update to 2.10.0. -- Add patch for GNOME bug #376991 (refactor password handling). - -* Mon Feb 26 2007 Matthew Barnes - 2.9.92-1.fc7 -- Update to 2.9.92. -- Require gtkhtml3 >= 3.13.92. -- Add missing libgnomeprintui22 requirements. -- Remove patch for GNOME bug #350253 (fixed upstream). -- Remove patch for GNOME bug #356177 (fixed upstream). -- Remove patch for GNOME bug #360946 (fixed upstream). -- Remove evolution-2.5.4-move-autosave-file.patch (fixed upstream). -- Add minimum version to intltool requirement (currently >= 0.35.5). - -* Thu Feb 15 2007 Matthew Barnes - 2.9.91-3.fc7 -- Revise patch for GNOME bug #362638 to fix RH bug #220714 - (certificate prompt causes crash). - -* Tue Feb 13 2007 Matthew Barnes - 2.9.91-2.fc7 -- Require GConf2 in post. -- Require scrollkeeper in post and postun. - -* Mon Feb 12 2007 Matthew Barnes - 2.9.91-1.fc7 -- Update to 2.9.91 -- Require gtkhtml3 >= 3.13.6. -- Add files for new imap-features plugin. -- Add flag to disable deprecated Pango symbols. -- Remove patch for GNOME bug #357216 (fixed upstream). -- Remove patch for GNOME bug #359979 (fixed upstream). - -* Fri Jan 26 2007 Matthew Barnes - 2.9.5-4.fc7 -- Compile with the -fno-strict-aliasing flag, which will hopefully improve - reliability until the illegal type-punning is fixed (RH bug #224552). - -* Sun Jan 21 2007 Matthew Barnes - 2.9.5-3.fc7 -- Revise evolution-2.7.1-no-gnome-common.patch so that we no longer - have to run autoconf before building. -- Revise evolution-2.5.4-fix-conduit-dir.patch so that we no longer - have to run automake before building. - -* Wed Jan 10 2007 Matthew Barnes - 2.9.5-2.fc7 -- Add patch for GNOME bug #359979 (change EMsgPort semantics). - -* Mon Jan 08 2007 Matthew Barnes - 2.9.5-1.fc7 -- Update to 2.9.5 -- Remove pilot-link-0.12 patch (fixed upstream). -- Remove patch for RH bug #215466 and #218589 (fixed upstream). -- Remove patch for RH bug #215695 (fixed upstream). - -* Sat Dec 30 2006 Matthew Barnes - 2.9.4-4.fc7 -- Add Requires evolution-data-server-devel to devel subpackage - (RH bug #218889). - -* Thu Dec 21 2006 Matthew Barnes - 2.9.4-3.fc7 -- Add patch for RH bug #218898 (viewing message source). - -* Wed Dec 20 2006 Matthew Barnes - 2.9.4-2.fc7 -- Revise patch for RH bug #202751 (printing of indic languages). - -* Tue Dec 19 2006 Matthew Barnes - 2.9.4-1.fc7 -- Update to 2.9.4 -- Bump eds_version to 1.9.4 due to soname changes. -- Remove patch for GNOME bug #382431 (fixed upstream). - -* Fri Dec 15 2006 Matthew Barnes - 2.9.3-5.fc7 -- Add patch for GNOME bug #373116 (use GtkColorButton). - -* Fri Dec 15 2006 Matthew Barnes - 2.9.3-4.fc7 -- Disable patch for RH bug #216537, which caused RH bug #219228. - -* Tue Dec 12 2006 Matthew Barnes - 2.9.3-3.fc7 -- Revise patch for RH bug #215466 to also fix RH bug #218589. - -* Mon Dec 11 2006 Matthew Barnes - 2.9.3-2.fc7 -- Add patch for RH bug #215467 (missing meeting participants). - -* Thu Dec 09 2006 Matthew Barnes - 2.9.3-1.fc7 -- Update to 2.9.3 -- Configure with scrollkeeper disabled. -- Disable automake portability checking. -- Ship our own icons from gnome-icon-theme. -- BuildRequires: gnome-doc-utils >= 0.8.0 -- Add patch for RH bug #215478 (Maildir and MH accounts). -- Add patch for RH bug #215695 (crashes w/o mail accounts). -- Add patch for RH bug #216537 (viewing attachments). -- Add patch for RH bug #218801 (count unread messages first). -- Add patch for GNOME bug #350253 (ship our own icons). -- Add patch for GNOME bug #382431 (implicit function declaration). -- Revise patch for GNOME bug #360946 (improved "about" dialog). -- Remove patch for GNOME bug #357970 (fixed upstream). - -* Tue Nov 28 2006 Matthew Barnes - 2.9.2-3.fc7 -- Add patch to port evolution conduits to pilot-link 0.12. -- Add patch for RH bug #215466 (optional meeting participants). -- Add patch for GNOME bug #373837 (use GtkFontButton). -- Remove patch for GNOME bug #343331 (fixed upstream). - -* Tue Nov 07 2006 Matthew Barnes - 2.9.2-2.fc7 -- Revise patch for RH bug #202751 and re-enable it. - -* Mon Nov 06 2006 Matthew Barnes - 2.9.2-1.fc7 -- Update to 2.9.2 -- Remove patch for Gnome.org bug #360240 (fixed upstream). -- Remove patch for Gnome.org bug #360619 (fixed upstream). - -* Mon Nov 06 2006 Matthew Barnes - 2.9.1-3.fc7 -- Add patch for RH bug #176400 (reset calendar IM context). -- Add patch for RH bug #182247 (calendar input glitch). - -* Fri Oct 20 2006 Matthew Barnes - 2.9.1-2.fc7 -- Add patch for Gnome.org bug #356177 (deprecate EMutex). -- Add patch for Gnome.org bug #363695 (deprecate EStrv/EPoolv). -- Disable patch for RH bug #202751 (unwanted side-effects). - -* Mon Oct 16 2006 Matthew Barnes - 2.9.1-1.fc7 -- Update to 2.9.1 -- Bump eds_version to 1.9.1, evo_major to 2.10. -- Remove patch for Gnome.org bug #359236 (fixed upstream). - -* Mon Oct 16 2006 Matthew Barnes - 2.8.1-4.fc7 -- Another typo. - -* Mon Oct 16 2006 Matthew Barnes - 2.8.1-3.fc7 -- Fix a typo in setting up .desktop symlinks. - -* Mon Oct 16 2006 Matthew Barnes - 2.8.1-2.fc7 -- Forgot to check-in one of the patches. - -* Mon Oct 16 2006 Matthew Barnes - 2.8.1-1.fc7 -- Update to 2.8.1 -- Use stricter build settings. -- Make .desktop symlinks absolute (RH bug #209322). -- Add patch for RH bug #202751 (printing of indic languages). -- Add patch for Gnome.org bug #357970 (deprecated GLib / GDK symbols). -- Add patch for Gnome.org bug #359236 (search state crash). -- Add patch for Gnome.org bug #360240 ("unused variable" warnings). -- Add patch for Gnome.org bug #360619 ("incompatible pointer type" warnings). -- Add patch for Gnome.org bug #360946 (improved "about" dialog). -- Add patch for Gnome.org bug #362638 (deprecate EThread). -- Update patch for RH bug #211058 (partially fixed upstream). -- Remove patch for RH bug #201307 (fixed upstream). -- Remove patch for RH bug #205576 (fixed upstream). -- Remove patch for Gnome.org bug #351332 (fixed upstream). -- Remove patch for Gnome.org bug #352450 (fixed upstream). -- Remove patch for Gnome.org bug #353472 (fixed upstream). -- Remove patch for Gnome.org bug #356811 (fixed upstream). - -* Sun Oct 01 2006 Jesse Keating - 2.8.0-7.fc6 -- rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Thu Sep 21 2006 Matthew Barnes - 2.8.0-6.fc6 -- Add patch for RH bug #205576 (message deletion in thread view). - -* Wed Sep 20 2006 Matthew Barnes - 2.8.0-5.fc6 -- Add patch for Gnome.org bug #356811 (lingering file on uninstall). - -* Tue Sep 19 2006 Matthew Barnes - 2.8.0-4.fc6 -- Bump eds_version to 1.8.0. - -* Wed Sep 13 2006 Matthew Barnes - 2.8.0-3.fc6 -- Add patch for RH bug #161885. - -* Wed Sep 13 2006 Matthew Barnes - 2.8.0-2.fc6 -- Add patch for RH bug #201307. - -* Mon Sep 4 2006 Matthew Barnes - 2.8.0-1.fc6 -- Update to 2.8.0 -- Remove patch for RH bug #197868 (fixed upstream). -- Remove patch for RH bug #201541 (fixed upstream). -- Remove patch for RH bug #201831 (fixed upstream). -- Remove patch for RH bug #202383 (fixed upstream). -- Remove patch for RH bug #203036 (fixed upstream). -- Remove patch for Gnome.org bug #352248 (fixed upstream). -- Remove patch for Gnome.org bug #352423 (fixed upstream). -- Update patch for Gnome.org bug #351332 (partially fixed upstream). - -* Thu Aug 31 2006 Matthew Barnes - 2.7.92-8.fc6 -- Add patch for RH bug #203036. -- Disable notification-cleanups patch. - -* Tue Aug 29 2006 Matthew Barnes - 2.7.92-7.fc6 -- Add patch for Gnome.org bug #353472. - -* Mon Aug 28 2006 Matthew Barnes - 2.7.92-6.fc6 -- Add another hunk to the patch for RH bug #201541. -- Add patch for RH bug #202289. - -* Mon Aug 28 2006 Matthew Barnes - 2.7.92-5.fc6 -- Add patch for RH bug #201541. - -* Wed Aug 23 2006 Matthew Barnes - 2.7.92-4.fc6 -- Add patches for Gnome.org bug #352450. - -* Tue Aug 22 2006 Matthew Barnes - 2.7.92-3.fc6 -- Replace my patch for RH bug #202383 with a better one from upstream. -- Add patch for Gnome.org bug #352423. - -* Mon Aug 21 2006 Matthew Barnes - 2.7.92-2.fc6 -- Add patch for Gnome.org bug #352248 (and remember to commit it). - -* Mon Aug 21 2006 Matthew Barnes - 2.7.92-1.fc6 -- Update to 2.7.92 -- Remove patch for RH bug #197834 (fixed upstream). -- Update patch for Gnome.org bug #351332 (partially fixed upstream). - -* Tue Aug 15 2006 Matthew Barnes - 2.7.91-5.fc6 -- Drop the bug-buddy dependency since it's not required for Evolution to run. - -* Mon Aug 14 2006 Matthew Barnes - 2.7.91-4 -- Add patch for RH bug #201831. - -* Mon Aug 14 2006 Matthew Barnes - 2.7.91-3 -- Consolidate "missing declarations" patches. -- Add patch for RH bug #202383. - -* Fri Aug 11 2006 Matthew Barnes - 2.7.91-2 -- Add patch for RH bug #197868. - -* Mon Aug 7 2006 Matthew Barnes - 2.7.91-1 -- Update to 2.7.91 -- Update patch for RH bug #197834 for use with bug-buddy 2.15.90. -- Require bug-buddy >= 2.15.90. - -* Fri Aug 4 2006 Matthew Barnes - 2.7.90-6 -- Update to 2.7.90 -- Require evolution-data-server-1.7.90.1. - -* Wed Aug 2 2006 Matthew Barnes - 2.7.4-5 -- Remove patch for RH bug #167157, as it fixed it the wrong way. -- The real fix for #167157 is in evolution-data-server-1.7.4-5. -- No longer packaging unused patches. - -* Mon Jul 31 2006 Matthew Barnes - 2.7.4-4 -- Add patch for RH bug #178295. -- Add patch for RH bug #167157. - -* Tue Jul 18 2006 Matthew Barnes - 2.7.4-3 -- Clean up spec file, renumber patches. -- Add BuildRequires for dbus-glib-devel. -- Rebuild to pick up new D-Bus. - -* Thu Jul 13 2006 Matthew Barnes - 2.7.4-2 -- Update patch for RH bug #157400. -- Update patch for RH bug #157505. - -* Wed Jul 12 2006 Matthew Barnes - 2.7.4-1 -- Update to 2.7.4 -- Remove evo-calendar-print-with-pango-7.patch (fixed upstream). -- Remove patch for Gnome.org bug #345677 (fixed upstream). -- Remove patch for RH bug #175596 (fixed upstream). - -* Wed Jul 12 2006 Jesse Keating - 2.7.3-10.1 -- rebuild - -* Tue Jul 11 2006 Matthew Barnes - 2.7.3-10 -- Update patch for RH bug #190359. - -* Fri Jul 7 2006 Matthew Barnes - 2.7.3-9 -- Make "Submit Bug Report" menu item work again (RH #197384). - -* Thu Jul 6 2006 Matthew Barnes - 2.7.3-8 -- Add patch for RH bug #166231 (also addresses #131227 and #157391). - -* Fri Jun 29 2006 Matthew Barnes - 2.7.3-7 -- Add patch for RH bug #157400, reorder some patch #'s. - -* Thu Jun 29 2006 Matthew Barnes - 2.7.3-6 -- Properly capitalize "Message->Mailing List" menu items (RH #175596). - -* Tue Jun 27 2006 Matthew Barnes - 2.7.3-5 -- Add patch for Gnome.org bug #211058 for Trever Adams to test. - -* Mon Jun 26 2006 Matthew Barnes - 2.7.3-4 -- Add patch for RH bug #157505 for QE testing. - -* Thu Jun 22 2006 Matthew Barnes - 2.7.3-3 -- Fix bad type in schema file (Gnome.org #345677). - -* Wed Jun 14 2006 Tomas Mraz - 2.7.3-2 -- rebuilt with new gnutls - -* Tue Jun 13 2006 Matthias Clasen - 2.7.3-1 -- Update to 2.7.3 - -* Mon May 29 2006 Dan Williams - 2.7.2.1-4 -- Don't crash on quit when trying to save window size (Gnome.org #343331) - -* Tue May 23 2006 Matthew Barnes 2.7.2.1-3 -- Port evolution-2.7.1-notification-cleanups.patch to new libnotify API. -- Require libnotify >= 0.4. - -* Fri May 19 2006 Matthew Barnes - 2.7.2.1-2 -- Require specific versions of GNU Autotools packages for building. -- Add evolution-2.7.2-preedit-gnome.bz-264485.patch (Mayank Jain). -- Various spec file cleanups. -- Pick up new libnotify. - -* Wed May 17 2006 Matthew Barnes - 2.7.2.1-1 -- Update to 2.7.2.1 -- Remove nss/nspr hunk from evolution-2.7.1-no-gnome-common.patch - (fixed upstream). - -* Fri May 12 2006 Matthew Barnes - 2.7.1-1 -- Update to 2.7.1 -- Bump evo_major from 2.6 to 2.8 -- Upstream evolution.desktop renamed evolution-%{evo_major}.desktop. -- Upstream evolution.keys renamed evolution-%{evo_major}.keys. -- Upstream evolution.mime renamed evolution-%{evo_major}.mime. -- Update line numbers in evolution-2.5.2-no-gnome-common.patch and - evolution-2.5.5.1-notification-cleanups.patch and rename them to - version 2.7.1. - -* Wed May 3 2006 Matthew Barnes - 2.6.1-3 -- rebuilt - -* Mon Apr 10 2006 Matthias Clasen - 2.6.1-2 -- Update to 2.6.1 - -* Thu Mar 30 2006 Caolan McNamara - 2.6.0-2 -- rebuild against reverted pilot-link -- disable evolution-2.5.4-fix-conduits.patch for reversion to pilot-link 0.11.8 - -* Mon Mar 13 2006 Ray Strode - 2.6.0-1 -- 2.6.0 -- turn on the "error on missing prototypes" check thing - -* Mon Feb 27 2006 Ray Strode - 2.5.92-1 -- 2.5.92 - -* Tue Feb 14 2006 David Malcolm - 2.5.91-1 -- 2.5.91 -- updated patch 101 to track upstream changes to calendar printing code -- remove uptreamed patch 807 (NM multiple initialization assertion) -- readded the mail-to-task plugin XML UI file -- bump e-d-s req to 1.5.91 - -* Fri Feb 10 2006 Jesse Keating - 2.5.90-2.1 -- bump again for double-long bug on ppc(64) - -* Thu Feb 9 2006 Christopher Aillon - 2.5.90-2 -- Disable the inline audio plugin for now since it uses gstreamer08 - -* Tue Feb 07 2006 Jesse Keating - 2.5.90-1.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Mon Jan 30 2006 David Malcolm - 2.5.90-1 -- 2.5.90 -- trimmed patches 805 and 808, as parts of these got merged upstream -- trimmed and regenerated patch 806 to track upstream -- removed the mail-to-task plugin XML UI file - -* Sat Jan 28 2006 David Malcolm - 2.5.5.1-2 -- added missing patch - -* Wed Jan 25 2006 David Malcolm - 2.5.5.1-1 -- 2.5.5.1 -- update patch 106 to track upstream, renaming from - evolution-2.2.2-commit-enter-on-calendar.patch to - evolution-2.5.5.1-commit-enter-on-calendar.patch -- update patch 805 to track upstream -- added patch to fix some newly missing declarations (patch 808) -- replace evolution-2.5.4-port-to-new-libnotify-api.patch with - evolution-2.5.5.1-notification-cleanups.patch, since much of this was - duplicated by another patch that landed upstream; removing the actions code - as it was crashing deep inside DBus (patch 806, #177666) -- explicitly list various files to reduce reliance on globbing; organized the - files into logical groups; comment them -- added -Wno-sign-compare to CFLAGS -- enabled parallel make -- introduced require_function_declarations macro to make - -Werror-implicit-function-declaration flag optional; turn it off for now -- include the new CalDAV and mail-attachments-import plugins in the file list; - add an XML UI file for the mail-to-task plugin. -- use "sed -i -e" rather than "sed -ie" to avoid getting severe bonobo files - -* Wed Jan 18 2006 Ray Strode - 2.5.4-10 -- fix fix for multilib issue with shlib bonobo components (bug 156982) - -* Wed Jan 18 2006 Ray Strode - 2.5.4-9 -- fix multilib issue with shlib bonobo components (bug 156982) - -* Thu Jan 12 2006 David Malcolm - 2.5.4-8 -- avoid multiple initialization of NetworkManager connections (patch 807, - gnome bug #326785) - -* Thu Jan 12 2006 David Malcolm - 2.5.4-7 -- updated alarm notification patch(patch 806, #177546, #177666, #177667, - #177670) - -* Thu Jan 12 2006 Christopher Aillon - 2.5.4-6 -- Remove unneeded Requires: notify-daemon - -* Thu Jan 12 2006 Christopher Aillon - 2.5.4-5 -- Update BR to libnotify-devel - -* Wed Jan 11 2006 David Malcolm - 2.5.4-4 -- ported alarm notification code to the new libnotify API (patch 806, #177546) -- added libnotify_support macro -- added explicit notify-daemon requirement as a workaround for bug #177535 - -* Tue Jan 10 2006 David Malcolm - 2.5.4-3 -- updated patch 800 to include patch for memo conduit (untested at this stage); - renaming from evolution-2.5.2-fix-conduits.patch to - evolution-2.5.4-fix-conduits.patch; extended patch 802 to handle the memo - conduit; renaming from evolution-2.2.2-fix-conduit-dir.patch to - evolution-2.5.4-fix-conduit-dir.patch; re-enable conduits in build (#175160) -- switch the build-time dep for the audio-inline plugin from gstreamer-devel to - gstreamer08-devel to better reflect the test in the tarball's configure.in - -* Wed Jan 4 2006 David Malcolm - 2.5.4-2 -- added optional build-time requirement on NetworkManager-glib-devel -- update patch 805 to cover a missing declaration in Network Manager support - -* Tue Jan 3 2006 David Malcolm - 2.5.4-1 -- 2.5.4 -- update patch 107 to track underlying code changes; rename from - evolution-2.2.2-move-autosave-file.patch to - evolution-2.5.4-move-autosave-file.patch -- added patch to fix more missing declarations (patch 805) -- added files for publish-calendar plugin - -* Mon Dec 19 2005 David Malcolm - 2.5.3-1 -- 2.5.3 -- Updated patch 106 (evolution-2.2.2-commit-enter-on-calendar.patch) so that it - still applies cleanly - -* Thu Dec 15 2005 Christopher Aillon 2.5.2-2 -- Require nspr and nss instead of mozilla-nspr and mozilla-nss -- Update no-gnome-common patch to work with standalone nss package - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Wed Dec 7 2005 David Malcolm - 2.5.2-1 -- 2.5.2 -- bump gtkhtml requirement from 3.7.6 to 3.9.2 -- bump eds requirement from 1.4.1.1 to 1.5.2 -- bump evo_major from 2.4 to 2.6 -- updated patch 107 -- updated patch 108 -- updated patch 800, replacing - rh-161817-attach-116019-conduit_pilot_link_updates.diff with - evolution-2.5.2-fix-conduits.patch. Not yet complete. -- disable pilot support for now (see #175160) -- added hula plugin to list of packaged plugins -- generalize gconf schema packaging to support changing evo_major - -* Fri Dec 2 2005 David Malcolm - 2.4.2-2 -- force regeneration of the intltool files to prevent a problem where the - tarball copy of intltool-merge.in was out of sync with the intltool.m4 in the - latest shipped copy of intltool, which resulted in a broken intltool-merge - script when the tree was reautotooled. (appears that the tarball was built - with a CVS copy of intltool where @EXPANDED_LIBDIR@ had been renamed to - @INTLTOOL_LIBDIR@, but our aclocal/intltool.m4 doesn't yet reflect that - change) - -* Tue Nov 29 2005 David Malcolm - 2.4.2-1 -- 2.4.2 -- explicitly list the plugins that are packaged (#166234) -- added build-time requirement on gstreamer-devel to cope with audio-inline - plugin - -* Tue Nov 29 2005 David Malcolm - 2.4.1-8 -- add -DLDAP_DEPRECATED to CFLAGS (#172999) - -* Wed Oct 26 2005 David Malcolm - 2.4.1-7 -- Added a patch (110) to hide the component switcher buttons by default on new - windows (#170799) by patching the GConf schema. -- Made list of installed schemas explicit. -- Own the plugins subdirectory - -* Tue Oct 25 2005 David Malcolm - 2.4.1-6 -- use 4 separate .desktop files from the redhat-menus package, rather than the - current single one; bump the redhat-menus requirement accordingly (from 1.13 - to 5.0.4); introduce a macro for this requirement. - -* Mon Oct 24 2005 David Malcolm - 2.4.1-5 -- fix removal of upstream .desktop file (broke on upgrade to Evolution 2.2, and - continued to be broken with 2.3/2.4) (#103826, again) - -* Tue Oct 18 2005 David Malcolm - 2.4.1-4 -- updated patch 804 to declare e_calendar_table_process_completed_tasks - -* Tue Oct 18 2005 David Malcolm - 2.4.1-3 -- added patch (804: evolution-2.4.1-fix-missing-declarations.patch) to fix - missing declaration (thanks to Peter Robinson) - -* Mon Oct 17 2005 David Malcolm - 2.4.1-2 -- bump e-d-s requirement to 1.4.1.1 - -* Tue Oct 4 2005 David Malcolm - 2.4.1-1 -- 2.4.1 -- regenerate patch 101 to handle conflict in - calendar/gui.print.c: print_week_day_event introduced by fix to upstream bug - 244981 (end date added while printing in the week view); bump patch name from - version 5 to version 6 -- removed patch 804 (conduits-multi-day-crash); this is now in upstream tarball - -* Wed Sep 14 2005 Jeremy Katz - 2.4.0-2 -- rebuild for mozilla on ppc64 - -* Wed Sep 7 2005 David Malcolm - 2.4.0-1 -- 2.4.0 -- Removed patch to fix implicit function declarations (patch 110, added in - 2.3.8-1) as this is now upstream. - -* Thu Sep 1 2005 David Malcolm - 2.3.8-4 -- Enable exchange support when configuring, so that the exchange-operations - plugin gets built. - -* Fri Aug 26 2005 David Malcolm - 2.3.8-3 -- Added patch for #157074 (patch 804) - -* Fri Aug 26 2005 David Malcolm - 2.3.8-2 -- Move -Werror-implicit-function-declaration from configuration to the make - stage, to avoid breaking configuration tests. - -* Tue Aug 23 2005 David Malcolm - 2.3.8-1 -- 2.3.8 -- add -Werror-implicit-function-declaration to CFLAGS and a patch to fix the - problems arising (patch 110) - -* Tue Aug 16 2005 David Malcolm - 2.3.7-3 -- Introduce macro for gnome-pilot dependency, bumping from 2.0.6 to 2.0.13 -- Add obsoletion of libgal2/libgal2-devel (dependency was removed in 2.3.6-1); - based on the last EVR of the libgal2 package in CVS, 2:2.5.3-2 - -* Mon Aug 15 2005 David Malcolm - 2.3.7-2 -- rebuild - -* Tue Aug 9 2005 David Malcolm - 2.3.7-1 -- 2.3.7 -- Bump evolution-data-server requirement from 1.3.6 to 1.3.7 -- Bump gtkhtml3 requirement from 3.6.2 to 3.7.6 - -* Mon Aug 8 2005 Tomas Mraz - 2.3.6.1-5 -- rebuild with new gnutls - -* Tue Aug 2 2005 David Malcolm - 2.3.6.1-4 -- Added patch to show correct mimetype for OpenOffice.org files when guessing - type for attachments with mimetype "application/octet-stream" (#164957) - -* Mon Aug 1 2005 David Malcolm - 2.3.6.1-3 -- Improved version of evolution-2.3.5.1-fix-150458.patch (#150458) - -* Sat Jul 30 2005 David Malcolm 2.3.6.1-2 -- Fixed version numbers in GConf schema files (#164622); added - apps-evolution-mail-prompts-checkdefault-2.4.schemas - -* Fri Jul 29 2005 David Malcolm - 2.3.6.1-1 -- 2.3.6.1 - -* Thu Jul 28 2005 David Malcolm - 2.3.6-1 -- 2.3.6 -- Bump evolution-data-server requirement to 1.3.6 (needed for - CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING) -- Removed libgal2[-devel] dependencies; the code has been moved into the - evolution tarball - -* Thu Jul 28 2005 David Malcolm - 2.3.5.1-2 -- added experimental patch to port ETable printing to use Pango (#150458) - -* Mon Jul 25 2005 David Malcolm - 2.3.5.1-1 -- 2.3.5.1 -- Update evo_major from 2.2 to 2.4 -- Updated evo-calendar-print-with-pango- patch from version 4 to 5 -- Removed Patch105: evolution-2.2.2-fix-new-mail-notify.patch as configure.in - in this branch tests for existance for dbus-glib-1, rather than max-version. -- Removed Patch801: gb-309138-attach-48417-fix-evo-conduit-memleaks.patch as - this is now in upstream tarball. -- Removed evolution-calendar-importers and evolution-addressbook-importers - directories. -- Updated evolution-2.2.2-no-gnome-common.patch to include a patch to rename - mozilla-nspr to nspr - -* Tue Jun 28 2005 David Malcolm - 2.2.2-11.fc5 -- Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools; patch 803) - -* Tue Jun 28 2005 David Malcolm - 2.2.2-10.fc5 -- Moved .conduit files to libdir/gnome-pilot/conduits, rather than beneath datadir, to match gnome-pilot (patch 802) - -* Mon Jun 27 2005 David Malcolm - 2.2.2-9.fc5 -- Replaced patch to port conduits to pilot-link-0.12 with Mark G Adams's version of same (#161817) -- Added Mark G Adams's memory leak fix (patch 801) - -* Mon Jun 6 2005 David Malcolm - 2.2.2-8 -- Added Ivan Gyurdiev's patch to move autosave files inside the .evolution - directory - -* Thu May 26 2005 David Malcolm - 2.2.2-7 -- Added Akira Tagoh's patch for calendar keypress handling (#154360) - -* Mon May 23 2005 David Malcolm - 2.2.2-6 -- Remove static versions of libraries - -* Thu May 5 2005 David Malcolm - 2.2.2-5 -- added evolution-2.2.2-fix-new-mail-notify.patch to CVS - -* Thu May 5 2005 David Malcolm - 2.2.2-4 -- Removed explicit mozilla_build_version; instead use pkg-config to determine -the path to the NSS/NSPR headers. -- Use a macro to express requirement on pilot-link (was 1:0.11.4, now 0.12; -patches depend on this) -- Re-enabled the new-mail-notify plugin (my patch to handle differing DBus -versions is in the upstream tarball; but configure.in disables the plugin for -dbus versions > 0.23; patched configure.in to allow arbitrary DBus versions, -and run autoconf at the start of the build) (#156328) - -* Sat Apr 30 2005 David Malcolm - 2.2.2-3 -- updated mozilla_build_version to 1.7.7 - -* Sat Apr 30 2005 David Malcolm - 2.2.2-2 -- Finished porting conduits to pilot-link-0.12 API; re-enabled pilot support (#152172) - -* Mon Apr 11 2005 David Malcolm - 2.2.2-1 -- 2.2.2 -- updated evo-calendar-print-with-pango-4.patch to handle upstream change to print_comp_item -- removed patch for XB73912; now in upstream tarball -- removed patch to new-mail-notify; generalised fix to cope with various DBus API versions is now upstream -- removed patch for XB73844; now in upstream tarball -- Update requirements: - - gtkhtml3 from 3.6.1 to 3.6.2 - - libgal2 from 2.4.1 to 2.4.2 - - eds from 1.2.1 to 1.2.2 - -* Wed Mar 23 2005 David Malcolm - 2.2.1.1-2 -- Add patch for upstream bug XB73844 (should now be able to accept meeting requests) - -* Fri Mar 18 2005 David Malcolm - 2.2.1.1-1 -- 2.1.1.1 - -* Thu Mar 17 2005 David Malcolm - 2.2.1-1 -- 2.2.1 -- Updated requirements: - * gtkhtml3 from 3.6.0 to 3.6.1 - * libgal2 from 2.4.0 to 2.4.1 - * eds from 1.2.0 to 1.2.1 -- Added rum-time requirement on gnome-vfs2; updated version requirement from 2.0 to 2.4 -- The new-mail-notify plugin will not be built for now since the upstream configure test now checks for dbus-glib-1 version <= 0.23.4 (to minimise problems caused by the API change) - -* Mon Mar 14 2005 David Malcolm - 2.2.0-10 -- disabled pilot-link support for now so that we have an evolution package; more patching is needed to get this to work with pilot-link-0.12 - -* Mon Mar 14 2005 David Malcolm - 2.2.0-9 -- another attempt at porting to pilot-link 0.12 - -* Mon Mar 14 2005 David Malcolm - 2.2.0-8 -- Added patch to deal with changes to pilot-link from 0.11->0.12 - -* Mon Mar 14 2005 David Malcolm - 2.2.0-7 -- use 0.31 rather than 0.31.0 for DBus version - -* Mon Mar 14 2005 David Malcolm - 2.2.0-6 -- rebuilt against pilot-link-0.12 -- added versioning to the requirement on dbus (>=0.31) - -* Thu Mar 10 2005 David Malcolm - 2.2.0-5 -- Added patch for changes to DBus API in version 0.31 (#150671) -- Removed explicit run-time spec-file requirement on mozilla. - The Mozilla NSS API/ABI stabilised by version 1.7.3 - The libraries are always located in the libdir - However, the headers are in /usr/include/mozilla-%{mozilla_build_version} - and so they move each time the mozilla version changes. - So we no longer have an explicit mozilla run-time requirement in the specfile; - a requirement on the appropriate NSS and NSPR .so files is automagically generated on build. - We have an explicit, exact build-time version, so that we can find the headers (without - invoking an RPM query from the spec file; to do so is considered bad practice) -- Introduced mozilla_build_version, to replace mozilla_version - -* Wed Mar 9 2005 Christopher Aillon - 2.2.0-4 -- Depend on mozilla 1.7.6 - -* Wed Mar 9 2005 David Malcolm - 2.2.0-3 -- added patch from upstream for bug XB-73192, fixing missing "Mark as Read/Unread" context menu items - -* Tue Mar 8 2005 David Malcolm - 2.2.0-2 -- actually add source tarball this time - -* Tue Mar 8 2005 David Malcolm - 2.2.0-1 -- 2.2.0 -- Removed patch for GCC 4 fix as this is now in upstream tarball -- Updated requirements: - * gtkhtml3 from 3.5.7 to 3.6.0 - * libgal2 from 2.3.5 to 2.4.0 - * eds from 1.1.6 to 1.2.0 - -* Tue Mar 8 2005 David Malcolm - 2.1.6-3 -- rebuild (to use latest DBus library) - -* Tue Mar 1 2005 David Malcolm - 2.1.6-2 -- added patch to fix build with GCC4 - -* Tue Mar 1 2005 David Malcolm - 2.1.6-1 -- Update from upstream unstable 2.1.6 to 2.1.6 -- Added patches to fix calendar and addressbook printing for non-Roman scripts (#138075) -- Added explicit requirement on libgnomeprint22 >= 2.8.0 -- Added BuildRequires: gtk-doc -- Updated requirements: - * gtkhtml3 from 3.5.6 to 3.5.7 - * libgal2 from 2.3.4 to 2.3.5 - * eds from 1.1.5 to 1.1.6 - -* Wed Feb 9 2005 David Malcolm - 2.1.5-1 -- Update from upstream unstable 2.1.4 to 2.1.5 -- Updated requirements: - * gtkhtml3 from 3.5.4 to 3.5.6 - * libgal2 from 2.3.3 to 2.3.4 - * eds from 1.1.4.1 to 1.1.5 -- Removed explicit packaging of weather icons as these are now below DATADIR/evolution/2.2 rather than DATADIR/evolution-2.2 - -* Wed Jan 26 2005 David Malcolm - 2.1.4-1 -- Update from upstream stable 2.0.3 to unstable 2.1.4 -- Updated evo_major from 2.0 to 2.2 -- Removed camel packaging as this has been moved to evolution-data-server for Evolution 2.2 -- Added plugins to the packaged files -- Added weather icons to the packaged files -- Updated requirements: - * gtkhtml3 from 3.3.2 to 3.5.4 - * libgal2 from 2.2.4 to 2.3.3 - * eds from 1.0.3 to 1.1.4.1 - * libsoup from 2.2.0 to 2.2.2 -- Added built-time requirement on atk-devel -- Enable all plugins for now -- Added requirement on dbus (for the new-mail-notify plugin) -- Enable gtk-doc -- Updated GConf schema name suffixes from 2.0 to 2.2 - -* Sun Dec 19 2004 Christopher Aillon 2.0.3-2 -- Rebuild against mozilla 1.7.5 - -* Wed Dec 15 2004 David Malcolm - 2.0.3-1 -- Update from upstream 2.0.2 to 2.0.3 with these bug fixes: - * Addressbook - XB67656 - almost the same email address are considrered identical (Siva) - XB69079 - Data repeated after save with bad date format (Siva) - XB66854 - Some strings are missed to translation (Rodney) - - * Calendar - XB47529 - Date in reminder window appears in UTF-8 in non-UTF-8 locale (Rodney) - XB68707 - Events ending at 12:00 AM show as ending at 12:00 pm (JP) - XB67403 - wrong alarm time displayed (Rodrigo) - XB68077 - appointment dialog re-size (Rodrigo) - - leak fixes (Chen) - - sensitize menu items in list view properly (JP) - - redraw display when 24hr time setting changes (JP) - - * Mail - XB69533 - Unable to subscribe to the alt hierarchy (Michael) - XB69776 - Signed Mail with attachments displays everything with multipart/boundaries stuff (Michael) - XB69615 - delete certificate after viewing smime message (Michael) - XB69109 - EHLO or HELO with ip addresses does not conform rfc 821 (Michael) - XB69982 - During Newsgroup list refresh, it crashes (Michael) - XB69446 - Mail shown as attachment if some headers are upper case (S. Caglar Onur) - XB68556 - NNTP with SSL won't work, even with stunnel (Michael) - XB69145 - toplevel message/rfc822 parts are broken for IMAP (Michael) - XB69241 - base64 attachement holding PGP block (Jeff) - XB67895 - nntp support not asking for password (Michael) - XB67898 - Use of symbolic port-names is not guaranteed to work everywhere (Michael) - XB69851 - remember password check doesn't stick (Michael) - XB69623 - Moving a message from an IMAP INBOX to an IMAP folder caused crash (Radek) - XB69339 - postscript and some other attachments not visable (Michael) - XB69579 - vFoldersXBUNMATCHED generates errors (Michael) - XB68958 - current message forgotten in vfolders (Michael) - XB68974 - Wizard doesn't store smtp auth settings (Michael) - XB67496 - html email not rendered in preview pane (Michael) - XB67014 - Checking supported auth types doesn't work with new SSL certificate (Michael) - XB68006 - Evo crashed after viewing previously-sent email and copying URL from it (Michael) - XB68787 - Crash when migrating 1.4 data to 2.0.2 (Michael) - XB67622 - SMTP auth usernames containing % character fail (Jeff) - - fix pthread_key_delete args (Julio M. Merino Vidal) -- Removed patch for "Unmatched" vfolder properties dialog (#141458) as this is now in upstream tarball (XB69579 above) -- Update dependency on e-d-s from 1.0.2 to 1.0.3 -- Update dependency on libgal2 from 2.2.3 to 2.2.4 - -* Wed Dec 1 2004 David Malcolm - 2.0.2-6 -- Fix broken properties dialog for "Unmatched" vfolder (#141458) - -* Wed Oct 27 2004 Christopher Aillon - 2.0.2-4 -- Re-enable s390(x) - -* Fri Oct 22 2004 David Malcolm - 2.0.2-3 -- added requirement on gnutls/gnutls-devel - -* Fri Oct 22 2004 David Malcolm - 2.0.2-2 -- Fix for #132050 (no entry for Evolution in the menus): use the new redhat-evolution.desktop file provided by redhat-menus-1.13 - -* Tue Oct 12 2004 David Malcolm - 2.0.2-1 -- Update from 2.0.1 to 2.0.2 -- Updated dependency on e-d-s from 1.0.1 to 1.0.2 -- Updated dependency on libgal2 from 2.2.2 to 2.2.3 -- Updated dependency on gtkhtml3 from 3.3.0 to 3.3.2 -- ppc's mozilla dependency is now in line with the other architectures at 1.7.3 - -* Sat Oct 9 2004 David Malcolm -- disable s390/s390x for now - -* Fri Oct 8 2004 David Malcolm - 2.0.1-3 -- Fix for #135135, updating the fix for #103826 that removes the evolution.desktop file in "Office"; the file to delete had been renamed to evolution-2.0.desktop -- Added requirement on redhat-menus, since this supplies the target of our .desktop symlink - -* Tue Sep 28 2004 David Malcolm - 2.0.1-2 -- update mozilla dependency from 1.7.2 to 1.7.3, apart from on ppc (and on s390 and s390x, which remain at 1.6, and on ppc64 where it isn't available at all) - -* Tue Sep 28 2004 David Malcolm - 2.0.1-1 -- Update from 2.0.0 to 2.0.1 -- Updated dependency on e-d-s from 1.0.0 to 1.0.1 -- Updated dependency on libgal2 from 2.2.0 to 2.2.2 - -* Mon Sep 20 2004 David Malcolm - 2.0.0-2 -- rebuilt - -* Tue Sep 14 2004 David Malcolm - 2.0.0-1 -- Update from 1.5.94.1 to 2.0.0 -- Change source FTP location from 1.5 to 2.0 -- Updated dependency on e-d-s from 0.0.99 to 1.0.0 -- Documentation has now moved from 1.5 to 2.0 - -* Tue Aug 31 2004 David Malcolm - 1.5.94.1-1 -- updated tarball from 1.5.93 to 1.5.94.1 -- the BASE_VERSION in the configure.in script has finally been updated from 1.5 to 2.0 (affects OAFIIDs, install dirs, binary names etc); updated evo_major and various other parts of the spec-file to reflect this; however documentation is still 1.5 in upstream tarball -- updated dependency on libgal2 from 2:2.1.14 to 2:2.2.0 -- updated dependency on libsoup from 2.1.13 to 2.2.0 -- updated dependency on e-d-s from 0.0.98 to 0.0.99 - -* Tue Aug 17 2004 David Malcolm - 1.5.93-2 -- updated gnome-icon-theme requirement from 1.2.0 to 1.3.6 to fix problem with missing stock icons (bz #130142) - -* Mon Aug 16 2004 David Malcolm - 1.5.93-1 -- updated tarball from 1.5.92.2 to 1.5.93 -- removed filechooser patch - this is now in the upstream tarball, with a test at configuration time; it was autodetected and enabled in my test build; I've explicitly enabled it to be certain. -- updated dependency on libgal2 from 2:2.1.13 to 2:2.1.14 -- updated dependency on libsoup from 2.1.12 to 2.1.13 -- updated dependency on e-d-s from 0.0.97 to 0.0.98 - -* Wed Aug 11 2004 David Malcolm - 1.5.92.2-2 -- Increased mozilla_version from 1.7 to 1.7.2 so that the NSS test looks in the correct place - -* Wed Aug 11 2004 David Malcolm - 1.5.92.2-1 -- updated tarball from 1.5.92.1 to 1.5.92.2 - -* Wed Aug 4 2004 David Malcolm - 1.5.92.1-1 -- updated tarball from 1.5.91 to 1.5.92.1 -- added a dependency on gnome-icon-theme -- updated dependency on libgal2 from 2:2.1.11 to 2:2.1.13 -- updated dependency on gtkhtml3 from 3.1.17 to 3.3.0 -- updated dependency on libsoup from 2.1.11 to 2.1.12 -- updated dependency on e-d-s from 0.0.95 to 0.0.97 - -* Mon Jul 26 2004 David Malcolm - 1.5.91-1 -- 1.5.91 - -* Thu Jul 8 2004 Jeremy Katz - 1.5.90-5 -- use mozilla 1.7 on platforms where it's available -- check to make sure the appropriate mozilla headers exist if using - mozilla nss for ssl or fail the build - -* Thu Jul 8 2004 David Malcolm -- rebuilt - -* Wed Jul 7 2004 David Malcolm -- rebuilt - -* Tue Jul 6 2004 David Malcolm - 1.5.90-2 -- Fixed sources file - -* Tue Jul 6 2004 David Malcolm - 1.5.90-1 -- 1.5.90; updated requirements on gtkhtml3, libgal2, and e-d-s - -* Thu Jun 17 2004 David Malcolm - 1.5.9.2-1 -- 1.5.9.2 - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Tue Jun 8 2004 David Malcolm - 1.5.9.1-3 -- Replaced /usr/lib with %%{_libdir} in mozills_nss ssl_flags - -* Mon Jun 7 2004 David Malcolm - 1.5.9.1-2 -- updated filechooser patch again - -* Mon Jun 7 2004 David Malcolm - 1.5.9.1-1 -- 1.5.9.1; updated filechooser patch - -* Wed May 26 2004 David Malcolm - 1.5.8-3 -- added ORBit2 and spamassassin requirements - -* Mon May 24 2004 David Malcolm - 1.5.8-2 -- Fixed up filechooser patch and re-enabled it - -* Fri May 21 2004 David Malcolm - 1.5.8-1 -- 1.5.8; added explicit libbonoboui requirement; disabled filechooser patch for now - -* Tue May 4 2004 David Malcolm - 1.5.7-3 -- Added GtkFileChooser patch based on work by Carlos Garnacho Parro (http://lists.ximian.com/archives/public/evolution-patches/2004-March/004867.html); added requirement for GTK 2.4 - -* Thu Apr 22 2004 David Malcolm - 1.5.7-2 -- added emfv signal fix patch and fix for defaults in switch statements on gcc3.4 - -* Wed Apr 21 2004 David Malcolm - 1.5.7-1 -- 1.5.7 - -* Wed Mar 10 2004 Jeremy Katz - 1.5.5-1 -- 1.5.5 - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Wed Feb 18 2004 Jeremy Katz - 1.5.4-1 -- 1.5.4 - -* Tue Feb 17 2004 Jeremy Katz -- buildrequire e-d-s-devel instead of e-d-s (#114712) -- enable nntp support (#114802) - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Tue Jan 27 2004 Jeremy Katz 1.5.3-1 -- 1.5.3 - -* Wed Jan 21 2004 Jeremy Katz 1.5.2-2 -- size_t/int mismatch compile fix for 64bit platforms - -* Wed Jan 14 2004 Jeremy Katz 1.5.2-0 -- 1.5.2 -- add patch to fix gconf warning with schema - -* Sun Jan 4 2004 Jeremy Katz 1.5.1-0 -- 1.5.1 -- temporarily disable redhatify patch -- use mozilla-nss for SSL -- fix schema names - -* Thu Nov 6 2003 Jeremy Katz 1.4.5-8 -- fall back to HELO for ESMTP (#108753) - -* Tue Oct 28 2003 Jeremy Katz 1.4.5-7 -- fix title on composer save dialog (#108159) - -* Mon Oct 27 2003 Jeremy Katz 1.4.5-6 -- Make imap command length shorter to avoid choking some imap servers - (notably cyrus-imap). -- Make wombat session managed so that we don't hit weird bonobo activation - things. This adds a dependency on $DISPLAY for wombat. (#106826) - -* Sun Oct 19 2003 Jeremy Katz 1.4.5-5 -- use AI_ADDRCONFIG to avoid returning IPv6 addresses on hosts without - IPv6 support -- add patch from upstream with reply-to-list shortcut (Ctrl-l) - -* Wed Oct 15 2003 Jeremy Katz 1.4.5-4 -- really, really remove duplicate menu entry (#103826) - -* Tue Oct 14 2003 Jeremy Katz 1.4.5-3 -- Pull in some patches from upstream CVS - * Avoid division by zero with POP (X#41610) - * Don't mangle headers (X#33545) - * Prefix IPV6 numeric hosts properly (X#46006, #105028) - * Use proper function for IPV6 reverse lookups (X#46006) - * Allow timezone offset to be up to 14 hours (X#49357) - -* Mon Oct 13 2003 Jeremy Katz -- add patch from upstream CVS to fix SMTP syntax problems (#106630) -- really remove duplicate menu entry (#103826) - -* Mon Oct 6 2003 Jeremy Katz -- make redhat-email.desktop symlink relative (#104391) - -* Wed Sep 24 2003 Jeremy Katz -- add ipv6 support per dwmw2's request - -* Tue Sep 23 2003 Jeremy Katz 1.4.5-2 -- 1.4.5 - -* Wed Sep 17 2003 Jeremy Katz -- move static libs into -devel (#104399) - -* Tue Sep 16 2003 Jeremy Katz 1.4.4-7 -- filter types are gtypes, not ints (#103934) - -* Wed Sep 10 2003 Jeremy Katz 1.4.4-6 -- fix from upstream (will be in 1.4.5) to fix menu merging in the - composer with new libbonobo - -* Fri Sep 5 2003 Jeremy Katz -- remove the desktop file in Office (#103826) - -* Tue Sep 2 2003 Jeremy Katz 1.4.4-5 -- patch from upstream to fix display of some mails in - different charsets (#102899) -- add requires on newer version of ORBit2 (#103386) -- add patch from upstream (extracted by George Karabin) to use gnome-vfs - mime icon lookup where available (#102553) - -* Fri Aug 22 2003 Jeremy Katz 1.4.4-4 -- include static libs (#102834) - -* Wed Aug 6 2003 Jeremy Katz 1.4.4-3 -- add a -devel subpackage (#99376) - -* Mon Aug 4 2003 Jeremy Katz 1.4.4-1 -- 1.4.4 - -* Wed Jul 30 2003 Jeremy Katz -- buildrequires fixup from Ville Skytta (#101325) - -* Thu Jul 24 2003 Jeremy Katz 1.4.3-6 -- include tagoh's patch for printing cjk contacts (committed upstream, #99374) - -* Tue Jul 22 2003 Nalin Dahyabhai 1.4.3-5 -- rebuild - -* Tue Jul 15 2003 Jeremy Katz 1.4.3-4 -- build on all arches again - -* Mon Jul 14 2003 Jeremy Katz 1.4.3-3 -- rebuild - -* Thu Jul 10 2003 Jeremy Katz 1.4.3-1 -- 1.4.3 - -* Thu Jun 19 2003 Jeremy Katz -- make gal version dep more explicit - -* Fri Jun 13 2003 Jeremy Katz -- fix desktop file (#97162) - -* Tue Jun 10 2003 Jeremy Katz 1.4.0-2 -- rebuild -- excludearch ppc64 for now - -* Mon Jun 9 2003 Jeremy Katz 1.4.0-1 -- 1.4.0 - -* Wed Jun 5 2003 Elliot Lee -- rebuilt - -* Thu Jun 5 2003 Jeremy Katz 1.3.92-2 -- rebuild - -* Wed Jun 4 2003 Jeremy Katz -- buildrequires gettext (#92276) - -* Sun May 25 2003 Jeremy Katz 1.3.92-1 -- 1.3.92 - -* Wed May 7 2003 Jeremy Katz 1.3.3-2 -- fix default for /schemas/apps/evolution/mail/display/mime_types - -* Tue May 6 2003 Jeremy Katz 1.3.3-1 -- 1.3.3 - -* Sun May 4 2003 Jeremy Katz 1.3.2-2 -- enable pilot support -- add redhatify patch back - -* Tue Apr 22 2003 Jeremy Katz -- add a /usr/bin/evolution symlink - -* Mon Apr 21 2003 Jeremy Katz -- fix gnome-spell version requirement - -* Wed Apr 16 2003 Jeremy Katz 1.3.2-1 -- add trivial fix for evolution-mail schema key (ximian #41419) - -* Tue Apr 15 2003 Jeremy Katz -- update to 1.3 -- don't build with pilot support for now -- don't redhat-ify the summary prefs for now - -* Sun Apr 6 2003 Jeremy Katz 1.2.4-2 -- fix krb5 libdir for lib64 systems - -* Sun Apr 6 2003 Jeremy Katz 1.2.4-1 -- update to 1.2.4 - -* Thu Apr 3 2003 Jeremy Katz 1.2.2-7 -- oops, fix a tyop - -* Thu Apr 3 2003 Jeremy Katz 1.2.2-6 -- add a few cleanups for 64bit cleanliness (#86347) - -* Sun Mar 30 2003 Jeremy Katz -- add some buildrequires (#87612) - -* Mon Mar 24 2003 Jeremy Katz 1.2.3-1 -- update to 1.2.3 - -* Wed Mar 19 2003 Jeremy Katz 1.2.2-5 -- security patches from upstream - - sanity check UUEncoding header before decoding (CAN-2003-0128) - - don't decode doubly UUEncoded content (CAN-2003-0129) - - don't use a bonobo component to display things without registered - handlers (CAN-2003-0130) - -* Mon Feb 24 2003 Elliot Lee 1.2.2-4 -- debuginfo rebuild - -* Thu Feb 20 2003 Jeremy Katz 1.2.2-3 -- memleak patch had some bits that weren't supposed to be there. update - to newer from upstream. -- fix directory checking in proxy patch - -* Thu Feb 20 2003 Jeremy Katz 1.2.2-2 -- add missing build dep (#84388) -- add patch from upstream for evolution-mail memleak -- add patch from upstream to use the gnome2 proxy settings by default - -* Fri Feb 7 2003 Jeremy Katz 1.2.2-1 -- 1.2.2 -- build on x86_64 - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Tue Jan 7 2003 Nalin Dahyabhai 1.2.1-4 -- rebuild - -* Fri Jan 3 2003 Nalin Dahyabhai -- if building with OpenSSL, attempt to get cflags and ldflags from pkgconfig - -* Thu Jan 2 2003 Jeremy Katz 1.2.1-3 -- we don't want to use native POSIX threads for mutexes in db3, override them - -* Mon Dec 16 2002 Tim Powers 1.2.1-2 -- rebuild - -* Fri Dec 13 2002 Jeremy Katz 1.2.1-1 -- update to 1.2.1 - -* Thu Dec 12 2002 Jeremy Katz 1.2.0-6 -- require a newer soup, the old one Has Bugs (tm) -- excludearch x86_64; getting a R_X86_64_32S relocation in libical - although everything appears to be built with -fPIC correctly - -* Tue Dec 10 2002 Jeremy Katz 1.2.0-5 -- patch for multilib krb5 - -* Mon Dec 2 2002 Jeremy Katz 1.2.0-4 -- add upstream patch to handle LDAPv3 better -- add upstream patch to fix shell memory leaks -- add upstream patch to fix ldap scope selection -- build with openssl instead of mozilla-nss since it's available on - more platforms -- build on all arches - -* Fri Nov 22 2002 Jeremy Katz -- require bonobo-conf, not -devel (#78398) - -* Wed Nov 20 2002 Florian La Roche 1.2.0-3 -- disable pilot support for mainframe - -* Mon Nov 18 2002 Jeremy Katz 1.2.0-2 -- macro-ify the mozilla version to make it easier to build against - newer mozillas with headers in new locations -- buildrequire pilot-link-devel (#78077) -- drop uneeded ldapv3 patch (toshok says 1.2 already handles this) -- drop unneeded patch for ordering of the libdb checks -- add fejj's patch to always subscribe to the inbox from evolution-patches - -* Tue Nov 12 2002 Jeremy Katz 1.2.0-1 -- 1.2.0 - -* Sat Nov 2 2002 Jeremy Katz 1.1.90-2 -- reenable pilot support -- redhatify - -* Fri Nov 1 2002 Jeremy Katz 1.1.90-1 -- update to 1.1.90 - -* Thu Oct 31 2002 Jeremy Katz -- include mozilla epochs in requires (#74577) -- add build requires on newer oaf (#76801) - -* Thu Oct 24 2002 Jeremy Katz 1.1.2-1 -- update to 1.1.2 -- remove unpackaged files from the buildrooot -- disable pilot support for now - -* Tue Sep 3 2002 Jeremy Katz 1.0.8-10 -- add freetype-devel to build requires (#73319) - -* Mon Sep 2 2002 Owen Taylor -- Fix a problem where evolution-mail right click items corrupted the stack - (#67992) - -* Thu Aug 29 2002 Jeremy Katz 1.0.8-9 -- don't install two desktop files (#72871) - -* Wed Aug 28 2002 Preston Brown 1.0.8-8 -- absolute symlink .desktop file (#72913) - -* Thu Aug 22 2002 han Ngo 1.0.8-7 -- rebuild against new pilot-link - -* Sat Aug 10 2002 Florian La Roche -- bzip2 source - -* Tue Aug 6 2002 Than Ngo 1.0.8-5 -- rebuild against new pilot-link-0.11.2 - -* Thu Jul 18 2002 Jeremy Katz 1.0.8-4 -- rebuild against new gnome-pilot - -* Tue Jul 9 2002 Jeremy Katz 1.0.8-3 -- remove static and libtool archives for importers and camel-providers (#68222) -- do desktop-file-install magic -- remove dead sites from summary list (#64522) -- support openldap protocol version 3 based off of Nalin's autofs changes - -* Mon Jul 8 2002 Jeremy Katz 1.0.8-2 -- fix openldap-devel buildrequire - -* Mon Jul 1 2002 Jeremy Katz 1.0.8-1 -- 1.0.8 - -* Thu Jun 27 2002 Jeremy Katz 1.0.7-2 -- include patch to omf files from otaylor@redhat.com to fix - scrollkeeper validation errors - -* Sun Jun 23 2002 Jeremy Katz 1.0.7-1 -- update to 1.0.7 -- excludearch alpha while mozilla isn't being built there - -* Sun May 26 2002 Tim Powers 1.0.5-2 -- automated rebuild - -* Mon May 13 2002 Jeremy Katz 1.0.5-1 -- update to 1.0.5 - -* Fri May 3 2002 Jeremy Katz 1.0.3-6 -- add patch to fix spool unread counts (#64198) -- build with the fix for the crasher mail sent to - evolution-list (ximian #24140) - -* Mon Apr 15 2002 Jeremy Katz 1.0.3-4 -- include fejj(at)ximian.com's patch to fix the EINPROGRESS error with ssl - since it's been committed to the branch and fixes the problem for me -- include patch from tagoh(at)redhat.com to change the default charset - for Japanese to ISO-2022-JP (#63214) - -* Wed Apr 10 2002 Jeremy Katz 1.0.3-3 -- minor tweaks to the redhatify patch -- make accepting appointments sent to mailing lists work -- use the RFC specified LDAP attribs for freebusy and calendarURI - in addressbook -- fix a crash in the startup wizard - -* Sun Mar 31 2002 Jeremy Katz 1.0.3-2 -- move desktop file to /etc/X11/applnk (#62399) - -* Sun Mar 24 2002 Jeremy Katz 1.0.3-1 -- update to evolution 1.0.3 -- change summary view to show a recent errata list by default - -* Thu Mar 14 2002 Jeremy Katz -- put correct path to nspr includes on configure command line - -* Mon Mar 11 2002 Jeremy Katz 1.0.2-3 -- mozilla 0.9.9 has nspr and nss subpackages, hooray! rip out the static - libnss linkage and just link against what is provided dynamically -- kill the -devel subpackage since it's of questionable use -- explicitly require mozilla-nss and mozilla-nspr packages to make it easier - to resolve the requirements - -* Thu Feb 21 2002 Jeremy Katz 1.0.2-2 -- rebuild in new environment -- temporarily exclude on ia64 again - -* Thu Jan 31 2002 Jeremy Katz 1.0.2-1 -- update to 1.0.2 - -* Mon Jan 28 2002 Jeremy Katz 1.0.1-4 -- build on ia64 now that mozilla exists for ia64 - -* Sun Jan 27 2002 Jeremy Katz 1.0.1-3 -- rebuild in new environment -- add pilot support - -* Sun Jan 13 2002 Jeremy Katz 1.0.1-2 -- rebuild without mozilla-psm in the buildroot so libnss is linked - statically as intended - -* Sat Jan 12 2002 Jeremy Katz 1.0.1-1 -- update to 1.0.1 -- patch for autoconf 2.52 accepted upstream -- include man page -- use --with-sub-version=" (%%{version}-%%{release})" - -* Tue Dec 18 2001 Jeremy Katz 1.0-2 -- really disable news -- add patch from Jens Petersen to hopefully get - builds working with autoconf 2.52 -- conditionalize static libnss stuff so that it can go away when we - have a mozilla with shared libnss - -* Thu Dec 6 2001 Jeremy Katz 1.0-1.7.2 -- add patches off of branch for: - * do not show up as Preview Release in version string - * have next/previous work with multiple selected messages -- build without pilot support - -* Mon Dec 3 2001 Jeremy Katz 1.0-1 -- and bump to 1.0 - -* Sun Dec 2 2001 Jeremy Katz -- let's build with an included copy of libnss now since OpenSSL is support - is disabled on the 1.0 branch -- build with --enable-dot-locking=no -- excludearch ia64 again now that we need libnspr - -* Mon Nov 26 2001 Jeremy Katz -- build with gnome-pilot and krb5 support -- conditionalize ldap, pilot and krb5 support -- clean up buildrequires some - -* Sat Nov 17 2001 Jeremy Katz -- we can build on ia64 since we're using openssl instead of nspr -- disable non-functional nntp support -- 0.99.2 (rc2) - -* Fri Nov 9 2001 Jeremy Katz -- add explicit requires on current bonobo, oaf, and GConf to help people - help themselves -- s/Copyright/License/ - -* Thu Nov 8 2001 Jeremy Katz -- add a patch to revert changes to camel-tcp-stream-openssl; appears to - fix the SSL hangs - -* Wed Nov 7 2001 Jeremy Katz -- fix filelist to include libical zoneinfo -- add devel subpackage with includes and static libs - -* Mon Nov 5 2001 Jeremy Katz -- updated to 0.99.0 aka 1.0 RC1 - -* Tue Oct 23 2001 Havoc Pennington -- 0.16 snagged from Ximian GNOME - -* Fri Oct 5 2001 Havoc Pennington -- initial build based on David Sainty's specfile - -* Thu Oct 04 2001 David Sainty -- Updated to 0.15.99, 20011004 from cvs. - -* Wed Sep 05 2001 David Sainty -- Updated to 0.13.99, 20010905 from cvs. - -* Mon Sep 03 2001 David Sainty -- Updated to 0.13.99, 20010903 from cvs. -- Fixed Requires + BuildRequires - -* Mon Aug 06 2001 David Sainty -- Updated to 0.12.99, 20010806 from cvs. - -* Mon Aug 06 2001 David Sainty -- Relocated libical* from /usr/lib due to kdepim, -2 - -* Mon Aug 06 2001 David Sainty -- First spec file for evolution. - +%autochangelog diff --git a/flatpak-evolution-fix-service-names.sh b/flatpak-evolution-fix-service-names.sh new file mode 100755 index 0000000..9454543 --- /dev/null +++ b/flatpak-evolution-fix-service-names.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +# see https://gitlab.gnome.org/GNOME/glib/issues/1737 +# previous versions used milliseconds instead of seconds as the timeout argument", +(`pkg-config --atleast-version 2.60.1 gio-2.0` || `pkg-config --atleast-version 2.61.0 gio-2.0`) && TIMEOUTMULT= || TIMEOUTMULT=000 + +sed -e "s|\@SOURCES_SERVICE\@|$(pkg-config --variable=sourcesdbusservicename evolution-data-server-1.2)|" \ + -e "s|\@ADDRESSBOOK_SERVICE\@|$(pkg-config --variable=addressbookdbusservicename evolution-data-server-1.2)|" \ + -e "s|\@CALENDAR_SERVICE\@|$(pkg-config --variable=calendardbusservicename evolution-data-server-1.2)|" \ + -e "s|\@TIMEOUTMULT\@|${TIMEOUTMULT}|" diff --git a/flatpak-evolution-wrapper.sh.in b/flatpak-evolution-wrapper.sh.in new file mode 100644 index 0000000..6a311fc --- /dev/null +++ b/flatpak-evolution-wrapper.sh.in @@ -0,0 +1,29 @@ +#!/bin/bash + +if [ "$1" = "--quit" -o "$1" = "--force-shutdown" ]; then + /app/bin/evolution.bin "$@" +else + export BOGOFILTER_DIR="${XDG_DATA_HOME}/bogofilter/" + export GIO_USE_NETWORK_MONITOR=base + gsettings reset org.gnome.evolution-data-server network-monitor-gio-name + + LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc -l) + if [ "${LINES}" = "0" ]; then + /app/libexec/evolution-source-registry & + gdbus wait --session --timeout=1@TIMEOUTMULT@ @SOURCES_SERVICE@ + fi + + LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @ADDRESSBOOK_SERVICE@ | wc -l) + if [ "${LINES}" = "0" ]; then + /app/libexec/evolution-addressbook-factory -r & + gdbus wait --session --timeout=1@TIMEOUTMULT@ @ADDRESSBOOK_SERVICE@ + fi + + LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @CALENDAR_SERVICE@ | wc -l) + if [ "${LINES}" = "0" ]; then + /app/libexec/evolution-calendar-factory -r & + gdbus wait --session --timeout=1@TIMEOUTMULT@ @CALENDAR_SERVICE@ + fi + + /app/bin/evolution.bin "$@" +fi diff --git a/rpminspect.yaml b/rpminspect.yaml new file mode 100644 index 0000000..1ba6977 --- /dev/null +++ b/rpminspect.yaml @@ -0,0 +1,5 @@ +--- +runpath: + allowed_paths: + - /usr/lib/evolution + - /usr/lib64/evolution diff --git a/sources b/sources index 502ccbe..b11ec23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -68d32e518f235bea9d768ae55e91bffc evolution-2.10.0.tar.bz2 +SHA512 (evolution-3.59.1.tar.xz) = 26d6d4dfcdbc3d89f88d9e24096c7ff910d221119def75d7f80a397f682be96860726832c7c62b46769ce9cfcc15e5844cbcc016facc9b21b4eb9bbb2c17360d