From 4e4dfca454f9d130fc97d1efd95bbfd292be2f7f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Oct 30 2007 16:27:34 +0000 Subject: - Attempt to split the gnome-pilot stuff into a separate evolution-conduits subpackage (RH bug #178155). --- 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 7fb6689..0000000 --- a/evolution-2.10.0-e-source-combo-box.patch +++ /dev/null @@ -1,1167 +0,0 @@ -diff -up evolution-2.12.0/widgets/misc/e-pilot-settings.c.e-source-combo-box evolution-2.12.0/widgets/misc/e-pilot-settings.c ---- evolution-2.12.0/widgets/misc/e-pilot-settings.c.e-source-combo-box 2007-09-16 15:33:23.000000000 -0400 -+++ evolution-2.12.0/widgets/misc/e-pilot-settings.c 2007-09-17 14:31:05.000000000 -0400 -@@ -27,7 +27,7 @@ - - #include - #include --#include -+#include - #include "e-pilot-settings.h" - - struct _EPilotSettingsPrivate -@@ -102,7 +102,7 @@ build_ui (EPilotSettings *ps, ESourceLis - - 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 @@ e_pilot_settings_get_source (EPilotSetti - 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 @@ e_pilot_settings_set_source (EPilotSetti - - 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 -diff -up evolution-2.12.0/plugins/itip-formatter/itip-formatter.c.e-source-combo-box evolution-2.12.0/plugins/itip-formatter/itip-formatter.c ---- evolution-2.12.0/plugins/itip-formatter/itip-formatter.c.e-source-combo-box 2007-09-16 15:16:41.000000000 -0400 -+++ evolution-2.12.0/plugins/itip-formatter/itip-formatter.c 2007-09-17 14:31:05.000000000 -0400 -@@ -40,7 +40,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -diff -up evolution-2.12.0/plugins/itip-formatter/itip-view.c.e-source-combo-box evolution-2.12.0/plugins/itip-formatter/itip-view.c ---- evolution-2.12.0/plugins/itip-formatter/itip-view.c.e-source-combo-box 2007-09-16 15:16:41.000000000 -0400 -+++ evolution-2.12.0/plugins/itip-formatter/itip-view.c 2007-09-17 14:31:05.000000000 -0400 -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -105,8 +105,8 @@ struct _ItipViewPrivate { - char *description; - - GtkWidget *selector_box; -- GtkWidget *esom; -- GtkWidget *esom_header; -+ GtkWidget *escb; -+ GtkWidget *escb_header; - ESourceList *source_list; - - GtkWidget *rsvp_box; -@@ -1788,10 +1788,12 @@ itip_view_clear_lower_info_items (ItipVi - } - - 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); - } - -@@ -1808,40 +1810,42 @@ itip_view_set_source_list (ItipView *vie - 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 * -@@ -1867,10 +1871,11 @@ itip_view_set_source (ItipView *view, ES - - 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 * -@@ -1883,10 +1888,11 @@ itip_view_get_source (ItipView *view) - - 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 -diff -up evolution-2.12.0/plugins/bbdb/gaimbuddies.c.e-source-combo-box evolution-2.12.0/plugins/bbdb/gaimbuddies.c ---- evolution-2.12.0/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-09-16 15:16:13.000000000 -0400 -+++ evolution-2.12.0/plugins/bbdb/gaimbuddies.c 2007-09-17 14:31:05.000000000 -0400 -@@ -44,7 +44,7 @@ - #include - - #include --#include -+#include - - #include - #include -diff -up evolution-2.12.0/plugins/bbdb/bbdb.c.e-source-combo-box evolution-2.12.0/plugins/bbdb/bbdb.c ---- evolution-2.12.0/plugins/bbdb/bbdb.c.e-source-combo-box 2007-09-16 15:16:13.000000000 -0400 -+++ evolution-2.12.0/plugins/bbdb/bbdb.c 2007-09-17 14:31:05.000000000 -0400 -@@ -40,7 +40,7 @@ - #include - - #include --#include -+#include - - #include - #include -@@ -71,10 +71,49 @@ static gboolean bbdb_timeout (gpointer d - static void bbdb_do_it (EBook *book, const char *name, const char *email); - static void add_email_to_contact (EContact *contact, const char *email); - static void enable_toggled_cb (GtkWidget *widget, gpointer data); --static void source_changed_cb (GtkWidget *widget, ESource *source, gpointer data); -+static void source_changed_cb (ESourceComboBox *source_combo_box, struct bbdb_stuff *stuff); - static GtkWidget *create_addressbook_option_menu (struct bbdb_stuff *stuff, int type); - static void cleanup_cb (GObject *o, gpointer data); - -+static ESource * -+find_esource_by_uri (ESourceList *source_list, const gchar *target_uri) -+{ -+ GSList *groups; -+ -+ /* XXX This would be unnecessary if the plugin had stored -+ * the addressbook's UID instead of the URI in GConf. -+ * Too late to change it now, I suppose. */ -+ -+ if (source_list == NULL || target_uri == NULL) -+ return NULL; -+ -+ groups = e_source_list_peek_groups (source_list); -+ -+ while (groups != NULL) { -+ GSList *sources; -+ -+ sources = e_source_group_peek_sources (groups->data); -+ -+ while (sources != NULL) { -+ gchar *uri; -+ gboolean match; -+ -+ uri = e_source_get_uri (sources->data); -+ match = (strcmp (uri, target_uri) == 0); -+ g_free (uri); -+ -+ if (match) -+ return sources->data; -+ -+ sources = g_slist_next (sources); -+ } -+ -+ groups = g_slist_next (groups); -+ } -+ -+ return NULL; -+} -+ - int - e_plugin_lib_enable (EPluginLib *ep, int enable) - { -@@ -266,8 +305,6 @@ bbdb_open_addressbook (int type) - char *uri; - EBook *book = NULL; - -- gboolean enable; -- - gboolean status; - GError *error = NULL; - -@@ -345,8 +382,23 @@ enable_toggled_cb (GtkWidget *widget, gp - - 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)); -- gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (selected_source), NULL); -+ const gchar *uri = NULL; -+ GError *error = NULL; -+ -+ selected_source = e_source_combo_box_get_active ( -+ E_SOURCE_COMBO_BOX (stuff->option_menu)); -+ if (selected_source != NULL) -+ uri = e_source_get_uri (selected_source); -+ -+ gconf_client_set_string ( -+ stuff->target->gconf, -+ GCONF_KEY_WHICH_ADDRESSBOOK, -+ uri, &error); -+ -+ if (error != NULL) { -+ g_warning ("%s", error->message); -+ g_error_free (error); -+ } - } - } - -@@ -364,7 +416,8 @@ enable_gaim_toggled_cb (GtkWidget *widge - - 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); - } - } -@@ -376,48 +429,77 @@ synchronize_button_clicked_cb (GtkWidget - } - - static void --source_changed_cb (GtkWidget *widget, ESource *source, gpointer data) -+source_changed_cb (ESourceComboBox *source_combo_box, -+ struct bbdb_stuff *stuff) - { -- struct bbdb_stuff *stuff = (struct bbdb_stuff *) data; -- -- gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (source), NULL); -+ ESource *source; -+ GError *error = NULL; -+ -+ source = e_source_combo_box_get_active (source_combo_box); -+ g_return_if_fail (source != NULL); -+ -+ gconf_client_set_string ( -+ stuff->target->gconf, -+ GCONF_KEY_WHICH_ADDRESSBOOK, -+ e_source_get_uri (source), &error); -+ -+ if (error != NULL) { -+ g_warning ("%s", error->message); -+ g_error_free (error); -+ } - } - - static void --gaim_source_changed_cb (GtkWidget *widget, ESource *source, gpointer data) -+gaim_source_changed_cb (ESourceComboBox *source_combo_box, -+ struct bbdb_stuff *stuff) - { -- struct bbdb_stuff *stuff = (struct bbdb_stuff *) data; -- gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, e_source_get_uri (source), NULL); -+ ESource *source; -+ GError *error = NULL; -+ -+ source = e_source_combo_box_get_active (source_combo_box); -+ g_return_if_fail (source != NULL); -+ -+ gconf_client_set_string ( -+ stuff->target->gconf, -+ GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, -+ e_source_get_uri (source), &error); -+ -+ if (error != NULL) { -+ g_warning ("%s", error->message); -+ g_error_free (error); -+ } - } - - 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; -+ char *selected_source_uri; - - 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); -- g_free (selected_source_uri); -- } -+ selected_source = find_esource_by_uri ( -+ source_list, selected_source_uri); -+ g_free (selected_source_uri); -+ -+ if (selected_source != NULL) -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (combo_box), selected_source); - -- gtk_widget_show (menu); -+ gtk_widget_show (combo_box); - - stuff->source_list = source_list; - -- return menu; -+ return combo_box; - } - - GtkWidget * -@@ -483,7 +565,7 @@ bbdb_page_factory (EPlugin *ep, EConfigH - - /* Source selection option menu */ - option = create_addressbook_option_menu (stuff, AUTOMATIC_CONTACTS_ADDRESSBOOK); -- g_signal_connect (option, "source_selected", G_CALLBACK (source_changed_cb), stuff); -+ g_signal_connect (option, "changed", G_CALLBACK (source_changed_cb), stuff); - gtk_widget_set_sensitive (option, gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE, NULL)); - gtk_box_pack_start (GTK_BOX (inner_vbox), option, FALSE, FALSE, 0); - stuff->option_menu = option; -@@ -519,7 +601,7 @@ bbdb_page_factory (EPlugin *ep, EConfigH - - /* Gaim Source Selection Option Menu */ - gaim_option = create_addressbook_option_menu (stuff, GAIM_ADDRESSBOOK); -- g_signal_connect (gaim_option, "source_selected", G_CALLBACK (gaim_source_changed_cb), stuff); -+ g_signal_connect (gaim_option, "changed", G_CALLBACK (gaim_source_changed_cb), stuff); - gtk_widget_set_sensitive (gaim_option, gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE_GAIM, NULL)); - gtk_box_pack_start (GTK_BOX (inner_vbox), gaim_option, FALSE, FALSE, 0); - stuff->gaim_option_menu = gaim_option; -diff -up evolution-2.12.0/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-list-editor/contact-list-editor.glade ---- evolution-2.12.0/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box 2007-09-16 14:53:41.000000000 -0400 -+++ evolution-2.12.0/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-09-17 14:31:05.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 -diff -up evolution-2.12.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c ---- evolution-2.12.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box 2007-09-16 14:53:41.000000000 -0400 -+++ evolution-2.12.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-09-17 14:31:05.000000000 -0400 -@@ -33,7 +33,7 @@ - #include - #include - --#include -+#include - - #include - #include -@@ -78,7 +78,7 @@ static void select_cb (GtkWidget *w, ECo - 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 @@ e_contact_list_editor_init (EContactList - 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 @@ e_contact_list_editor_init (EContactList - "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 @@ new_target_cb (EBook *new_book, EBookSta - 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 @@ cancel_load (EContactListEditor *editor) - } - - 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 @@ select_cb (GtkWidget *w, EContactListEdi - } - - 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 @@ fill_in_info(EContactListEditor *editor) - } - - 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); - } -diff -up evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade ---- evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-09-16 14:52:39.000000000 -0400 -+++ evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade 2007-09-17 14:31:05.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 -diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c ---- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-09-16 14:52:39.000000000 -0400 -+++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c 2007-09-17 14:31:05.000000000 -0400 -@@ -46,7 +46,7 @@ - #include - - #include --#include -+#include - - #include - -@@ -589,15 +589,16 @@ static void - 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 -@@ -2527,13 +2528,15 @@ new_target_cb (EBook *new_book, EBookSta - 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); -@@ -2557,8 +2560,12 @@ cancel_load (EContactEditor *editor) - } - - 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)) -@@ -3383,8 +3390,8 @@ e_contact_editor_init (EContactEditor *e - 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"); -@@ -3835,26 +3842,26 @@ e_contact_editor_create_web(gchar *name, - } - - 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); - g_object_unref (gconf_client); - -- gtk_widget_show (menu); -- return menu; -+ gtk_widget_show (combo_box); -+ return combo_box; - } -diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c ---- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-09-16 14:52:39.000000000 -0400 -+++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-09-17 14:31:05.000000000 -0400 -@@ -37,7 +37,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include "e-contact-editor.h" -@@ -269,8 +269,12 @@ clicked_cb (GtkWidget *w, gint button, g - } - - 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; -@@ -319,16 +323,20 @@ build_quick_add_dialog (QuickAdd *qa) - gconf_client = gconf_client_get_default (); - source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources"); - g_object_unref (gconf_client); -- 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); - -diff -up evolution-2.12.0/calendar/gui/dialogs/memo-page.glade.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/memo-page.glade ---- evolution-2.12.0/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-09-16 15:33:57.000000000 -0400 -+++ evolution-2.12.0/calendar/gui/dialogs/memo-page.glade 2007-09-17 14:31:05.000000000 -0400 -@@ -194,7 +194,7 @@ - - - True -- memo_page_create_source_option_menu -+ memo_page_create_source_combo_box - 0 - 0 - Tue, 13 Jan 2004 22:00:00 GMT -diff -up evolution-2.12.0/calendar/gui/dialogs/event-page.glade.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/event-page.glade ---- evolution-2.12.0/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-09-16 15:33:57.000000000 -0400 -+++ evolution-2.12.0/calendar/gui/dialogs/event-page.glade 2007-09-17 14:31:05.000000000 -0400 -@@ -827,7 +827,7 @@ - - - True -- event_page_create_source_option_menu -+ event_page_create_source_combo_box - 0 - 0 - Wed, 17 Dec 2003 18:20:26 GMT -diff -up evolution-2.12.0/calendar/gui/dialogs/task-page.glade.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/task-page.glade ---- evolution-2.12.0/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-09-16 15:33:57.000000000 -0400 -+++ evolution-2.12.0/calendar/gui/dialogs/task-page.glade 2007-09-17 14:31:05.000000000 -0400 -@@ -671,7 +671,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 -diff -up evolution-2.12.0/calendar/gui/dialogs/memo-page.c.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/memo-page.c ---- evolution-2.12.0/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-09-16 15:33:57.000000000 -0400 -+++ evolution-2.12.0/calendar/gui/dialogs/memo-page.c 2007-09-17 14:31:44.000000000 -0400 -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -352,7 +352,6 @@ memo_page_fill_widgets (CompEditorPage * - GSList *l; - const char *categories; - gchar *backend_addr = NULL; -- ESource *source; - - mpage = MEMO_PAGE (page); - priv = mpage->priv; -@@ -451,8 +450,9 @@ memo_page_fill_widgets (CompEditorPage * - g_free (backend_addr); - - /* 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; - -@@ -893,13 +893,12 @@ field_changed_cb (GtkWidget *widget, gpo - } - - 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; -@@ -911,8 +910,9 @@ source_changed_cb (GtkWidget *widget, ES - 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, -@@ -1055,7 +1055,7 @@ init_widgets (MemoPage *mpage) - 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" -@@ -1271,22 +1271,23 @@ memo_page_create_date_edit (void) - 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); - g_object_unref (gconf_client); - -- gtk_widget_show (menu); -- return menu; -+ gtk_widget_show (combo_box); -+ return combo_box; - } -diff -up evolution-2.12.0/calendar/gui/dialogs/event-page.c.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/event-page.c ---- evolution-2.12.0/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-09-16 15:33:57.000000000 -0400 -+++ evolution-2.12.0/calendar/gui/dialogs/event-page.c 2007-09-17 14:31:05.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" -@@ -1000,7 +1000,6 @@ event_page_fill_widgets (CompEditorPage - const char *location, *uid = NULL; - const char *categories; - gchar *backend_addr = NULL; -- ESource *source; - GSList *l; - gboolean validated = TRUE; - -@@ -1215,8 +1214,9 @@ event_page_fill_widgets (CompEditorPage - 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) -@@ -2662,7 +2662,8 @@ event_page_sendoptions_clicked_cb (Event - - 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; - } -@@ -2691,13 +2692,12 @@ field_changed_cb (GtkWidget *widget, gpo - } - - 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; -@@ -2716,8 +2716,9 @@ source_changed_cb (GtkWidget *widget, ES - 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, -@@ -2980,7 +2981,7 @@ init_widgets (EventPage *epage) - 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 (); -@@ -3306,24 +3307,25 @@ make_timezone_entry (void) - 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); - g_object_unref (gconf_client); - -- gtk_widget_show (menu); -- return menu; -+ gtk_widget_show (combo_box); -+ return combo_box; - } - - GtkWidget *make_status_icons (void); -diff -up evolution-2.12.0/calendar/gui/dialogs/task-page.c.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/task-page.c ---- evolution-2.12.0/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-09-16 15:33:57.000000000 -0400 -+++ evolution-2.12.0/calendar/gui/dialogs/task-page.c 2007-09-17 14:31:58.000000000 -0400 -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include "common/authentication.h" -@@ -533,7 +533,6 @@ task_page_fill_widgets (CompEditorPage * - const char *categories, *uid; - icaltimezone *zone, *default_zone; - gchar *backend_addr = NULL; -- ESource *source; - - tpage = TASK_PAGE (page); - priv = tpage->priv; -@@ -677,8 +676,9 @@ task_page_fill_widgets (CompEditorPage * - 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_get_cal_address (COMP_EDITOR_PAGE (tpage)->client, &backend_addr, NULL); - set_subscriber_info_string (tpage, backend_addr); -@@ -1688,13 +1688,12 @@ field_changed_cb (GtkWidget *widget, gpo - } - - 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; -@@ -1713,8 +1712,9 @@ source_changed_cb (GtkWidget *widget, ES - 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, -@@ -1726,7 +1726,7 @@ source_changed_cb (GtkWidget *widget, ES - 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 -@@ -1778,7 +1778,8 @@ task_page_sendoptions_clicked_cb (TaskPa - 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"); - } - -@@ -1836,7 +1837,7 @@ init_widgets (TaskPage *tpage) - 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" -@@ -2081,22 +2082,23 @@ task_page_create_date_edit (void) - 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); - g_object_unref (gconf_client); - -- gtk_widget_show (menu); -- return menu; -+ gtk_widget_show (combo_box); -+ return combo_box; - } -diff -up evolution-2.12.0/calendar/gui/e-itip-control.c.e-source-combo-box evolution-2.12.0/calendar/gui/e-itip-control.c ---- evolution-2.12.0/calendar/gui/e-itip-control.c.e-source-combo-box 2007-09-16 15:34:45.000000000 -0400 -+++ evolution-2.12.0/calendar/gui/e-itip-control.c 2007-09-17 14:31:05.000000000 -0400 -@@ -44,7 +44,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -226,13 +226,13 @@ typedef struct { - } 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 @@ find_cal_opened_cb (ECal *ecal, ECalenda - 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 @@ find_cal_opened_cb (ECal *ecal, ECalenda - 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.11.92-icon-names.patch b/evolution-2.11.92-icon-names.patch deleted file mode 100644 index 5e82648..0000000 --- a/evolution-2.11.92-icon-names.patch +++ /dev/null @@ -1,1788 +0,0 @@ -diff -up evolution-2.12.1/mail/em-folder-browser.c.icon-names evolution-2.12.1/mail/em-folder-browser.c ---- evolution-2.12.1/mail/em-folder-browser.c.icon-names 2007-10-15 22:34:22.000000000 -0400 -+++ evolution-2.12.1/mail/em-folder-browser.c 2007-10-15 22:34:23.000000000 -0400 -@@ -206,7 +206,7 @@ enum { - /* Options for View */ - static EMFBSearchBarItem emfb_view_items[] = { - {{ N_("All Messages"), VIEW_ALL_MESSAGES, 0 }, NULL}, -- {{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "stock_mail-unread"}, -+ {{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "mail-unread"}, - {{ NULL, 0, 0 }, NULL}, - {{ N_("No Label"),VIEW_NO_LABEL, 0 }, NULL}, - {{ NULL, -1, 0 }, NULL} -@@ -215,12 +215,12 @@ static EMFBSearchBarItem emfb_view_items - /* TODO: Following options should be customizable */ - static EMFBSearchBarItem temp_view_items[] = { - {{ NULL, 0, 0 }, NULL}, -- {{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"}, -+ {{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "mail-read"}, - {{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL}, - {{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL}, - {{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"}, - {{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"}, -- {{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "stock_not-spam"}, -+ {{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "mail-mark-notjunk"}, - /* { NULL, 0, NULL }, */ - /* { N_("Customize"), NOT_IMPLEMENTED, NULL }, */ - {{ NULL, -1, 0 }, NULL} -@@ -1603,7 +1603,7 @@ static BonoboUIVerb emfb_verbs[] = { - }; - - static EPixmap emfb_pixmaps[] = { -- E_PIXMAP ("/commands/ChangeFolderProperties", "stock_folder-properties", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ChangeFolderProperties", "document-properties", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FolderCopy", "stock_folder-copy", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FolderMove", "stock_folder-move", E_ICON_SIZE_MENU), - -diff -up evolution-2.12.1/mail/em-folder-tree.c.icon-names evolution-2.12.1/mail/em-folder-tree.c ---- evolution-2.12.1/mail/em-folder-tree.c.icon-names 2007-10-15 22:34:22.000000000 -0400 -+++ evolution-2.12.1/mail/em-folder-tree.c 2007-10-15 22:34:23.000000000 -0400 -@@ -288,11 +288,11 @@ render_pixbuf (GtkTreeViewColumn *column - guint32 flags; - - if (!initialised) { -- folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("stock_folder", E_ICON_SIZE_MENU); -+ folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("folder", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_INBOX] = e_icon_factory_get_icon ("stock_inbox", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_OUTBOX] = e_icon_factory_get_icon ("stock_outbox", E_ICON_SIZE_MENU); -- folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("gnome-fs-trash-empty", E_ICON_SIZE_MENU); -- folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("stock_spam", E_ICON_SIZE_MENU); -+ folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("user-trash", E_ICON_SIZE_MENU); -+ folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("mail-mark-junk", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_SHARED_TO_ME] = e_icon_factory_get_icon ("stock_shared-to-me", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_SHARED_BY_ME] = e_icon_factory_get_icon ("stock_shared-by-me", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_SENT] = e_icon_factory_get_icon ("stock_sent-mail", E_ICON_SIZE_MENU); -@@ -1002,7 +1002,7 @@ static EPopupItem emft_drop_popup_menu[] - { E_POPUP_ITEM, "00.emc.02", N_("_Copy"), emft_drop_popup_copy, NULL, "stock_folder-copy", 2 }, - { E_POPUP_ITEM, "00.emc.03", N_("_Move"), emft_drop_popup_move, NULL, "stock_folder-move", 2 }, - { E_POPUP_BAR, "10.emc" }, -- { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "stock_cancel", 0 }, -+ { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "dialog-cancel", 0 }, - }; - - static void -@@ -2114,16 +2114,16 @@ static EPopupItem emft_popup_items[] = { - - { E_POPUP_BAR, "20.emc" }, - /* FIXME: need to disable for nochildren folders */ -- { E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS }, -+ { E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }, - /* FIXME: need to disable for undeletable folders */ -- { E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "stock_delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, -+ { E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "edit-delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, - { E_POPUP_ITEM, "20.emc.02", N_("_Rename..."), emft_popup_rename_folder, NULL, NULL, 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, -- { E_POPUP_ITEM, "20.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "stock_refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}, -- { E_POPUP_ITEM, "20.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "stock_mail-send", EM_POPUP_FOLDER_OUTBOX, 0 }, -+ { E_POPUP_ITEM, "20.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "view-refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}, -+ { E_POPUP_ITEM, "20.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "mail-send", EM_POPUP_FOLDER_OUTBOX, 0 }, - - - { E_POPUP_BAR, "80.emc" }, -- { E_POPUP_ITEM, "80.emc.00", N_("_Properties"), emft_popup_properties, NULL, "stock_folder-properties", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT } -+ { E_POPUP_ITEM, "80.emc.00", N_("_Properties"), emft_popup_properties, NULL, "document-properties", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT } - }; - static EPopupItem trash_popup_item = {E_POPUP_ITEM, "20.emc.03", N_("_Empty Trash"), emft_popup_empty_trash,NULL,NULL, 1, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}; - -diff -up evolution-2.12.1/mail/message-list.c.icon-names evolution-2.12.1/mail/message-list.c ---- evolution-2.12.1/mail/message-list.c.icon-names 2007-10-15 22:34:22.000000000 -0400 -+++ evolution-2.12.1/mail/message-list.c 2007-10-15 22:34:23.000000000 -0400 -@@ -217,9 +217,9 @@ static struct { - char *icon_name; - GdkPixbuf *pixbuf; - } states_pixmaps[] = { -- { "stock_mail-unread", NULL }, -- { "stock_mail-open", NULL }, -- { "stock_mail-replied", NULL }, -+ { "mail-unread", NULL }, -+ { "mail-read", NULL }, -+ { "mail-replied", NULL }, - { "stock_mail-unread-multiple", NULL }, - { "stock_mail-open-multiple", NULL }, - { NULL, NULL }, -diff -up evolution-2.12.1/mail/mail-mt.c.icon-names evolution-2.12.1/mail/mail-mt.c ---- evolution-2.12.1/mail/mail-mt.c.icon-names 2007-10-15 22:34:22.000000000 -0400 -+++ evolution-2.12.1/mail/mail-mt.c 2007-10-15 22:34:23.000000000 -0400 -@@ -964,7 +964,7 @@ op_status_exec (struct _op_status_msg *m - data->activity_state = 1; - - if (progress_icon == NULL) -- progress_icon = e_icon_factory_get_icon ("stock_mail-unread", E_ICON_SIZE_MENU); -+ progress_icon = e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_MENU); - - MAIL_MT_UNLOCK (mail_msg_lock); - if (msg->info->desc) -diff -up evolution-2.12.1/mail/em-folder-view.c.icon-names evolution-2.12.1/mail/em-folder-view.c ---- evolution-2.12.1/mail/em-folder-view.c.icon-names 2007-10-15 22:34:21.000000000 -0400 -+++ evolution-2.12.1/mail/em-folder-view.c 2007-10-15 22:36:38.000000000 -0400 -@@ -1216,29 +1216,29 @@ EMFV_POPUP_AUTO_TYPE(filter_type_current - /* TODO: Move some of these to be 'standard' menu's */ - - static EPopupItem emfv_popup_items[] = { -- { E_POPUP_ITEM, "00.emfv.00", N_("_Copy"), emfv_popup_copy_text, NULL, "stock_copy", EM_FOLDER_VIEW_SELECT_DISPLAY|EM_FOLDER_VIEW_SELECT_SELECTION }, -+ { E_POPUP_ITEM, "00.emfv.00", N_("_Copy"), emfv_popup_copy_text, NULL, "edit-copy", EM_FOLDER_VIEW_SELECT_DISPLAY|EM_FOLDER_VIEW_SELECT_SELECTION }, - - { E_POPUP_BAR, "10.emfv", NULL, NULL, NULL, NULL }, - -- { E_POPUP_ITEM, "10.emfv.00", N_("_Reply to Sender"), emfv_popup_reply_sender, NULL, "stock_mail-reply", EM_POPUP_SELECT_ONE }, -- { E_POPUP_ITEM, "10.emfv.01", N_("Reply to _All"), emfv_popup_reply_all, NULL, "stock_mail-reply-to-all", EM_POPUP_SELECT_ONE }, -- { E_POPUP_ITEM, "10.emfv.02", N_("_Forward"), emfv_popup_forward, NULL, "stock_mail-forward", EM_POPUP_SELECT_MANY }, -+ { E_POPUP_ITEM, "10.emfv.00", N_("_Reply to Sender"), emfv_popup_reply_sender, NULL, "mail-reply-sender", EM_POPUP_SELECT_ONE }, -+ { E_POPUP_ITEM, "10.emfv.01", N_("Reply to _All"), emfv_popup_reply_all, NULL, "mail-reply-all", EM_POPUP_SELECT_ONE }, -+ { E_POPUP_ITEM, "10.emfv.02", N_("_Forward"), emfv_popup_forward, NULL, "mail-forward", EM_POPUP_SELECT_MANY }, - - { E_POPUP_BAR, "20.emfv", NULL, NULL, NULL, NULL }, - /* EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone */ - { E_POPUP_ITEM, "20.emfv.00", N_("_Edit as New Message..."), emfv_popup_edit, NULL, NULL, EM_POPUP_SELECT_ONE }, -- { E_POPUP_ITEM, "20.emfv.01", N_("_Save As..."), emfv_popup_saveas, NULL, "stock_save-as", EM_POPUP_SELECT_MANY }, -- { E_POPUP_ITEM, "20.emfv.02", N_("_Print..."), emfv_popup_print, NULL, "stock_print", EM_POPUP_SELECT_ONE }, -+ { E_POPUP_ITEM, "20.emfv.01", N_("_Save As..."), emfv_popup_saveas, NULL, "document-save-as", EM_POPUP_SELECT_MANY }, -+ { E_POPUP_ITEM, "20.emfv.02", N_("_Print..."), emfv_popup_print, NULL, "document-print", EM_POPUP_SELECT_ONE }, - - { E_POPUP_BAR, "40.emfv", NULL, NULL, NULL, NULL }, -- { E_POPUP_ITEM, "40.emfv.00", N_("_Delete"), emfv_popup_delete, NULL, "stock_delete", EM_POPUP_SELECT_DELETE|EM_FOLDER_VIEW_SELECT_LISTONLY }, -+ { E_POPUP_ITEM, "40.emfv.00", N_("_Delete"), emfv_popup_delete, NULL, "edit-delete", EM_POPUP_SELECT_DELETE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "40.emfv.01", N_("U_ndelete"), emfv_popup_undelete, NULL, NULL, EM_POPUP_SELECT_UNDELETE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "40.emfv.02", N_("_Move to Folder..."), emfv_popup_move, NULL, "stock_mail-move", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "40.emfv.03", N_("_Copy to Folder..."), emfv_popup_copy, NULL, "stock_mail-copy", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, - - { E_POPUP_BAR, "50.emfv", NULL, NULL, NULL, NULL }, -- { E_POPUP_ITEM, "50.emfv.00", N_("Mar_k as Read"), emfv_popup_mark_read, NULL, "stock_mail-open", EM_POPUP_SELECT_MARK_READ|EM_FOLDER_VIEW_SELECT_LISTONLY }, -- { E_POPUP_ITEM, "50.emfv.01", N_("Mark as _Unread"), emfv_popup_mark_unread, NULL, "stock_mail-unread", EM_POPUP_SELECT_MARK_UNREAD|EM_FOLDER_VIEW_SELECT_LISTONLY }, -+ { E_POPUP_ITEM, "50.emfv.00", N_("Mar_k as Read"), emfv_popup_mark_read, NULL, "mail-read", EM_POPUP_SELECT_MARK_READ|EM_FOLDER_VIEW_SELECT_LISTONLY }, -+ { E_POPUP_ITEM, "50.emfv.01", N_("Mark as _Unread"), emfv_popup_mark_unread, NULL, "mail-unread", EM_POPUP_SELECT_MARK_UNREAD|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "50.emfv.02", N_("Mark as _Important"), emfv_popup_mark_important, NULL, "emblem-important", EM_POPUP_SELECT_MARK_IMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "50.emfv.03", N_("Mark as Un_important"), emfv_popup_mark_unimportant, NULL, NULL, EM_POPUP_SELECT_MARK_UNIMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "50.emfv.04", N_("Mark as _Junk"), emfv_popup_mark_junk, NULL, "mail-mark-junk", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_JUNK }, -@@ -1950,43 +1950,47 @@ static BonoboUIVerb emfv_message_verbs[] - BONOBO_UI_VERB_END - }; - static EPixmap emfv_message_pixmaps[] = { -- E_PIXMAP ("/commands/EditCut", "stock_cut", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/EditCopy", "stock_copy", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/EditPaste", "stock_paste", E_ICON_SIZE_MENU), -- -- E_PIXMAP ("/commands/PrintMessage", "stock_print", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/PrintPreviewMessage", "stock_print-preview", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageDelete", "gnome-fs-trash-empty", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageCopy", "stock_mail-copy", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageMove", "stock_mail-move", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageReplyAll", "stock_mail-reply-to-all", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageReplySender", "stock_mail-reply", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageForward", "stock_mail-forward", E_ICON_SIZE_MENU), -+ -+ E_PIXMAP ("/commands/EditCopy", "edit-copy", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/EditCut", "edit-cut", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/EditPaste", "edit-paste", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MailCompose", "mail-message-new", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageApplyFilters", "stock_mail-filters-apply", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageCopy", "stock_mail-copy", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageDelete", "user-trash", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageFilterJunk", "mail-mark-junk", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageSearch", "stock_search", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageSaveAs", "stock_save-as", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageMarkAsRead", "stock_mail-open", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageMarkAsUnRead", "stock_mail-unread", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageFollowUpFlag", "stock_mail-flag-for-followup", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageForward", "mail-forward", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageMarkAsImportant", "emblem-important", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageMarkAsJunk", "mail-mark-junk", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageMarkAsNotJunk", "mail-mark-notjunk", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageFollowUpFlag", "stock_mail-flag-for-followup", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/ViewLoadImages", "stock_insert_image", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MailCompose", "stock_mail-compose", E_ICON_SIZE_MENU), -- -- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplySender", "stock_mail-reply", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplyAll", "stock_mail-reply-to-all", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageForward", "stock_mail-forward", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/MailMessageToolbar/PrintMessage", "stock_print", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/commands/MessageMarkAsRead", "mail-read", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageMarkAsUnRead", "mail-unread", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageMove", "stock_mail-move", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageReplyAll", "mail-reply-all", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageReplySender", "mail-reply-sender", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageSaveAs", "document-save-as", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageSearch", "edit-find", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/PrintMessage", "document-print", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/PrintPreviewMessage", "document-print-preview", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TextZoomIn", "zoom-in", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TextZoomOut", "zoom-out", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TextZoomReset", "zoom-original", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ViewLoadImages", "insert-image", E_ICON_SIZE_MENU), -+ -+ E_PIXMAP ("/menu/MessagePlaceholder/Message/MessageNavigation/GoTo", "go-jump", E_ICON_SIZE_MENU), -+ -+ E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplySender", "mail-reply-sender", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplyAll", "mail-reply-all", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageForward", "mail-forward", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/MailMessageToolbar/PrintMessage", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMove", "stock_mail-move", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageCopy", "stock_mail-copy", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageDelete", "stock_delete", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageDelete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsJunk", "mail-mark-junk", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsNotJunk", "mail-mark-notjunk", E_ICON_SIZE_LARGE_TOOLBAR), -- -- E_PIXMAP ("/Toolbar/MailNextButtons/MailNext", "stock_next", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/MailNextButtons/MailPrevious", "stock_previous", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/MailNextButtons/MailNext", "go-next", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/MailNextButtons/MailPrevious", "go-previous", E_ICON_SIZE_LARGE_TOOLBAR), - - E_PIXMAP_END - }; -@@ -2604,7 +2608,7 @@ emp_uri_popup_link_copy(EPopup *ep, EPop - - static EPopupItem emfv_uri_popups[] = { - { E_POPUP_ITEM, "00.uri.11", N_("C_all To..."), emp_uri_popup_link_copy, NULL, NULL, EM_POPUP_URI_CALLTO }, -- { E_POPUP_ITEM, "00.uri.15", N_("_Copy Link Location"), emp_uri_popup_link_copy, NULL, "gtk-copy", EM_POPUP_URI_NOT_MAILTO }, -+ { E_POPUP_ITEM, "00.uri.15", N_("_Copy Link Location"), emp_uri_popup_link_copy, NULL, "edit-copy", EM_POPUP_URI_NOT_MAILTO }, - - { E_POPUP_SUBMENU, "99.uri.00", N_("Create _Search Folder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO }, - { E_POPUP_ITEM, "99.uri.00/00.10", N_("_From this Address"), emp_uri_popup_vfolder_sender, NULL, NULL, EM_POPUP_URI_MAILTO }, -diff -up evolution-2.12.1/mail/em-popup.c.icon-names evolution-2.12.1/mail/em-popup.c ---- evolution-2.12.1/mail/em-popup.c.icon-names 2007-10-12 02:56:01.000000000 -0400 -+++ evolution-2.12.1/mail/em-popup.c 2007-10-15 22:34:23.000000000 -0400 -@@ -564,25 +564,25 @@ emp_part_popup_forward (EPopup *ep, EPop - } - - static EMPopupItem emp_standard_object_popups[] = { -- { E_POPUP_ITEM, "00.part.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "stock_save-as", 0 }, -+ { E_POPUP_ITEM, "00.part.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "document-save-as", 0 }, - { E_POPUP_ITEM, "00.part.10", N_("Set as _Background"), emp_part_popup_set_background, NULL, NULL, EM_POPUP_PART_IMAGE }, - { E_POPUP_BAR, "10.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE }, -- { E_POPUP_ITEM, "10.part.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "stock_mail-reply" , EM_POPUP_PART_MESSAGE }, -+ { E_POPUP_ITEM, "10.part.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "mail-reply-sender" , EM_POPUP_PART_MESSAGE }, - { E_POPUP_ITEM, "10.part.01", N_("Reply to _List"), emp_part_popup_reply_list, NULL, NULL, EM_POPUP_PART_MESSAGE}, -- { E_POPUP_ITEM, "10.part.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "stock_mail-reply-to-all", EM_POPUP_PART_MESSAGE}, -+ { E_POPUP_ITEM, "10.part.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "mail-reply-all", EM_POPUP_PART_MESSAGE}, - { E_POPUP_BAR, "20.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE }, -- { E_POPUP_ITEM, "20.part.00", N_("_Forward"), emp_part_popup_forward, NULL, "stock_mail-forward", EM_POPUP_PART_MESSAGE }, -+ { E_POPUP_ITEM, "20.part.00", N_("_Forward"), emp_part_popup_forward, NULL, "mail-forward", EM_POPUP_PART_MESSAGE }, - }; - - static EMPopupItem emp_attachment_object_popups[] = { -- { E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "stock_save-as", 0 }, -+ { E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "document-save-as", 0 }, - { E_POPUP_ITEM, "00.attach.10", N_("Set as _Background"), emp_part_popup_set_background, NULL, NULL, EM_POPUP_ATTACHMENTS_IMAGE }, - { E_POPUP_BAR, "05.attach", NULL, NULL, NULL, NULL, EM_POPUP_ATTACHMENTS_MESSAGE }, -- { E_POPUP_ITEM, "05.attach.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "stock_mail-reply" , EM_POPUP_ATTACHMENTS_MESSAGE }, -+ { E_POPUP_ITEM, "05.attach.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "mail-reply-sender" , EM_POPUP_ATTACHMENTS_MESSAGE }, - { E_POPUP_ITEM, "05.attach.01", N_("Reply to _List"), emp_part_popup_reply_list, NULL, NULL, EM_POPUP_ATTACHMENTS_MESSAGE}, -- { E_POPUP_ITEM, "05.attach.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "stock_mail-reply-to-all", EM_POPUP_ATTACHMENTS_MESSAGE}, -+ { E_POPUP_ITEM, "05.attach.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "mail-reply-all", EM_POPUP_ATTACHMENTS_MESSAGE}, - { E_POPUP_BAR, "05.attach.10", NULL, NULL, NULL, NULL, EM_POPUP_ATTACHMENTS_MESSAGE }, -- { E_POPUP_ITEM, "05.attach.15", N_("_Forward"), emp_part_popup_forward, NULL, "stock_mail-forward", EM_POPUP_ATTACHMENTS_MESSAGE }, -+ { E_POPUP_ITEM, "05.attach.15", N_("_Forward"), emp_part_popup_forward, NULL, "mail-forward", EM_POPUP_ATTACHMENTS_MESSAGE }, - }; - - static const EPopupItem emp_standard_part_apps_bar = { E_POPUP_BAR, "99.object" }; -@@ -631,8 +631,8 @@ emp_uri_popup_address_add(EPopup *ep, EP - - static EPopupItem emp_standard_uri_popups[] = { - { E_POPUP_ITEM, "00.uri.00", N_("_Open Link in Browser"), emp_uri_popup_link_open, NULL, NULL, EM_POPUP_URI_HTTP }, -- { E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, "stock_mail-compose", EM_POPUP_URI_MAILTO }, -- { E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "gtk-add", EM_POPUP_URI_MAILTO }, -+ { E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, "mail-message-new", EM_POPUP_URI_MAILTO }, -+ { E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "contact-new", EM_POPUP_URI_MAILTO }, - }; - - /* ********************************************************************** */ -diff -up evolution-2.12.1/mail/mail-send-recv.c.icon-names evolution-2.12.1/mail/mail-send-recv.c ---- evolution-2.12.1/mail/mail-send-recv.c.icon-names 2007-10-15 22:34:22.000000000 -0400 -+++ evolution-2.12.1/mail/mail-send-recv.c 2007-10-15 22:34:23.000000000 -0400 -@@ -399,7 +399,7 @@ build_dialog (EAccountList *accounts, Ca - gtk_widget_show (cancel_button); - gtk_dialog_add_action_widget (gd, cancel_button, GTK_RESPONSE_CANCEL); - -- icon_list = e_icon_factory_get_icon_list ("stock_mail-send-receive"); -+ icon_list = e_icon_factory_get_icon_list ("mail-send-receive"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (gd), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); -@@ -560,7 +560,7 @@ build_dialog (EAccountList *accounts, Ca - info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); - - send_icon = e_icon_factory_get_image ( -- "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR); -+ "mail-send", E_ICON_SIZE_LARGE_TOOLBAR); - pretty_url = format_url (destination, NULL); - label = gtk_label_new (NULL); - gtk_label_set_ellipsize ( -diff -up evolution-2.12.1/mail/mail-component.c.icon-names evolution-2.12.1/mail/mail-component.c ---- evolution-2.12.1/mail/mail-component.c.icon-names 2007-10-15 22:34:21.000000000 -0400 -+++ evolution-2.12.1/mail/mail-component.c 2007-10-15 22:34:23.000000000 -0400 -@@ -878,7 +878,7 @@ impl__get_userCreatableItems (PortableSe - list->_buffer[0].menuDescription = _("_Mail Message"); - list->_buffer[0].tooltip = _("Compose a new mail message"); - list->_buffer[0].menuShortcut = 'm'; -- list->_buffer[0].iconName = "stock_mail-compose"; -+ list->_buffer[0].iconName = "mail-message-new"; - list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; - - list->_buffer[1].id = "folder"; -@@ -886,7 +886,7 @@ impl__get_userCreatableItems (PortableSe - list->_buffer[1].menuDescription = _("Mail _Folder"); - list->_buffer[1].tooltip = _("Create a new mail folder"); - list->_buffer[1].menuShortcut = '\0'; -- list->_buffer[1].iconName = "stock_new-dir"; -+ list->_buffer[1].iconName = "folder-new"; - list->_buffer[1].type = GNOME_Evolution_CREATABLE_FOLDER; - - return list; -diff -up evolution-2.12.1/plugins/exchange-operations/exchange-folder.c.icon-names evolution-2.12.1/plugins/exchange-operations/exchange-folder.c ---- evolution-2.12.1/plugins/exchange-operations/exchange-folder.c.icon-names 2007-10-15 22:34:21.000000000 -0400 -+++ evolution-2.12.1/plugins/exchange-operations/exchange-folder.c 2007-10-15 22:34:23.000000000 -0400 -@@ -63,7 +63,7 @@ static void exchange_get_folder (char *u - - - static EPopupItem popup_inbox_items[] = { -- { E_POPUP_ITEM, "29.inbox_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_inbox_unsubscribe, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS } -+ { E_POPUP_ITEM, "29.inbox_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_inbox_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } - }; - - void -@@ -232,7 +232,7 @@ org_gnome_exchange_check_inbox_subscribe - } - - static EPopupItem popup_items[] = { -- { E_POPUP_ITEM, "29.calendar_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_unsubscribe, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS } -+ { E_POPUP_ITEM, "29.calendar_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } - }; - - void -@@ -242,7 +242,7 @@ popup_free (EPopup *ep, GSList *items, v - } - - static EPopupItem popup_ab_items[] = { -- { E_POPUP_ITEM, "29.address_book_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_ab_unsubscribe, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS } -+ { E_POPUP_ITEM, "29.address_book_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_ab_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } - }; - - void -diff -up evolution-2.12.1/plugins/exchange-operations/exchange-folder-permission.c.icon-names evolution-2.12.1/plugins/exchange-operations/exchange-folder-permission.c ---- evolution-2.12.1/plugins/exchange-operations/exchange-folder-permission.c.icon-names 2007-10-12 02:55:27.000000000 -0400 -+++ evolution-2.12.1/plugins/exchange-operations/exchange-folder-permission.c 2007-10-15 22:34:23.000000000 -0400 -@@ -58,7 +58,7 @@ void org_gnome_exchange_menu_cal_permiss - gchar *selected_exchange_folder_uri = NULL; - - static EPopupItem popup_items[] = { -- { E_POPUP_ITEM, "30.emc.10", N_("Permissions..."), org_folder_permissions_cb, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS } -+ { E_POPUP_ITEM, "30.emc.10", N_("Permissions..."), org_folder_permissions_cb, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } - }; - - static void -diff -up evolution-2.12.1/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.icon-names evolution-2.12.1/plugins/save-calendar/org-gnome-save-calendar.eplug.xml ---- evolution-2.12.1/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.icon-names 2007-10-12 02:55:29.000000000 -0400 -+++ evolution-2.12.1/plugins/save-calendar/org-gnome-save-calendar.eplug.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -8,10 +8,10 @@ - - - -- -+ - - -- -+ - - - -diff -up evolution-2.12.1/plugins/groupwise-features/share-folder-common.c.icon-names evolution-2.12.1/plugins/groupwise-features/share-folder-common.c ---- evolution-2.12.1/plugins/groupwise-features/share-folder-common.c.icon-names 2007-10-15 22:34:21.000000000 -0400 -+++ evolution-2.12.1/plugins/groupwise-features/share-folder-common.c 2007-10-15 22:34:23.000000000 -0400 -@@ -333,7 +333,7 @@ new_folder_response (EMFolderSelector *e - } - - static EPopupItem popup_items[] = { --{ E_POPUP_ITEM, "20.emc.001", N_("New _Shared Folder..."), create_shared_folder, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS } -+{ E_POPUP_ITEM, "20.emc.001", N_("New _Shared Folder..."), create_shared_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } - }; - - static void -diff -up evolution-2.12.1/addressbook/gui/component/addressbook-component.c.icon-names evolution-2.12.1/addressbook/gui/component/addressbook-component.c ---- evolution-2.12.1/addressbook/gui/component/addressbook-component.c.icon-names 2007-10-12 02:39:01.000000000 -0400 -+++ evolution-2.12.1/addressbook/gui/component/addressbook-component.c 2007-10-15 22:34:23.000000000 -0400 -@@ -229,7 +229,7 @@ impl__get_userCreatableItems (PortableSe - list->_buffer[0].menuDescription = _("_Contact"); - list->_buffer[0].tooltip = _("Create a new contact"); - list->_buffer[0].menuShortcut = 'c'; -- list->_buffer[0].iconName = "stock_contact"; -+ list->_buffer[0].iconName = "contact-new"; - list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; - - list->_buffer[1].id = "contact_list"; -diff -up evolution-2.12.1/addressbook/gui/component/addressbook-view.c.icon-names evolution-2.12.1/addressbook/gui/component/addressbook-view.c ---- evolution-2.12.1/addressbook/gui/component/addressbook-view.c.icon-names 2007-10-12 02:39:01.000000000 -0400 -+++ evolution-2.12.1/addressbook/gui/component/addressbook-view.c 2007-10-15 22:34:23.000000000 -0400 -@@ -71,7 +71,7 @@ - static GObjectClass *parent_class = NULL; - - /* This is used for the addressbook status bar */ --#define EVOLUTION_CONTACTS_PROGRESS_IMAGE "stock_contact" -+#define EVOLUTION_CONTACTS_PROGRESS_IMAGE "contact-new" - static GdkPixbuf *progress_icon = NULL; - - #define d(x) -@@ -614,26 +614,24 @@ static BonoboUIVerb verbs [] = { - }; - - static EPixmap pixmaps [] = { -- E_PIXMAP ("/menu/File/FileOps/ContactsSaveAsVCard", "stock_save-as", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/File/Print/ContactsPrint", "stock_print", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/File/Print/ContactsPrintPreview", "stock_print-preview", E_ICON_SIZE_MENU), -- -- E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCut", "stock_cut", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCopy", "stock_copy", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsPaste", "stock_paste", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactDelete", "stock_delete", E_ICON_SIZE_MENU), -- -- E_PIXMAP ("/menu/ActionsPlaceholder/Actions/ContactsSendContactToOther", "stock_mail-forward", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/ActionsPlaceholder/Actions/ContactsSendMessageToContact", "stock_mail-send", E_ICON_SIZE_MENU), -- -- E_PIXMAP ("/Toolbar/ContactsPrint", "stock_print", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/ContactDelete", "stock_delete", E_ICON_SIZE_LARGE_TOOLBAR), -- -- E_PIXMAP ("/menu/FolderPlaceholder/Folder/FolderCopy", "stock_folder-copy", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/FolderPlaceholder/Folder/FolderMove", "stock_folder-move", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/FolderPlaceholder/Folder/ChangeFolderProperties", "stock_folder-properties", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/FolderPlaceholder/Folder/FolderSave", "stock_save-as", E_ICON_SIZE_MENU), -- -+ E_PIXMAP ("/commands/ChangeFolderProperties", "stock_folder-properties", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ContactDelete", "edit-delete", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ContactsCopy", "edit-copy", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ContactsCut", "edit-cut", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ContactsPaste", "edit-paste", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ContactsPrint", "document-print", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ContactsPrintPreview", "document-print-preview", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ContactsSaveAsVCard", "document-save-as", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ContactsSendContactToOther", "mail-forward", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ContactsSendMessageToContact", "mail-send", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FolderCopy", "edit-copy", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FolderDelete", "edit-delete", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FolderMove", "stock_folder-move", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FolderSave", "document-save-as", E_ICON_SIZE_MENU), -+ -+ E_PIXMAP ("/Toolbar/ContactsPrint", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/ContactDelete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), -+ - E_PIXMAP_END - }; - -@@ -953,10 +951,10 @@ primary_source_selection_changed_callbac - } - - static EPopupItem abv_source_popups[] = { -- { E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "stock_contact", 0, 0 }, -- { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_addressbook_cb, NULL, "stock_delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "contact-new", 0, 0 }, -+ { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_addressbook_cb, NULL, "edit-delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY }, - { E_POPUP_BAR, "40.bar"}, -- { E_POPUP_ITEM, "40.saveasvcard", N_("Save As Vcard..."), save_addressbook_cb, NULL,"stock_save-as", 0, EAB_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "40.saveasvcard", N_("Save As Vcard..."), save_addressbook_cb, NULL,"document-save-as", 0, EAB_POPUP_SOURCE_PRIMARY }, - { E_POPUP_BAR, "30.bar"}, - { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_addressbook_cb, NULL,"stock_folder-properties", 0, EAB_POPUP_SOURCE_PRIMARY }, - }; -@@ -1334,7 +1332,7 @@ addressbook_view_init (AddressbookView * - e_activity_handler_attach_task_bar (priv->activity_handler, - E_TASK_BAR (priv->statusbar_widget)); - -- priv->info_widget = e_info_label_new("stock_contact"); -+ priv->info_widget = e_info_label_new("contact-new"); - e_info_label_set_info((EInfoLabel*)priv->info_widget, _("Contacts"), ""); - gtk_widget_show (priv->info_widget); - -diff -up evolution-2.12.1/addressbook/gui/widgets/e-addressbook-view.c.icon-names evolution-2.12.1/addressbook/gui/widgets/e-addressbook-view.c ---- evolution-2.12.1/addressbook/gui/widgets/e-addressbook-view.c.icon-names 2007-10-12 02:39:06.000000000 -0400 -+++ evolution-2.12.1/addressbook/gui/widgets/e-addressbook-view.c 2007-10-15 22:34:23.000000000 -0400 -@@ -958,27 +958,27 @@ new_list (EPopup *ep, EPopupItem *pitem, - static EPopupItem eabv_popup_items[] = { - { E_POPUP_ITEM, "05.open", N_("_Open"), open_contact, NULL, NULL, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE }, - { E_POPUP_BAR, "10.bar" }, -- { E_POPUP_ITEM, "10.new", N_("_New Contact..."), new_card, NULL, "stock_contact", 0, EAB_POPUP_SELECT_EDITABLE}, -+ { E_POPUP_ITEM, "10.new", N_("_New Contact..."), new_card, NULL, "contact-new", 0, EAB_POPUP_SELECT_EDITABLE}, - { E_POPUP_ITEM, "15.newlist", N_("New Contact _List..."), new_list, NULL, "stock_contact-list", 0, EAB_POPUP_SELECT_EDITABLE }, - - { E_POPUP_BAR, "20.bar" }, -- { E_POPUP_ITEM, "30.saveas", N_("_Save as VCard..."), save_as, NULL, "stock_save-as", 0, EAB_POPUP_SELECT_ANY }, -- { E_POPUP_ITEM, "40.forward", N_("_Forward Contact"), send_as, NULL, "stock_mail-forward", EAB_POPUP_SELECT_ONE }, -- { E_POPUP_ITEM, "40.forward", N_("_Forward Contacts"), send_as, NULL, "stock_mail-forward", EAB_POPUP_SELECT_MANY }, -- { E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contact"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_CONTACT }, -- { E_POPUP_ITEM, "50.mailto", N_("Send _Message to List"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_LIST }, -- { E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contacts"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_MANY|EAB_POPUP_SELECT_EMAIL }, -- { E_POPUP_ITEM, "60.print", N_("_Print"), print, NULL, "stock_print", 0, EAB_POPUP_SELECT_ANY }, -+ { E_POPUP_ITEM, "30.saveas", N_("_Save as VCard..."), save_as, NULL, "document-save-as", 0, EAB_POPUP_SELECT_ANY }, -+ { E_POPUP_ITEM, "40.forward", N_("_Forward Contact"), send_as, NULL, "mail-forward", EAB_POPUP_SELECT_ONE }, -+ { E_POPUP_ITEM, "40.forward", N_("_Forward Contacts"), send_as, NULL, "mail-forward", EAB_POPUP_SELECT_MANY }, -+ { E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contact"), send_to, NULL, "mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_CONTACT }, -+ { E_POPUP_ITEM, "50.mailto", N_("Send _Message to List"), send_to, NULL, "mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_LIST }, -+ { E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contacts"), send_to, NULL, "mail-send", EAB_POPUP_SELECT_MANY|EAB_POPUP_SELECT_EMAIL }, -+ { E_POPUP_ITEM, "60.print", N_("_Print"), print, NULL, "document-print", 0, EAB_POPUP_SELECT_ANY }, - - { E_POPUP_BAR, "70.bar" }, - { E_POPUP_ITEM, "80.copyto", N_("Cop_y to Address Book..."), copy_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY }, - { E_POPUP_ITEM, "90.moveto", N_("Mo_ve to Address Book..."), move_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE }, - - { E_POPUP_BAR, "a0.bar" }, -- { E_POPUP_ITEM, "b0.cut", N_("Cu_t"), cut, NULL, "stock_cut", 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE }, -- { E_POPUP_ITEM, "c0.copy", N_("_Copy"), copy, NULL, "stock_copy", 0, EAB_POPUP_SELECT_ANY }, -- { E_POPUP_ITEM, "d0.paste", N_("P_aste"), paste, NULL, "stock_paste", 0, EAB_POPUP_SELECT_EDITABLE }, -- { E_POPUP_ITEM, "e0.delete", N_("_Delete"), delete, NULL, "stock_delete", 0, EAB_POPUP_SELECT_EDITABLE|EAB_POPUP_SELECT_ANY }, -+ { E_POPUP_ITEM, "b0.cut", N_("Cu_t"), cut, NULL, "edit-cut", 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE }, -+ { E_POPUP_ITEM, "c0.copy", N_("_Copy"), copy, NULL, "edit-copy", 0, EAB_POPUP_SELECT_ANY }, -+ { E_POPUP_ITEM, "d0.paste", N_("P_aste"), paste, NULL, "edit-paste", 0, EAB_POPUP_SELECT_EDITABLE }, -+ { E_POPUP_ITEM, "e0.delete", N_("_Delete"), delete, NULL, "edit-delete", 0, EAB_POPUP_SELECT_EDITABLE|EAB_POPUP_SELECT_ANY }, - }; - - static void -diff -up evolution-2.12.1/addressbook/gui/widgets/eab-contact-display.c.icon-names evolution-2.12.1/addressbook/gui/widgets/eab-contact-display.c ---- evolution-2.12.1/addressbook/gui/widgets/eab-contact-display.c.icon-names 2007-10-12 02:39:06.000000000 -0400 -+++ evolution-2.12.1/addressbook/gui/widgets/eab-contact-display.c 2007-10-15 22:34:23.000000000 -0400 -@@ -170,9 +170,9 @@ eab_selection_clear_event(GtkWidget *wid - - static EPopupItem eab_uri_popups[] = { - { E_POPUP_ITEM, "05.open", N_("_Open Link in Browser"), eab_uri_popup_link_open, NULL, NULL, EAB_POPUP_URI_NOT_MAILTO }, -- { E_POPUP_ITEM, "10.copy", N_("_Copy Link Location"), eab_uri_popup_link_copy, NULL, "gtk-copy", EAB_POPUP_URI_NOT_MAILTO }, -- { E_POPUP_ITEM, "15.send", N_("_Send New Message To..."), eab_uri_popup_address_send, NULL, "stock_mail-compose", EAB_POPUP_URI_MAILTO}, -- { E_POPUP_ITEM, "20.copy", N_("Copy _Email Address"), eab_uri_popup_email_address_copy, NULL, "gtk-copy", EAB_POPUP_URI_MAILTO}, -+ { E_POPUP_ITEM, "10.copy", N_("_Copy Link Location"), eab_uri_popup_link_copy, NULL, "edit-copy", EAB_POPUP_URI_NOT_MAILTO }, -+ { E_POPUP_ITEM, "15.send", N_("_Send New Message To..."), eab_uri_popup_address_send, NULL, "mail-message-new", EAB_POPUP_URI_MAILTO}, -+ { E_POPUP_ITEM, "20.copy", N_("Copy _Email Address"), eab_uri_popup_email_address_copy, NULL, "edit-copy", EAB_POPUP_URI_MAILTO}, - }; - - -diff -up evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-fullname.c.icon-names evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-fullname.c ---- evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-fullname.c.icon-names 2007-10-12 02:38:53.000000000 -0400 -+++ evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-fullname.c 2007-10-15 22:34:23.000000000 -0400 -@@ -140,7 +140,7 @@ e_contact_editor_fullname_init (EContact - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0); - g_object_unref(widget); - -- icon_list = e_icon_factory_get_icon_list ("stock_contact"); -+ icon_list = e_icon_factory_get_icon_list ("contact-new"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_fullname), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); -diff -up evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-address.c.icon-names evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-address.c ---- evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-address.c.icon-names 2007-10-12 02:38:53.000000000 -0400 -+++ evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-address.c 2007-10-15 22:34:23.000000000 -0400 -@@ -455,7 +455,7 @@ e_contact_editor_address_init (EContactE - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0); - g_object_unref(widget); - -- icon_list = e_icon_factory_get_icon_list ("stock_contact"); -+ icon_list = e_icon_factory_get_icon_list ("contact-new"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_address), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); -diff -up evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-im.c.icon-names evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-im.c ---- evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-im.c.icon-names 2007-10-12 02:38:53.000000000 -0400 -+++ evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-im.c 2007-10-15 22:34:23.000000000 -0400 -@@ -289,7 +289,7 @@ e_contact_editor_im_init (EContactEditor - gtk_widget_grab_focus(glade_xml_get_widget(gui, "entry-username")); - - /* set the icon */ -- icon_list = e_icon_factory_get_icon_list ("stock_contact"); -+ icon_list = e_icon_factory_get_icon_list ("contact-new"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_im), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); -diff -up evolution-2.12.1/ui/evolution.xml.icon-names evolution-2.12.1/ui/evolution.xml ---- evolution-2.12.1/ui/evolution.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -7,10 +7,10 @@ - - - -+ accel="*Control*w"/> - - -+ accel="*Control*q"/> - - -@@ -67,7 +67,8 @@ - - - -- -+ - - - -@@ -98,9 +99,11 @@ - pixtype="pixbuf"/> - - -+ _label="_Close Window" -+ pixtype="pixbuf"/> - -- -+ - - - -diff -up evolution-2.12.1/ui/evolution-event-editor.xml.icon-names evolution-2.12.1/ui/evolution-event-editor.xml ---- evolution-2.12.1/ui/evolution-event-editor.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-event-editor.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -45,13 +45,15 @@ - _tip="Make this a recurring event" pixtype="pixbuf"/> - - -+ _tip="Query free / busy information for the attendees" -+ pixtype="pixbuf"/> - - - - -+ _tip="Click here to set or unset alarms for this event" -+ pixtype="pixbuf"/> - - - -@@ -71,7 +73,7 @@ - - - -- -+ - - - -@@ -79,8 +81,8 @@ - - - -- -- -+ -+ - - - -diff -up evolution-2.12.1/ui/evolution-memos.xml.icon-names evolution-2.12.1/ui/evolution-memos.xml ---- evolution-2.12.1/ui/evolution-memos.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-memos.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -1,15 +1,15 @@ - - - -- -- -+ - -- -- -- -+ -+ -+ - -+ pixtype="pixbuf"/> - - - -@@ -41,15 +41,15 @@ - - - -- -- -- -+ -+ -+ - - - -- -+ - -- -+ - - - -diff -up evolution-2.12.1/ui/evolution-composer-entries.xml.icon-names evolution-2.12.1/ui/evolution-composer-entries.xml ---- evolution-2.12.1/ui/evolution-composer-entries.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-composer-entries.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -3,15 +3,15 @@ - - -+ accel="*Control*x" pixtype="pixbuf"/> - - -+ accel="*Control*c" pixtype="pixbuf"/> - - -+ accel="*Control*v" pixtype="pixbuf"/> - - - - -- -\ No newline at end of file -+ -diff -up evolution-2.12.1/ui/evolution-mail-list.xml.icon-names evolution-2.12.1/ui/evolution-mail-list.xml ---- evolution-2.12.1/ui/evolution-mail-list.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-mail-list.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -4,15 +4,15 @@ - - -+ accel="*Control*x" pixtype="pixbuf"/> - - -+ accel="*Control*c" pixtype="pixbuf"/> - - -+ accel="*Control*v" pixtype="pixbuf"/> - - - -- -- -+ -+ - - - -diff -up evolution-2.12.1/ui/evolution-subscribe.xml.icon-names evolution-2.12.1/ui/evolution-subscribe.xml ---- evolution-2.12.1/ui/evolution-subscribe.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-subscribe.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -3,7 +3,7 @@ - - - -+ pixtype="pixbuf" _label="_Close" accel="*Control*w"/> - - - -diff -up evolution-2.12.1/ui/evolution-tasks.xml.icon-names evolution-2.12.1/ui/evolution-tasks.xml ---- evolution-2.12.1/ui/evolution-tasks.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-tasks.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -1,20 +1,20 @@ - - - -- -- -+ - -- -- -- -+ -+ -+ - -+ pixtype="pixbuf"/> - - - - -- -+ - - - -@@ -59,22 +59,22 @@ - - - -- -+ - - - - - - -- -- -- -+ -+ -+ - - - -- -+ - -- -+ - - - -diff -up evolution-2.12.1/ui/evolution-addressbook.xml.icon-names evolution-2.12.1/ui/evolution-addressbook.xml ---- evolution-2.12.1/ui/evolution-addressbook.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-addressbook.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -1,18 +1,17 @@ - - -+ - -+ accel="*Control*d" pixtype="pixbuf"/> - - -+ accel="*Control*p" pixtype="pixbuf"/> - - -+ pixtype="pixbuf"/> - - - -- -+ - - -+ accel="*Control*c" pixtype="pixbuf"/> - - -+ accel="*Control*v" pixtype="pixbuf"/> - - -+ accel="*Control*s" pixtype="pixbuf"/> - - -+ _tip="Send selected contacts to another person." -+ pixtype="pixbuf"/> - - -+ _tip="Send a message to the selected contacts." -+ pixtype="pixbuf"/> - - -+ - -+ - -+ pixtype="pixbuf"/> -+ - -+ - -+ - - - -@@ -98,14 +101,12 @@ - - -+ verb="" _label="S_ave Address Book As VCard"/> - - - -- -- -+ -+ - - - -@@ -130,7 +131,7 @@ - - - -- -+ - - - -@@ -140,10 +141,10 @@ - - - -+ _label="_Forward Contact..." verb=""/> - - -+ _label="_Send Message to Contact..." verb=""/> - - - -@@ -153,13 +154,13 @@ - - - -- -+ - -- -+ - - - -- -+ - - - -@@ -168,10 +169,10 @@ - - - -+ _label="Print" pixtype="pixbuf"/> - - -+ _label="Delete" pixtype="pixbuf"/> - - -diff -up evolution-2.12.1/ui/evolution-editor.xml.icon-names evolution-2.12.1/ui/evolution-editor.xml ---- evolution-2.12.1/ui/evolution-editor.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-editor.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -1,15 +1,15 @@ - - -- -- -+ -+ - -- -- -- -+ -+ -+ - - - -- -+ - - - -@@ -39,7 +39,7 @@ - - - -- -+ - - - -@@ -53,8 +53,8 @@ - - - -- -- -+ -+ - - - -diff -up evolution-2.12.1/ui/evolution-mail-message.xml.icon-names evolution-2.12.1/ui/evolution-mail-message.xml ---- evolution-2.12.1/ui/evolution-mail-message.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-mail-message.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -11,15 +11,15 @@ - - -+ accel="*Control*x" pixtype="pixbuf"/> - - -+ accel="*Control*c" pixtype="pixbuf"/> - - -+ accel="*Control*v" pixtype="pixbuf"/> - - -+ accel="*Control*o"/> - - -@@ -157,12 +156,12 @@ - -+ pixtype="pixbuf"/> - - -+ pixtype="pixbuf"/> - - -+ pixtype="pixbuf"/> - - -+ pixtype="pixbuf"/> - - -+ _tip="Set up the page settings for your current printer"/> - - -+ accel="*Control*plus" pixtype="pixbuf"/> - - -+ accel="*Control*minus" pixtype="pixbuf"/> - - -+ accel="*Control*0" pixtype="pixbuf"/> - - - -@@ -287,13 +285,9 @@ - - - -- -- -- -- -+ -+ -+ - - - -@@ -318,7 +312,7 @@ - - - -- -+ - - - -@@ -370,7 +364,7 @@ - - - -- -+ - - - -@@ -416,7 +410,7 @@ - - -+ pixtype="pixbuf"/> - - - - -- -+ - - - -diff -up evolution-2.12.1/ui/evolution-message-composer.xml.icon-names evolution-2.12.1/ui/evolution-message-composer.xml ---- evolution-2.12.1/ui/evolution-message-composer.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-message-composer.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -2,22 +2,22 @@ - - - - -@@ -101,8 +100,8 @@ - - - -- -- -+ -+ - - - -@@ -134,7 +133,7 @@ - - - -+ _label="_Attachment..."/> - - - -diff -up evolution-2.12.1/ui/evolution-calendar.xml.icon-names evolution-2.12.1/ui/evolution-calendar.xml ---- evolution-2.12.1/ui/evolution-calendar.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-calendar.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -1,14 +1,14 @@ - - - -- -- -+ - - - - -- -+ - - - -@@ -16,13 +16,13 @@ - - - -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ - - - -@@ -75,8 +75,8 @@ - - - -- -- -+ -+ - - - -@@ -86,7 +86,7 @@ - - - -- -+ - - - -diff -up evolution-2.12.1/composer/e-msg-composer.c.icon-names evolution-2.12.1/composer/e-msg-composer.c ---- evolution-2.12.1/composer/e-msg-composer.c.icon-names 2007-10-15 22:34:22.000000000 -0400 -+++ evolution-2.12.1/composer/e-msg-composer.c 2007-10-15 22:34:23.000000000 -0400 -@@ -2208,14 +2208,17 @@ static BonoboUIVerb verbs [] = { - }; - - static EPixmap pixcache [] = { -- E_PIXMAP ("/Toolbar/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) , -+ E_PIXMAP ("/commands/DeleteAll", "edit-delete", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FileAttach", "mail-attachment", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FileClose", "window-close", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FileOpen", "document-open", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FileSave", "document-save", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FileSaveAs", "document-save-as", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FileSend", "mail-send", E_ICON_SIZE_MENU), - --/* E_PIXMAP ("/menu/Insert/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), */ -- E_PIXMAP ("/commands/FileSend", "stock_mail-send", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/FileSave", "stock_save", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/FileSaveAs", "stock_save-as", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/Toolbar/FileSend", "mail-send", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/FileSaveDraft", "document-save", E_ICON_SIZE_LARGE_TOOLBAR) , -+ E_PIXMAP ("/Toolbar/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), - - E_PIXMAP_END - }; -@@ -3614,7 +3617,7 @@ composer_entry_focus_in_event_cb (GtkWid - xmlfile, - "evolution-composer-entries", NULL); - g_free (xmlfile); -- -+ - bonobo_ui_component_thaw (p->entry_uic, NULL); - - return FALSE; -@@ -3879,7 +3882,7 @@ create_composer (int visible_mask) - G_CALLBACK (msg_composer_destroy_notify), - NULL); - -- icon_list = e_icon_factory_get_icon_list ("stock_mail-compose"); -+ icon_list = e_icon_factory_get_icon_list ("mail-message-new"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (composer), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); -diff -up evolution-2.12.1/composer/e-msg-composer-select-file.c.icon-names evolution-2.12.1/composer/e-msg-composer-select-file.c ---- evolution-2.12.1/composer/e-msg-composer-select-file.c.icon-names 2007-10-12 02:56:12.000000000 -0400 -+++ evolution-2.12.1/composer/e-msg-composer-select-file.c 2007-10-15 22:34:23.000000000 -0400 -@@ -126,7 +126,7 @@ get_selector(struct _EMsgComposer *compo - gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:composer"); - gtk_window_set_modal ((GtkWindow *) selection, FALSE); - -- icon_list = e_icon_factory_get_icon_list ("stock_mail-compose"); -+ icon_list = e_icon_factory_get_icon_list ("mail-message-new"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); -diff -up evolution-2.12.1/shell/e-shell-window-commands.c.icon-names evolution-2.12.1/shell/e-shell-window-commands.c ---- evolution-2.12.1/shell/e-shell-window-commands.c.icon-names 2007-10-12 02:39:26.000000000 -0400 -+++ evolution-2.12.1/shell/e-shell-window-commands.c 2007-10-15 22:34:23.000000000 -0400 -@@ -844,12 +844,14 @@ static BonoboUIVerb help_verbs [] = { - }; - - static EPixmap pixmaps [] = { -- E_PIXMAP ("/commands/SendReceive", "stock_mail-send-receive", E_ICON_SIZE_MENU), -- E_PIXMAP ("/Toolbar/SendReceive", "stock_mail-send-receive", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/menu/File/OpenNewWindow", "stock_new-window", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/Toolbar/SendReceive", "mail-send-receive", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/menu/File/OpenNewWindow", "window-new", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/menu/File/SendReceive", "mail-send-receive", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/FileImporter", "stock_mail-import", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/Edit/Settings", "gnome-settings", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/menu/File/FileClose", "window-close", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/menu/File/FileExit", "application-exit", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/menu/Edit/Settings", "preferences-desktop", E_ICON_SIZE_MENU), - - E_PIXMAP_END - }; -diff -up evolution-2.12.1/calendar/gui/e-memo-table.c.icon-names evolution-2.12.1/calendar/gui/e-memo-table.c ---- evolution-2.12.1/calendar/gui/e-memo-table.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/e-memo-table.c 2007-10-15 22:34:23.000000000 -0400 -@@ -985,7 +985,7 @@ static EPopupItem memos_popup_items [] = - - { E_POPUP_BAR, "70.bar" }, - -- { E_POPUP_ITEM, "80.forward", N_("_Forward as iCalendar"), e_memo_table_on_forward, NULL, "stock_mail-forward", E_CAL_POPUP_SELECT_ONE }, -+ { E_POPUP_ITEM, "80.forward", N_("_Forward as iCalendar"), e_memo_table_on_forward, NULL, "mail-forward", E_CAL_POPUP_SELECT_ONE }, - - { E_POPUP_BAR, "90.bar" }, - -diff -up evolution-2.12.1/calendar/gui/memos-component.c.icon-names evolution-2.12.1/calendar/gui/memos-component.c ---- evolution-2.12.1/calendar/gui/memos-component.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/memos-component.c 2007-10-15 22:34:23.000000000 -0400 -@@ -462,9 +462,9 @@ edit_memo_list_cb (EPopup *ep, EPopupIte - - static EPopupItem emc_source_popups[] = { - { E_POPUP_ITEM, "10.new", N_("_New Memo List"), new_memo_list_cb, NULL, "stock_notes", 0, 0 }, -- { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_memo_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, -- { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_memo_list_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY }, -- { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_memo_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_memo_list_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_memo_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_memo_list_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, - }; - - static void -diff -up evolution-2.12.1/calendar/gui/dialogs/event-editor.c.icon-names evolution-2.12.1/calendar/gui/dialogs/event-editor.c ---- evolution-2.12.1/calendar/gui/dialogs/event-editor.c.icon-names 2007-10-12 03:04:06.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/dialogs/event-editor.c 2007-10-15 22:34:23.000000000 -0400 -@@ -428,18 +428,19 @@ static EPixmap pixmaps[] = { - * icons is filled in at run-time in event_editor_init() are - * updated, too. - */ -+ E_PIXMAP ("/commands/ActionAlarm", "stock_alarm", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_MENU), -+ - E_PIXMAP ("/Toolbar/ActionAlarm", "stock_alarm", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/menu/Options/ActionAlarm", "stock_alarm", E_ICON_SIZE_MENU), - E_PIXMAP ("/Toolbar/ActionAllDayEvent", "stock_new-24h-appointment", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/ViewTimeZone", "stock_timezone", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/menu/Options/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_LARGE_TOOLBAR), -+ - /* These two will have an absolute path to the png file filled - * in at run-time, see event_editor_init(). - */ - E_PIXMAP ("/Toolbar/ActionFreeBusy", NULL, E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/menu/Options/ActionFreeBusy", NULL, E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ActionFreeBusy", NULL, E_ICON_SIZE_MENU), - E_PIXMAP_END - }; - -@@ -561,12 +562,12 @@ event_editor_init (EventEditor *ee) - editor->uic, "ActionFreeBusy", - menu_action_freebusy_cb, editor); - -- /* NOTE: Make sure the 7 and 8 below correspond to the correct -+ /* NOTE: Make sure the 6 and 7 below correspond to the correct - * elements in the pixmaps array. - */ -- if (!pixmaps[7].name) { -+ if (!pixmaps[6].name) { -+ pixmaps[6].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL); - pixmaps[7].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL); -- pixmaps[8].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL); - } - e_pixmaps_update (editor->uic, pixmaps); - -diff -up evolution-2.12.1/calendar/gui/dialogs/task-editor.c.icon-names evolution-2.12.1/calendar/gui/dialogs/task-editor.c ---- evolution-2.12.1/calendar/gui/dialogs/task-editor.c.icon-names 2007-10-12 03:04:06.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/dialogs/task-editor.c 2007-10-15 22:34:23.000000000 -0400 -@@ -294,9 +294,11 @@ static BonoboUIVerb verbs [] = { - }; - - static EPixmap pixmaps[] = { -+ E_PIXMAP ("/commands/OptionStatus", "stock_view-details", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ViewTimeZone", "stock_timezone", E_ICON_SIZE_MENU), -+ - E_PIXMAP ("/Toolbar/ViewTimeZone", "stock_timezone", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/OptionStatus", "stock_view-details", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/commands/OptionStatus", "stock_view-details", E_ICON_SIZE_LARGE_TOOLBAR), - - E_PIXMAP_END - }; -diff -up evolution-2.12.1/calendar/gui/dialogs/cal-attachment-select-file.c.icon-names evolution-2.12.1/calendar/gui/dialogs/cal-attachment-select-file.c ---- evolution-2.12.1/calendar/gui/dialogs/cal-attachment-select-file.c.icon-names 2007-10-12 03:04:06.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/dialogs/cal-attachment-select-file.c 2007-10-15 22:34:23.000000000 -0400 -@@ -123,7 +123,7 @@ run_selector(CompEditor *editor, const c - gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:editor"); - gtk_window_set_modal ((GtkWindow *) selection, TRUE); - -- icon_list = e_icon_factory_get_icon_list ("stock_mail-compose"); -+ icon_list = e_icon_factory_get_icon_list ("mail-message-new"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); -diff -up evolution-2.12.1/calendar/gui/dialogs/comp-editor.c.icon-names evolution-2.12.1/calendar/gui/dialogs/comp-editor.c ---- evolution-2.12.1/calendar/gui/dialogs/comp-editor.c.icon-names 2007-10-15 22:34:22.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/dialogs/comp-editor.c 2007-10-15 22:34:23.000000000 -0400 -@@ -1486,8 +1486,17 @@ static BonoboUIVerb verbs [] = { - }; - - static EPixmap pixmaps[] = { -+ E_PIXMAP ("/commands/FileSave", "document-save", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FileClose", "window-close", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/EditCut", "edit-cut", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/EditCopy", "edit-copy", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/EditPaste", "edit-paste", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/Help", "help-contents", E_ICON_SIZE_MENU), -+ -+ E_PIXMAP ("/Toolbar/FileSave", "document-save", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/FileClose", "window-close", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU), - - E_PIXMAP_END - }; -@@ -2257,7 +2266,7 @@ make_icon_from_comp (ECalComponent *comp - type = e_cal_component_get_vtype (comp); - switch (type) { - case E_CAL_COMPONENT_EVENT: -- return "stock_new-appointment"; -+ return "appointment-new"; - case E_CAL_COMPONENT_TODO: - return "stock_task"; - case E_CAL_COMPONENT_JOURNAL: -diff -up evolution-2.12.1/calendar/gui/calendar-component.c.icon-names evolution-2.12.1/calendar/gui/calendar-component.c ---- evolution-2.12.1/calendar/gui/calendar-component.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/calendar-component.c 2007-10-15 22:34:23.000000000 -0400 -@@ -603,9 +603,9 @@ edit_calendar_cb (EPopup *ep, EPopupItem - - static EPopupItem ecc_source_popups[] = { - { E_POPUP_ITEM, "10.new", N_("_New Calendar"), new_calendar_cb, NULL, "stock_calendar", 0, 0 }, -- { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_calendar_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, -- { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_calendar_cb, NULL, "stock_delete", 0,E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE }, -- { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_calendar_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_calendar_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_calendar_cb, NULL, "edit-delete", 0,E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE }, -+ { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_calendar_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, - }; - - static void -@@ -1582,7 +1582,7 @@ impl__get_userCreatableItems (PortableSe - list->_buffer[0].menuDescription = _("_Appointment"); - list->_buffer[0].tooltip = _("Create a new appointment"); - list->_buffer[0].menuShortcut = 'a'; -- list->_buffer[0].iconName = "stock_new-appointment"; -+ list->_buffer[0].iconName = "appointment-new"; - list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; - - list->_buffer[1].id = CREATE_MEETING_ID; -diff -up evolution-2.12.1/calendar/gui/tasks-control.c.icon-names evolution-2.12.1/calendar/gui/tasks-control.c ---- evolution-2.12.1/calendar/gui/tasks-control.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/tasks-control.c 2007-10-15 22:34:23.000000000 -0400 -@@ -38,7 +38,7 @@ - #include - #include - #include --#include "e-util/e-icon-factory.h" -+#include - #include - #include "dialogs/cal-prefs-dialog.h" - #include "calendar-config.h" -@@ -253,7 +253,19 @@ static BonoboUIVerb verbs [] = { - }; - - static EPixmap pixmaps [] = { -- E_PIXMAP ("/menu/ActionsPlaceholder/Actions/TasksForward", "stock_mail-forward", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TasksCopy", "edit-copy", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TasksCut", "edit-cut", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TasksDelete", "edit-delete", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TasksForward", "mail-forward", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TasksPaste", "edit-paste", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TasksPrint", "document-print", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TasksPrintPreview", "document-print-preview", E_ICON_SIZE_MENU), -+ -+ E_PIXMAP ("/Toolbar/Cut", "edit-cut", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Copy", "edit-copy", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Paste", "edit-paste", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), - - E_PIXMAP_END - }; -diff -up evolution-2.12.1/calendar/gui/e-calendar-table.c.icon-names evolution-2.12.1/calendar/gui/e-calendar-table.c ---- evolution-2.12.1/calendar/gui/e-calendar-table.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/e-calendar-table.c 2007-10-15 22:34:23.000000000 -0400 -@@ -1414,7 +1414,7 @@ static EPopupItem tasks_popup_items [] = - { E_POPUP_BAR, "70.bar" }, - - { E_POPUP_ITEM, "80.assign", N_("_Assign Task"), e_calendar_table_on_assign, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ASSIGNABLE }, -- { E_POPUP_ITEM, "90.forward", N_("_Forward as iCalendar"), e_calendar_table_on_forward, NULL, "stock_mail-forward", E_CAL_POPUP_SELECT_ONE }, -+ { E_POPUP_ITEM, "90.forward", N_("_Forward as iCalendar"), e_calendar_table_on_forward, NULL, "mail-forward", E_CAL_POPUP_SELECT_ONE }, - { E_POPUP_ITEM, "a0.markonecomplete", N_("_Mark as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE}, - { E_POPUP_ITEM, "b0.markmanycomplete", N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE }, - { E_POPUP_ITEM, "c0.markoneincomplete", N_("_Mark as Incomplete"), mark_as_incomplete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_COMPLETE}, -diff -up evolution-2.12.1/calendar/gui/e-day-view.c.icon-names evolution-2.12.1/calendar/gui/e-day-view.c ---- evolution-2.12.1/calendar/gui/e-day-view.c.icon-names 2007-10-15 22:34:22.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/e-day-view.c 2007-10-15 22:34:23.000000000 -0400 -@@ -1420,7 +1420,7 @@ e_day_view_realize (GtkWidget *widget) - - /* Create the pixmaps. */ - day_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU); -- day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); -+ day_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU); - day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); - day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); - day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); -@@ -1494,7 +1494,7 @@ e_day_view_realize (GtkWidget *widget) - - /* Create the pixmaps. */ - day_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU); -- day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); -+ day_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU); - day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); - day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); - day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); -diff -up evolution-2.12.1/calendar/gui/e-calendar-view.c.icon-names evolution-2.12.1/calendar/gui/e-calendar-view.c ---- evolution-2.12.1/calendar/gui/e-calendar-view.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/e-calendar-view.c 2007-10-15 22:34:23.000000000 -0400 -@@ -1655,7 +1655,7 @@ on_paste (EPopup *ep, EPopupItem *pitem, - } - - static EPopupItem ecv_main_items [] = { -- { E_POPUP_ITEM, "00.new", N_("New _Appointment..."), on_new_appointment, NULL, "stock_new-appointment", 0, 0 }, -+ { E_POPUP_ITEM, "00.new", N_("New _Appointment..."), on_new_appointment, NULL, "appointment-new", 0, 0 }, - { E_POPUP_ITEM, "10.newallday", N_("New All Day _Event"), on_new_event, NULL, "stock_new-24h-appointment", 0, 0}, - { E_POPUP_ITEM, "20.meeting", N_("New _Meeting"), on_new_meeting, NULL, "stock_new-meeting", 0, 0}, - { E_POPUP_ITEM, "30.task", N_("New _Task"), on_new_task, NULL, "stock_task", 0, 0}, -@@ -1691,9 +1691,9 @@ static EPopupItem ecv_child_items [] = { - { E_POPUP_ITEM, "44.moveto", N_("Mo_ve to Calendar..."), on_move_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE }, - { E_POPUP_ITEM, "45.delegate", N_("_Delegate Meeting..."), on_delegate, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_DELEGATABLE | E_CAL_POPUP_SELECT_MEETING}, - { E_POPUP_ITEM, "46.schedule", N_("_Schedule Meeting..."), on_meeting, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTMEETING }, -- { E_POPUP_ITEM, "47.forward", N_("_Forward as iCalendar..."), on_forward, NULL, "stock_mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING }, -- { E_POPUP_ITEM, "48.reply", N_("_Reply"), on_reply, NULL, "stock_mail-reply", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING }, -- { E_POPUP_ITEM, "49.reply-all", N_("Reply to _All"), on_reply_all, NULL, "stock_mail-reply-to-all", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING }, -+ { E_POPUP_ITEM, "47.forward", N_("_Forward as iCalendar..."), on_forward, NULL, "mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING }, -+ { E_POPUP_ITEM, "48.reply", N_("_Reply"), on_reply, NULL, "mail-reply-sender", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING }, -+ { E_POPUP_ITEM, "49.reply-all", N_("Reply to _All"), on_reply_all, NULL, "mail-reply-all", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING }, - - { E_POPUP_BAR, "50." }, - -diff -up evolution-2.12.1/calendar/gui/tasks-component.c.icon-names evolution-2.12.1/calendar/gui/tasks-component.c ---- evolution-2.12.1/calendar/gui/tasks-component.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/tasks-component.c 2007-10-15 22:34:23.000000000 -0400 -@@ -453,9 +453,9 @@ edit_task_list_cb (EPopup *ep, EPopupIte - - static EPopupItem etc_source_popups[] = { - { E_POPUP_ITEM, "10.new", N_("_New Task List"), new_task_list_cb, NULL, "stock_todo", 0, 0 }, -- { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_task_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, -- { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY }, -- { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_task_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_task_list_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_task_list_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, - }; - - static void -diff -up evolution-2.12.1/calendar/gui/calendar-commands.c.icon-names evolution-2.12.1/calendar/gui/calendar-commands.c ---- evolution-2.12.1/calendar/gui/calendar-commands.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/calendar-commands.c 2007-10-15 22:34:23.000000000 -0400 -@@ -593,15 +593,29 @@ static BonoboUIVerb verbs [] = { - BONOBO_UI_VERB_END - }; - --static EPixmap pixmaps [] = --{ -- E_PIXMAP ("/Toolbar/DayView", "stock_calendar-view-day", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/WorkWeekView", "stock_calendar-view-work-week", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/WeekView", "stock_calendar-view-week", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/MonthView", "stock_calendar-view-month", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/ListView", "stock_calendar-view-list", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/Prev", "stock_previous", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/Next", "stock_next", E_ICON_SIZE_LARGE_TOOLBAR), -+static EPixmap pixmaps [] = { -+ E_PIXMAP ("/commands/CalendarPrev", "go-previous", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/CalendarPrint", "document-print", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/DeleteAllOccurrences", "edit-delete", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/DeleteOccurrence", "edit-delete", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/CalendarGoto", "go-jump", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/CalendarNext", "go-next", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/CalendarPrintPreview", "document-print-preview", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/Copy", "edit-copy", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/Cut", "edit-cut", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/Delete", "edit-delete", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/Paste", "edit-paste", E_ICON_SIZE_MENU), -+ -+ E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Prev", "go-previous", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Next", "go-next", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Goto", "go-jump", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/DayView", "stock_calendar-view-day", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/WorkWeekView", "stock_calendar-view-work-week", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/WeekView", "stock_calendar-view-week", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/MonthView", "stock_calendar-view-month", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/ListView", "stock_calendar-view-list", E_ICON_SIZE_LARGE_TOOLBAR), - - E_PIXMAP_END - }; -diff -up evolution-2.12.1/calendar/gui/memos-control.c.icon-names evolution-2.12.1/calendar/gui/memos-control.c ---- evolution-2.12.1/calendar/gui/memos-control.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/memos-control.c 2007-10-15 22:34:23.000000000 -0400 -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - #include - - #include "calendar-config.h" -@@ -183,6 +184,23 @@ static BonoboUIVerb verbs [] = { - BONOBO_UI_VERB_END - }; - -+static EPixmap pixmaps [] = { -+ E_PIXMAP ("/commands/MemosCopy", "edit-copy", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MemosCut", "edit-cut", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MemosDelete", "edit-delete", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MemosPaste", "edit-paste", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MemosPrint", "document-print", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MemosPrintPreview", "document-print-preview", E_ICON_SIZE_MENU), -+ -+ E_PIXMAP ("/Toolbar/Cut", "edit-cut", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Copy", "edit-copy", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Paste", "edit-paste", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), -+ -+ E_PIXMAP_END -+}; -+ - void - memos_control_activate (BonoboControl *control, EMemos *memos) - { -@@ -215,6 +233,8 @@ memos_control_activate (BonoboControl *c - NULL); - g_free (xmlfile); - -+ e_pixmaps_update (uic, pixmaps); -+ - e_memos_setup_view_menus (memos, uic); - - /* Signals from the memos widget; also sensitize the menu items as appropriate */ -diff -up evolution-2.12.1/calendar/gui/e-cal-popup.c.icon-names evolution-2.12.1/calendar/gui/e-cal-popup.c ---- evolution-2.12.1/calendar/gui/e-cal-popup.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/e-cal-popup.c 2007-10-15 22:34:23.000000000 -0400 -@@ -276,9 +276,9 @@ ecalp_part_popup_set_background(EPopup * - static const EPopupItem ecalp_standard_part_apps_bar = { E_POPUP_BAR, "99.object" }; - - static ECalPopupItem ecalp_attachment_object_popups[] = { -- { E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), ecalp_part_popup_saveas, NULL, "stock_save-as", E_CAL_POPUP_ATTACHMENTS_ONE }, -+ { E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), ecalp_part_popup_saveas, NULL, "document-save-as", E_CAL_POPUP_ATTACHMENTS_ONE }, - { E_POPUP_ITEM, "00.attach.10", N_("Set as _Background"), ecalp_part_popup_set_background, NULL, NULL, E_CAL_POPUP_ATTACHMENTS_IMAGE }, -- { E_POPUP_ITEM, "00.attach.20", N_("_Save Selected"), ecalp_part_popup_save_selected, NULL, "stock_save-as", E_CAL_POPUP_ATTACHMENTS_MULTIPLE }, -+ { E_POPUP_ITEM, "00.attach.20", N_("_Save Selected"), ecalp_part_popup_save_selected, NULL, "document-save-as", E_CAL_POPUP_ATTACHMENTS_MULTIPLE }, - { E_POPUP_BAR, "05.attach", }, - }; - -diff -up evolution-2.12.1/calendar/gui/e-week-view.c.icon-names evolution-2.12.1/calendar/gui/e-week-view.c ---- evolution-2.12.1/calendar/gui/e-week-view.c.icon-names 2007-10-15 22:34:22.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/e-week-view.c 2007-10-15 22:34:23.000000000 -0400 -@@ -695,7 +695,7 @@ e_week_view_realize (GtkWidget *widget) - - /* Create the pixmaps. */ - week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU); -- week_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); -+ week_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU); - week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); - week_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); - week_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); diff --git a/evolution-2.11.92-mail-attachment.patch b/evolution-2.11.92-mail-attachment.patch deleted file mode 100644 index 6197ee7..0000000 --- a/evolution-2.11.92-mail-attachment.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff -up evolution-2.11.92/mail/em-folder-browser.c.mail-attachment evolution-2.11.92/mail/em-folder-browser.c ---- evolution-2.11.92/mail/em-folder-browser.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400 -+++ evolution-2.11.92/mail/em-folder-browser.c 2007-09-11 18:58:15.000000000 -0400 -@@ -218,7 +218,7 @@ static EMFBSearchBarItem temp_view_items - {{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"}, - {{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL}, - {{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL}, -- {{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "stock_attach"}, -+ {{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"}, - {{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"}, - {{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "stock_not-spam"}, - /* { NULL, 0, NULL }, */ -diff -up evolution-2.11.92/mail/message-list.c.mail-attachment evolution-2.11.92/mail/message-list.c ---- evolution-2.11.92/mail/message-list.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400 -+++ evolution-2.11.92/mail/message-list.c 2007-09-11 18:58:15.000000000 -0400 -@@ -223,7 +223,7 @@ static struct { - { "stock_mail-unread-multiple", NULL }, - { "stock_mail-open-multiple", NULL }, - { NULL, NULL }, -- { "stock_attach", NULL }, -+ { "mail-attachment", NULL }, - { "emblem-important", NULL }, - { "stock_score-lowest", NULL }, - { "stock_score-lower", NULL }, -diff -up evolution-2.11.92/widgets/misc/e-attachment-bar.c.mail-attachment evolution-2.11.92/widgets/misc/e-attachment-bar.c ---- evolution-2.11.92/widgets/misc/e-attachment-bar.c.mail-attachment 2007-09-02 14:57:07.000000000 -0400 -+++ evolution-2.11.92/widgets/misc/e-attachment-bar.c 2007-09-11 18:58:15.000000000 -0400 -@@ -281,8 +281,7 @@ update (EAttachmentBar *bar) - attachment = priv->attachments->pdata[i]; - - if (!attachment->is_available_local || !attachment->body) { -- /* stock_attach would be better, but its fugly scaled up */ -- if ((pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG))) { -+ if ((pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG))) { - attachment->index = gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, ""); - g_object_unref (pixbuf); - } -@@ -373,8 +372,7 @@ update (EAttachmentBar *bar) - pixbuf = e_icon_for_mime_type (mime_type, 48); - if (pixbuf == NULL) { - g_warning("cannot find icon for mime type %s (installation problem?)", mime_type); -- /* stock_attach would be better, but its fugly scaled up */ -- pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG); -+ pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG); - } - g_free (mime_type); - } -diff -up evolution-2.11.92/composer/e-msg-composer.c.mail-attachment evolution-2.11.92/composer/e-msg-composer.c ---- evolution-2.11.92/composer/e-msg-composer.c.mail-attachment 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/composer/e-msg-composer.c 2007-09-11 18:58:15.000000000 -0400 -@@ -2208,11 +2208,11 @@ static BonoboUIVerb verbs [] = { - }; - - static EPixmap pixcache [] = { -- E_PIXMAP ("/Toolbar/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) , - --/* E_PIXMAP ("/menu/Insert/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), */ -+/* E_PIXMAP ("/menu/Insert/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), */ - E_PIXMAP ("/commands/FileSend", "stock_mail-send", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FileSave", "stock_save", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FileSaveAs", "stock_save-as", E_ICON_SIZE_MENU), -@@ -3989,7 +3989,7 @@ create_composer (int visible_mask) - gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_num), 1.0, 0.5); - expander_hbox = gtk_hbox_new (FALSE, 0); - -- p->attachment_expander_icon = e_icon_factory_get_image ("stock_attach", E_ICON_SIZE_MENU); -+ p->attachment_expander_icon = e_icon_factory_get_image ("mail-attachment", E_ICON_SIZE_MENU); - gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_icon), 1, 0.5); - gtk_widget_set_size_request (p->attachment_expander_icon, 100, -1); - -diff -up evolution-2.11.92/calendar/gui/e-week-view.c.mail-attachment evolution-2.11.92/calendar/gui/e-week-view.c ---- evolution-2.11.92/calendar/gui/e-week-view.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400 -+++ evolution-2.11.92/calendar/gui/e-week-view.c 2007-09-11 18:58:16.000000000 -0400 -@@ -697,7 +697,7 @@ e_week_view_realize (GtkWidget *widget) - week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU); - week_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); - week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); -- week_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); -+ week_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); - week_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); - } - -diff -up evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.mail-attachment evolution-2.11.92/calendar/gui/dialogs/comp-editor.c ---- evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.mail-attachment 2007-09-02 14:57:08.000000000 -0400 -+++ evolution-2.11.92/calendar/gui/dialogs/comp-editor.c 2007-09-11 18:58:15.000000000 -0400 -@@ -1486,8 +1486,8 @@ static BonoboUIVerb verbs [] = { - }; - - static EPixmap pixmaps[] = { -- E_PIXMAP ("/Toolbar/InsertAttachments", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "stock_attach", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU), - - E_PIXMAP_END - }; -@@ -1546,7 +1546,7 @@ setup_widgets (CompEditor *editor) - gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_num), 1.0, 0.5); - expander_hbox = gtk_hbox_new (FALSE, 0); - -- attachment_pixbuf = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); -+ attachment_pixbuf = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); - priv->attachment_expander_icon = gtk_image_new_from_pixbuf (attachment_pixbuf); - gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_icon), 1, 0.5); - gtk_widget_set_size_request (priv->attachment_expander_icon, 100, -1); -diff -up evolution-2.11.92/calendar/gui/e-day-view.c.mail-attachment evolution-2.11.92/calendar/gui/e-day-view.c ---- evolution-2.11.92/calendar/gui/e-day-view.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400 -+++ evolution-2.11.92/calendar/gui/e-day-view.c 2007-09-11 18:58:16.000000000 -0400 -@@ -1423,7 +1423,7 @@ e_day_view_realize (GtkWidget *widget) - day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); - day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); - day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); -- day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); -+ day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); - - - /* Set the canvas item colors. */ -@@ -1497,7 +1497,7 @@ e_day_view_realize (GtkWidget *widget) - day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); - day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); - day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); -- day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); -+ day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); - - - /* Set the canvas item colors. */ 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.spec b/evolution.spec index 04260c8..4ef405c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,9 +30,9 @@ %define nm_support 0 %endif %ifarch s390 s390x -%define pilot_support 0 +%define build_conduits 0 %else -%define pilot_support 1 +%define build_conduits 1 %endif %define use_mozilla_nss 1 @@ -45,7 +45,7 @@ Name: evolution Version: 2.21.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -174,7 +174,7 @@ BuildRequires: gstreamer-devel BuildRequires: openldap-devel >= 2.0.11 %endif -%if %{pilot_support} +%if %{build_conduits} 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 @@ -199,13 +199,13 @@ BuildRequires: libnotify-devel %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 +Summary: Development files for building against %{name} Requires: %{name} = %{version} Requires: evolution-data-server-devel >= %{eds_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} @@ -214,15 +214,27 @@ Requires: libxml2-devel 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}. %package help Group: Applications/Productivity -Summary: Help files for Evolution +Summary: Help files for %{name} Requires: %{name} = %{version}-%{release} %description help -This package contains the help for Evolution. +This package contains user documentation for %{name}. + +%if %{build_conduits} +%package conduits +Group: Applictions/Communications +Summary: gnome-pilot conduits for %{name} +Requires: %{name} = %{version}-%{release} +Requires: gnome-pilot >= %{gnome_pilot_version} + +%description conduits +The package contains conduits for synchronizing PalmPilot or other +PalmOS devices with %{name}. +%endif %prep %setup -q -n evolution-%{version} @@ -261,10 +273,10 @@ done %define ldap_flags --without-openldap %endif -%if %{pilot_support} -%define pilot_flags --enable-pilot-conduits=yes +%if %{build_conduits} +%define pilot_flags --enable-pilot-conduits %else -%define pilot_flags --enable-pilot-conduits=no +%define pilot_flags --disable-pilot-conduits %endif %if %{krb5_support} @@ -274,9 +286,9 @@ done %endif %if %{nntp_support} -%define nntp_flags --enable-nntp=yes +%define nntp_flags --enable-nntp %else -%define nntp_flags --enable-nntp=no +%define nntp_flags --disable-nntp %endif %if %{use_mozilla_nss} @@ -293,9 +305,9 @@ fi %endif %if %{exchange_support} -%define exchange_flags --enable-exchange=yes +%define exchange_flags --enable-exchange %else -%define exchange_flags --enable-exchange=no +%define exchange_flags --disable-exchange %endif CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS @@ -486,24 +498,6 @@ rm -rf $RPM_BUILD_ROOT %{_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.conduit - -%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_common_conduit.so -%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so -%{_libdir}/gnome-pilot/conduits/e-calendar.conduit - -%{_libdir}/evolution/%{evo_major}/conduits/libememo_conduit.so -%{_libdir}/gnome-pilot/conduits/e-memo.conduit - -%{_libdir}/evolution/%{evo_major}/conduits/libetodo_conduit.so -%{_libdir}/gnome-pilot/conduits/e-todo.conduit -%endif - # The plugin directory: %dir %{evo_plugin_dir} @@ -667,10 +661,30 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %files help -f help.lang +%defattr(-, root, root) %dir %{_datadir}/omf/evolution +%if %{build_conduits} +%files conduits +%defattr(-, root, root) +%dir %{_libdir}/evolution/%{evo_major}/conduits +%{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so +%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_common_conduit.so +%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so +%{_libdir}/evolution/%{evo_major}/conduits/libememo_conduit.so +%{_libdir}/evolution/%{evo_major}/conduits/libetodo_conduit.so +%{_libdir}/gnome-pilot/conduits/e-address.conduit +%{_libdir}/gnome-pilot/conduits/e-calendar.conduit +%{_libdir}/gnome-pilot/conduits/e-memo.conduit +%{_libdir}/gnome-pilot/conduits/e-todo.conduit +%endif + %changelog -* Mon Oct 29 2007 Matthew Barnes - 2.12.1-2.fc9 +* Tue Oct 30 2007 Matthew Barnes - 2.12.1-2.fc9 +- Attempt to split the gnome-pilot stuff into a separate + evolution-conduits subpackage (RH bug #178155). + +* Mon Oct 29 2007 Matthew Barnes - 2.21.1-1.fc9 - Update to 2.21.1 - Remove redundant requirements. - Bump EDS requirement to 2.21.1.