From 7c4ce285d03821cbb13cadd74ae491abed3c3bdf Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 5 May 2009 22:40:51 -0400 Subject: Convert the vCard Bonobo control to an EMFormatHook plugin. --- addressbook/gui/component/component-factory.c | 4 - addressbook/gui/widgets/Makefile.am | 2 - addressbook/gui/widgets/eab-vcard-control.c | 316 --------- addressbook/gui/widgets/eab-vcard-control.h | 28 - configure.in | 3 +- mail/em-format-html-display.c | 208 +----- .../.libs/liborg-gnome-vcard-inline.la | 1 + .../.libs/liborg-gnome-vcard-inline.lai | 41 ++ .../.libs/liborg-gnome-vcard-inline.so | Bin 0 -> 50526 bytes plugins/vcard-inline/.libs/vcard-inline.o | Bin 0 -> 55316 bytes plugins/vcard-inline/Makefile | 719 +++++++++++++++++++++ plugins/vcard-inline/Makefile.am | 20 + plugins/vcard-inline/Makefile.in | 709 ++++++++++++++++++++ plugins/vcard-inline/liborg-gnome-vcard-inline.la | 41 ++ plugins/vcard-inline/org-gnome-vcard-inline.eplug | 16 + .../vcard-inline/org-gnome-vcard-inline.eplug.xml | 28 + plugins/vcard-inline/vcard-inline.c | 284 ++++++++ plugins/vcard-inline/vcard-inline.lo | 4 + 18 files changed, 1871 insertions(+), 553 deletions(-) delete mode 100644 addressbook/gui/widgets/eab-vcard-control.c delete mode 100644 addressbook/gui/widgets/eab-vcard-control.h create mode 120000 plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.la create mode 100644 plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.lai create mode 100755 plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.so create mode 100644 plugins/vcard-inline/.libs/vcard-inline.o create mode 100644 plugins/vcard-inline/Makefile create mode 100644 plugins/vcard-inline/Makefile.am create mode 100644 plugins/vcard-inline/Makefile.in create mode 100644 plugins/vcard-inline/liborg-gnome-vcard-inline.la create mode 100644 plugins/vcard-inline/org-gnome-vcard-inline.eplug create mode 100644 plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml create mode 100644 plugins/vcard-inline/vcard-inline.c create mode 100644 plugins/vcard-inline/vcard-inline.lo diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c index feea79d88f..52bc377115 100644 --- a/addressbook/gui/component/component-factory.c +++ b/addressbook/gui/component/component-factory.c @@ -31,7 +31,6 @@ #include "addressbook-view.h" #include "autocompletion-config.h" #include "eab-popup-control.h" -#include "eab-vcard-control.h" #ifdef ENABLE_SMIME #include "smime/gui/certificate-manager.h" #endif @@ -40,7 +39,6 @@ #define FACTORY_ID "OAFIID:GNOME_Evolution_Addressbook_Factory:" BASE_VERSION -#define VCARD_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_VCard_Control:" BASE_VERSION #define COMPONENT_ID "OAFIID:GNOME_Evolution_Addressbook_Component:" BASE_VERSION #define ADDRESS_POPUP_ID "OAFIID:GNOME_Evolution_Addressbook_AddressPopup:" BASE_VERSION #define COMPLETION_CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_Autocompletion_ConfigControl:" BASE_VERSION @@ -56,8 +54,6 @@ factory (BonoboGenericFactory *factory, { d(printf ("asked to activate component_id `%s'\n", component_id)); - if (strcmp (component_id, VCARD_CONTROL_ID) == 0) - return BONOBO_OBJECT (eab_vcard_control_new ()); if (strcmp (component_id, COMPONENT_ID) == 0) { BonoboObject *object = BONOBO_OBJECT (addressbook_component_peek ()); bonobo_object_ref (object); diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index c3a14d8aeb..ebdf49ef40 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -37,8 +37,6 @@ libeabwidgets_la_SOURCES = \ eab-popup.h \ eab-popup-control.c \ eab-popup-control.h \ - eab-vcard-control.c \ - eab-vcard-control.h \ e-minicard.c \ e-minicard.h \ e-minicard-label.c \ diff --git a/addressbook/gui/widgets/eab-vcard-control.c b/addressbook/gui/widgets/eab-vcard-control.c deleted file mode 100644 index 1e890167f6..0000000000 --- a/addressbook/gui/widgets/eab-vcard-control.c +++ /dev/null @@ -1,316 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - * - * Authors: - * Chris Lahey - * Chris Toshok - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#include -#include - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include "eab-vcard-control.h" -#include "eab-contact-merging.h" - -typedef struct { - EABContactDisplay *display; - GList *card_list; - GtkWidget *label; - EABContactDisplayRenderMode render_mode; -} EABVCardControl; - -#define VCARD_CONTROL_ID "OAFIID:GNOME_Evolution_Addressbook_VCard_Control:" BASE_VERSION - -/* - * Bonobo::PersistStream - * - * These two functions implement the Bonobo::PersistStream load and - * save methods which allow data to be loaded into and out of the - * BonoboObject. - */ -static char * -stream_read (Bonobo_Stream stream) -{ - Bonobo_Stream_iobuf *buffer; - CORBA_Environment ev; - char *data = NULL; - gint length = 0; - - CORBA_exception_init (&ev); - do { -#define READ_CHUNK_SIZE 65536 - Bonobo_Stream_read (stream, READ_CHUNK_SIZE, - &buffer, &ev); - - if (ev._major != CORBA_NO_EXCEPTION) { - CORBA_exception_free (&ev); - return NULL; - } - - if (buffer->_length <= 0) - break; - - data = g_realloc (data, length + buffer->_length + 1); - - memcpy (data + length, buffer->_buffer, buffer->_length); - - length += buffer->_length; - - CORBA_free (buffer); - } while (1); - - CORBA_free (buffer); - CORBA_exception_free (&ev); - - if (data) - data[length] = '\0'; - else - data = g_strdup(""); - - return data; -} /* stream_read */ - -/* - * This function implements the Bonobo::PersistStream:load method. - */ -static void -pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream, - Bonobo_Persist_ContentType type, void *data, - CORBA_Environment *ev) -{ - GList *list; - char *vcard; - EABVCardControl *vcard_control = data; - - if (type && g_ascii_strcasecmp (type, "text/vCard") != 0 && - g_ascii_strcasecmp (type, "text/x-vCard") != 0) { - CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Bonobo_Persist_WrongDataType, NULL); - return; - } - - if ((vcard = stream_read (stream)) == NULL) { - CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Bonobo_Persist_FileNotFound, NULL); - return; - } - - g_list_foreach ( - vcard_control->card_list, - (GFunc) g_object_unref, NULL); - g_list_free (vcard_control->card_list); - - list = eab_contact_list_from_string (vcard); - g_free(vcard); - vcard_control->card_list = list; - if (list) { - eab_contact_display_render (vcard_control->display, E_CONTACT (list->data), - vcard_control->render_mode); - } - if (list && list->next) { - char *message; - int length = g_list_length (list) - 1; - message = g_strdup_printf (ngettext("There is one other contact.", - "There are %d other contacts.", length), - length); - gtk_label_set_text (GTK_LABEL (vcard_control->label), message); - g_free (message); - gtk_widget_show (vcard_control->label); - } else { - gtk_widget_hide (vcard_control->label); - } -} /* pstream_load */ - -/* - * This function implements the Bonobo::PersistStream:save method. - */ -static void -pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream, - Bonobo_Persist_ContentType type, void *data, - CORBA_Environment *ev) -{ - EABVCardControl *vcard_control = data; - char *vcard; - int length; - - if (type && g_ascii_strcasecmp (type, "text/vCard") != 0 && - g_ascii_strcasecmp (type, "text/x-vCard") != 0) { - CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_Bonobo_Persist_WrongDataType, NULL); - return; - } - - vcard = eab_contact_list_to_string (vcard_control->card_list); - length = strlen (vcard); - bonobo_stream_client_write (stream, vcard, length, ev); - g_free (vcard); -} /* pstream_save */ - -static Bonobo_Persist_ContentTypeList * -pstream_get_content_types (BonoboPersistStream *ps, void *closure, - CORBA_Environment *ev) -{ - return bonobo_persist_generate_content_types (2, "text/vCard", "text/x-vCard"); -} - -static void -book_open_cb (EBook *book, EBookStatus status, gpointer closure) -{ - GList *list = closure; - if (status == E_BOOK_ERROR_OK) { - GList *p; - for (p = list; p; p = p->next) { - /* XXX argh, more passing of NULL's for callbacks */ - eab_merging_book_add_contact (book, E_CONTACT (p->data), NULL, NULL); - } - } - if (book) - g_object_unref (book); - g_list_foreach (list, (GFunc) g_object_unref, NULL); - g_list_free (list); -} - -static void -save_in_addressbook(GtkWidget *button, gpointer data) -{ - EABVCardControl *vcard_control = data; - GList *list, *p; - - list = g_list_copy (vcard_control->card_list); - - for (p = list; p; p = p->next) - g_object_ref (p->data); - - addressbook_load_default_book (book_open_cb, list); -} - -static void -toggle_full_vcard(GtkWidget *button, gpointer data) -{ - EABVCardControl *vcard_control = data; - char *label; - - if (!vcard_control->card_list) - return; - - if (vcard_control->render_mode == EAB_CONTACT_DISPLAY_RENDER_NORMAL) { - vcard_control->render_mode = EAB_CONTACT_DISPLAY_RENDER_COMPACT; - label = _("Show Full vCard"); - } - else { - vcard_control->render_mode = EAB_CONTACT_DISPLAY_RENDER_NORMAL; - label = _("Show Compact vCard"); - } - - gtk_button_set_label (GTK_BUTTON (button), label); - eab_contact_display_render (vcard_control->display, E_CONTACT (vcard_control->card_list->data), - vcard_control->render_mode); -} - -static void -free_struct (gpointer data, GObject *where_object_was) -{ - EABVCardControl *vcard_control = data; - - g_list_foreach ( - vcard_control->card_list, - (GFunc) g_object_unref, NULL); - g_list_free (vcard_control->card_list); - g_free (vcard_control); -} - -BonoboControl * -eab_vcard_control_new (void) -{ - BonoboControl *control; - BonoboPersistStream *stream; - GtkWidget *display; - GtkWidget *button1, *button2; - GtkWidget *bbox; - GtkWidget *vbox; - - EABVCardControl *vcard_control = g_new (EABVCardControl, 1); - - vcard_control->card_list = NULL; - vcard_control->display = NULL; - vcard_control->label = NULL; - - vcard_control->render_mode = EAB_CONTACT_DISPLAY_RENDER_COMPACT; - - /* Create the control. */ - - display = eab_contact_display_new (); - vcard_control->display = EAB_CONTACT_DISPLAY (display); - - bbox = gtk_hbutton_box_new (); - gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START); - gtk_box_set_spacing (GTK_BOX (bbox), 12); - - button1 = gtk_button_new_with_label(_("Show Full vCard")); - g_signal_connect (button1, "clicked", - G_CALLBACK (toggle_full_vcard), vcard_control); - gtk_box_pack_start (GTK_BOX (bbox), button1, FALSE, FALSE, 0); - - button2 = gtk_button_new_with_label(_("Save in address book")); - g_signal_connect (button2, "clicked", - G_CALLBACK (save_in_addressbook), vcard_control); - gtk_box_pack_start (GTK_BOX (bbox), button2, FALSE, FALSE, 0); - - /* This is intentionally not shown. */ - vcard_control->label = gtk_label_new (""); - - vbox = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), display, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (vbox), vcard_control->label, TRUE, TRUE, 0); - gtk_widget_show_all (bbox); - gtk_widget_show (display); - gtk_widget_show (vbox); - - control = bonobo_control_new (vbox); - - g_object_weak_ref (G_OBJECT (control), free_struct, vcard_control); - - stream = bonobo_persist_stream_new (pstream_load, pstream_save, - pstream_get_content_types, - VCARD_CONTROL_ID, - vcard_control); - - if (stream == NULL) { - bonobo_object_unref (BONOBO_OBJECT (control)); - return NULL; - } - - bonobo_object_add_interface (BONOBO_OBJECT (control), - BONOBO_OBJECT (stream)); - - return control; -} diff --git a/addressbook/gui/widgets/eab-vcard-control.h b/addressbook/gui/widgets/eab-vcard-control.h deleted file mode 100644 index 06ca62727a..0000000000 --- a/addressbook/gui/widgets/eab-vcard-control.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifndef __EAB_VCARD_CONTROL_H__ -#define __EAB_VCARD_CONTROL_H__ - -#include - -BonoboControl *eab_vcard_control_new (void); - -#endif /* __EAB_VCARD_CONTROL_H__ */ diff --git a/configure.in b/configure.in index 3793b086a6..45e54f854c 100644 --- a/configure.in +++ b/configure.in @@ -1785,7 +1785,7 @@ plugins_base_always="calendar-file calendar-http $CALENDAR_WEATHER itip-formatte plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono" -plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates pst-import" +plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates pst-import vcard-inline" plugins_standard="$plugins_standard_always" all_plugins_standard="$plugins_standard" @@ -2120,6 +2120,7 @@ plugins/startup-wizard/Makefile plugins/subject-thread/Makefile plugins/templates/Makefile plugins/tnef-attachments/Makefile +plugins/vcard-inline/Makefile plugins/webdav-account-setup/Makefile smime/Makefile smime/lib/Makefile diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index f20af59683..bc2f4e25bf 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -46,11 +46,6 @@ #include -#include -#include -#include -#include - #include #include #include @@ -174,8 +169,6 @@ static void efhd_format_optional(EMFormat *, CamelStream *, CamelMimePart *, Cam static void efhd_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, CamelCipherValidity *valid); static void efhd_complete(EMFormat *); -static gboolean efhd_bonobo_object(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject); -static gboolean efhd_use_component(const char *mime_type); static void efhd_builtin_init(EMFormatHTMLDisplayClass *efhc); enum { @@ -187,8 +180,6 @@ enum { static guint efhd_signals[EFHD_LAST_SIGNAL] = { 0 }; -/* EMFormatHandler's for bonobo objects */ -static GHashTable *efhd_bonobo_handlers; static EMFormatHTMLClass *efhd_parent; static EMFormatClass *efhd_format_class; @@ -338,7 +329,7 @@ efhd_class_init(GObjectClass *klass) } GType -em_format_html_display_get_type(void) +em_format_html_display_get_type (void) { static GType type = 0; @@ -354,8 +345,6 @@ em_format_html_display_get_type(void) efhd_parent = g_type_class_ref(em_format_html_get_type()); efhd_format_class = g_type_class_ref(em_format_get_type()); type = g_type_register_static(em_format_html_get_type(), "EMFormatHTMLDisplay", &info, 0); - - efhd_bonobo_handlers = g_hash_table_new(g_str_hash, g_str_equal); } return type; @@ -1274,38 +1263,10 @@ efhd_builtin_init(EMFormatHTMLDisplayClass *efhc) em_format_class_add_handler((EMFormatClass *)efhc, &type_builtin_table[i]); } -/* ********************************************************************** */ -static void -efhd_bonobo_unknown(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info) -{ - char *classid; - - classid = g_strdup_printf("bonobo-unknown:///em-format-html-display/%s", emf->part_id->str); - em_format_html_add_pobject((EMFormatHTML *)emf, sizeof(EMFormatHTMLPObject), classid, part, efhd_bonobo_object); - camel_stream_printf(stream, "
\n", classid, info->mime_type); - g_free(classid); -} - - /* ********************************************************************** */ -static const EMFormatHandler *efhd_find_handler(EMFormat *emf, const char *mime_type) +static const EMFormatHandler * +efhd_find_handler(EMFormat *emf, const char *mime_type) { - const EMFormatHandler *handle; - - if ( (handle = ((EMFormatClass *)efhd_parent)->find_handler(emf, mime_type)) == NULL - && efhd_use_component(mime_type) - && (handle = g_hash_table_lookup(efhd_bonobo_handlers, mime_type)) == NULL) { - - EMFormatHandler *h = g_malloc0(sizeof(*h)); - - h->mime_type = g_strdup(mime_type); - h->handler = efhd_bonobo_unknown; - h->flags = EM_FORMAT_HANDLER_INLINE_DISPOSITION; - g_hash_table_insert(efhd_bonobo_handlers, h->mime_type, h); - - handle = h; - } - - return handle; + return ((EMFormatClass *) efhd_parent)->find_handler (emf, mime_type); } static void efhd_format_clone(EMFormat *emf, CamelFolder *folder, const char *uid, CamelMimeMessage *msg, EMFormat *src) @@ -1843,155 +1804,6 @@ efhd_attachment_frame(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri) } } -static gboolean -efhd_bonobo_object(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject) -{ - CamelDataWrapper *wrapper; - Bonobo_ServerInfo *component; - GtkWidget *embedded; - Bonobo_PersistStream persist; - CORBA_Environment ev; - CamelStreamMem *cstream; - BonoboStream *bstream; - BonoboControlFrame *control_frame; - Bonobo_PropertyBag prop_bag; - - component = bonobo_activation_get_default_component_for_mime_type (eb->type); - if (component == NULL) - return FALSE; - - embedded = bonobo_widget_new_control(component->iid, NULL); - CORBA_free(component); - if (embedded == NULL) - return FALSE; - - CORBA_exception_init(&ev); - - control_frame = bonobo_widget_get_control_frame((BonoboWidget *)embedded); - prop_bag = bonobo_control_frame_get_control_property_bag(control_frame, NULL); - if (prop_bag != CORBA_OBJECT_NIL) { - /* - * Now we can take care of business. Currently, the only control - * that needs something passed to it through a property bag is - * the iTip control, and it needs only the From email address, - * but perhaps in the future we can generalize this section of code - * to pass a bunch of useful things to all embedded controls. - */ - const CamelInternetAddress *from; - char *from_address; - - from = camel_mime_message_get_from((CamelMimeMessage *)((EMFormat *)efh)->message); - from_address = camel_address_encode((CamelAddress *)from); - bonobo_property_bag_client_set_value_string(prop_bag, "from_address", from_address, &ev); - g_free(from_address); - - Bonobo_Unknown_unref(prop_bag, &ev); - } - - persist = (Bonobo_PersistStream)Bonobo_Unknown_queryInterface(bonobo_widget_get_objref((BonoboWidget *)embedded), - "IDL:Bonobo/PersistStream:1.0", &ev); - if (persist == CORBA_OBJECT_NIL) { - g_object_ref_sink(embedded); - CORBA_exception_free(&ev); - return FALSE; - } - - /* Write the data to a CamelStreamMem... */ - cstream = (CamelStreamMem *)camel_stream_mem_new(); - wrapper = camel_medium_get_content_object((CamelMedium *)pobject->part); - if (FALSE && !g_ascii_strncasecmp (eb->type, "text/", 5)) { - /* do charset conversion, etc */ - d(printf("performing charset conversion for %s component\n", eb->type)); - em_format_format_text((EMFormat *)efh, (CamelStream *)cstream, wrapper); - } else { - camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) cstream); - } - - /* ...convert the CamelStreamMem to a BonoboStreamMem... */ - bstream = bonobo_stream_mem_create((char *)cstream->buffer->data, cstream->buffer->len, TRUE, FALSE); - camel_object_unref(cstream); - - /* ...and hydrate the PersistStream from the BonoboStream. */ - Bonobo_PersistStream_load(persist, - bonobo_object_corba_objref(BONOBO_OBJECT (bstream)), - eb->type, &ev); - bonobo_object_unref(BONOBO_OBJECT (bstream)); - Bonobo_Unknown_unref(persist, &ev); - CORBA_Object_release(persist, &ev); - - if (ev._major != CORBA_NO_EXCEPTION) { - g_object_ref_sink(embedded); - CORBA_exception_free(&ev); - return FALSE; - } - CORBA_exception_free(&ev); - - gtk_widget_show(embedded); - gtk_container_add(GTK_CONTAINER (eb), embedded); - - return TRUE; -} - -static gboolean -efhd_check_server_prop(Bonobo_ServerInfo *component, const char *propname, const char *value) -{ - CORBA_sequence_CORBA_string stringv; - Bonobo_ActivationProperty *prop; - int i; - - prop = bonobo_server_info_prop_find(component, propname); - if (!prop || prop->v._d != Bonobo_ACTIVATION_P_STRINGV) - return FALSE; - - stringv = prop->v._u.value_stringv; - for (i = 0; i < stringv._length; i++) { - if (!g_ascii_strcasecmp(value, stringv._buffer[i])) - return TRUE; - } - - return FALSE; -} - -static gboolean -efhd_use_component(const char *mime_type) -{ - GList *components, *iter; - Bonobo_ServerInfo *component = NULL; - - /* should this cache it? */ - - if (g_ascii_strcasecmp(mime_type, "text/x-vcard") != 0 - && g_ascii_strcasecmp(mime_type, "text/calendar") != 0) { - const char **mime_types; - int i; - - mime_types = mail_config_get_allowable_mime_types(); - for (i = 0; mime_types[i]; i++) { - if (!g_ascii_strcasecmp(mime_types[i], mime_type)) - goto type_ok; - } - return FALSE; - } -type_ok: - components = bonobo_activation_get_all_components_for_mime_type (mime_type); - for (iter = components; iter; iter = iter->next) { - Bonobo_ServerInfo *comp = iter->data; - - comp = iter->data; - if (efhd_check_server_prop(comp, "repo_ids", "IDL:Bonobo/PersistStream:1.0") - && efhd_check_server_prop(comp, "bonobo:supported_mime_types", mime_type)) { - component = comp; - break; - } - } - - /* FIXME: How should I free the Bonobo_ServerInfo's ? */ - g_list_foreach (components, (GFunc)CORBA_free, NULL); - g_list_free (components); - - return component != NULL; -} - static void efhd_bar_resize (EMFormatHTML *efh, GtkAllocation *event) @@ -2097,16 +1909,8 @@ efhd_format_attachment(EMFormat *emf, CamelStream *stream, CamelMimePart *part, stream, "\n" EM_FORMAT_HTML_VPAD); - if (handle) { - if (info->shown) - handle->handler(emf, stream, part, handle); - } else if (efhd_use_component(mime_type)) { - g_free(classid); /* messy */ - - classid = g_strdup_printf("bonobo-unknown:///em-format-html-display/%s", emf->part_id->str); - em_format_html_add_pobject((EMFormatHTML *)emf, sizeof(EMFormatHTMLPObject), classid, part, efhd_bonobo_object); - camel_stream_printf(stream, "
>\n", classid, mime_type); - } + if (handle && info->shown) + handle->handler(emf, stream, part, handle); g_free(classid); } diff --git a/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.la b/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.la new file mode 120000 index 0000000000..4ffc357ca7 --- /dev/null +++ b/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.la @@ -0,0 +1 @@ +../liborg-gnome-vcard-inline.la \ No newline at end of file diff --git a/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.lai b/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.lai new file mode 100644 index 0000000000..21c94c82d7 --- /dev/null +++ b/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.lai @@ -0,0 +1,41 @@ +# liborg-gnome-vcard-inline.la - a libtool library file +# Generated by ltmain.sh (GNU libtool) 2.2.6 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='liborg-gnome-vcard-inline.so' + +# Names of this library. +library_names='liborg-gnome-vcard-inline.so liborg-gnome-vcard-inline.so liborg-gnome-vcard-inline.so' + +# The name of the static archive. +old_library='' + +# Linker flags that can not go in dependency_libs. +inherited_linker_flags=' -pthread' + +# Libraries that this one depends upon. +dependency_libs=' -L/home/mbarnes/local/lib /home/mbarnes/local/lib/libedataserverui-1.2.la -L/usr/lib -L/usr/kerberos/lib -lgnome-keyring /home/mbarnes/local/lib/libebook-1.2.la /home/mbarnes/local/lib/libcamel-1.2.la -lssl3 -lsmime3 -lnss3 -lnssutil3 -lkrb5 -lk5crypto -lcom_err -lgssapi_krb5 /home/mbarnes/local/lib/libedataserver-1.2.la -lplds4 -lplc4 -lnspr4 -lsasl2 -lssl -lcrypto -lz -lsqlite3 -lsoup-2.4 /home/mbarnes/local/lib/libgtkhtml-editor.la /home/mbarnes/local/lib/libgtkhtml-3.14.la /home/mbarnes/local/lib/libgailutil.la -lXext -lXrender -lXinerama -lXrandr -lXcursor -lX11 -lXcomposite -lXdamage -lXfixes -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 /home/mbarnes/local/lib/libgthread-2.0.la -lpthread -lrt /home/mbarnes/local/lib/libgtk-x11-2.0.la -lxml2 /home/mbarnes/local/lib/libgdk-x11-2.0.la -latk-1.0 -lpangoft2-1.0 /home/mbarnes/local/lib/libgdk_pixbuf-2.0.la /home/mbarnes/local/lib/libgio-2.0.la -lselinux -lm -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig /home/mbarnes/local/lib/libgobject-2.0.la /home/mbarnes/local/lib/libgmodule-2.0.la -ldl /home/mbarnes/local/lib/libglib-2.0.la' + +# Names of additional weak libraries provided by this library +weak_library_names='' + +# Version information for liborg-gnome-vcard-inline. +current=0 +age=0 +revision=0 + +# Is this an already installed library? +installed=yes + +# Should we warn about portability when linking against -modules? +shouldnotlink=yes + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='/home/mbarnes/local/lib/evolution/2.28/plugins' diff --git a/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.so b/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.so new file mode 100755 index 0000000000..a7ab796fe3 Binary files /dev/null and b/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.so differ diff --git a/plugins/vcard-inline/.libs/vcard-inline.o b/plugins/vcard-inline/.libs/vcard-inline.o new file mode 100644 index 0000000000..a75afa9adc Binary files /dev/null and b/plugins/vcard-inline/.libs/vcard-inline.o differ diff --git a/plugins/vcard-inline/Makefile b/plugins/vcard-inline/Makefile new file mode 100644 index 0000000000..bb9369d04c --- /dev/null +++ b/plugins/vcard-inline/Makefile @@ -0,0 +1,719 @@ +# Makefile.in generated by automake 1.10.2 from Makefile.am. +# plugins/vcard-inline/Makefile. Generated from Makefile.in by configure. + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + + + + +pkgdatadir = $(datadir)/evolution +pkglibdir = $(libdir)/evolution +pkgincludedir = $(includedir)/evolution +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = i686-pc-linux-gnu +host_triplet = i686-pc-linux-gnu +subdir = plugins/vcard-inline +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +pluginLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(plugin_LTLIBRARIES) +am__DEPENDENCIES_1 = +liborg_gnome_vcard_inline_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +am_liborg_gnome_vcard_inline_la_OBJECTS = vcard-inline.lo +liborg_gnome_vcard_inline_la_OBJECTS = \ + $(am_liborg_gnome_vcard_inline_la_OBJECTS) +liborg_gnome_vcard_inline_la_LINK = $(LIBTOOL) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(liborg_gnome_vcard_inline_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I. -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(liborg_gnome_vcard_inline_la_SOURCES) +DIST_SOURCES = $(liborg_gnome_vcard_inline_la_SOURCES) +pluginDATA_INSTALL = $(INSTALL_DATA) +DATA = $(plugin_DATA) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A11Y_CFLAGS = -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/atk-1.0 +A11Y_LIBS = -L/home/mbarnes/local/lib -latk-1.0 -lgobject-2.0 -lglib-2.0 +ACLOCAL = ${SHELL} /home/mbarnes/git/gnome/evolution/missing --run aclocal-1.10 +ALL_LINGUAS = +AMTAR = ${SHELL} /home/mbarnes/git/gnome/evolution/missing --run tar +AR = ar +AS = as +AUTOCONF = ${SHELL} /home/mbarnes/git/gnome/evolution/missing --run autoconf +AUTOHEADER = ${SHELL} /home/mbarnes/git/gnome/evolution/missing --run autoheader +AUTOMAKE = ${SHELL} /home/mbarnes/git/gnome/evolution/missing --run automake-1.10 +AWK = gawk +BASE_VERSION = 2.28 +BONOBOUI_REQUIRED = 2.4.2 +CAMEL_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 $(WERROR) +CAMEL_EXCHANGE_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/evolution-data-server-2.28/exchange -I/usr/include/libbonoboui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libxml2 -I/usr/include/libbonobo-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/pango-1.0 -I/usr/include/libart-2.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libglade-2.0 -I/usr/include/libsoup-2.4 $(WERROR) +CAMEL_EXCHANGE_LIBS = -pthread -L/home/mbarnes/local/lib -lbonoboui-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lcamel-provider-1.2 -lcamel-1.2 -lsqlite3 -ledataserverui-1.2 -lglade-2.0 -lebook-1.2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lexchange-storage-1.2 -lecal-1.2 -lical -licalss -licalvcal -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 +CAMEL_GROUPWISE_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/evolution-data-server-2.28/groupwise -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 $(WERROR) +CAMEL_GROUPWISE_LIBS = -pthread -L/home/mbarnes/local/lib -lcamel-provider-1.2 -lcamel-1.2 -lsqlite3 -ledataserver-1.2 -lxml2 -lgconf-2 -lbonobo-2 -lbonobo-activation -lORBit-2 -lgthread-2.0 -lrt -legroupwise-1.2 -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 +CAMEL_LIBS = -pthread -L/home/mbarnes/local/lib -lcamel-provider-1.2 -lcamel-1.2 -ledataserver-1.2 -lsqlite3 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 +CATALOGS = +CATOBJEXT = .gmo +CC = gcc +CCDEPMODE = depmode=gcc3 +CERT_UI_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/libglade-2.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 $(WERROR) -I/usr/include/nss3 -I/usr/include/nspr4 $(WERROR) +CERT_UI_LIBS = -pthread -L/home/mbarnes/local/lib -ledataserverui-1.2 -lebook-1.2 -ledataserver-1.2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lbonobo-activation -lORBit-2 -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl +CFLAGS = -g -O0 -Wall -Wdeclaration-after-statement -Werror-implicit-function-declaration -Wformat -Wall -Wmissing-prototypes -Wno-sign-compare +CPP = gcc -E +CPPFLAGS = +CYGPATH_W = echo +DATADIRNAME = share +DATASERVER_EXEC_VERSION = 2.28 +DATASERVER_IDL = /home/mbarnes/local/share/idl/evolution-data-server-1.2/Evolution-DataServer.idl +DEFS = -DHAVE_CONFIG_H +DEPDIR = .deps +DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper +DLLTOOL = dlltool +DOC_USER_FORMATS = +DOLT_BASH = /bin/bash +DSYMUTIL = +DTAPPINTEGRATE = no +DUMPBIN = +ECHO_C = +ECHO_N = -n +ECHO_T = +EGREP = /bin/grep -E +EVOLUTION_ADDRESSBOOK_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/libgtkhtml-3.14/editor -I/usr/include/libbonoboui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libxml2 -I/usr/include/libbonobo-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/pango-1.0 -I/usr/include/libart-2.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libglade-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/enchant -I/usr/include/libsoup-2.4 $(WERROR) +EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/libgtkhtml-3.14/editor -I/usr/include/libgnome-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/libglade-2.0 -I/usr/include/enchant -I/usr/include/libsoup-2.4 $(WERROR) +EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -lgpilotd -lgpilotdcm -lgpilotdconduit -lpisock -lpisync -ledataserverui-1.2 -lebook-1.2 -lcamel-1.2 -ledataserver-1.2 -lsqlite3 -lsoup-2.4 -lgtkhtml-editor -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 +EVOLUTION_ADDRESSBOOK_LIBS = -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -ledataserverui-1.2 -lebook-1.2 -lcamel-1.2 -ledataserver-1.2 -lsqlite3 -lsoup-2.4 -lgtkhtml-editor -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 +EVOLUTION_CALENDAR_CFLAGS = -pthread -DORBIT2=1 -DDBUS_API_SUBJECT_TO_CHANGE -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/libgtkhtml-3.14/editor -I/home/mbarnes/local/include/evolution-data-server-2.28/google/libgdata -I/home/mbarnes/local/include/evolution-data-server-2.28/google/libgdata-google -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/libglade-2.0 -I/usr/include/enchant -I/usr/include/libsoup-2.4 -I/usr/include/hal $(WERROR) +EVOLUTION_CALENDAR_CONDUIT_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/usr/include/libgnome-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 $(WERROR) -pthread -DORBIT2=1 -DDBUS_API_SUBJECT_TO_CHANGE -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/libgtkhtml-3.14/editor -I/home/mbarnes/local/include/evolution-data-server-2.28/google/libgdata -I/home/mbarnes/local/include/evolution-data-server-2.28/google/libgdata-google -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/libglade-2.0 -I/usr/include/enchant -I/usr/include/libsoup-2.4 -I/usr/include/hal $(WERROR) +EVOLUTION_CALENDAR_CONDUIT_LIBS = -pthread -L/home/mbarnes/local/lib -lgpilotd -lgpilotdcm -lgpilotdconduit -lpisock -lpisync -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgconf-2 -lgthread-2.0 -lrt -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -L/lib -lecal-1.2 -lical -licalss -licalvcal -ledataserverui-1.2 -lebook-1.2 -ledataserver-1.2 -lebackend-1.2 -lhal -lnotify -ldbus-glib-1 -ldbus-1 -lgtkhtml-editor -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgdata-1.2 -lgdata-google-1.2 -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 +EVOLUTION_CALENDAR_LIBS = -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -L/lib -lecal-1.2 -lical -licalss -licalvcal -ledataserverui-1.2 -lebook-1.2 -ledataserver-1.2 -lebackend-1.2 -lhal -lnotify -ldbus-glib-1 -ldbus-1 -lgtkhtml-editor -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgdata-1.2 -lgdata-google-1.2 -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 +EVOLUTION_DATA_SERVER_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/evolution-data-server-2.28/groupwise -I/home/mbarnes/local/include/evolution-data-server-2.28/google/libgdata -I/home/mbarnes/local/include/evolution-data-server-2.28/google/libgdata-google -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libglade-2.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 +EVOLUTION_DATA_SERVER_LIBS = -pthread -L/home/mbarnes/local/lib -lecal-1.2 -lical -licalss -licalvcal -ledataserverui-1.2 -lglade-2.0 -lebook-1.2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -ledataserver-1.2 -lxml2 -lgconf-2 -lbonobo-2 -lbonobo-activation -lORBit-2 -lgthread-2.0 -lrt -legroupwise-1.2 -lebackend-1.2 -lgdata-1.2 -lgdata-google-1.2 -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 +EVOLUTION_DIR = /home/mbarnes/git/gnome/evolution +EVOLUTION_MAIL_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/home/mbarnes/local/include/libgtkhtml-3.14/editor -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/libglade-2.0 -I/usr/include/enchant -I/usr/include/nss3 -I/usr/include/nspr4 $(WERROR) +EVOLUTION_MAIL_LIBS = -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -lcamel-provider-1.2 -lcamel-1.2 -lsqlite3 -lgtkhtml-editor -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl -ledataserverui-1.2 -lglade-2.0 -lebook-1.2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 +EVOLUTION_TEST_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 $(WERROR) +EVOLUTION_TEST_LIBS = -pthread -L/home/mbarnes/local/lib -lgnomeui-2 -lSM -lICE -lgnomevfs-2 -lgconf-2 -lbonoboui-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lbonobo-2 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 +EXEEXT = +E_NAME_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 $(WERROR) +E_NAME_LIBS = -pthread -L/home/mbarnes/local/lib -lgnomeui-2 -lSM -lICE -lgnomevfs-2 -lgconf-2 -lbonoboui-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lbonobo-2 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 +E_UTIL_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/usr/include/libbonoboui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libxml2 -I/usr/include/libbonobo-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/pango-1.0 -I/usr/include/libart-2.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libglade-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libsoup-2.4 -I/usr/include/nspr4 $(WERROR) +E_UTIL_LIBS = -pthread -L/home/mbarnes/local/lib -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -ledataserverui-1.2 -lglade-2.0 -lebook-1.2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lcamel-1.2 -ledataserver-1.2 -lsqlite3 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 -lplds4 -lplc4 -lnspr4 -lpthread -ldl -lpthread -lX11 +E_WIDGETS_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/usr/include/libbonoboui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libxml2 -I/usr/include/libbonobo-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/pango-1.0 -I/usr/include/libart-2.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libglade-2.0 -I/usr/include/libsoup-2.4 $(WERROR) +E_WIDGETS_LIBS = -pthread -L/home/mbarnes/local/lib -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -ledataserverui-1.2 -lglade-2.0 -lebook-1.2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 +FGREP = /bin/grep -F +FOUND_DBUS_VERSION = 1200 +GCONFTOOL = /usr/bin/gconftool-2 +GCONF_SCHEMA_CONFIG_SOURCE = xml:merged:/etc/gconf/gconf.xml.defaults +GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas +GETTEXT_PACKAGE = evolution-2.28 +GIT_CFLAGS = +GIT_LIBS = +GLIB_CFLAGS = -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include +GLIB_GENMARSHAL = glib-genmarshal +GLIB_LIBS = -L/home/mbarnes/local/lib -lglib-2.0 +GLIB_MKENUMS = glib-mkenums +GMOFILES = +GMSGFMT = /usr/bin/msgfmt +GNOME_PILOT_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/usr/include/libgnome-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 +GNOME_PILOT_LIBS = -pthread -L/home/mbarnes/local/lib -lgpilotd -lgpilotdcm -lgpilotdconduit -lpisock -lpisync -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgconf-2 -lgthread-2.0 -lrt -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 +GNOME_PLATFORM_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libxml2 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/libglade-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 +GNOME_PLATFORM_LIBS = -pthread -L/home/mbarnes/local/lib -lglade-2.0 -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgconf-2 -lgthread-2.0 -lrt -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -lxml2 +GOBJECT_QUERY = gobject-query +GREP = /bin/grep +GSTREAMER_CFLAGS = -pthread -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/gstreamer-0.10 -I/usr/include/libxml2 +GSTREAMER_LIBS = -pthread -L/home/mbarnes/local/lib -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lxml2 -lglib-2.0 +GTKHTML_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/libglade-2.0 -I/usr/include/enchant -I/usr/include/gconf/2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/libart-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 +GTKHTML_DATADIR = /home/mbarnes/local/share/gtkhtml-3.14 +GTKHTML_LIBS = -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 +HAL_CFLAGS = -DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include +HAL_LIBS = -L/lib -lhal -ldbus-1 +HAVE_DBUS = +HAVE_JW = yes +HELP_DIR = ${datadir}/gnome/help +ICONV_CFLAGS = +ICONV_LIBS = +IDL_INCLUDES = -I /usr/share/idl/bonobo-2.0 -I /usr/share/idl/bonobo-activation-2.0 -I /home/mbarnes/local/share/idl/evolution-data-server-1.2 +IMPORTERS_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/usr/include/libglade-2.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 $(WERROR) +IMPORTERS_LIBS = -pthread -L/home/mbarnes/local/lib -ledataserverui-1.2 -lcamel-provider-1.2 -lcamel-1.2 -lsqlite3 -lglade-2.0 -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lebook-1.2 -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 +INSTALL = /usr/bin/install -c +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_PROGRAM = ${INSTALL} +INSTALL_SCRIPT = ${INSTALL} +INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +INSTOBJEXT = .mo +INTERFACE_VERSION = 2.28 +INTLLIBS = +INTLTOOL_EXTRACT = /usr/bin/intltool-extract +INTLTOOL_MERGE = /usr/bin/intltool-merge +INTLTOOL_PERL = /usr/bin/perl +INTLTOOL_UPDATE = /usr/bin/intltool-update +JW = /usr/bin/jw +KDE_APPLNK_DIR = +KILL_PROCESS_CMD = /usr/bin/killall +KRB4_CFLAGS = +KRB4_LIBS = +KRB5_CFLAGS = +KRB5_LIBS = +LD = /usr/bin/ld +LDAP_CFLAGS = -DLDAP_DEPRECATED +LDAP_LIBS = -lldap -llber -lresolv -lnsl +LDFLAGS = -Wl,--as-needed +LEX = flex +LEXLIB = -lfl +LEX_OUTPUT_ROOT = lex.yy +LIBEXCHANGESTORAGE_CFLAGS = -I/home/mbarnes/local/include/evolution-data-server-2.28/exchange -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 +LIBEXCHANGESTORAGE_LIBS = -L/home/mbarnes/local/lib -lexchange-storage-1.2 -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 +LIBFILTER_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/libglade-2.0 -I/usr/include/libsoup-2.4 $(WERROR) +LIBFILTER_LIBS = -pthread -L/home/mbarnes/local/lib -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lglade-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 +LIBGWEATHER_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/usr/include/libxml2 -I/usr/include/libsoup-2.4 -I/usr/include/gconf/2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include +LIBGWEATHER_LIBS = -L/home/mbarnes/local/lib -lgweather -lgtk-x11-2.0 -lgconf-2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 +LIBNOTIFY_CFLAGS = -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/lib/gtk-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 +LIBNOTIFY_LIBS = -L/home/mbarnes/local/lib -L/lib -lnotify -lgtk-x11-2.0 -ldbus-glib-1 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgmodule-2.0 -ldbus-1 -lgobject-2.0 -lglib-2.0 +LIBOBJS = +LIBPST_CFLAGS = +LIBPST_LIBS = +LIBS = +LIBSOUP_CFLAGS = -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 $(WERROR) +LIBSOUP_LIBS = -L/home/mbarnes/local/lib -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 +LIBTOOL = $(top_builddir)/doltlibtool +LIPO = +LN_S = ln -s +LTCOMPILE = $(top_builddir)/doltcompile $(COMPILE) +LTCXXCOMPILE = $(top_builddir)/doltcompile $(CXXCOMPILE) +LTLIBOBJS = +MAINT = +MAKEINFO = ${SHELL} /home/mbarnes/git/gnome/evolution/missing --run makeinfo +MANUAL_NSPR_CFLAGS = +MANUAL_NSPR_LIBS = +MANUAL_NSS_CFLAGS = +MANUAL_NSS_LIBS = +MKDIR_P = /bin/mkdir -p +MKINSTALLDIRS = ./mkinstalldirs +MONO_CFLAGS = +MONO_LIBS = +MOZILLA_NSS_CFLAGS = -I/usr/include/nss3 -I/usr/include/nspr4 $(WERROR) +MOZILLA_NSS_LIBS = -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl +MSGFMT = /usr/bin/msgfmt +MSGFMT_OPTS = -c +MSGMERGE = /usr/bin/msgmerge +NM = /usr/bin/nm -B +NMEDIT = +NMN_CFLAGS = -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include +NMN_LIBS = -L/home/mbarnes/local/lib -L/lib -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 +NM_CFLAGS = -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include +NM_LIBS = -L/home/mbarnes/local/lib -L/lib -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 +NO_UNDEFINED = +OBJDUMP = objdump +OBJEXT = o +OMF_DIR = ${datadir}/omf +ORBIT_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/orbit-2.0 +ORBIT_CONFIG = /usr/bin/orbit2-config +ORBIT_IDL = /usr/bin/orbit-idl-2 +ORBIT_LIBS = -pthread -L/home/mbarnes/local/lib -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 -lm +OTOOL = +OTOOL64 = +PACKAGE = evolution +PACKAGE_BUGREPORT = http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution +PACKAGE_NAME = evolution +PACKAGE_STRING = evolution 2.27.2 +PACKAGE_TARNAME = evolution +PACKAGE_VERSION = 2.27.2 +PATH_SEPARATOR = : +PERL = /usr/bin/perl +PILOT_LINK_MAJOR = 0 +PILOT_LINK_MICRO = 3 +PILOT_LINK_MINOR = 12 +PILOT_LINK_PATCH = +PILOT_LINK_VERSION = 0.12.3 +PISOCK_CFLAGS = +PISOCK_LIBS = -lpisock -lpisync +PKG_CONFIG = /usr/bin/pkg-config +POFILES = +POSUB = po +PO_IN_DATADIR_FALSE = +PO_IN_DATADIR_TRUE = +PTHREAD_LIB = -lpthread +PURIFY = impure +PY_INCLUDES = +PY_LIBS = +RANLIB = ranlib +REGEX_LIBS = +SED = /bin/sed +SET_MAKE = +SHELL = /bin/sh +SHELL_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/libglade-2.0 -I/usr/include/enchant $(WERROR) +SHELL_LIBS = -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -L/lib -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgmodule-2.0 -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 +SOEXT = .so +STRIP = strip +THREADS_CFLAGS = +THREADS_LIBS = -lpthread +TNEF_CFLAGS = -DHAVE_LIBYTNEF_YTNEF_H +TZDIALOG_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include $(WERROR) -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libxml2 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/libglade-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 +TZDIALOG_LIBS = -pthread -L/home/mbarnes/local/lib -lecal-1.2 -lical -licalss -licalvcal -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 -pthread -L/home/mbarnes/local/lib -lglade-2.0 -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgconf-2 -lgthread-2.0 -lrt -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -lxml2 +UPGRADE_REVISION = 0 +USE_NLS = yes +VERSION = 2.27.2 +WARN_CFLAGS = -Wall -Wmissing-prototypes +WINDRES = : +XGETTEXT = /usr/bin/xgettext +XMKMF = +X_CFLAGS = +X_EXTRA_LIBS = +X_LIBS = -lX11 +X_PRE_LIBS = +YACC = bison -y +YFLAGS = +abs_builddir = /home/mbarnes/git/gnome/evolution/plugins/vcard-inline +abs_srcdir = /home/mbarnes/git/gnome/evolution/plugins/vcard-inline +abs_top_builddir = /home/mbarnes/git/gnome/evolution +abs_top_srcdir = /home/mbarnes/git/gnome/evolution +ac_ct_CC = gcc +ac_ct_DUMPBIN = +all_plugins_base = calendar-file calendar-http calendar-weather itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup mail-account-disable publish-calendar caldav imap-features google-account-setup webdav-account-setup sa-junk-plugin bogo-junk-plugin exchange-operations mono +all_plugins_experimental = folder-unsubscribe external-editor hula-account-setup ipod-sync tnef-attachments +all_plugins_standard = bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates pst-import vcard-inline +am__include = include +am__leading_dot = . +am__quote = +am__tar = tar --format=ustar -chf - "$$tardir" +am__untar = tar -xf - +bindir = ${exec_prefix}/bin +bindir_in_server_file = ${exec_prefix}/bin +build = i686-pc-linux-gnu +build_alias = +build_cpu = i686 +build_os = linux-gnu +build_vendor = pc +builddir = . +componentdir = ${libdir}/evolution/2.28/components +componentdir_in_server_file = ${libdir}/evolution/2.28/components +datadir = ${datarootdir} +datarootdir = ${prefix}/share +docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +dvidir = ${docdir} +etspecdir = ${datadir}/evolution/2.28/etspec +evolutionhelpdir = ${datadir}/evolution/2.28/help +evolutionuidir = ${datadir}/evolution/2.28/ui +exec_prefix = ${prefix} +gladedir = ${datadir}/evolution/2.28/glade +host = i686-pc-linux-gnu +host_alias = +host_cpu = i686 +host_os = linux-gnu +host_vendor = pc +htmldir = ${docdir} +idldir = ${datadir}/idl/evolution-2.28 +images16dir = ${datadir}/evolution/2.28/images/16x16 +images48dir = ${datadir}/evolution/2.28/images/48x48 +imagesdir = ${datadir}/evolution/2.28/images +includedir = ${prefix}/include +infodir = ${datarootdir}/info +install_sh = $(SHELL) /home/mbarnes/git/gnome/evolution/install-sh +libdir = ${exec_prefix}/lib +libexecdir = ${exec_prefix}/libexec +localedir = $(prefix)/$(DATADIRNAME)/locale +localstatedir = ${prefix}/var +lt_ECHO = echo +mandir = ${datarootdir}/man +mkdir_p = /bin/mkdir -p +oldincludedir = /usr/include +pdfdir = ${docdir} +plugindir = ${libdir}/evolution/2.28/plugins +plugins_enabled = calendar-file calendar-http calendar-weather itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup mail-account-disable publish-calendar caldav imap-features google-account-setup webdav-account-setup sa-junk-plugin bogo-junk-plugin exchange-operations bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates vcard-inline +prefix = /home/mbarnes/local +privconduitdir = ${libdir}/evolution/2.28/conduits +privdatadir = ${datadir}/evolution/2.28 +privincludedir = ${includedir}/evolution-2.28 +privlibdir = ${libdir}/evolution/2.28 +privlibexecdir = ${libexecdir}/evolution/2.28 +privlibexecdir_in_server_file = ${libexecdir}/evolution/2.28 +privsolibdir = ${libdir}/evolution/2.28 +program_transform_name = s,x,x, +psdir = ${docdir} +pythonpath = +sbindir = ${exec_prefix}/sbin +serverdir = ${exec_prefix}/lib/bonobo/servers +sharedstatedir = ${prefix}/com +soundsdir = ${datadir}/evolution/2.28/sounds +srcdir = . +sysconfdir = ${prefix}/etc +target_alias = +top_build_prefix = ../../ +top_builddir = ../.. +top_srcdir = ../.. +viewsdir = ${datadir}/evolution/2.28/views +INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ + $(EVOLUTION_MAIL_CFLAGS) + +plugin_DATA = org-gnome-vcard-inline.eplug +plugin_LTLIBRARIES = liborg-gnome-vcard-inline.la +liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c +liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_vcard_inline_la_LIBADD = \ + $(EVOLUTION_ADDRESSBOOK_LIBS) + +EXTRA_DIST = org-gnome-vcard-inline.eplug.xml +BUILT_SOURCES = $(plugin_DATA) +CLEANFILES = $(BUILT_SOURCES) +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/vcard-inline/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/vcard-inline/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + else :; fi; \ + done + +uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + done + +clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +liborg-gnome-vcard-inline.la: $(liborg_gnome_vcard_inline_la_OBJECTS) $(liborg_gnome_vcard_inline_la_DEPENDENCIES) + $(liborg_gnome_vcard_inline_la_LINK) -rpath $(plugindir) $(liborg_gnome_vcard_inline_la_OBJECTS) $(liborg_gnome_vcard_inline_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +include ./$(DEPDIR)/vcard-inline.Plo + +.c.o: + $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +# source='$<' object='$@' libtool=no \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(COMPILE) -c $< + +.c.obj: + $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` + mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +# source='$<' object='$@' libtool=no \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: + $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< + mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +# source='$<' object='$@' libtool=yes \ +# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ +# $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) + test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + done + +uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ + rm -f "$(DESTDIR)$(plugindir)/$$f"; \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +all-am: Makefile $(LTLIBRARIES) $(DATA) +installdirs: + for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-pluginDATA install-pluginLTLIBRARIES + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pluginLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginDATA \ + install-pluginLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +%.eplug: %.eplug.in + sed -e 's|\@PLUGINDIR\@|$(plugindir)|' \ + -e 's|\@SOEXT\@|$(SOEXT)|' \ + -e 's|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|' \ + -e 's|\@LOCALEDIR\@|$(localedir)|' $< > $@ + +%.eplug.in: %.eplug.xml + LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@ + +%.error: %.error.xml + LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@ + $(EVOLUTION_MAIL_LIBS) +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am new file mode 100644 index 0000000000..781eb53bd4 --- /dev/null +++ b/plugins/vcard-inline/Makefile.am @@ -0,0 +1,20 @@ +INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ + $(EVOLUTION_MAIL_CFLAGS) + +@EVO_PLUGIN_RULE@ + +plugin_DATA = org-gnome-vcard-inline.eplug +plugin_LTLIBRARIES = liborg-gnome-vcard-inline.la + +liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c +liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_vcard_inline_la_LIBADD = \ + $(EVOLUTION_ADDRESSBOOK_LIBS) + $(EVOLUTION_MAIL_LIBS) + +EXTRA_DIST = org-gnome-vcard-inline.eplug.xml + +BUILT_SOURCES = $(plugin_DATA) +CLEANFILES = $(BUILT_SOURCES) diff --git a/plugins/vcard-inline/Makefile.in b/plugins/vcard-inline/Makefile.in new file mode 100644 index 0000000000..a1f373a63f --- /dev/null +++ b/plugins/vcard-inline/Makefile.in @@ -0,0 +1,709 @@ +# Makefile.in generated by automake 1.10.2 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = plugins/vcard-inline +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" +pluginLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(plugin_LTLIBRARIES) +am__DEPENDENCIES_1 = +liborg_gnome_vcard_inline_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +am_liborg_gnome_vcard_inline_la_OBJECTS = vcard-inline.lo +liborg_gnome_vcard_inline_la_OBJECTS = \ + $(am_liborg_gnome_vcard_inline_la_OBJECTS) +liborg_gnome_vcard_inline_la_LINK = $(LIBTOOL) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(liborg_gnome_vcard_inline_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = $(liborg_gnome_vcard_inline_la_SOURCES) +DIST_SOURCES = $(liborg_gnome_vcard_inline_la_SOURCES) +pluginDATA_INSTALL = $(INSTALL_DATA) +DATA = $(plugin_DATA) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +A11Y_CFLAGS = @A11Y_CFLAGS@ +A11Y_LIBS = @A11Y_LIBS@ +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AR = @AR@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BASE_VERSION = @BASE_VERSION@ +BONOBOUI_REQUIRED = @BONOBOUI_REQUIRED@ +CAMEL_CFLAGS = @CAMEL_CFLAGS@ +CAMEL_EXCHANGE_CFLAGS = @CAMEL_EXCHANGE_CFLAGS@ +CAMEL_EXCHANGE_LIBS = @CAMEL_EXCHANGE_LIBS@ +CAMEL_GROUPWISE_CFLAGS = @CAMEL_GROUPWISE_CFLAGS@ +CAMEL_GROUPWISE_LIBS = @CAMEL_GROUPWISE_LIBS@ +CAMEL_LIBS = @CAMEL_LIBS@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CERT_UI_CFLAGS = @CERT_UI_CFLAGS@ +CERT_UI_LIBS = @CERT_UI_LIBS@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ +DATASERVER_IDL = @DATASERVER_IDL@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +DLLTOOL = @DLLTOOL@ +DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DOLT_BASH = @DOLT_BASH@ +DSYMUTIL = @DSYMUTIL@ +DTAPPINTEGRATE = @DTAPPINTEGRATE@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ +EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ +EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ +EVOLUTION_ADDRESSBOOK_LIBS = @EVOLUTION_ADDRESSBOOK_LIBS@ +EVOLUTION_CALENDAR_CFLAGS = @EVOLUTION_CALENDAR_CFLAGS@ +EVOLUTION_CALENDAR_CONDUIT_CFLAGS = @EVOLUTION_CALENDAR_CONDUIT_CFLAGS@ +EVOLUTION_CALENDAR_CONDUIT_LIBS = @EVOLUTION_CALENDAR_CONDUIT_LIBS@ +EVOLUTION_CALENDAR_LIBS = @EVOLUTION_CALENDAR_LIBS@ +EVOLUTION_DATA_SERVER_CFLAGS = @EVOLUTION_DATA_SERVER_CFLAGS@ +EVOLUTION_DATA_SERVER_LIBS = @EVOLUTION_DATA_SERVER_LIBS@ +EVOLUTION_DIR = @EVOLUTION_DIR@ +EVOLUTION_MAIL_CFLAGS = @EVOLUTION_MAIL_CFLAGS@ +EVOLUTION_MAIL_LIBS = @EVOLUTION_MAIL_LIBS@ +EVOLUTION_TEST_CFLAGS = @EVOLUTION_TEST_CFLAGS@ +EVOLUTION_TEST_LIBS = @EVOLUTION_TEST_LIBS@ +EXEEXT = @EXEEXT@ +E_NAME_CFLAGS = @E_NAME_CFLAGS@ +E_NAME_LIBS = @E_NAME_LIBS@ +E_UTIL_CFLAGS = @E_UTIL_CFLAGS@ +E_UTIL_LIBS = @E_UTIL_LIBS@ +E_WIDGETS_CFLAGS = @E_WIDGETS_CFLAGS@ +E_WIDGETS_LIBS = @E_WIDGETS_LIBS@ +FGREP = @FGREP@ +FOUND_DBUS_VERSION = @FOUND_DBUS_VERSION@ +GCONFTOOL = @GCONFTOOL@ +GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ +GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIT_CFLAGS = @GIT_CFLAGS@ +GIT_LIBS = @GIT_LIBS@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GNOME_PILOT_CFLAGS = @GNOME_PILOT_CFLAGS@ +GNOME_PILOT_LIBS = @GNOME_PILOT_LIBS@ +GNOME_PLATFORM_CFLAGS = @GNOME_PLATFORM_CFLAGS@ +GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LIBS@ +GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ +GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ +GSTREAMER_LIBS = @GSTREAMER_LIBS@ +GTKHTML_CFLAGS = @GTKHTML_CFLAGS@ +GTKHTML_DATADIR = @GTKHTML_DATADIR@ +GTKHTML_LIBS = @GTKHTML_LIBS@ +HAL_CFLAGS = @HAL_CFLAGS@ +HAL_LIBS = @HAL_LIBS@ +HAVE_DBUS = @HAVE_DBUS@ +HAVE_JW = @HAVE_JW@ +HELP_DIR = @HELP_DIR@ +ICONV_CFLAGS = @ICONV_CFLAGS@ +ICONV_LIBS = @ICONV_LIBS@ +IDL_INCLUDES = @IDL_INCLUDES@ +IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ +IMPORTERS_LIBS = @IMPORTERS_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTERFACE_VERSION = @INTERFACE_VERSION@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +JW = @JW@ +KDE_APPLNK_DIR = @KDE_APPLNK_DIR@ +KILL_PROCESS_CMD = @KILL_PROCESS_CMD@ +KRB4_CFLAGS = @KRB4_CFLAGS@ +KRB4_LIBS = @KRB4_LIBS@ +KRB5_CFLAGS = @KRB5_CFLAGS@ +KRB5_LIBS = @KRB5_LIBS@ +LD = @LD@ +LDAP_CFLAGS = @LDAP_CFLAGS@ +LDAP_LIBS = @LDAP_LIBS@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBEXCHANGESTORAGE_CFLAGS = @LIBEXCHANGESTORAGE_CFLAGS@ +LIBEXCHANGESTORAGE_LIBS = @LIBEXCHANGESTORAGE_LIBS@ +LIBFILTER_CFLAGS = @LIBFILTER_CFLAGS@ +LIBFILTER_LIBS = @LIBFILTER_LIBS@ +LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ +LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ +LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ +LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBPST_CFLAGS = @LIBPST_CFLAGS@ +LIBPST_LIBS = @LIBPST_LIBS@ +LIBS = @LIBS@ +LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ +LIBSOUP_LIBS = @LIBSOUP_LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTCOMPILE = @LTCOMPILE@ +LTCXXCOMPILE = @LTCXXCOMPILE@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ +MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ +MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ +MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MONO_CFLAGS = @MONO_CFLAGS@ +MONO_LIBS = @MONO_LIBS@ +MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ +MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +NMN_CFLAGS = @NMN_CFLAGS@ +NMN_LIBS = @NMN_LIBS@ +NM_CFLAGS = @NM_CFLAGS@ +NM_LIBS = @NM_LIBS@ +NO_UNDEFINED = @NO_UNDEFINED@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OMF_DIR = @OMF_DIR@ +ORBIT_CFLAGS = @ORBIT_CFLAGS@ +ORBIT_CONFIG = @ORBIT_CONFIG@ +ORBIT_IDL = @ORBIT_IDL@ +ORBIT_LIBS = @ORBIT_LIBS@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ +PILOT_LINK_MAJOR = @PILOT_LINK_MAJOR@ +PILOT_LINK_MICRO = @PILOT_LINK_MICRO@ +PILOT_LINK_MINOR = @PILOT_LINK_MINOR@ +PILOT_LINK_PATCH = @PILOT_LINK_PATCH@ +PILOT_LINK_VERSION = @PILOT_LINK_VERSION@ +PISOCK_CFLAGS = @PISOCK_CFLAGS@ +PISOCK_LIBS = @PISOCK_LIBS@ +PKG_CONFIG = @PKG_CONFIG@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +PTHREAD_LIB = @PTHREAD_LIB@ +PURIFY = @PURIFY@ +PY_INCLUDES = @PY_INCLUDES@ +PY_LIBS = @PY_LIBS@ +RANLIB = @RANLIB@ +REGEX_LIBS = @REGEX_LIBS@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SHELL_CFLAGS = @SHELL_CFLAGS@ +SHELL_LIBS = @SHELL_LIBS@ +SOEXT = @SOEXT@ +STRIP = @STRIP@ +THREADS_CFLAGS = @THREADS_CFLAGS@ +THREADS_LIBS = @THREADS_LIBS@ +TNEF_CFLAGS = @TNEF_CFLAGS@ +TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ +TZDIALOG_LIBS = @TZDIALOG_LIBS@ +UPGRADE_REVISION = @UPGRADE_REVISION@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WINDRES = @WINDRES@ +XGETTEXT = @XGETTEXT@ +XMKMF = @XMKMF@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +all_plugins_base = @all_plugins_base@ +all_plugins_experimental = @all_plugins_experimental@ +all_plugins_standard = @all_plugins_standard@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +bindir_in_server_file = @bindir_in_server_file@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +componentdir = @componentdir@ +componentdir_in_server_file = @componentdir_in_server_file@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +etspecdir = @etspecdir@ +evolutionhelpdir = @evolutionhelpdir@ +evolutionuidir = @evolutionuidir@ +exec_prefix = @exec_prefix@ +gladedir = @gladedir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +idldir = @idldir@ +images16dir = @images16dir@ +images48dir = @images48dir@ +imagesdir = @imagesdir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +plugindir = @plugindir@ +plugins_enabled = @plugins_enabled@ +prefix = @prefix@ +privconduitdir = @privconduitdir@ +privdatadir = @privdatadir@ +privincludedir = @privincludedir@ +privlibdir = @privlibdir@ +privlibexecdir = @privlibexecdir@ +privlibexecdir_in_server_file = @privlibexecdir_in_server_file@ +privsolibdir = @privsolibdir@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pythonpath = @pythonpath@ +sbindir = @sbindir@ +serverdir = @serverdir@ +sharedstatedir = @sharedstatedir@ +soundsdir = @soundsdir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +viewsdir = @viewsdir@ +INCLUDES = \ + -I$(top_srcdir) \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ + $(EVOLUTION_MAIL_CFLAGS) + +plugin_DATA = org-gnome-vcard-inline.eplug +plugin_LTLIBRARIES = liborg-gnome-vcard-inline.la +liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c +liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_vcard_inline_la_LIBADD = \ + $(EVOLUTION_ADDRESSBOOK_LIBS) + +EXTRA_DIST = org-gnome-vcard-inline.eplug.xml +BUILT_SOURCES = $(plugin_DATA) +CLEANFILES = $(BUILT_SOURCES) +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/vcard-inline/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/vcard-inline/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + else :; fi; \ + done + +uninstall-pluginLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ + done + +clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +liborg-gnome-vcard-inline.la: $(liborg_gnome_vcard_inline_la_OBJECTS) $(liborg_gnome_vcard_inline_la_DEPENDENCIES) + $(liborg_gnome_vcard_inline_la_LINK) -rpath $(plugindir) $(liborg_gnome_vcard_inline_la_OBJECTS) $(liborg_gnome_vcard_inline_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcard-inline.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-pluginDATA: $(plugin_DATA) + @$(NORMAL_INSTALL) + test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" + @list='$(plugin_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ + $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ + done + +uninstall-pluginDATA: + @$(NORMAL_UNINSTALL) + @list='$(plugin_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ + rm -f "$(DESTDIR)$(plugindir)/$$f"; \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am +all-am: Makefile $(LTLIBRARIES) $(DATA) +installdirs: + for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-pluginDATA install-pluginLTLIBRARIES + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pluginLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pluginDATA \ + install-pluginLTLIBRARIES install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-pluginDATA uninstall-pluginLTLIBRARIES + + +@EVO_PLUGIN_RULE@ + $(EVOLUTION_MAIL_LIBS) +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/plugins/vcard-inline/liborg-gnome-vcard-inline.la b/plugins/vcard-inline/liborg-gnome-vcard-inline.la new file mode 100644 index 0000000000..3af19da824 --- /dev/null +++ b/plugins/vcard-inline/liborg-gnome-vcard-inline.la @@ -0,0 +1,41 @@ +# liborg-gnome-vcard-inline.la - a libtool library file +# Generated by ltmain.sh (GNU libtool) 2.2.6 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='liborg-gnome-vcard-inline.so' + +# Names of this library. +library_names='liborg-gnome-vcard-inline.so liborg-gnome-vcard-inline.so liborg-gnome-vcard-inline.so' + +# The name of the static archive. +old_library='' + +# Linker flags that can not go in dependency_libs. +inherited_linker_flags=' -pthread' + +# Libraries that this one depends upon. +dependency_libs=' -L/home/mbarnes/local/lib /home/mbarnes/local/lib/libedataserverui-1.2.la -L/usr/lib -L/usr/kerberos/lib -lgnome-keyring /home/mbarnes/local/lib/libebook-1.2.la /home/mbarnes/local/lib/libcamel-1.2.la -lssl3 -lsmime3 -lnss3 -lnssutil3 -lkrb5 -lk5crypto -lcom_err -lgssapi_krb5 /home/mbarnes/local/lib/libedataserver-1.2.la -lplds4 -lplc4 -lnspr4 -lsasl2 -lssl -lcrypto -lz -lsqlite3 -lsoup-2.4 /home/mbarnes/local/lib/libgtkhtml-editor.la /home/mbarnes/local/lib/libgtkhtml-3.14.la /home/mbarnes/local/lib/libgailutil.la -lXext -lXrender -lXinerama -lXrandr -lXcursor -lX11 -lXcomposite -lXdamage -lXfixes -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 /home/mbarnes/local/lib/libgthread-2.0.la -lpthread -lrt /home/mbarnes/local/lib/libgtk-x11-2.0.la -lxml2 /home/mbarnes/local/lib/libgdk-x11-2.0.la -latk-1.0 -lpangoft2-1.0 /home/mbarnes/local/lib/libgdk_pixbuf-2.0.la /home/mbarnes/local/lib/libgio-2.0.la -lselinux -lm -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig /home/mbarnes/local/lib/libgobject-2.0.la /home/mbarnes/local/lib/libgmodule-2.0.la -ldl /home/mbarnes/local/lib/libglib-2.0.la' + +# Names of additional weak libraries provided by this library +weak_library_names='' + +# Version information for liborg-gnome-vcard-inline. +current=0 +age=0 +revision=0 + +# Is this an already installed library? +installed=no + +# Should we warn about portability when linking against -modules? +shouldnotlink=yes + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='/home/mbarnes/local/lib/evolution/2.28/plugins' diff --git a/plugins/vcard-inline/org-gnome-vcard-inline.eplug b/plugins/vcard-inline/org-gnome-vcard-inline.eplug new file mode 100644 index 0000000000..6221f9bcfc --- /dev/null +++ b/plugins/vcard-inline/org-gnome-vcard-inline.eplug @@ -0,0 +1,16 @@ + + + + + + Show vCards directly in mail messages. + + + + + + + + + + \ No newline at end of file diff --git a/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml b/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml new file mode 100644 index 0000000000..c54587d369 --- /dev/null +++ b/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml @@ -0,0 +1,28 @@ + + + + + + <_description> + Show vCards directly in mail messages. + + + + + + + + + + + diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c new file mode 100644 index 0000000000..68c9813da5 --- /dev/null +++ b/plugins/vcard-inline/vcard-inline.c @@ -0,0 +1,284 @@ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "addressbook/gui/component/addressbook.h" +#include "addressbook/gui/merging/eab-contact-merging.h" +#include "addressbook/gui/widgets/eab-contact-display.h" +#include "addressbook/util/eab-book-util.h" +#include "mail/em-format-hook.h" +#include "mail/em-format-html.h" + +#define d(x) + +typedef struct _VCardInlinePObject VCardInlinePObject; + +struct _VCardInlinePObject { + EMFormatHTMLPObject object; + + GList *contact_list; + GtkWidget *contact_display; + GtkWidget *message_label; + EABContactDisplayRenderMode mode; +}; + +static gint org_gnome_vcard_inline_classid; + +/* Forward Declarations */ +void org_gnome_vcard_inline_format (void *ep, EMFormatHookTarget *target); + +static void +org_gnome_vcard_inline_pobject_free (EMFormatHTMLPObject *object) +{ + VCardInlinePObject *vcard_object; + + vcard_object = (VCardInlinePObject *) object; + + g_list_foreach ( + vcard_object->contact_list, + (GFunc) g_object_unref, NULL); + g_list_free (vcard_object->contact_list); + vcard_object->contact_list = NULL; + + if (vcard_object->contact_display != NULL) { + g_object_unref (vcard_object->contact_display); + vcard_object->contact_display = NULL; + } + + if (vcard_object->message_label != NULL) { + g_object_unref (vcard_object->message_label); + vcard_object->message_label = NULL; + } +} + +static void +org_gnome_vcard_inline_decode (VCardInlinePObject *vcard_object, + CamelMimePart *mime_part) +{ + CamelDataWrapper *data_wrapper; + CamelMedium *medium; + CamelStream *stream; + GList *contact_list; + GByteArray *array; + const gchar *string; + + array = g_byte_array_new (); + medium = CAMEL_MEDIUM (mime_part); + + /* Stream takes ownership of the byte array. */ + stream = camel_stream_mem_new_with_byte_array (array); + data_wrapper = camel_medium_get_content_object (medium); + camel_data_wrapper_decode_to_stream (data_wrapper, stream); + + string = (gchar *) array->data; + contact_list = eab_contact_list_from_string (string); + vcard_object->contact_list = contact_list; + + camel_object_unref (data_wrapper); + camel_object_unref (stream); +} + +static void +org_gnome_vcard_inline_book_open_cb (EBook *book, + EBookStatus status, + gpointer user_data) +{ + GList *contact_list = user_data; + GList *iter; + + if (status != E_BOOK_ERROR_OK) + goto exit; + + for (iter = contact_list; iter != NULL; iter = iter->next) + eab_merging_book_add_contact ( + book, E_CONTACT (iter->data), NULL, NULL); + +exit: + if (book != NULL) + g_object_unref (book); + + g_list_foreach (contact_list, (GFunc) g_object_unref, NULL); + g_list_free (contact_list); +} + +static void +org_gnome_vcard_inline_save_cb (VCardInlinePObject *vcard_object) +{ + GList *contact_list; + + contact_list = g_list_copy (vcard_object->contact_list); + g_list_foreach (contact_list, (GFunc) g_object_ref, NULL); + + addressbook_load_default_book ( + org_gnome_vcard_inline_book_open_cb, contact_list); +} + +static void +org_gnome_vcard_inline_toggle_cb (VCardInlinePObject *vcard_object, + GtkButton *button) +{ + EABContactDisplay *contact_display; + const gchar *label; + + contact_display = EAB_CONTACT_DISPLAY (vcard_object->contact_display); + + /* Toggle between "full" and "compact" modes. */ + if (vcard_object->mode == EAB_CONTACT_DISPLAY_RENDER_NORMAL) { + vcard_object->mode = EAB_CONTACT_DISPLAY_RENDER_COMPACT; + label = _("Show Full vCard"); + } else { + vcard_object->mode = EAB_CONTACT_DISPLAY_RENDER_NORMAL; + label = _("Show Compact vCard"); + } + + gtk_button_set_label (button, label); + + eab_contact_display_render ( + EAB_CONTACT_DISPLAY (vcard_object->contact_display), + E_CONTACT (vcard_object->contact_list->data), + vcard_object->mode); +} + +static gboolean +org_gnome_vcard_inline_embed (EMFormatHTML *format, + GtkHTMLEmbedded *embedded, + EMFormatHTMLPObject *object) +{ + VCardInlinePObject *vcard_object; + GtkWidget *button_box; + GtkWidget *container; + GtkWidget *widget; + EContact *contact; + guint length; + + vcard_object = (VCardInlinePObject *) object; + length = g_list_length (vcard_object->contact_list); + + if (vcard_object->contact_list != NULL) + contact = E_CONTACT (vcard_object->contact_list->data); + else + contact = NULL; + + container = GTK_WIDGET (embedded); + + widget = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (container), widget); + gtk_widget_show (widget); + + container = widget; + + widget = gtk_hbutton_box_new (); + gtk_button_box_set_layout ( + GTK_BUTTON_BOX (widget), GTK_BUTTONBOX_START); + gtk_box_set_spacing (GTK_BOX (widget), 12); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0); + gtk_widget_show (widget); + + button_box = widget; + + widget = eab_contact_display_new (); + gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); + vcard_object->contact_display = g_object_ref (widget); + gtk_widget_show (widget); + + widget = gtk_label_new (NULL); + gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); + vcard_object->message_label = g_object_ref (widget); + + if (length == 2) { + const gchar *text; + + text = _("There is one other contact."); + gtk_label_set_text (GTK_LABEL (widget), text); + gtk_widget_show (widget); + + } else if (length > 2) { + gchar *text; + + text = g_strdup_printf ( + _("There are %d other contacts."), length - 1); + gtk_label_set_text (GTK_LABEL (widget), text); + gtk_widget_show (widget); + g_free (text); + + } else + gtk_widget_hide (widget); + + container = button_box; + + widget = gtk_button_new_with_label (_("Show Full vCard")); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); + gtk_widget_show (widget); + + g_signal_connect_swapped ( + widget, "clicked", + G_CALLBACK (org_gnome_vcard_inline_toggle_cb), + vcard_object); + + widget = gtk_button_new_with_label (_("Save in Address Book")); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); + gtk_widget_show (widget); + + g_signal_connect_swapped ( + widget, "clicked", + G_CALLBACK (org_gnome_vcard_inline_save_cb), + vcard_object); + + return TRUE; +} + +void +org_gnome_vcard_inline_format (void *ep, EMFormatHookTarget *target) +{ + VCardInlinePObject *vcard_object; + gchar *classid; + + classid = g_strdup_printf ( + "org-gnome-vcard-inline-display-%d", + org_gnome_vcard_inline_classid++); + + vcard_object = (VCardInlinePObject *) + em_format_html_add_pobject ( + EM_FORMAT_HTML (target->format), + sizeof (VCardInlinePObject), + classid, target->part, + org_gnome_vcard_inline_embed); + + camel_object_ref (target->part); + + vcard_object->mode = EAB_CONTACT_DISPLAY_RENDER_COMPACT; + vcard_object->object.free = org_gnome_vcard_inline_pobject_free; + org_gnome_vcard_inline_decode (vcard_object, target->part); + + camel_stream_printf ( + target->stream, "", classid); + + g_free (classid); +} diff --git a/plugins/vcard-inline/vcard-inline.lo b/plugins/vcard-inline/vcard-inline.lo new file mode 100644 index 0000000000..adb1c83857 --- /dev/null +++ b/plugins/vcard-inline/vcard-inline.lo @@ -0,0 +1,4 @@ +# vcard-inline.lo - a libtool object file +# Generated by doltcompile, not libtool +pic_object='.libs/vcard-inline.o' +non_pic_object=none -- cgit v1.2.3 From 1ce0ee997b7fe65d2146d474d70233f0c1775539 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 6 May 2009 08:10:40 -0400 Subject: Make vcard-inline actually work. --- .../.libs/liborg-gnome-vcard-inline.la | 1 - .../.libs/liborg-gnome-vcard-inline.lai | 41 --------------------- .../.libs/liborg-gnome-vcard-inline.so | Bin 50526 -> 0 bytes plugins/vcard-inline/.libs/vcard-inline.o | Bin 55316 -> 0 bytes plugins/vcard-inline/org-gnome-vcard-inline.eplug | 4 +- .../vcard-inline/org-gnome-vcard-inline.eplug.xml | 4 +- plugins/vcard-inline/vcard-inline.c | 12 +++--- 7 files changed, 10 insertions(+), 52 deletions(-) delete mode 120000 plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.la delete mode 100644 plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.lai delete mode 100755 plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.so delete mode 100644 plugins/vcard-inline/.libs/vcard-inline.o diff --git a/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.la b/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.la deleted file mode 120000 index 4ffc357ca7..0000000000 --- a/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.la +++ /dev/null @@ -1 +0,0 @@ -../liborg-gnome-vcard-inline.la \ No newline at end of file diff --git a/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.lai b/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.lai deleted file mode 100644 index 21c94c82d7..0000000000 --- a/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.lai +++ /dev/null @@ -1,41 +0,0 @@ -# liborg-gnome-vcard-inline.la - a libtool library file -# Generated by ltmain.sh (GNU libtool) 2.2.6 -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='liborg-gnome-vcard-inline.so' - -# Names of this library. -library_names='liborg-gnome-vcard-inline.so liborg-gnome-vcard-inline.so liborg-gnome-vcard-inline.so' - -# The name of the static archive. -old_library='' - -# Linker flags that can not go in dependency_libs. -inherited_linker_flags=' -pthread' - -# Libraries that this one depends upon. -dependency_libs=' -L/home/mbarnes/local/lib /home/mbarnes/local/lib/libedataserverui-1.2.la -L/usr/lib -L/usr/kerberos/lib -lgnome-keyring /home/mbarnes/local/lib/libebook-1.2.la /home/mbarnes/local/lib/libcamel-1.2.la -lssl3 -lsmime3 -lnss3 -lnssutil3 -lkrb5 -lk5crypto -lcom_err -lgssapi_krb5 /home/mbarnes/local/lib/libedataserver-1.2.la -lplds4 -lplc4 -lnspr4 -lsasl2 -lssl -lcrypto -lz -lsqlite3 -lsoup-2.4 /home/mbarnes/local/lib/libgtkhtml-editor.la /home/mbarnes/local/lib/libgtkhtml-3.14.la /home/mbarnes/local/lib/libgailutil.la -lXext -lXrender -lXinerama -lXrandr -lXcursor -lX11 -lXcomposite -lXdamage -lXfixes -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 /home/mbarnes/local/lib/libgthread-2.0.la -lpthread -lrt /home/mbarnes/local/lib/libgtk-x11-2.0.la -lxml2 /home/mbarnes/local/lib/libgdk-x11-2.0.la -latk-1.0 -lpangoft2-1.0 /home/mbarnes/local/lib/libgdk_pixbuf-2.0.la /home/mbarnes/local/lib/libgio-2.0.la -lselinux -lm -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig /home/mbarnes/local/lib/libgobject-2.0.la /home/mbarnes/local/lib/libgmodule-2.0.la -ldl /home/mbarnes/local/lib/libglib-2.0.la' - -# Names of additional weak libraries provided by this library -weak_library_names='' - -# Version information for liborg-gnome-vcard-inline. -current=0 -age=0 -revision=0 - -# Is this an already installed library? -installed=yes - -# Should we warn about portability when linking against -modules? -shouldnotlink=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/home/mbarnes/local/lib/evolution/2.28/plugins' diff --git a/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.so b/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.so deleted file mode 100755 index a7ab796fe3..0000000000 Binary files a/plugins/vcard-inline/.libs/liborg-gnome-vcard-inline.so and /dev/null differ diff --git a/plugins/vcard-inline/.libs/vcard-inline.o b/plugins/vcard-inline/.libs/vcard-inline.o deleted file mode 100644 index a75afa9adc..0000000000 Binary files a/plugins/vcard-inline/.libs/vcard-inline.o and /dev/null differ diff --git a/plugins/vcard-inline/org-gnome-vcard-inline.eplug b/plugins/vcard-inline/org-gnome-vcard-inline.eplug index 6221f9bcfc..bdfdb732d1 100644 --- a/plugins/vcard-inline/org-gnome-vcard-inline.eplug +++ b/plugins/vcard-inline/org-gnome-vcard-inline.eplug @@ -7,8 +7,8 @@ - - + + diff --git a/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml b/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml index c54587d369..f9b2c1693e 100644 --- a/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml +++ b/plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml @@ -14,11 +14,11 @@ diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c index 68c9813da5..2d6a93a91d 100644 --- a/plugins/vcard-inline/vcard-inline.c +++ b/plugins/vcard-inline/vcard-inline.c @@ -175,16 +175,11 @@ org_gnome_vcard_inline_embed (EMFormatHTML *format, GtkWidget *button_box; GtkWidget *container; GtkWidget *widget; - EContact *contact; guint length; vcard_object = (VCardInlinePObject *) object; length = g_list_length (vcard_object->contact_list); - - if (vcard_object->contact_list != NULL) - contact = E_CONTACT (vcard_object->contact_list->data); - else - contact = NULL; + g_return_val_if_fail (length > 0, FALSE); container = GTK_WIDGET (embedded); @@ -208,6 +203,11 @@ org_gnome_vcard_inline_embed (EMFormatHTML *format, vcard_object->contact_display = g_object_ref (widget); gtk_widget_show (widget); + eab_contact_display_render ( + EAB_CONTACT_DISPLAY (vcard_object->contact_display), + E_CONTACT (vcard_object->contact_list->data), + vcard_object->mode); + widget = gtk_label_new (NULL); gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); vcard_object->message_label = g_object_ref (widget); -- cgit v1.2.3 From 2d6579015159b36a1ac85ac44360a336f4379f37 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 6 May 2009 08:43:29 -0400 Subject: Remove auto-generated files from git. --- plugins/vcard-inline/Makefile | 719 --------------------------------------- plugins/vcard-inline/Makefile.in | 709 -------------------------------------- 2 files changed, 1428 deletions(-) delete mode 100644 plugins/vcard-inline/Makefile delete mode 100644 plugins/vcard-inline/Makefile.in diff --git a/plugins/vcard-inline/Makefile b/plugins/vcard-inline/Makefile deleted file mode 100644 index bb9369d04c..0000000000 --- a/plugins/vcard-inline/Makefile +++ /dev/null @@ -1,719 +0,0 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. -# plugins/vcard-inline/Makefile. Generated from Makefile.in by configure. - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - - - - -pkgdatadir = $(datadir)/evolution -pkglibdir = $(libdir)/evolution -pkgincludedir = $(includedir)/evolution -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = i686-pc-linux-gnu -host_triplet = i686-pc-linux-gnu -subdir = plugins/vcard-inline -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" -pluginLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(plugin_LTLIBRARIES) -am__DEPENDENCIES_1 = -liborg_gnome_vcard_inline_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_liborg_gnome_vcard_inline_la_OBJECTS = vcard-inline.lo -liborg_gnome_vcard_inline_la_OBJECTS = \ - $(am_liborg_gnome_vcard_inline_la_OBJECTS) -liborg_gnome_vcard_inline_la_LINK = $(LIBTOOL) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(liborg_gnome_vcard_inline_la_LDFLAGS) \ - $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I. -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(liborg_gnome_vcard_inline_la_SOURCES) -DIST_SOURCES = $(liborg_gnome_vcard_inline_la_SOURCES) -pluginDATA_INSTALL = $(INSTALL_DATA) -DATA = $(plugin_DATA) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -A11Y_CFLAGS = -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/atk-1.0 -A11Y_LIBS = -L/home/mbarnes/local/lib -latk-1.0 -lgobject-2.0 -lglib-2.0 -ACLOCAL = ${SHELL} /home/mbarnes/git/gnome/evolution/missing --run aclocal-1.10 -ALL_LINGUAS = -AMTAR = ${SHELL} /home/mbarnes/git/gnome/evolution/missing --run tar -AR = ar -AS = as -AUTOCONF = ${SHELL} /home/mbarnes/git/gnome/evolution/missing --run autoconf -AUTOHEADER = ${SHELL} /home/mbarnes/git/gnome/evolution/missing --run autoheader -AUTOMAKE = ${SHELL} /home/mbarnes/git/gnome/evolution/missing --run automake-1.10 -AWK = gawk -BASE_VERSION = 2.28 -BONOBOUI_REQUIRED = 2.4.2 -CAMEL_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 $(WERROR) -CAMEL_EXCHANGE_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/evolution-data-server-2.28/exchange -I/usr/include/libbonoboui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libxml2 -I/usr/include/libbonobo-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/pango-1.0 -I/usr/include/libart-2.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libglade-2.0 -I/usr/include/libsoup-2.4 $(WERROR) -CAMEL_EXCHANGE_LIBS = -pthread -L/home/mbarnes/local/lib -lbonoboui-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lcamel-provider-1.2 -lcamel-1.2 -lsqlite3 -ledataserverui-1.2 -lglade-2.0 -lebook-1.2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lexchange-storage-1.2 -lecal-1.2 -lical -licalss -licalvcal -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 -CAMEL_GROUPWISE_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/evolution-data-server-2.28/groupwise -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 $(WERROR) -CAMEL_GROUPWISE_LIBS = -pthread -L/home/mbarnes/local/lib -lcamel-provider-1.2 -lcamel-1.2 -lsqlite3 -ledataserver-1.2 -lxml2 -lgconf-2 -lbonobo-2 -lbonobo-activation -lORBit-2 -lgthread-2.0 -lrt -legroupwise-1.2 -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -CAMEL_LIBS = -pthread -L/home/mbarnes/local/lib -lcamel-provider-1.2 -lcamel-1.2 -ledataserver-1.2 -lsqlite3 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 -CATALOGS = -CATOBJEXT = .gmo -CC = gcc -CCDEPMODE = depmode=gcc3 -CERT_UI_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/libglade-2.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 $(WERROR) -I/usr/include/nss3 -I/usr/include/nspr4 $(WERROR) -CERT_UI_LIBS = -pthread -L/home/mbarnes/local/lib -ledataserverui-1.2 -lebook-1.2 -ledataserver-1.2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lbonobo-activation -lORBit-2 -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl -CFLAGS = -g -O0 -Wall -Wdeclaration-after-statement -Werror-implicit-function-declaration -Wformat -Wall -Wmissing-prototypes -Wno-sign-compare -CPP = gcc -E -CPPFLAGS = -CYGPATH_W = echo -DATADIRNAME = share -DATASERVER_EXEC_VERSION = 2.28 -DATASERVER_IDL = /home/mbarnes/local/share/idl/evolution-data-server-1.2/Evolution-DataServer.idl -DEFS = -DHAVE_CONFIG_H -DEPDIR = .deps -DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper -DLLTOOL = dlltool -DOC_USER_FORMATS = -DOLT_BASH = /bin/bash -DSYMUTIL = -DTAPPINTEGRATE = no -DUMPBIN = -ECHO_C = -ECHO_N = -n -ECHO_T = -EGREP = /bin/grep -E -EVOLUTION_ADDRESSBOOK_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/libgtkhtml-3.14/editor -I/usr/include/libbonoboui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libxml2 -I/usr/include/libbonobo-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/pango-1.0 -I/usr/include/libart-2.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libglade-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/enchant -I/usr/include/libsoup-2.4 $(WERROR) -EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/libgtkhtml-3.14/editor -I/usr/include/libgnome-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/libglade-2.0 -I/usr/include/enchant -I/usr/include/libsoup-2.4 $(WERROR) -EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -lgpilotd -lgpilotdcm -lgpilotdconduit -lpisock -lpisync -ledataserverui-1.2 -lebook-1.2 -lcamel-1.2 -ledataserver-1.2 -lsqlite3 -lsoup-2.4 -lgtkhtml-editor -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -EVOLUTION_ADDRESSBOOK_LIBS = -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -ledataserverui-1.2 -lebook-1.2 -lcamel-1.2 -ledataserver-1.2 -lsqlite3 -lsoup-2.4 -lgtkhtml-editor -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -EVOLUTION_CALENDAR_CFLAGS = -pthread -DORBIT2=1 -DDBUS_API_SUBJECT_TO_CHANGE -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/libgtkhtml-3.14/editor -I/home/mbarnes/local/include/evolution-data-server-2.28/google/libgdata -I/home/mbarnes/local/include/evolution-data-server-2.28/google/libgdata-google -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/libglade-2.0 -I/usr/include/enchant -I/usr/include/libsoup-2.4 -I/usr/include/hal $(WERROR) -EVOLUTION_CALENDAR_CONDUIT_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/usr/include/libgnome-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 $(WERROR) -pthread -DORBIT2=1 -DDBUS_API_SUBJECT_TO_CHANGE -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/libgtkhtml-3.14/editor -I/home/mbarnes/local/include/evolution-data-server-2.28/google/libgdata -I/home/mbarnes/local/include/evolution-data-server-2.28/google/libgdata-google -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/libglade-2.0 -I/usr/include/enchant -I/usr/include/libsoup-2.4 -I/usr/include/hal $(WERROR) -EVOLUTION_CALENDAR_CONDUIT_LIBS = -pthread -L/home/mbarnes/local/lib -lgpilotd -lgpilotdcm -lgpilotdconduit -lpisock -lpisync -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgconf-2 -lgthread-2.0 -lrt -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -L/lib -lecal-1.2 -lical -licalss -licalvcal -ledataserverui-1.2 -lebook-1.2 -ledataserver-1.2 -lebackend-1.2 -lhal -lnotify -ldbus-glib-1 -ldbus-1 -lgtkhtml-editor -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgdata-1.2 -lgdata-google-1.2 -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -EVOLUTION_CALENDAR_LIBS = -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -L/lib -lecal-1.2 -lical -licalss -licalvcal -ledataserverui-1.2 -lebook-1.2 -ledataserver-1.2 -lebackend-1.2 -lhal -lnotify -ldbus-glib-1 -ldbus-1 -lgtkhtml-editor -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgdata-1.2 -lgdata-google-1.2 -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -EVOLUTION_DATA_SERVER_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/evolution-data-server-2.28/groupwise -I/home/mbarnes/local/include/evolution-data-server-2.28/google/libgdata -I/home/mbarnes/local/include/evolution-data-server-2.28/google/libgdata-google -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libglade-2.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -EVOLUTION_DATA_SERVER_LIBS = -pthread -L/home/mbarnes/local/lib -lecal-1.2 -lical -licalss -licalvcal -ledataserverui-1.2 -lglade-2.0 -lebook-1.2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -ledataserver-1.2 -lxml2 -lgconf-2 -lbonobo-2 -lbonobo-activation -lORBit-2 -lgthread-2.0 -lrt -legroupwise-1.2 -lebackend-1.2 -lgdata-1.2 -lgdata-google-1.2 -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -EVOLUTION_DIR = /home/mbarnes/git/gnome/evolution -EVOLUTION_MAIL_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/home/mbarnes/local/include/libgtkhtml-3.14/editor -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/libglade-2.0 -I/usr/include/enchant -I/usr/include/nss3 -I/usr/include/nspr4 $(WERROR) -EVOLUTION_MAIL_LIBS = -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -lcamel-provider-1.2 -lcamel-1.2 -lsqlite3 -lgtkhtml-editor -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl -ledataserverui-1.2 -lglade-2.0 -lebook-1.2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 -EVOLUTION_TEST_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 $(WERROR) -EVOLUTION_TEST_LIBS = -pthread -L/home/mbarnes/local/lib -lgnomeui-2 -lSM -lICE -lgnomevfs-2 -lgconf-2 -lbonoboui-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lbonobo-2 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 -EXEEXT = -E_NAME_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 $(WERROR) -E_NAME_LIBS = -pthread -L/home/mbarnes/local/lib -lgnomeui-2 -lSM -lICE -lgnomevfs-2 -lgconf-2 -lbonoboui-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lbonobo-2 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 -E_UTIL_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/usr/include/libbonoboui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libxml2 -I/usr/include/libbonobo-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/pango-1.0 -I/usr/include/libart-2.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libglade-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libsoup-2.4 -I/usr/include/nspr4 $(WERROR) -E_UTIL_LIBS = -pthread -L/home/mbarnes/local/lib -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -ledataserverui-1.2 -lglade-2.0 -lebook-1.2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lcamel-1.2 -ledataserver-1.2 -lsqlite3 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 -lplds4 -lplc4 -lnspr4 -lpthread -ldl -lpthread -lX11 -E_WIDGETS_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/usr/include/libbonoboui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libxml2 -I/usr/include/libbonobo-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/pango-1.0 -I/usr/include/libart-2.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libglade-2.0 -I/usr/include/libsoup-2.4 $(WERROR) -E_WIDGETS_LIBS = -pthread -L/home/mbarnes/local/lib -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -ledataserverui-1.2 -lglade-2.0 -lebook-1.2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 -FGREP = /bin/grep -F -FOUND_DBUS_VERSION = 1200 -GCONFTOOL = /usr/bin/gconftool-2 -GCONF_SCHEMA_CONFIG_SOURCE = xml:merged:/etc/gconf/gconf.xml.defaults -GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas -GETTEXT_PACKAGE = evolution-2.28 -GIT_CFLAGS = -GIT_LIBS = -GLIB_CFLAGS = -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -GLIB_GENMARSHAL = glib-genmarshal -GLIB_LIBS = -L/home/mbarnes/local/lib -lglib-2.0 -GLIB_MKENUMS = glib-mkenums -GMOFILES = -GMSGFMT = /usr/bin/msgfmt -GNOME_PILOT_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/usr/include/libgnome-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -GNOME_PILOT_LIBS = -pthread -L/home/mbarnes/local/lib -lgpilotd -lgpilotdcm -lgpilotdconduit -lpisock -lpisync -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgconf-2 -lgthread-2.0 -lrt -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -GNOME_PLATFORM_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libxml2 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/libglade-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 -GNOME_PLATFORM_LIBS = -pthread -L/home/mbarnes/local/lib -lglade-2.0 -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgconf-2 -lgthread-2.0 -lrt -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -lxml2 -GOBJECT_QUERY = gobject-query -GREP = /bin/grep -GSTREAMER_CFLAGS = -pthread -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/gstreamer-0.10 -I/usr/include/libxml2 -GSTREAMER_LIBS = -pthread -L/home/mbarnes/local/lib -lgstreamer-0.10 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lxml2 -lglib-2.0 -GTKHTML_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/libglade-2.0 -I/usr/include/enchant -I/usr/include/gconf/2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/libart-2.0 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -GTKHTML_DATADIR = /home/mbarnes/local/share/gtkhtml-3.14 -GTKHTML_LIBS = -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -HAL_CFLAGS = -DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -HAL_LIBS = -L/lib -lhal -ldbus-1 -HAVE_DBUS = -HAVE_JW = yes -HELP_DIR = ${datadir}/gnome/help -ICONV_CFLAGS = -ICONV_LIBS = -IDL_INCLUDES = -I /usr/share/idl/bonobo-2.0 -I /usr/share/idl/bonobo-activation-2.0 -I /home/mbarnes/local/share/idl/evolution-data-server-1.2 -IMPORTERS_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/usr/include/libglade-2.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 $(WERROR) -IMPORTERS_LIBS = -pthread -L/home/mbarnes/local/lib -ledataserverui-1.2 -lcamel-provider-1.2 -lcamel-1.2 -lsqlite3 -lglade-2.0 -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lebook-1.2 -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 -INSTALL = /usr/bin/install -c -INSTALL_DATA = ${INSTALL} -m 644 -INSTALL_PROGRAM = ${INSTALL} -INSTALL_SCRIPT = ${INSTALL} -INSTALL_STRIP_PROGRAM = $(install_sh) -c -s -INSTOBJEXT = .mo -INTERFACE_VERSION = 2.28 -INTLLIBS = -INTLTOOL_EXTRACT = /usr/bin/intltool-extract -INTLTOOL_MERGE = /usr/bin/intltool-merge -INTLTOOL_PERL = /usr/bin/perl -INTLTOOL_UPDATE = /usr/bin/intltool-update -JW = /usr/bin/jw -KDE_APPLNK_DIR = -KILL_PROCESS_CMD = /usr/bin/killall -KRB4_CFLAGS = -KRB4_LIBS = -KRB5_CFLAGS = -KRB5_LIBS = -LD = /usr/bin/ld -LDAP_CFLAGS = -DLDAP_DEPRECATED -LDAP_LIBS = -lldap -llber -lresolv -lnsl -LDFLAGS = -Wl,--as-needed -LEX = flex -LEXLIB = -lfl -LEX_OUTPUT_ROOT = lex.yy -LIBEXCHANGESTORAGE_CFLAGS = -I/home/mbarnes/local/include/evolution-data-server-2.28/exchange -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 -LIBEXCHANGESTORAGE_LIBS = -L/home/mbarnes/local/lib -lexchange-storage-1.2 -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -LIBFILTER_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/libglade-2.0 -I/usr/include/libsoup-2.4 $(WERROR) -LIBFILTER_LIBS = -pthread -L/home/mbarnes/local/lib -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lart_lgpl_2 -lglade-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 -LIBGWEATHER_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/usr/include/libxml2 -I/usr/include/libsoup-2.4 -I/usr/include/gconf/2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -LIBGWEATHER_LIBS = -L/home/mbarnes/local/lib -lgweather -lgtk-x11-2.0 -lgconf-2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -LIBNOTIFY_CFLAGS = -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/lib/gtk-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -LIBNOTIFY_LIBS = -L/home/mbarnes/local/lib -L/lib -lnotify -lgtk-x11-2.0 -ldbus-glib-1 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgmodule-2.0 -ldbus-1 -lgobject-2.0 -lglib-2.0 -LIBOBJS = -LIBPST_CFLAGS = -LIBPST_LIBS = -LIBS = -LIBSOUP_CFLAGS = -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/libsoup-2.4 -I/usr/include/libxml2 $(WERROR) -LIBSOUP_LIBS = -L/home/mbarnes/local/lib -lsoup-2.4 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -LIBTOOL = $(top_builddir)/doltlibtool -LIPO = -LN_S = ln -s -LTCOMPILE = $(top_builddir)/doltcompile $(COMPILE) -LTCXXCOMPILE = $(top_builddir)/doltcompile $(CXXCOMPILE) -LTLIBOBJS = -MAINT = -MAKEINFO = ${SHELL} /home/mbarnes/git/gnome/evolution/missing --run makeinfo -MANUAL_NSPR_CFLAGS = -MANUAL_NSPR_LIBS = -MANUAL_NSS_CFLAGS = -MANUAL_NSS_LIBS = -MKDIR_P = /bin/mkdir -p -MKINSTALLDIRS = ./mkinstalldirs -MONO_CFLAGS = -MONO_LIBS = -MOZILLA_NSS_CFLAGS = -I/usr/include/nss3 -I/usr/include/nspr4 $(WERROR) -MOZILLA_NSS_LIBS = -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl -MSGFMT = /usr/bin/msgfmt -MSGFMT_OPTS = -c -MSGMERGE = /usr/bin/msgmerge -NM = /usr/bin/nm -B -NMEDIT = -NMN_CFLAGS = -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -NMN_LIBS = -L/home/mbarnes/local/lib -L/lib -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -NM_CFLAGS = -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -NM_LIBS = -L/home/mbarnes/local/lib -L/lib -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -NO_UNDEFINED = -OBJDUMP = objdump -OBJEXT = o -OMF_DIR = ${datadir}/omf -ORBIT_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/orbit-2.0 -ORBIT_CONFIG = /usr/bin/orbit2-config -ORBIT_IDL = /usr/bin/orbit-idl-2 -ORBIT_LIBS = -pthread -L/home/mbarnes/local/lib -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 -lm -OTOOL = -OTOOL64 = -PACKAGE = evolution -PACKAGE_BUGREPORT = http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution -PACKAGE_NAME = evolution -PACKAGE_STRING = evolution 2.27.2 -PACKAGE_TARNAME = evolution -PACKAGE_VERSION = 2.27.2 -PATH_SEPARATOR = : -PERL = /usr/bin/perl -PILOT_LINK_MAJOR = 0 -PILOT_LINK_MICRO = 3 -PILOT_LINK_MINOR = 12 -PILOT_LINK_PATCH = -PILOT_LINK_VERSION = 0.12.3 -PISOCK_CFLAGS = -PISOCK_LIBS = -lpisock -lpisync -PKG_CONFIG = /usr/bin/pkg-config -POFILES = -POSUB = po -PO_IN_DATADIR_FALSE = -PO_IN_DATADIR_TRUE = -PTHREAD_LIB = -lpthread -PURIFY = impure -PY_INCLUDES = -PY_LIBS = -RANLIB = ranlib -REGEX_LIBS = -SED = /bin/sed -SET_MAKE = -SHELL = /bin/sh -SHELL_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/libgtkhtml-3.14 -I/usr/include/libgnomeui-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-keyring-1 -I/usr/include/libgnome-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/libpng12 -I/usr/include/libglade-2.0 -I/usr/include/enchant $(WERROR) -SHELL_LIBS = -pthread -Wl,--export-dynamic -L/home/mbarnes/local/lib -L/lib -lgtkhtml-3.14 -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgmodule-2.0 -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -SOEXT = .so -STRIP = strip -THREADS_CFLAGS = -THREADS_LIBS = -lpthread -TNEF_CFLAGS = -DHAVE_LIBYTNEF_YTNEF_H -TZDIALOG_CFLAGS = -pthread -DORBIT2=1 -I/home/mbarnes/local/include/evolution-data-server-2.28 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include $(WERROR) -pthread -DORBIT2=1 -I/home/mbarnes/local/include/glib-2.0 -I/home/mbarnes/local/lib/glib-2.0/include -I/home/mbarnes/local/include/gtk-2.0 -I/home/mbarnes/local/lib/gtk-2.0/include -I/home/mbarnes/local/include/gail-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libbonobo-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libbonoboui-2.0 -I/usr/include/libxml2 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libart-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/libglade-2.0 -I/usr/include/libgnomeui-2.0 -I/usr/include/gnome-keyring-1 -TZDIALOG_LIBS = -pthread -L/home/mbarnes/local/lib -lecal-1.2 -lical -licalss -licalvcal -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 -pthread -L/home/mbarnes/local/lib -lglade-2.0 -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgconf-2 -lgthread-2.0 -lrt -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -lxml2 -UPGRADE_REVISION = 0 -USE_NLS = yes -VERSION = 2.27.2 -WARN_CFLAGS = -Wall -Wmissing-prototypes -WINDRES = : -XGETTEXT = /usr/bin/xgettext -XMKMF = -X_CFLAGS = -X_EXTRA_LIBS = -X_LIBS = -lX11 -X_PRE_LIBS = -YACC = bison -y -YFLAGS = -abs_builddir = /home/mbarnes/git/gnome/evolution/plugins/vcard-inline -abs_srcdir = /home/mbarnes/git/gnome/evolution/plugins/vcard-inline -abs_top_builddir = /home/mbarnes/git/gnome/evolution -abs_top_srcdir = /home/mbarnes/git/gnome/evolution -ac_ct_CC = gcc -ac_ct_DUMPBIN = -all_plugins_base = calendar-file calendar-http calendar-weather itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup mail-account-disable publish-calendar caldav imap-features google-account-setup webdav-account-setup sa-junk-plugin bogo-junk-plugin exchange-operations mono -all_plugins_experimental = folder-unsubscribe external-editor hula-account-setup ipod-sync tnef-attachments -all_plugins_standard = bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates pst-import vcard-inline -am__include = include -am__leading_dot = . -am__quote = -am__tar = tar --format=ustar -chf - "$$tardir" -am__untar = tar -xf - -bindir = ${exec_prefix}/bin -bindir_in_server_file = ${exec_prefix}/bin -build = i686-pc-linux-gnu -build_alias = -build_cpu = i686 -build_os = linux-gnu -build_vendor = pc -builddir = . -componentdir = ${libdir}/evolution/2.28/components -componentdir_in_server_file = ${libdir}/evolution/2.28/components -datadir = ${datarootdir} -datarootdir = ${prefix}/share -docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} -dvidir = ${docdir} -etspecdir = ${datadir}/evolution/2.28/etspec -evolutionhelpdir = ${datadir}/evolution/2.28/help -evolutionuidir = ${datadir}/evolution/2.28/ui -exec_prefix = ${prefix} -gladedir = ${datadir}/evolution/2.28/glade -host = i686-pc-linux-gnu -host_alias = -host_cpu = i686 -host_os = linux-gnu -host_vendor = pc -htmldir = ${docdir} -idldir = ${datadir}/idl/evolution-2.28 -images16dir = ${datadir}/evolution/2.28/images/16x16 -images48dir = ${datadir}/evolution/2.28/images/48x48 -imagesdir = ${datadir}/evolution/2.28/images -includedir = ${prefix}/include -infodir = ${datarootdir}/info -install_sh = $(SHELL) /home/mbarnes/git/gnome/evolution/install-sh -libdir = ${exec_prefix}/lib -libexecdir = ${exec_prefix}/libexec -localedir = $(prefix)/$(DATADIRNAME)/locale -localstatedir = ${prefix}/var -lt_ECHO = echo -mandir = ${datarootdir}/man -mkdir_p = /bin/mkdir -p -oldincludedir = /usr/include -pdfdir = ${docdir} -plugindir = ${libdir}/evolution/2.28/plugins -plugins_enabled = calendar-file calendar-http calendar-weather itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup mail-account-disable publish-calendar caldav imap-features google-account-setup webdav-account-setup sa-junk-plugin bogo-junk-plugin exchange-operations bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task audio-inline mailing-list-actions default-mailer prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates vcard-inline -prefix = /home/mbarnes/local -privconduitdir = ${libdir}/evolution/2.28/conduits -privdatadir = ${datadir}/evolution/2.28 -privincludedir = ${includedir}/evolution-2.28 -privlibdir = ${libdir}/evolution/2.28 -privlibexecdir = ${libexecdir}/evolution/2.28 -privlibexecdir_in_server_file = ${libexecdir}/evolution/2.28 -privsolibdir = ${libdir}/evolution/2.28 -program_transform_name = s,x,x, -psdir = ${docdir} -pythonpath = -sbindir = ${exec_prefix}/sbin -serverdir = ${exec_prefix}/lib/bonobo/servers -sharedstatedir = ${prefix}/com -soundsdir = ${datadir}/evolution/2.28/sounds -srcdir = . -sysconfdir = ${prefix}/etc -target_alias = -top_build_prefix = ../../ -top_builddir = ../.. -top_srcdir = ../.. -viewsdir = ${datadir}/evolution/2.28/views -INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) - -plugin_DATA = org-gnome-vcard-inline.eplug -plugin_LTLIBRARIES = liborg-gnome-vcard-inline.la -liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c -liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -liborg_gnome_vcard_inline_la_LIBADD = \ - $(EVOLUTION_ADDRESSBOOK_LIBS) - -EXTRA_DIST = org-gnome-vcard-inline.eplug.xml -BUILT_SOURCES = $(plugin_DATA) -CLEANFILES = $(BUILT_SOURCES) -all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/vcard-inline/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/vcard-inline/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ - done - -clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -liborg-gnome-vcard-inline.la: $(liborg_gnome_vcard_inline_la_OBJECTS) $(liborg_gnome_vcard_inline_la_DEPENDENCIES) - $(liborg_gnome_vcard_inline_la_LINK) -rpath $(plugindir) $(liborg_gnome_vcard_inline_la_OBJECTS) $(liborg_gnome_vcard_inline_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -include ./$(DEPDIR)/vcard-inline.Plo - -.c.o: - $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -# source='$<' object='$@' libtool=no \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(COMPILE) -c $< - -.c.obj: - $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` - mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -# source='$<' object='$@' libtool=no \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: - $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< - mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -# source='$<' object='$@' libtool=yes \ -# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \ -# $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - done - -uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ - rm -f "$(DESTDIR)$(plugindir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LTLIBRARIES) $(DATA) -installdirs: - for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -clean: clean-am - -clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-pluginDATA install-pluginLTLIBRARIES - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pluginLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pluginDATA \ - install-pluginLTLIBRARIES install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -%.eplug: %.eplug.in - sed -e 's|\@PLUGINDIR\@|$(plugindir)|' \ - -e 's|\@SOEXT\@|$(SOEXT)|' \ - -e 's|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|' \ - -e 's|\@LOCALEDIR\@|$(localedir)|' $< > $@ - -%.eplug.in: %.eplug.xml - LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@ - -%.error: %.error.xml - LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@ - $(EVOLUTION_MAIL_LIBS) -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/plugins/vcard-inline/Makefile.in b/plugins/vcard-inline/Makefile.in deleted file mode 100644 index a1f373a63f..0000000000 --- a/plugins/vcard-inline/Makefile.in +++ /dev/null @@ -1,709 +0,0 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = plugins/vcard-inline -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" -pluginLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(plugin_LTLIBRARIES) -am__DEPENDENCIES_1 = -liborg_gnome_vcard_inline_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_liborg_gnome_vcard_inline_la_OBJECTS = vcard-inline.lo -liborg_gnome_vcard_inline_la_OBJECTS = \ - $(am_liborg_gnome_vcard_inline_la_OBJECTS) -liborg_gnome_vcard_inline_la_LINK = $(LIBTOOL) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(liborg_gnome_vcard_inline_la_LDFLAGS) \ - $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(liborg_gnome_vcard_inline_la_SOURCES) -DIST_SOURCES = $(liborg_gnome_vcard_inline_la_SOURCES) -pluginDATA_INSTALL = $(INSTALL_DATA) -DATA = $(plugin_DATA) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -A11Y_CFLAGS = @A11Y_CFLAGS@ -A11Y_LIBS = @A11Y_LIBS@ -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BASE_VERSION = @BASE_VERSION@ -BONOBOUI_REQUIRED = @BONOBOUI_REQUIRED@ -CAMEL_CFLAGS = @CAMEL_CFLAGS@ -CAMEL_EXCHANGE_CFLAGS = @CAMEL_EXCHANGE_CFLAGS@ -CAMEL_EXCHANGE_LIBS = @CAMEL_EXCHANGE_LIBS@ -CAMEL_GROUPWISE_CFLAGS = @CAMEL_GROUPWISE_CFLAGS@ -CAMEL_GROUPWISE_LIBS = @CAMEL_GROUPWISE_LIBS@ -CAMEL_LIBS = @CAMEL_LIBS@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CERT_UI_CFLAGS = @CERT_UI_CFLAGS@ -CERT_UI_LIBS = @CERT_UI_LIBS@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DATASERVER_EXEC_VERSION = @DATASERVER_EXEC_VERSION@ -DATASERVER_IDL = @DATASERVER_IDL@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ -DOLT_BASH = @DOLT_BASH@ -DSYMUTIL = @DSYMUTIL@ -DTAPPINTEGRATE = @DTAPPINTEGRATE@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EVOLUTION_ADDRESSBOOK_CFLAGS = @EVOLUTION_ADDRESSBOOK_CFLAGS@ -EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS = @EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS@ -EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS = @EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS@ -EVOLUTION_ADDRESSBOOK_LIBS = @EVOLUTION_ADDRESSBOOK_LIBS@ -EVOLUTION_CALENDAR_CFLAGS = @EVOLUTION_CALENDAR_CFLAGS@ -EVOLUTION_CALENDAR_CONDUIT_CFLAGS = @EVOLUTION_CALENDAR_CONDUIT_CFLAGS@ -EVOLUTION_CALENDAR_CONDUIT_LIBS = @EVOLUTION_CALENDAR_CONDUIT_LIBS@ -EVOLUTION_CALENDAR_LIBS = @EVOLUTION_CALENDAR_LIBS@ -EVOLUTION_DATA_SERVER_CFLAGS = @EVOLUTION_DATA_SERVER_CFLAGS@ -EVOLUTION_DATA_SERVER_LIBS = @EVOLUTION_DATA_SERVER_LIBS@ -EVOLUTION_DIR = @EVOLUTION_DIR@ -EVOLUTION_MAIL_CFLAGS = @EVOLUTION_MAIL_CFLAGS@ -EVOLUTION_MAIL_LIBS = @EVOLUTION_MAIL_LIBS@ -EVOLUTION_TEST_CFLAGS = @EVOLUTION_TEST_CFLAGS@ -EVOLUTION_TEST_LIBS = @EVOLUTION_TEST_LIBS@ -EXEEXT = @EXEEXT@ -E_NAME_CFLAGS = @E_NAME_CFLAGS@ -E_NAME_LIBS = @E_NAME_LIBS@ -E_UTIL_CFLAGS = @E_UTIL_CFLAGS@ -E_UTIL_LIBS = @E_UTIL_LIBS@ -E_WIDGETS_CFLAGS = @E_WIDGETS_CFLAGS@ -E_WIDGETS_LIBS = @E_WIDGETS_LIBS@ -FGREP = @FGREP@ -FOUND_DBUS_VERSION = @FOUND_DBUS_VERSION@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GIT_CFLAGS = @GIT_CFLAGS@ -GIT_LIBS = @GIT_LIBS@ -GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GLIB_LIBS = @GLIB_LIBS@ -GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOME_PILOT_CFLAGS = @GNOME_PILOT_CFLAGS@ -GNOME_PILOT_LIBS = @GNOME_PILOT_LIBS@ -GNOME_PLATFORM_CFLAGS = @GNOME_PLATFORM_CFLAGS@ -GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LIBS@ -GOBJECT_QUERY = @GOBJECT_QUERY@ -GREP = @GREP@ -GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ -GSTREAMER_LIBS = @GSTREAMER_LIBS@ -GTKHTML_CFLAGS = @GTKHTML_CFLAGS@ -GTKHTML_DATADIR = @GTKHTML_DATADIR@ -GTKHTML_LIBS = @GTKHTML_LIBS@ -HAL_CFLAGS = @HAL_CFLAGS@ -HAL_LIBS = @HAL_LIBS@ -HAVE_DBUS = @HAVE_DBUS@ -HAVE_JW = @HAVE_JW@ -HELP_DIR = @HELP_DIR@ -ICONV_CFLAGS = @ICONV_CFLAGS@ -ICONV_LIBS = @ICONV_LIBS@ -IDL_INCLUDES = @IDL_INCLUDES@ -IMPORTERS_CFLAGS = @IMPORTERS_CFLAGS@ -IMPORTERS_LIBS = @IMPORTERS_LIBS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTERFACE_VERSION = @INTERFACE_VERSION@ -INTLLIBS = @INTLLIBS@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -JW = @JW@ -KDE_APPLNK_DIR = @KDE_APPLNK_DIR@ -KILL_PROCESS_CMD = @KILL_PROCESS_CMD@ -KRB4_CFLAGS = @KRB4_CFLAGS@ -KRB4_LIBS = @KRB4_LIBS@ -KRB5_CFLAGS = @KRB5_CFLAGS@ -KRB5_LIBS = @KRB5_LIBS@ -LD = @LD@ -LDAP_CFLAGS = @LDAP_CFLAGS@ -LDAP_LIBS = @LDAP_LIBS@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBEXCHANGESTORAGE_CFLAGS = @LIBEXCHANGESTORAGE_CFLAGS@ -LIBEXCHANGESTORAGE_LIBS = @LIBEXCHANGESTORAGE_LIBS@ -LIBFILTER_CFLAGS = @LIBFILTER_CFLAGS@ -LIBFILTER_LIBS = @LIBFILTER_LIBS@ -LIBGWEATHER_CFLAGS = @LIBGWEATHER_CFLAGS@ -LIBGWEATHER_LIBS = @LIBGWEATHER_LIBS@ -LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ -LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBPST_CFLAGS = @LIBPST_CFLAGS@ -LIBPST_LIBS = @LIBPST_LIBS@ -LIBS = @LIBS@ -LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ -LIBSOUP_LIBS = @LIBSOUP_LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTCOMPILE = @LTCOMPILE@ -LTCXXCOMPILE = @LTCXXCOMPILE@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANUAL_NSPR_CFLAGS = @MANUAL_NSPR_CFLAGS@ -MANUAL_NSPR_LIBS = @MANUAL_NSPR_LIBS@ -MANUAL_NSS_CFLAGS = @MANUAL_NSS_CFLAGS@ -MANUAL_NSS_LIBS = @MANUAL_NSS_LIBS@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MONO_CFLAGS = @MONO_CFLAGS@ -MONO_LIBS = @MONO_LIBS@ -MOZILLA_NSS_CFLAGS = @MOZILLA_NSS_CFLAGS@ -MOZILLA_NSS_LIBS = @MOZILLA_NSS_LIBS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -NMN_CFLAGS = @NMN_CFLAGS@ -NMN_LIBS = @NMN_LIBS@ -NM_CFLAGS = @NM_CFLAGS@ -NM_LIBS = @NM_LIBS@ -NO_UNDEFINED = @NO_UNDEFINED@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ -ORBIT_CFLAGS = @ORBIT_CFLAGS@ -ORBIT_CONFIG = @ORBIT_CONFIG@ -ORBIT_IDL = @ORBIT_IDL@ -ORBIT_LIBS = @ORBIT_LIBS@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -PILOT_LINK_MAJOR = @PILOT_LINK_MAJOR@ -PILOT_LINK_MICRO = @PILOT_LINK_MICRO@ -PILOT_LINK_MINOR = @PILOT_LINK_MINOR@ -PILOT_LINK_PATCH = @PILOT_LINK_PATCH@ -PILOT_LINK_VERSION = @PILOT_LINK_VERSION@ -PISOCK_CFLAGS = @PISOCK_CFLAGS@ -PISOCK_LIBS = @PISOCK_LIBS@ -PKG_CONFIG = @PKG_CONFIG@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -PTHREAD_LIB = @PTHREAD_LIB@ -PURIFY = @PURIFY@ -PY_INCLUDES = @PY_INCLUDES@ -PY_LIBS = @PY_LIBS@ -RANLIB = @RANLIB@ -REGEX_LIBS = @REGEX_LIBS@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SHELL_CFLAGS = @SHELL_CFLAGS@ -SHELL_LIBS = @SHELL_LIBS@ -SOEXT = @SOEXT@ -STRIP = @STRIP@ -THREADS_CFLAGS = @THREADS_CFLAGS@ -THREADS_LIBS = @THREADS_LIBS@ -TNEF_CFLAGS = @TNEF_CFLAGS@ -TZDIALOG_CFLAGS = @TZDIALOG_CFLAGS@ -TZDIALOG_LIBS = @TZDIALOG_LIBS@ -UPGRADE_REVISION = @UPGRADE_REVISION@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WARN_CFLAGS = @WARN_CFLAGS@ -WINDRES = @WINDRES@ -XGETTEXT = @XGETTEXT@ -XMKMF = @XMKMF@ -X_CFLAGS = @X_CFLAGS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -YACC = @YACC@ -YFLAGS = @YFLAGS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -all_plugins_base = @all_plugins_base@ -all_plugins_experimental = @all_plugins_experimental@ -all_plugins_standard = @all_plugins_standard@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -bindir_in_server_file = @bindir_in_server_file@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -componentdir = @componentdir@ -componentdir_in_server_file = @componentdir_in_server_file@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -etspecdir = @etspecdir@ -evolutionhelpdir = @evolutionhelpdir@ -evolutionuidir = @evolutionuidir@ -exec_prefix = @exec_prefix@ -gladedir = @gladedir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -idldir = @idldir@ -images16dir = @images16dir@ -images48dir = @images48dir@ -imagesdir = @imagesdir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -plugindir = @plugindir@ -plugins_enabled = @plugins_enabled@ -prefix = @prefix@ -privconduitdir = @privconduitdir@ -privdatadir = @privdatadir@ -privincludedir = @privincludedir@ -privlibdir = @privlibdir@ -privlibexecdir = @privlibexecdir@ -privlibexecdir_in_server_file = @privlibexecdir_in_server_file@ -privsolibdir = @privsolibdir@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -pythonpath = @pythonpath@ -sbindir = @sbindir@ -serverdir = @serverdir@ -sharedstatedir = @sharedstatedir@ -soundsdir = @soundsdir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -viewsdir = @viewsdir@ -INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) - -plugin_DATA = org-gnome-vcard-inline.eplug -plugin_LTLIBRARIES = liborg-gnome-vcard-inline.la -liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c -liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -liborg_gnome_vcard_inline_la_LIBADD = \ - $(EVOLUTION_ADDRESSBOOK_LIBS) - -EXTRA_DIST = org-gnome-vcard-inline.eplug.xml -BUILT_SOURCES = $(plugin_DATA) -CLEANFILES = $(BUILT_SOURCES) -all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/vcard-inline/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu plugins/vcard-inline/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - else :; fi; \ - done - -uninstall-pluginLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \ - done - -clean-pluginLTLIBRARIES: - -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -liborg-gnome-vcard-inline.la: $(liborg_gnome_vcard_inline_la_OBJECTS) $(liborg_gnome_vcard_inline_la_DEPENDENCIES) - $(liborg_gnome_vcard_inline_la_LINK) -rpath $(plugindir) $(liborg_gnome_vcard_inline_la_OBJECTS) $(liborg_gnome_vcard_inline_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcard-inline.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-pluginDATA: $(plugin_DATA) - @$(NORMAL_INSTALL) - test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)" - @list='$(plugin_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pluginDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ - $(pluginDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(plugindir)/$$f"; \ - done - -uninstall-pluginDATA: - @$(NORMAL_UNINSTALL) - @list='$(plugin_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ - rm -f "$(DESTDIR)$(plugindir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LTLIBRARIES) $(DATA) -installdirs: - for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -clean: clean-am - -clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-pluginDATA install-pluginLTLIBRARIES - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pluginLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pluginDATA \ - install-pluginLTLIBRARIES install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-pluginDATA uninstall-pluginLTLIBRARIES - - -@EVO_PLUGIN_RULE@ - $(EVOLUTION_MAIL_LIBS) -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: -- cgit v1.2.3 From 16d286593c110aa6ff138a79f5b350e368f9e238 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 6 May 2009 08:44:33 -0400 Subject: Remove generated files from git. --- plugins/vcard-inline/liborg-gnome-vcard-inline.la | 41 ----------------------- plugins/vcard-inline/org-gnome-vcard-inline.eplug | 16 --------- plugins/vcard-inline/vcard-inline.lo | 4 --- 3 files changed, 61 deletions(-) delete mode 100644 plugins/vcard-inline/liborg-gnome-vcard-inline.la delete mode 100644 plugins/vcard-inline/org-gnome-vcard-inline.eplug delete mode 100644 plugins/vcard-inline/vcard-inline.lo diff --git a/plugins/vcard-inline/liborg-gnome-vcard-inline.la b/plugins/vcard-inline/liborg-gnome-vcard-inline.la deleted file mode 100644 index 3af19da824..0000000000 --- a/plugins/vcard-inline/liborg-gnome-vcard-inline.la +++ /dev/null @@ -1,41 +0,0 @@ -# liborg-gnome-vcard-inline.la - a libtool library file -# Generated by ltmain.sh (GNU libtool) 2.2.6 -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='liborg-gnome-vcard-inline.so' - -# Names of this library. -library_names='liborg-gnome-vcard-inline.so liborg-gnome-vcard-inline.so liborg-gnome-vcard-inline.so' - -# The name of the static archive. -old_library='' - -# Linker flags that can not go in dependency_libs. -inherited_linker_flags=' -pthread' - -# Libraries that this one depends upon. -dependency_libs=' -L/home/mbarnes/local/lib /home/mbarnes/local/lib/libedataserverui-1.2.la -L/usr/lib -L/usr/kerberos/lib -lgnome-keyring /home/mbarnes/local/lib/libebook-1.2.la /home/mbarnes/local/lib/libcamel-1.2.la -lssl3 -lsmime3 -lnss3 -lnssutil3 -lkrb5 -lk5crypto -lcom_err -lgssapi_krb5 /home/mbarnes/local/lib/libedataserver-1.2.la -lplds4 -lplc4 -lnspr4 -lsasl2 -lssl -lcrypto -lz -lsqlite3 -lsoup-2.4 /home/mbarnes/local/lib/libgtkhtml-editor.la /home/mbarnes/local/lib/libgtkhtml-3.14.la /home/mbarnes/local/lib/libgailutil.la -lXext -lXrender -lXinerama -lXrandr -lXcursor -lX11 -lXcomposite -lXdamage -lXfixes -lgnomeui-2 -lSM -lICE -lglade-2.0 -lenchant -lbonoboui-2 -lgnomevfs-2 -lgnomecanvas-2 -lgnome-2 -lpopt -lbonobo-2 -lbonobo-activation -lORBit-2 -lart_lgpl_2 -lgconf-2 /home/mbarnes/local/lib/libgthread-2.0.la -lpthread -lrt /home/mbarnes/local/lib/libgtk-x11-2.0.la -lxml2 /home/mbarnes/local/lib/libgdk-x11-2.0.la -latk-1.0 -lpangoft2-1.0 /home/mbarnes/local/lib/libgdk_pixbuf-2.0.la /home/mbarnes/local/lib/libgio-2.0.la -lselinux -lm -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig /home/mbarnes/local/lib/libgobject-2.0.la /home/mbarnes/local/lib/libgmodule-2.0.la -ldl /home/mbarnes/local/lib/libglib-2.0.la' - -# Names of additional weak libraries provided by this library -weak_library_names='' - -# Version information for liborg-gnome-vcard-inline. -current=0 -age=0 -revision=0 - -# Is this an already installed library? -installed=no - -# Should we warn about portability when linking against -modules? -shouldnotlink=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/home/mbarnes/local/lib/evolution/2.28/plugins' diff --git a/plugins/vcard-inline/org-gnome-vcard-inline.eplug b/plugins/vcard-inline/org-gnome-vcard-inline.eplug deleted file mode 100644 index bdfdb732d1..0000000000 --- a/plugins/vcard-inline/org-gnome-vcard-inline.eplug +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - Show vCards directly in mail messages. - - - - - - - - - - \ No newline at end of file diff --git a/plugins/vcard-inline/vcard-inline.lo b/plugins/vcard-inline/vcard-inline.lo deleted file mode 100644 index adb1c83857..0000000000 --- a/plugins/vcard-inline/vcard-inline.lo +++ /dev/null @@ -1,4 +0,0 @@ -# vcard-inline.lo - a libtool object file -# Generated by doltcompile, not libtool -pic_object='.libs/vcard-inline.o' -non_pic_object=none -- cgit v1.2.3 From b7fbe1d689879c7c1639129b8ebe518a29242477 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Mon, 11 May 2009 09:59:57 -0400 Subject: =?UTF-8?q?Bug=20582168=20=E2=80=93=20Remove=20duplicated=20sheban?= =?UTF-8?q?g=20and=20comment=20from=20autogen.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- autogen.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/autogen.sh b/autogen.sh index 4b51a10c76..267560d8a9 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,9 +1,6 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -- cgit v1.2.3 From f8c480420f3129fce7ff06551d74a41f97fde216 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 12 May 2009 21:43:37 -0400 Subject: =?UTF-8?q?Bug=20440919=20=E2=80=93=20Evolution=20can't=20attach?= =?UTF-8?q?=20"zero=20length"=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- widgets/misc/e-attachment.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index 537a3470d7..67647116e3 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -418,6 +418,10 @@ attachment_progress_cb (goffset current_num_bytes, goffset total_num_bytes, EAttachment *attachment) { + /* Avoid dividing by zero. */ + if (total_num_bytes == 0) + return; + attachment->priv->percent = (current_num_bytes * 100) / total_num_bytes; @@ -1493,6 +1497,12 @@ attachment_load_finish (LoadContext *load_context) if (disposition != NULL) camel_mime_part_set_disposition (mime_part, disposition); + /* Correctly report the size of zero length special files. */ + if (g_file_info_get_size (file_info) == 0) { + g_file_info_set_size (file_info, size); + attachment_set_file_info (attachment, file_info); + } + g_simple_async_result_set_op_res_gpointer ( simple, mime_part, (GDestroyNotify) camel_object_unref); -- cgit v1.2.3 From fee1642fc78d80a382c5c96cb294f4bd3d00be77 Mon Sep 17 00:00:00 2001 From: Johnny Jacob Date: Wed, 13 May 2009 12:30:35 +0530 Subject: Bug 581424 - Personal folder tree appears besides Public folder in subscription editor. mail/em-subscribe-editor.c (sub_folderinfo_exec): Use CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST for requesting list of subscribable folders. --- mail/em-subscribe-editor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index 724b9b4874..9842e32d0e 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -356,7 +356,8 @@ sub_folderinfo_exec (struct _emse_folderinfo_msg *m) if (m->seq == m->sub->seq) { camel_operation_register(m->base.cancel); - m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL, &m->base.ex); + m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, + CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL | CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST, &m->base.ex); camel_operation_unregister(m->base.cancel); } } -- cgit v1.2.3 From 00cf33a815541bc2e4a2d96e29900241bf58c379 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 13 May 2009 11:39:18 -0400 Subject: =?UTF-8?q?Bug=20582144=20=E2=80=93=20Evolution=20not=20showing=20?= =?UTF-8?q?proper=20attachment=20filename?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- widgets/misc/e-attachment-store.c | 5 ++++- widgets/misc/e-attachment.c | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/widgets/misc/e-attachment-store.c b/widgets/misc/e-attachment-store.c index 9d0fe6d21e..53a1cbe1ff 100644 --- a/widgets/misc/e-attachment-store.c +++ b/widgets/misc/e-attachment-store.c @@ -839,11 +839,13 @@ e_attachment_store_get_uris_async (EAttachmentStore *store, /* Any remaining attachments in the list should have MIME parts * only, so we need to save them all to a temporary directory. - * We use a directory so the files can retain their basenames. */ + * We use a directory so the files can retain their basenames. + * XXX This could trigger a blocking temp directory cleanup. */ template = g_strdup_printf (PACKAGE "-%s-XXXXXX", g_get_user_name ()); path = e_mkdtemp (template); g_free (template); + /* XXX Let's hope errno got set property. */ if (path == NULL) { GSimpleAsyncResult *simple; @@ -871,6 +873,7 @@ e_attachment_store_get_uris_async (EAttachmentStore *store, uri_context); g_object_unref (temp_directory); + g_free (path); } gchar ** diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index 67647116e3..e4e336e58b 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -2025,16 +2025,18 @@ attachment_open_save_finished_cb (EAttachment *attachment, static void attachment_open_save_temporary (OpenContext *open_context) { - GFile *file; + GFile *temp_directory; gchar *template; gchar *path; GError *error = NULL; errno = 0; - /* XXX This could trigger a blocking temp directory cleanup. */ + /* Save the file to a temporary directory. + * We use a directory so the files can retain their basenames. + * XXX This could trigger a blocking temp directory cleanup. */ template = g_strdup_printf (PACKAGE "-%s-XXXXXX", g_get_user_name ()); - path = e_mktemp (template); + path = e_mkdtemp (template); g_free (template); /* XXX Let's hope errno got set properly. */ @@ -2048,15 +2050,15 @@ attachment_open_save_temporary (OpenContext *open_context) if (attachment_open_check_for_error (open_context, error)) return; - file = g_file_new_for_path (path); - - g_free (path); + temp_directory = g_file_new_for_path (path); e_attachment_save_async ( - open_context->attachment, file, (GAsyncReadyCallback) + open_context->attachment, + temp_directory, (GAsyncReadyCallback) attachment_open_save_finished_cb, open_context); - g_object_unref (file); + g_object_unref (temp_directory); + g_free (path); } void -- cgit v1.2.3 From 6d6c1171ec57818c96e9f1f00fb0502791cbeab8 Mon Sep 17 00:00:00 2001 From: Marcel Stimberg Date: Wed, 13 May 2009 23:05:36 +0200 Subject: Make the Calendar view scroll using the arrow keys This fixes bug 559366. --- calendar/gui/e-week-view.c | 91 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 74 insertions(+), 17 deletions(-) diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 264e30271d..eaa6a3a47c 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -3812,10 +3812,16 @@ static gint map_right[] = {3, 4, 5, 3, 4, 5, 6}; static void e_week_view_do_cursor_key_up (EWeekView *week_view) { - if (week_view->selection_start_day <= 0) + if (week_view->selection_start_day == -1) return; week_view->selection_start_day--; + + if (week_view->selection_start_day < 0) { + e_week_view_scroll_a_step (week_view, E_CAL_VIEW_MOVE_UP); + week_view->selection_start_day = 6; + } + week_view->selection_end_day = week_view->selection_start_day; g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); @@ -3824,11 +3830,16 @@ e_week_view_do_cursor_key_up (EWeekView *week_view) static void e_week_view_do_cursor_key_down (EWeekView *week_view) { - if (week_view->selection_start_day == -1 || - week_view->selection_start_day >= 6) + if (week_view->selection_start_day == -1) return; week_view->selection_start_day++; + + if (week_view->selection_start_day > 6) { + e_week_view_scroll_a_step (week_view, E_CAL_VIEW_MOVE_DOWN); + week_view->selection_start_day = 0; + } + week_view->selection_end_day = week_view->selection_start_day; g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); @@ -3861,11 +3872,23 @@ e_week_view_do_cursor_key_right (EWeekView *week_view) static void e_month_view_do_cursor_key_up (EWeekView *week_view) { - if (week_view->selection_start_day < 7) + if (week_view->selection_start_day == -1) return; - week_view->selection_start_day -= 7; - week_view->selection_end_day = week_view->selection_start_day; + if (week_view->selection_start_day < 7) { + /* no easy way to calculate new selection_start_day, therefore + * calculate a time_t value and set_selected_time_range */ + time_t current; + if (e_calendar_view_get_selected_time_range(&week_view->cal_view, ¤t, NULL)) { + current = time_add_week(current,-1); + e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_UP); + e_week_view_set_selected_time_range_visible(week_view,current,current); + } + } else { + week_view->selection_start_day -= 7; + week_view->selection_end_day = week_view->selection_start_day; + } + g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); } @@ -3875,12 +3898,23 @@ e_month_view_do_cursor_key_down (EWeekView *week_view) { gint weeks_shown = e_week_view_get_weeks_shown (week_view); - if (week_view->selection_start_day == -1 || - week_view->selection_start_day >= (weeks_shown - 1) * 7) + if (week_view->selection_start_day == -1) return; - week_view->selection_start_day += 7; - week_view->selection_end_day = week_view->selection_start_day; + if (week_view->selection_start_day >= (weeks_shown - 1) * 7) { + /* no easy way to calculate new selection_start_day, therefore + * calculate a time_t value and set_selected_time_range */ + time_t current; + if (e_calendar_view_get_selected_time_range(&week_view->cal_view, ¤t, NULL)) { + current = time_add_week(current,1); + e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_DOWN); + e_week_view_set_selected_time_range_visible(week_view,current,current); + } + } else { + week_view->selection_start_day += 7; + week_view->selection_end_day = week_view->selection_start_day; + } + g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); } @@ -3888,11 +3922,23 @@ e_month_view_do_cursor_key_down (EWeekView *week_view) static void e_month_view_do_cursor_key_left (EWeekView *week_view) { - if (week_view->selection_start_day <= 0) + if (week_view->selection_start_day == -1) return; - week_view->selection_start_day--; - week_view->selection_end_day = week_view->selection_start_day; + if (week_view->selection_start_day == 0) { + /* no easy way to calculate new selection_start_day, therefore + * calculate a time_t value and set_selected_time_range */ + time_t current; + if (e_calendar_view_get_selected_time_range(&week_view->cal_view, ¤t, NULL)) { + current = time_add_day(current,-1); + e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_UP); + e_week_view_set_selected_time_range_visible(week_view,current,current); + } + } else { + week_view->selection_start_day--; + week_view->selection_end_day = week_view->selection_start_day; + } + g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); } @@ -3902,12 +3948,23 @@ e_month_view_do_cursor_key_right (EWeekView *week_view) { gint weeks_shown = e_week_view_get_weeks_shown (week_view); - if (week_view->selection_start_day == -1 || - week_view->selection_start_day >= weeks_shown * 7 - 1) + if (week_view->selection_start_day == -1) return; - week_view->selection_start_day++; - week_view->selection_end_day = week_view->selection_start_day; + if (week_view->selection_start_day == weeks_shown * 7 - 1) { + /* no easy way to calculate new selection_start_day, therefore + * calculate a time_t value and set_selected_time_range */ + time_t current; + if (e_calendar_view_get_selected_time_range(&week_view->cal_view, ¤t, NULL)) { + current = time_add_day(current,1); + e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_DOWN); + e_week_view_set_selected_time_range_visible(week_view,current,current); + } + } else { + week_view->selection_start_day++; + week_view->selection_end_day = week_view->selection_start_day; + } + g_signal_emit_by_name (week_view, "selected_time_changed"); gtk_widget_queue_draw (week_view->main_canvas); } -- cgit v1.2.3 From cdfa00701f45b3ada6bbec771ab4531b09a7b83d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 13 May 2009 17:27:50 -0400 Subject: Remove an unnecessary variable from get_attachment_list(). --- calendar/gui/dialogs/comp-editor.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 4af998eb26..2a1513327e 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -197,7 +197,7 @@ get_attachment_list (CompEditor *editor) EAttachmentView *view; GtkTreeModel *model; GtkTreeIter iter; - GSList *parts = NULL, *list = NULL; + GSList *list = NULL; const char *comp_uid = NULL; const char *local_store = e_cal_get_local_attachment_store (editor->priv->client); gboolean valid; @@ -282,8 +282,6 @@ get_attachment_list (CompEditor *editor) g_free (filename); } - if (parts) - g_slist_free (parts); return list; } -- cgit v1.2.3 From bbe6437d089381bb2a3008e98a03aebef53af0e6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 14 May 2009 10:50:38 -0400 Subject: =?UTF-8?q?Bug=20582585=20=E2=80=93=20Crash=20when=20deleting=20mu?= =?UTF-8?q?ltiple=20attachments=20from=20composed=20mail?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- widgets/misc/e-attachment-view.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c index 27ef5d84a8..48292cfbc3 100644 --- a/widgets/misc/e-attachment-view.c +++ b/widgets/misc/e-attachment-view.c @@ -1038,6 +1038,12 @@ e_attachment_view_remove_selected (EAttachmentView *view, store = e_attachment_view_get_store (view); model = GTK_TREE_MODEL (store); + /* Remove attachments in reverse order to avoid invalidating + * tree paths as we iterate over the list. Note, the list is + * probably already sorted but we sort again just to be safe. */ + selected = g_list_reverse (g_list_sort ( + selected, (GCompareFunc) gtk_tree_path_compare)); + for (item = selected; item != NULL; item = item->next) { EAttachment *attachment; GtkTreePath *path = item->data; -- cgit v1.2.3 From 68af3e6898a57080490f860c5076d91a57f6407e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 14 May 2009 12:55:33 -0400 Subject: Add e_attachment_store_get_attachments(). --- widgets/misc/e-attachment-store.c | 76 +++++++++++++++++++++------------------ widgets/misc/e-attachment-store.h | 2 ++ 2 files changed, 44 insertions(+), 34 deletions(-) diff --git a/widgets/misc/e-attachment-store.c b/widgets/misc/e-attachment-store.c index 53a1cbe1ff..216a60d32a 100644 --- a/widgets/misc/e-attachment-store.c +++ b/widgets/misc/e-attachment-store.c @@ -360,12 +360,35 @@ e_attachment_store_add_to_multipart (EAttachmentStore *store, CamelMultipart *multipart, const gchar *default_charset) { + GList *list, *iter; + + g_return_if_fail (E_IS_ATTACHMENT_STORE (store)); + g_return_if_fail (CAMEL_MULTIPART (multipart)); + + list = e_attachment_store_get_attachments (store); + + for (iter = list; iter != NULL; iter = iter->next) { + EAttachment *attachment = iter->data; + + /* Skip the attachment if it's still loading. */ + if (!e_attachment_get_loading (attachment)) + e_attachment_add_to_multipart ( + attachment, multipart, default_charset); + } + + g_list_foreach (list, (GFunc) g_object_unref, NULL); + g_list_free (list); +} + +GList * +e_attachment_store_get_attachments (EAttachmentStore *store) +{ + GList *list = NULL; GtkTreeModel *model; GtkTreeIter iter; gboolean valid; - g_return_if_fail (E_IS_ATTACHMENT_STORE (store)); - g_return_if_fail (CAMEL_MULTIPART (multipart)); + g_return_val_if_fail (E_IS_ATTACHMENT_STORE (store), NULL); model = GTK_TREE_MODEL (store); valid = gtk_tree_model_get_iter_first (model, &iter); @@ -377,15 +400,12 @@ e_attachment_store_add_to_multipart (EAttachmentStore *store, column_id = E_ATTACHMENT_STORE_COLUMN_ATTACHMENT; gtk_tree_model_get (model, &iter, column_id, &attachment, -1); - /* Skip the attachment if it's still loading. */ - if (!e_attachment_get_loading (attachment)) - e_attachment_add_to_multipart ( - attachment, multipart, default_charset); - - g_object_unref (attachment); + list = g_list_prepend (list, attachment); valid = gtk_tree_model_iter_next (model, &iter); } + + return g_list_reverse (list); } const gchar * @@ -422,60 +442,48 @@ e_attachment_store_get_num_attachments (EAttachmentStore *store) guint e_attachment_store_get_num_loading (EAttachmentStore *store) { - GtkTreeModel *model; - GtkTreeIter iter; + GList *list, *iter; guint num_loading = 0; - gboolean valid; g_return_val_if_fail (E_IS_ATTACHMENT_STORE (store), 0); - model = GTK_TREE_MODEL (store); - valid = gtk_tree_model_get_iter_first (model, &iter); + list = e_attachment_store_get_attachments (store); - while (valid) { - EAttachment *attachment; - gint column_id; + for (iter = list; iter != NULL; iter = iter->next) { + EAttachment *attachment = iter->data; - column_id = E_ATTACHMENT_STORE_COLUMN_ATTACHMENT; - gtk_tree_model_get (model, &iter, column_id, &attachment, -1); if (e_attachment_get_loading (attachment)) num_loading++; - g_object_unref (attachment); - - valid = gtk_tree_model_iter_next (model, &iter); } + g_list_foreach (list, (GFunc) g_object_unref, NULL); + g_list_free (list); + return num_loading; } goffset e_attachment_store_get_total_size (EAttachmentStore *store) { - GtkTreeModel *model; - GtkTreeIter iter; + GList *list, *iter; goffset total_size = 0; - gboolean valid; g_return_val_if_fail (E_IS_ATTACHMENT_STORE (store), 0); - model = GTK_TREE_MODEL (store); - valid = gtk_tree_model_get_iter_first (model, &iter); + list = e_attachment_store_get_attachments (store); - while (valid) { - EAttachment *attachment; + for (iter = list; iter != NULL; iter = iter->next) { + EAttachment *attachment = iter->data; GFileInfo *file_info; - gint column_id; - column_id = E_ATTACHMENT_STORE_COLUMN_ATTACHMENT; - gtk_tree_model_get (model, &iter, column_id, &attachment, -1); file_info = e_attachment_get_file_info (attachment); if (file_info != NULL) total_size += g_file_info_get_size (file_info); - g_object_unref (attachment); - - valid = gtk_tree_model_iter_next (model, &iter); } + g_list_foreach (list, (GFunc) g_object_unref, NULL); + g_list_free (list); + return total_size; } diff --git a/widgets/misc/e-attachment-store.h b/widgets/misc/e-attachment-store.h index e7f89b7f6c..9fdd74d493 100644 --- a/widgets/misc/e-attachment-store.h +++ b/widgets/misc/e-attachment-store.h @@ -84,6 +84,8 @@ void e_attachment_store_add_to_multipart (EAttachmentStore *store, CamelMultipart *multipart, const gchar *default_charset); +GList * e_attachment_store_get_attachments + (EAttachmentStore *store); const gchar * e_attachment_store_get_current_folder (EAttachmentStore *store); void e_attachment_store_set_current_folder -- cgit v1.2.3 From 6c1805443f69bc65e05e323ff60ceeb0ae702800 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 14 May 2009 20:04:35 +0200 Subject: Bug 582626 - Remove forgotten widgets from a glade file --- calendar/gui/dialogs/cal-prefs-dialog.glade | 36 ----------------------------- 1 file changed, 36 deletions(-) diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade index 87e69d74c5..9f2617db04 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.glade +++ b/calendar/gui/dialogs/cal-prefs-dialog.glade @@ -113,24 +113,6 @@ - - - Adjust for daylight sa_ving time - True - True - False - True - True - - - 1 - 2 - 1 - 2 - GTK_FILL - - - True @@ -176,24 +158,6 @@ GTK_FILL - - - Adjust for daylight sa_ving time - True - True - False - True - True - - - 1 - 2 - 2 - 3 - GTK_FILL - - - True -- cgit v1.2.3 From ea3e4f239a529716452159d5deac20cd9a38c832 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 14 May 2009 21:20:55 -0400 Subject: =?UTF-8?q?Bug=20458491=20=E2=80=93=20Remove=20useless=20"Call=20T?= =?UTF-8?q?o..."=20popup=20menu=20option?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mail/em-folder-view.c | 1 - mail/em-popup.c | 5 ----- mail/em-popup.h | 4 +--- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 8e220955fa..2fa04b5990 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -2752,7 +2752,6 @@ emp_uri_popup_link_copy(EPopup *ep, EPopupItem *pitem, void *data) } 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, "edit-copy", EM_POPUP_URI_NOT_MAILTO }, { E_POPUP_SUBMENU, "99.uri.00", N_("Create _Search Folder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO }, diff --git a/mail/em-popup.c b/mail/em-popup.c index debad8cb56..192ab7ac7b 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -261,10 +261,6 @@ em_popup_target_new_uri(EMPopup *emp, const char *uri) if (g_ascii_strncasecmp(uri, "http:", 5) == 0 || g_ascii_strncasecmp(uri, "https:", 6) == 0) mask &= ~EM_POPUP_URI_HTTP; - else if (g_ascii_strncasecmp(uri, "sip:", 3) == 0 - || g_ascii_strncasecmp(uri, "h323:", 5) == 0 - || g_ascii_strncasecmp(uri, "callto:", 7) == 0) - mask &= ~EM_POPUP_URI_CALLTO; if (g_ascii_strncasecmp(uri, "mailto:", 7) == 0) mask &= ~EM_POPUP_URI_MAILTO; @@ -824,7 +820,6 @@ static const EPopupHookTargetMask emph_uri_masks[] = { { "http", EM_POPUP_URI_HTTP }, { "mailto", EM_POPUP_URI_MAILTO }, { "notmailto", EM_POPUP_URI_NOT_MAILTO }, - { "callto", EM_POPUP_URI_CALLTO }, { NULL } }; diff --git a/mail/em-popup.h b/mail/em-popup.h index 77f80e5599..8df98a6488 100644 --- a/mail/em-popup.h +++ b/mail/em-popup.h @@ -113,14 +113,12 @@ enum _em_popup_target_select_t { * @EM_POPUP_URI_HTTP: This is a HTTP or HTTPS url. * @EM_POPUP_URI_MAILTO: This is a MAILTO url. * @EM_POPUP_URI_NOT_MAILTO: This is not a MAILTO url. - * @EM_POPUP_URI_CALLTO: This is a CALLTO url. * **/ enum _em_popup_target_uri_t { EM_POPUP_URI_HTTP = 1<<0, EM_POPUP_URI_MAILTO = 1<<1, - EM_POPUP_URI_NOT_MAILTO = 1<<2, - EM_POPUP_URI_CALLTO = 1<<3, + EM_POPUP_URI_NOT_MAILTO = 1<<2 }; /** -- cgit v1.2.3 From e4fa8fe10408c4c370e1e11e4bb2d7745f50aceb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 16 May 2009 12:11:55 -0400 Subject: Fix several types of pedantic compiler warnings. --- a11y/addressbook/ea-minicard.c | 2 +- a11y/e-table/gal-a11y-e-table-item.c | 2 +- addressbook/conduit/address-conduit.c | 4 ++-- addressbook/gui/component/addressbook-config.h | 2 +- addressbook/gui/component/addressbook-view.c | 2 +- .../gui/contact-list-editor/e-contact-list-editor.c | 2 +- addressbook/gui/widgets/e-addressbook-model.c | 2 +- addressbook/gui/widgets/e-addressbook-reflow-adapter.c | 2 +- addressbook/gui/widgets/e-addressbook-view.c | 4 ++-- addressbook/gui/widgets/e-addressbook-view.h | 2 +- addressbook/gui/widgets/eab-config.h | 2 +- addressbook/gui/widgets/eab-gui-util.h | 2 +- addressbook/gui/widgets/eab-menu.h | 4 ++-- addressbook/gui/widgets/eab-popup.h | 8 ++++---- calendar/conduits/calendar/calendar-conduit.c | 2 +- calendar/conduits/common/libecalendar-common-conduit.c | 4 ++-- calendar/conduits/todo/todo-conduit.c | 2 +- calendar/gui/alarm-notify/alarm-queue.c | 2 +- calendar/gui/calendar-component.c | 2 +- calendar/gui/dialogs/event-page.c | 4 ++-- calendar/gui/dialogs/task-details-page.c | 2 +- calendar/gui/dialogs/task-page.c | 2 +- calendar/gui/e-cal-config.h | 2 +- calendar/gui/e-cal-event.h | 4 ++-- calendar/gui/e-cal-list-view-config.c | 2 +- calendar/gui/e-cal-menu.h | 4 ++-- calendar/gui/e-cal-popup.h | 6 +++--- calendar/gui/e-calendar-table.c | 2 +- calendar/gui/e-calendar-view.c | 4 ++-- calendar/gui/e-cell-date-edit-config.c | 2 +- calendar/gui/e-date-edit-config.c | 2 +- calendar/gui/e-day-view-config.c | 2 +- calendar/gui/e-memo-table.c | 2 +- calendar/gui/memos-component.c | 2 +- calendar/gui/tasks-component.c | 2 +- composer/e-msg-composer.c | 2 +- e-util/e-bconf-map.h | 2 +- e-util/e-config.h | 4 ++-- e-util/e-cursor.h | 6 ++---- e-util/e-event.h | 2 +- e-util/e-menu.h | 2 +- e-util/e-profile-event.h | 4 ++-- e-util/e-signature-list.h | 2 +- filter/filter-datespec.c | 2 +- filter/filter-datespec.h | 2 +- filter/filter-rule.h | 2 +- filter/rule-context.h | 2 +- filter/rule-editor.h | 2 +- mail/em-account-editor.h | 2 +- mail/em-composer-utils.c | 2 +- mail/em-config.h | 2 +- mail/em-event.h | 14 +++++++------- mail/em-folder-browser.c | 4 ++-- mail/em-folder-selector.h | 4 ++-- mail/em-folder-tree-model.c | 2 +- mail/em-folder-view.c | 2 +- mail/em-folder-view.h | 2 +- mail/em-format-html-display.c | 6 +++--- mail/em-format-html.h | 2 +- mail/em-format.c | 4 ++-- mail/em-format.h | 4 ++-- mail/em-inline-filter.c | 2 +- mail/em-mailer-prefs.c | 18 +++--------------- mail/em-menu.h | 2 +- mail/em-migrate.c | 4 ++-- mail/em-popup.h | 6 +++--- mail/em-sync-stream.c | 2 +- mail/em-vfolder-rule.c | 2 +- mail/em-vfolder-rule.h | 2 +- mail/mail-autofilter.h | 2 +- mail/mail-component.h | 2 +- mail/mail-mt.c | 2 +- mail/mail-mt.h | 4 ++-- mail/mail-ops.c | 4 ++-- mail/message-list.c | 6 +++--- mail/message-list.h | 4 ++-- plugins/attachment-reminder/attachment-reminder.c | 2 +- plugins/backup-restore/backup-restore.c | 2 +- plugins/email-custom-header/email-custom-header.c | 4 ++-- plugins/exchange-operations/exchange-account-setup.c | 2 +- plugins/groupwise-features/install-shared.c | 4 ++-- plugins/groupwise-features/share-folder-common.c | 2 +- plugins/groupwise-features/share-folder.c | 2 +- plugins/publish-calendar/publish-location.h | 10 +++------- plugins/publish-calendar/url-editor-dialog.h | 4 ++-- plugins/sa-junk-plugin/em-junk-filter.c | 9 --------- plugins/templates/templates.c | 2 +- shell/e-component-registry.h | 2 +- shell/e-shell-window.c | 2 +- shell/es-event.h | 2 +- shell/es-menu.h | 4 ++-- smime/gui/e-cert-selector.h | 2 +- smime/lib/e-asn1-object.h | 2 +- smime/lib/e-cert.c | 4 ++-- smime/lib/e-pkcs12.c | 2 +- widgets/menus/gal-view-instance-save-as-dialog.c | 2 +- widgets/misc/e-canvas-background.c | 2 +- widgets/misc/e-canvas.c | 8 ++++---- widgets/misc/e-charset-picker.c | 2 +- widgets/misc/e-filter-bar.c | 2 +- widgets/misc/e-filter-bar.h | 2 +- widgets/misc/e-search-bar.c | 2 +- widgets/misc/e-search-bar.h | 2 +- widgets/table/e-cell-hbox.c | 10 +++++----- widgets/table/e-table-col.c | 2 +- widgets/table/e-table-config.c | 2 +- widgets/table/e-table.c | 2 +- widgets/table/e-tree-selection-model.c | 2 +- widgets/table/e-tree.c | 2 +- 109 files changed, 160 insertions(+), 187 deletions(-) diff --git a/a11y/addressbook/ea-minicard.c b/a11y/addressbook/ea-minicard.c index d0219e03b5..258fcbd4bc 100644 --- a/a11y/addressbook/ea-minicard.c +++ b/a11y/addressbook/ea-minicard.c @@ -240,7 +240,7 @@ static gboolean atk_action_interface_do_action (AtkAction *iface, gint i) return FALSE; switch (i) { - // open card + /* open card */ case 0: e_minicard_activate_editor (minicard); break; diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c index 16d50df9b0..e28d0f6b83 100644 --- a/a11y/e-table/gal-a11y-e-table-item.c +++ b/a11y/e-table/gal-a11y-e-table-item.c @@ -760,7 +760,7 @@ enum { ETI_HEADER_UNCHANGED = 0, ETI_HEADER_REORDERED, ETI_HEADER_NEW_ADDED, - ETI_HEADER_REMOVED, + ETI_HEADER_REMOVED }; /* diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index 6340b999f4..c939b9cd27 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -207,7 +207,7 @@ e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *categ category->name[i][j] = '\0'; } - //find a desktop id that is not in use between 128 and 255 + /* find a desktop id that is not in use between 128 and 255 */ /* XXX desktopUniqueID should really be used for tracking * categories across renaming operations, but as Evo * doesn't have a concept of category UIDs or renaming, @@ -266,7 +266,7 @@ void e_pilot_local_category_to_remote(int * pilotCategory, } l = c_list; while(l && *pilotCategory == 0) { - //list != 0, so at least 1 category is assigned + /* list != 0, so at least 1 category is assigned */ category_string = e_pilot_utf8_to_pchar((const char *)l->data); for (i=0; i < PILOT_MAX_CATEGORIES; i++) { /* only 15 chars + nul in palm category name */ diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h index 04b44cd872..6ea33f1656 100644 --- a/addressbook/gui/component/addressbook-config.h +++ b/addressbook/gui/component/addressbook-config.h @@ -29,7 +29,7 @@ typedef enum { ADDRESSBOOK_LDAP_AUTH_NONE, ADDRESSBOOK_LDAP_AUTH_SIMPLE_EMAIL, - ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN, + ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN } AddressbookLDAPAuthType; typedef enum { diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 53560e87d9..2f77fc4e50 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -479,7 +479,7 @@ set_status_message (EABView *eav, const char *message, AddressbookView *view) priv->activity_id = 0; } } else if (priv->activity_id == 0) { - char *clientid = g_strdup_printf ("%p", view); + char *clientid = g_strdup_printf ("%p", (gpointer) view); priv->activity_id = e_activity_handler_operation_started ( activity_handler, clientid, message, TRUE); diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index 8fec8b315d..80fb7514a1 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -126,7 +126,7 @@ struct _EContactListEditorPrivate { #define VCARD_TYPE "text/x-vcard" enum { - TARGET_TYPE_VCARD, + TARGET_TYPE_VCARD }; static GtkTargetEntry targets[] = { diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index 7273689fd1..73518fc0b2 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -47,7 +47,7 @@ enum { PROP_0, PROP_BOOK, PROP_QUERY, - PROP_EDITABLE, + PROP_EDITABLE }; enum { diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 1f2b1aad7a..d2c20722ef 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -50,7 +50,7 @@ enum { PROP_BOOK, PROP_QUERY, PROP_EDITABLE, - PROP_MODEL, + PROP_MODEL }; enum { diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 3c0c28f6ad..9fdb15eac9 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -111,7 +111,7 @@ enum { PROP_BOOK, PROP_SOURCE, PROP_QUERY, - PROP_TYPE, + PROP_TYPE }; enum { @@ -149,7 +149,7 @@ static GalViewCollection *collection = NULL; enum { ESB_FULL_NAME, ESB_EMAIL, - ESB_ANY, + ESB_ANY }; #if 0 diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index c9ac35d2fa..799e01a792 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -55,7 +55,7 @@ struct _EABMenuTargetSelect; typedef enum { EAB_VIEW_NONE, /* initialized to this */ EAB_VIEW_MINICARD, - EAB_VIEW_TABLE, + EAB_VIEW_TABLE } EABViewType; diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h index 59b1705764..6e593f1fb8 100644 --- a/addressbook/gui/widgets/eab-config.h +++ b/addressbook/gui/widgets/eab-config.h @@ -45,7 +45,7 @@ struct _EABConfigClass { }; enum _eab_config_target_t { - EAB_CONFIG_TARGET_SOURCE, + EAB_CONFIG_TARGET_SOURCE }; typedef struct _EABConfigTargetSource EABConfigTargetSource; diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h index 79dbe5493a..4cab9b36b0 100644 --- a/addressbook/gui/widgets/eab-gui-util.h +++ b/addressbook/gui/widgets/eab-gui-util.h @@ -66,7 +66,7 @@ void eab_contact_list_save (char *title, typedef enum { EAB_DISPOSITION_AS_ATTACHMENT, - EAB_DISPOSITION_AS_TO, + EAB_DISPOSITION_AS_TO } EABDisposition; void eab_send_contact (EContact *contact, diff --git a/addressbook/gui/widgets/eab-menu.h b/addressbook/gui/widgets/eab-menu.h index 7da05c133b..380346651b 100644 --- a/addressbook/gui/widgets/eab-menu.h +++ b/addressbook/gui/widgets/eab-menu.h @@ -40,7 +40,7 @@ typedef struct _EABMenuClass EABMenuClass; /* Current target description */ enum _eab_menu_target_t { - EAB_MENU_TARGET_SELECT, + EAB_MENU_TARGET_SELECT }; /** @@ -57,7 +57,7 @@ enum _eab_menu_target_select_t { EAB_MENU_SELECT_MANY = 1<<1, EAB_MENU_SELECT_ANY = 1<<2, EAB_MENU_SELECT_EDITABLE = 1<<3, - EAB_MENU_SELECT_EMAIL = 1<<4, + EAB_MENU_SELECT_EMAIL = 1<<4 }; typedef struct _EABMenuTargetSelect EABMenuTargetSelect; diff --git a/addressbook/gui/widgets/eab-popup.h b/addressbook/gui/widgets/eab-popup.h index 933c815af8..b86cc12a99 100644 --- a/addressbook/gui/widgets/eab-popup.h +++ b/addressbook/gui/widgets/eab-popup.h @@ -50,7 +50,7 @@ enum _eab_popup_target_t { EAB_POPUP_TARGET_SELECT, EAB_POPUP_TARGET_URI, EAB_POPUP_TARGET_SOURCE, - EAB_POPUP_TARGET_SELECT_NAMES, + EAB_POPUP_TARGET_SELECT_NAMES }; /** @@ -69,13 +69,13 @@ enum _eab_popup_target_select_t { EAB_POPUP_SELECT_EDITABLE = 1<<3, EAB_POPUP_SELECT_EMAIL = 1<<4, EAB_POPUP_LIST = 1<<5, - EAB_POPUP_CONTACT = 1<<6, + EAB_POPUP_CONTACT = 1<<6 }; enum _eab_popup_target_uri_t { EAB_POPUP_URI_HTTP = 1<<0, EAB_POPUP_URI_MAILTO = 1<<1, - EAB_POPUP_URI_NOT_MAILTO = 1<<2, + EAB_POPUP_URI_NOT_MAILTO = 1<<2 }; /** * enum _eab_popup_target_source_t - EABPopupTargetSource qualifiers. @@ -87,7 +87,7 @@ enum _eab_popup_target_uri_t { enum _eab_popup_target_source_t { EAB_POPUP_SOURCE_PRIMARY = 1<<0, EAB_POPUP_SOURCE_SYSTEM = 1<<1, /* system folder */ - EAB_POPUP_SOURCE_USER = 1<<2, /* user folder (!system) */ + EAB_POPUP_SOURCE_USER = 1<<2 /* user folder (!system) */ }; typedef struct _EABPopupTargetSelect EABPopupTargetSelect; diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index e7e5f57506..b9b6b3449c 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -1631,7 +1631,7 @@ pre_sync (GnomePilotConduit *conduit, pi_buffer_free(buffer); #endif unpack_AppointmentAppInfo (&(ctxt->ai), buf, len); - //unpack_CategoryAppInfo (&(ctxt->ai.category), buf, len); + /* unpack_CategoryAppInfo (&(ctxt->ai.category), buf, len); */ g_free (buf); check_for_slow_setting (conduit, ctxt); diff --git a/calendar/conduits/common/libecalendar-common-conduit.c b/calendar/conduits/common/libecalendar-common-conduit.c index fbbe0278b1..59f411da69 100644 --- a/calendar/conduits/common/libecalendar-common-conduit.c +++ b/calendar/conduits/common/libecalendar-common-conduit.c @@ -93,7 +93,7 @@ e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *categ category->name[i][j] = '\0'; } - //find a desktop id that is not in use between 128 and 255 + /* find a desktop id that is not in use between 128 and 255 */ for (desktopUniqueID = 128; desktopUniqueID <= 255; desktopUniqueID++) { int found = 0; for(j=0; jdata); if (c_list->next != 0) { LOG (g_message ("Note: item has more categories in evolution, first chosen")); diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index f40bc82eab..7639291504 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -1013,7 +1013,7 @@ pre_sync (GnomePilotConduit *conduit, /* Get the default component */ if (!e_cal_get_default_object (ctxt->client, &icalcomp, NULL)) return -1; - LOG (g_message ( " Got default component: %p", icalcomp)); + LOG (g_message (" Got default component: %p", (gpointer) icalcomp)); ctxt->default_comp = e_cal_component_new (); if (!e_cal_component_set_icalcomponent (ctxt->default_comp, icalcomp)) { diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index 859b775607..e7be5554b8 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -1540,7 +1540,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa, g_signal_connect (G_OBJECT (tray_data->query), "objects_removed", G_CALLBACK (on_dialog_objs_removed_cb), tray_data); - // FIXME: We should remove this check + /* FIXME: We should remove this check */ if (!config_data_get_notify_with_tray ()) { tray_blink_id = -1; open_alarm_dialog (tray_data); diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 4d30929272..078c854b98 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -73,7 +73,7 @@ #define CALENDAR_ERROR_TIME_OUT_KEY "/apps/evolution/calendar/display/error_timeout" enum DndTargetType { - DND_TARGET_TYPE_CALENDAR_LIST, + DND_TARGET_TYPE_CALENDAR_LIST }; #define CALENDAR_TYPE "text/calendar" #define XCALENDAR_TYPE "text/x-calendar" diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index dfc33fbbc4..cd54c65c08 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -209,7 +209,7 @@ static void update_end_time_combo ( EventPage *epage); static void event_page_select_organizer (EventPage *epage, const char *backend_address); static void set_subscriber_info_string (EventPage *epage, const char *backend_address); -G_DEFINE_TYPE (EventPage, event_page, TYPE_COMP_EDITOR_PAGE); +G_DEFINE_TYPE (EventPage, event_page, TYPE_COMP_EDITOR_PAGE) static void event_page_dispose (GObject *object) @@ -1885,7 +1885,7 @@ enum { ATTENDEE_CAN_DELEGATE = 1<<1, ATTENDEE_CAN_DELETE = 1<<2, ATTENDEE_CAN_ADD = 1<<3, - ATTENDEE_LAST = 1<<4, + ATTENDEE_LAST = 1<<4 }; static EPopupItem context_menu_items[] = { diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c index 959c275443..86a39aad24 100644 --- a/calendar/gui/dialogs/task-details-page.c +++ b/calendar/gui/dialogs/task-details-page.c @@ -77,7 +77,7 @@ typedef enum { PRIORITY_HIGH, PRIORITY_NORMAL, PRIORITY_LOW, - PRIORITY_UNDEFINED, + PRIORITY_UNDEFINED } TaskEditorPriority; static const int priority_map[] = { diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index c3a8e34ba0..fc0c2330bf 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -1195,7 +1195,7 @@ enum { ATTENDEE_CAN_DELEGATE = 1<<1, ATTENDEE_CAN_DELETE = 1<<2, ATTENDEE_CAN_ADD = 1<<3, - ATTENDEE_LAST = 1<<4, + ATTENDEE_LAST = 1<<4 }; static EPopupItem context_menu_items[] = { diff --git a/calendar/gui/e-cal-config.h b/calendar/gui/e-cal-config.h index 8af6313b5b..8f27cbd2f2 100644 --- a/calendar/gui/e-cal-config.h +++ b/calendar/gui/e-cal-config.h @@ -47,7 +47,7 @@ struct _ECalConfigClass { enum _e_cal_config_target_t { EC_CONFIG_TARGET_SOURCE, - EC_CONFIG_TARGET_PREFS, + EC_CONFIG_TARGET_PREFS }; typedef struct _ECalConfigTargetSource ECalConfigTargetSource; diff --git a/calendar/gui/e-cal-event.h b/calendar/gui/e-cal-event.h index 4fbaa394ec..a77d2a147f 100644 --- a/calendar/gui/e-cal-event.h +++ b/calendar/gui/e-cal-event.h @@ -37,12 +37,12 @@ typedef struct _ECalEvent ECalEvent; typedef struct _ECalEventClass ECalEventClass; enum _e_cal_event_target_t { - E_CAL_EVENT_TARGET_COMPONENT, + E_CAL_EVENT_TARGET_COMPONENT }; /* Flags that describe TARGET_COMPONENT */ enum { - E_CAL_EVENT_COMPONENT_MIGRATION = 1 << 0, + E_CAL_EVENT_COMPONENT_MIGRATION = 1 << 0 }; typedef struct _ECalEventTargetComponent ECalEventTargetComponent; diff --git a/calendar/gui/e-cal-list-view-config.c b/calendar/gui/e-cal-list-view-config.c index efa8b9b7fb..6c930b1b61 100644 --- a/calendar/gui/e-cal-list-view-config.c +++ b/calendar/gui/e-cal-list-view-config.c @@ -32,7 +32,7 @@ struct _ECalListViewConfigPrivate { /* Property IDs */ enum props { PROP_0, - PROP_VIEW, + PROP_VIEW }; G_DEFINE_TYPE (ECalListViewConfig, e_cal_list_view_config, G_TYPE_OBJECT) diff --git a/calendar/gui/e-cal-menu.h b/calendar/gui/e-cal-menu.h index 30962d9a1a..9c37a6a9ae 100644 --- a/calendar/gui/e-cal-menu.h +++ b/calendar/gui/e-cal-menu.h @@ -39,7 +39,7 @@ typedef struct _ECalMenuClass ECalMenuClass; /* Current target description */ /* Types of popup tagets */ enum _e_cal_menu_target_t { - E_CAL_MENU_TARGET_SELECT, + E_CAL_MENU_TARGET_SELECT }; /** @@ -73,7 +73,7 @@ enum _e_cal_menu_target_select_t { E_CAL_MENU_SELECT_ASSIGNABLE = 1<<10, E_CAL_MENU_SELECT_HASURL = 1<<11, - E_CAL_MENU_SELECT_NOTCOMPLETE = 1<<12, + E_CAL_MENU_SELECT_NOTCOMPLETE = 1<<12 }; typedef struct _ECalMenuTargetSelect ECalMenuTargetSelect; diff --git a/calendar/gui/e-cal-popup.h b/calendar/gui/e-cal-popup.h index 34874efdba..185e9877f0 100644 --- a/calendar/gui/e-cal-popup.h +++ b/calendar/gui/e-cal-popup.h @@ -50,7 +50,7 @@ struct _ECalendarView; enum _e_cal_popup_target_t { E_CAL_POPUP_TARGET_SELECT, E_CAL_POPUP_TARGET_SOURCE, - E_CAL_POPUP_TARGET_ATTACHMENTS, + E_CAL_POPUP_TARGET_ATTACHMENTS }; /** @@ -89,7 +89,7 @@ enum _e_cal_popup_target_select_t { E_CAL_POPUP_SELECT_ACCEPTABLE = 1<<14, E_CAL_POPUP_SELECT_NOTCOMPLETE = 1<<15, E_CAL_POPUP_SELECT_NOSAVESCHEDULES = 1<<16, - E_CAL_POPUP_SELECT_COMPLETE = 1<<17, + E_CAL_POPUP_SELECT_COMPLETE = 1<<17 }; /** @@ -121,7 +121,7 @@ enum _e_cal_popup_target_attachments_t { E_CAL_POPUP_ATTACHMENTS_MANY = 1<<1, /* one or more selected */ E_CAL_POPUP_ATTACHMENTS_MODIFY = 1<<2, /* check for modify operation */ E_CAL_POPUP_ATTACHMENTS_MULTIPLE = 1<<3, - E_CAL_POPUP_ATTACHMENTS_IMAGE = 1<<4, + E_CAL_POPUP_ATTACHMENTS_IMAGE = 1<<4 }; typedef struct _ECalPopupTargetSelect ECalPopupTargetSelect; diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index ddf96d00f2..d032066f86 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -1882,7 +1882,7 @@ e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *mes cal_table->activity_id = 0; } } else if (cal_table->activity_id == 0) { - char *client_id = g_strdup_printf ("%p", cal_table); + char *client_id = g_strdup_printf ("%p", (gpointer) cal_table); cal_table->activity_id = e_activity_handler_operation_started ( cal_table->activity_handler, client_id, message, TRUE); diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 6c8e1f83ab..a99149ae2e 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -85,7 +85,7 @@ extern ECompEditorRegistry *comp_editor_registry; /* Property IDs */ enum props { PROP_0, - PROP_MODEL, + PROP_MODEL }; /* FIXME Why are we emitting these event signals here? Can't the model just be listened to? */ @@ -567,7 +567,7 @@ e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *messag priv->activity_id = 0; } } else if (priv->activity_id == 0) { - char *client_id = g_strdup_printf ("%p", cal_view); + char *client_id = g_strdup_printf ("%p", (gpointer) cal_view); priv->activity_id = e_activity_handler_operation_started ( priv->activity_handler, client_id, message, TRUE); diff --git a/calendar/gui/e-cell-date-edit-config.c b/calendar/gui/e-cell-date-edit-config.c index e2a9cc6eb2..5be8569bd3 100644 --- a/calendar/gui/e-cell-date-edit-config.c +++ b/calendar/gui/e-cell-date-edit-config.c @@ -35,7 +35,7 @@ struct _ECellDateEditConfigPrivate { /* Property IDs */ enum props { PROP_0, - PROP_CELL, + PROP_CELL }; G_DEFINE_TYPE (ECellDateEditConfig, e_cell_date_edit_config, G_TYPE_OBJECT) diff --git a/calendar/gui/e-date-edit-config.c b/calendar/gui/e-date-edit-config.c index 16732305ec..d6fd6cf675 100644 --- a/calendar/gui/e-date-edit-config.c +++ b/calendar/gui/e-date-edit-config.c @@ -32,7 +32,7 @@ struct _EDateEditConfigPrivate { /* Property IDs */ enum props { PROP_0, - PROP_EDIT, + PROP_EDIT }; G_DEFINE_TYPE (EDateEditConfig, e_date_edit_config, G_TYPE_OBJECT) diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c index b7acf6541f..44156bf18e 100644 --- a/calendar/gui/e-day-view-config.c +++ b/calendar/gui/e-day-view-config.c @@ -32,7 +32,7 @@ struct _EDayViewConfigPrivate { /* Property IDs */ enum props { PROP_0, - PROP_VIEW, + PROP_VIEW }; G_DEFINE_TYPE (EDayViewConfig, e_day_view_config, G_TYPE_OBJECT) diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index 260103ada0..067a87bf29 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -1130,7 +1130,7 @@ e_memo_table_set_status_message (EMemoTable *memo_table, const gchar *message) memo_table->activity_id = 0; } } else if (memo_table->activity_id == 0) { - char *client_id = g_strdup_printf ("%p", memo_table); + char *client_id = g_strdup_printf ("%p", (gpointer) memo_table); memo_table->activity_id = e_activity_handler_operation_started ( memo_table->activity_handler, client_id, message, TRUE); diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c index 0e422d548d..66b6f6a2ec 100644 --- a/calendar/gui/memos-component.c +++ b/calendar/gui/memos-component.c @@ -59,7 +59,7 @@ #define CREATE_MEMO_LIST_ID "memo-list" enum DndTargetType { - DND_TARGET_TYPE_CALENDAR_LIST, + DND_TARGET_TYPE_CALENDAR_LIST }; #define CALENDAR_TYPE "text/calendar" #define XCALENDAR_TYPE "text/x-calendar" diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index 9ed21d5186..25bf06bda1 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -58,7 +58,7 @@ #define CREATE_TASK_LIST_ID "task-list" enum DndTargetType { - DND_TARGET_TYPE_CALENDAR_LIST, + DND_TARGET_TYPE_CALENDAR_LIST }; #define CALENDAR_TYPE "text/calendar" #define XCALENDAR_TYPE "text/x-calendar" diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 3079e8ed57..32a2a40a9c 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -1361,7 +1361,7 @@ msg_composer_subject_changed_cb (EMsgComposer *composer) enum { UPDATE_AUTO_CC, - UPDATE_AUTO_BCC, + UPDATE_AUTO_BCC }; static void diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h index f47368de78..1d72119c8c 100644 --- a/e-util/e-bconf-map.h +++ b/e-util/e-bconf-map.h @@ -41,7 +41,7 @@ enum { E_BCONF_MAP_ENUM, /* long/bool -> prop of name 'to', with the value indexed into the child map table's from field */ E_BCONF_MAP_CHILD, /* a new child of name 'to' */ E_BCONF_MAP_MASK = 0x3f, - E_BCONF_MAP_CONTENT = 0x80, /* if set, create a new node of name 'to' instead of a property */ + E_BCONF_MAP_CONTENT = 0x80 /* if set, create a new node of name 'to' instead of a property */ }; typedef struct _e_bconf_map { diff --git a/e-util/e-config.h b/e-util/e-config.h index 2eeb663d59..1ee7e29b58 100644 --- a/e-util/e-config.h +++ b/e-util/e-config.h @@ -75,7 +75,7 @@ typedef struct _GtkWidget * (*EConfigItemFactoryFunc)(EConfig *ec, EConfigItem * typedef enum _e_config_target_change_t { E_CONFIG_TARGET_CHANGED_STATE, - E_CONFIG_TARGET_CHANGED_REBUILD, + E_CONFIG_TARGET_CHANGED_REBUILD } e_config_target_change_t; /** @@ -123,7 +123,7 @@ enum _e_config_t { E_CONFIG_SECTION, E_CONFIG_SECTION_TABLE, E_CONFIG_ITEM, - E_CONFIG_ITEM_TABLE, /* only allowed in table sections */ + E_CONFIG_ITEM_TABLE /* only allowed in table sections */ }; /** diff --git a/e-util/e-cursor.h b/e-util/e-cursor.h index 9e1a228316..f0b78b3126 100644 --- a/e-util/e-cursor.h +++ b/e-util/e-cursor.h @@ -27,11 +27,9 @@ #include typedef enum { - E_CURSOR_NORMAL, - E_CURSOR_BUSY, - -}ECursorType; + E_CURSOR_BUSY +} ECursorType; void e_cursor_set (GtkWidget *widget, ECursorType cursor); diff --git a/e-util/e-event.h b/e-util/e-event.h index 074d8deed2..c97f1b30bc 100644 --- a/e-util/e-event.h +++ b/e-util/e-event.h @@ -60,7 +60,7 @@ typedef void (*EEventFactoryFunc)(EEvent *ee, void *); **/ enum _e_event_t { E_EVENT_PASS, /* passthrough */ - E_EVENT_SINK, /* sink events */ + E_EVENT_SINK /* sink events */ }; /** diff --git a/e-util/e-menu.h b/e-util/e-menu.h index e6ee11f304..f844f80400 100644 --- a/e-util/e-menu.h +++ b/e-util/e-menu.h @@ -68,7 +68,7 @@ enum _e_menu_t { E_MENU_TOGGLE, E_MENU_RADIO, E_MENU_TYPE_MASK = 0xffff, - E_MENU_ACTIVE = 0x10000, + E_MENU_ACTIVE = 0x10000 }; /** diff --git a/e-util/e-profile-event.h b/e-util/e-profile-event.h index b7ac21adc1..dd84671902 100644 --- a/e-util/e-profile-event.h +++ b/e-util/e-profile-event.h @@ -42,14 +42,14 @@ typedef struct _EProfileEventClass EProfileEventClass; /* Current target description */ enum _e_profile_event_target_t { - E_PROFILE_EVENT_TARGET, + E_PROFILE_EVENT_TARGET }; /* Flags that qualify a target (UNIMPLEMENTED) */ enum { E_PROFILE_EVENT_START = 1<< 0, E_PROFILE_EVENT_END = 1<< 1, - E_PROFILE_EVENT_CANCEL = 1<< 2, + E_PROFILE_EVENT_CANCEL = 1<< 2 }; typedef struct _EProfileEventTarget EProfileEventTarget; diff --git a/e-util/e-signature-list.h b/e-util/e-signature-list.h index 4edd48a7dd..cfaa64c28a 100644 --- a/e-util/e-signature-list.h +++ b/e-util/e-signature-list.h @@ -41,7 +41,7 @@ typedef struct _ESignatureListClass ESignatureListClass; /* search options for the find command */ typedef enum { E_SIGNATURE_FIND_NAME, - E_SIGNATURE_FIND_UID, + E_SIGNATURE_FIND_UID } e_signature_find_t; struct _ESignatureList { diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c index 599681c4d4..cf92b804f5 100644 --- a/filter/filter-datespec.c +++ b/filter/filter-datespec.c @@ -366,7 +366,7 @@ set_values (FilterDatespec *fds) p->type = fds->type==FDST_UNKNOWN ? FDST_NOW : fds->type; - note_type = fds->type==FDST_X_FUTURE ? FDST_X_AGO : fds->type; // FUTURE and AGO use the same notebook pages/etc. + note_type = fds->type==FDST_X_FUTURE ? FDST_X_AGO : fds->type; /* FUTURE and AGO use the same notebook pages/etc. */ switch (p->type) { case FDST_NOW: diff --git a/filter/filter-datespec.h b/filter/filter-datespec.h index 29c4f872b1..cbb79a46c5 100644 --- a/filter/filter-datespec.h +++ b/filter/filter-datespec.h @@ -42,7 +42,7 @@ typedef enum _FilterDatespec_type { FDST_NOW, FDST_SPECIFIED, FDST_X_AGO, - FDST_X_FUTURE, + FDST_X_FUTURE } FilterDatespec_type; struct _FilterDatespec { diff --git a/filter/filter-rule.h b/filter/filter-rule.h index 184c1270e5..b1683e1c8b 100644 --- a/filter/filter-rule.h +++ b/filter/filter-rule.h @@ -52,7 +52,7 @@ enum _filter_threading_t { FILTER_THREAD_ALL, /* add all possible threads */ FILTER_THREAD_REPLIES, /* add only replies */ FILTER_THREAD_REPLIES_PARENTS, /* replies plus parents */ - FILTER_THREAD_SINGLE, /* messages with no replies or parents */ + FILTER_THREAD_SINGLE /* messages with no replies or parents */ }; #define FILTER_SOURCE_INCOMING "incoming" /* performed on incoming email */ diff --git a/filter/rule-context.h b/filter/rule-context.h index f7a10df65f..ba7e47c381 100644 --- a/filter/rule-context.h +++ b/filter/rule-context.h @@ -45,7 +45,7 @@ typedef struct _RuleContextClass RuleContextClass; /* backend capabilities, this is a hack since we don't support nested rules */ enum { RULE_CONTEXT_GROUPING = 1 << 0, - RULE_CONTEXT_THREADING = 1 << 1, + RULE_CONTEXT_THREADING = 1 << 1 }; struct _RuleContext { diff --git a/filter/rule-editor.h b/filter/rule-editor.h index 4e675f839f..555b5e8263 100644 --- a/filter/rule-editor.h +++ b/filter/rule-editor.h @@ -77,7 +77,7 @@ enum { RULE_EDITOR_LOG_EDIT, RULE_EDITOR_LOG_ADD, RULE_EDITOR_LOG_REMOVE, - RULE_EDITOR_LOG_RANK, + RULE_EDITOR_LOG_RANK }; struct _RuleEditorUndo { diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h index 9a5b09afe3..43e5c0652c 100644 --- a/mail/em-account-editor.h +++ b/mail/em-account-editor.h @@ -38,7 +38,7 @@ typedef struct _EMAccountEditorClass EMAccountEditorClass; typedef enum { EMAE_NOTEBOOK, - EMAE_DRUID, + EMAE_DRUID } em_account_editor_t; struct _EMAccountEditor { diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 0425645abe..2336f3c798 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -2047,7 +2047,7 @@ enum { ATTRIB_TM_YEAR, ATTRIB_TM_2YEAR, ATTRIB_TM_WDAY, /* not actually used */ - ATTRIB_TM_YDAY, + ATTRIB_TM_YDAY }; typedef void (* AttribFormatter) (GString *str, const char *attr, CamelMimeMessage *message); diff --git a/mail/em-config.h b/mail/em-config.h index 5530d27d00..ba19bb1c37 100644 --- a/mail/em-config.h +++ b/mail/em-config.h @@ -42,7 +42,7 @@ typedef struct _EMConfigClass EMConfigClass; enum _em_config_target_t { EM_CONFIG_TARGET_FOLDER, EM_CONFIG_TARGET_PREFS, - EM_CONFIG_TARGET_ACCOUNT, + EM_CONFIG_TARGET_ACCOUNT }; typedef struct _EMConfigTargetFolder EMConfigTargetFolder; diff --git a/mail/em-event.h b/mail/em-event.h index eb45050a27..21df1df42d 100644 --- a/mail/em-event.h +++ b/mail/em-event.h @@ -49,37 +49,37 @@ enum _em_event_target_t { EM_EVENT_TARGET_MESSAGE, EM_EVENT_TARGET_COMPOSER, EM_EVENT_TARGET_SEND_RECEIVE, - EM_EVENT_TARGET_CUSTOM_ICON, + EM_EVENT_TARGET_CUSTOM_ICON }; /* Flags for FOLDER BROWSER Events*/ enum { - EM_EVENT_FOLDER_BROWSER = 1<< 0, + EM_EVENT_FOLDER_BROWSER = 1<< 0 }; /* Flags that describe TARGET_FOLDER */ enum { - EM_EVENT_FOLDER_NEWMAIL = 1<< 0, + EM_EVENT_FOLDER_NEWMAIL = 1<< 0 }; /* Flags that describe TARGET_MESSAGE */ enum { - EM_EVENT_MESSAGE_REPLY_ALL = 1<< 0, + EM_EVENT_MESSAGE_REPLY_ALL = 1<< 0 }; /* Flags that describe TARGET_COMPOSER */ enum { - EM_EVENT_COMPOSER_SEND_OPTION = 1<< 0, + EM_EVENT_COMPOSER_SEND_OPTION = 1<< 0 }; /* Flags that describe TARGET_SEND_RECEIVE*/ enum { - EM_EVENT_SEND_RECEIVE = 1<< 0, + EM_EVENT_SEND_RECEIVE = 1<< 0 }; /* Flags that describe TARGET_CUSTOM_ICON*/ enum { - EM_EVENT_CUSTOM_ICON = 1<< 0, + EM_EVENT_CUSTOM_ICON = 1<< 0 }; typedef struct _EMEventTargetFolder EMEventTargetFolder; diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 58e42a5834..7a3e690e2b 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -181,7 +181,7 @@ enum { static guint folder_browser_signals [LAST_SIGNAL] = {0, }; enum { - ESB_SAVE, + ESB_SAVE }; static ESearchBarItem emfb_search_items[] = { @@ -1363,7 +1363,7 @@ emfb_list_key_press(ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, } if (!folder_choose && !emfb->view.preview->caret_mode && mail_config_get_enable_magic_spacebar ()) { - //check for unread messages. if yes .. rewindback to the folder + /* check for unread messages. if yes .. rewindback to the folder */ EMFolderTree *emft = g_object_get_data((GObject*)emfb, "foldertree"); switch (ev->key.keyval) { case GDK_space: diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h index 06b1bc4520..7b011f588c 100644 --- a/mail/em-folder-selector.h +++ b/mail/em-folder-selector.h @@ -61,11 +61,11 @@ struct _EMFolderSelectorClass { }; enum { - EM_FOLDER_SELECTOR_CAN_CREATE = 1, + EM_FOLDER_SELECTOR_CAN_CREATE = 1 }; enum { - EM_FOLDER_SELECTOR_RESPONSE_NEW = 1, + EM_FOLDER_SELECTOR_RESPONSE_NEW = 1 }; GType em_folder_selector_get_type (void); diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 8687b1cbd2..04e66e2c86 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -295,7 +295,7 @@ em_folder_tree_model_init (EMFolderTreeModel *model) model->account_hash = g_hash_table_new (g_direct_hash, g_direct_equal); model->account_changed_id = g_signal_connect (model->accounts, "account-changed", G_CALLBACK (account_changed), model); model->account_removed_id = g_signal_connect (model->accounts, "account-removed", G_CALLBACK (account_removed), model); - //g_signal_connect (model, "row-changed", G_CALLBACK (emft_model_unread_count_changed), NULL); + /* g_signal_connect (model, "row-changed", G_CALLBACK (emft_model_unread_count_changed), NULL); */ } static void diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 2fa04b5990..42037b5a33 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -2821,7 +2821,7 @@ emfv_append_menu (EMPopup *des_emp, GtkMenu *des_menu, EMPopup *src_emp, GtkMenu gtk_widget_destroy (GTK_WIDGET (src_menu)); /* free src_emp together with des_emp; name contains unique identifier */ - name = g_strdup_printf ("emp_%p", src_emp); + name = g_strdup_printf ("emp_%p", (gpointer) src_emp); g_object_set_data_full (G_OBJECT (des_emp), name, src_emp, emfv_free_em_popup); g_free (name); diff --git a/mail/em-folder-view.h b/mail/em-folder-view.h index 42ef20d296..4af4760cac 100644 --- a/mail/em-folder-view.h +++ b/mail/em-folder-view.h @@ -67,7 +67,7 @@ enum { EM_FOLDER_VIEW_SELECT_SELECTION = EM_POPUP_SELECT_LAST<<6, EM_FOLDER_VIEW_SELECT_NOSELECTION = EM_POPUP_SELECT_LAST<<7, EM_FOLDER_VIEW_PREVIEW_PRESENT = EM_POPUP_SELECT_LAST<<8, - EM_FOLDER_VIEW_SELECT_LAST = EM_POPUP_SELECT_LAST<<9, + EM_FOLDER_VIEW_SELECT_LAST = EM_POPUP_SELECT_LAST<<9 }; struct _EMFolderViewEnable { diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index f20af59683..68a28ea7cd 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -182,7 +182,7 @@ enum { EFHD_LINK_CLICKED, EFHD_POPUP_EVENT, EFHD_ON_URL, - EFHD_LAST_SIGNAL, + EFHD_LAST_SIGNAL }; static guint efhd_signals[EFHD_LAST_SIGNAL] = { 0 }; @@ -606,11 +606,11 @@ em_format_html_get_search_dialog (EMFormatHTMLDisplay *efhd) g_signal_connect (G_OBJECT (p->search_entry), "changed", (GCallback) icon_entry_changed_cb, clear_button); gtk_box_pack_start ((GtkBox *)(p->search_entry_box), icon_entry, FALSE, FALSE, 0); -// gtk_box_pack_start ((GtkBox *)(p->search_entry_box), icon_entry, TRUE, TRUE, 0); + /* gtk_box_pack_start ((GtkBox *)(p->search_entry_box), icon_entry, TRUE, TRUE, 0); */ hbox2 = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, FALSE, FALSE, 5); -// gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5); + /* gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5); */ button3 = gtk_button_new_with_mnemonic (_("_Previous")); gtk_button_set_image (GTK_BUTTON (button3), GTK_WIDGET(gtk_image_new_from_stock(GTK_STOCK_GO_BACK, GTK_ICON_SIZE_BUTTON))); diff --git a/mail/em-format-html.h b/mail/em-format-html.h index a34f7b6915..7cadd5e282 100644 --- a/mail/em-format-html.h +++ b/mail/em-format-html.h @@ -65,7 +65,7 @@ typedef struct _EMFormatHTMLPrivate EMFormatHTMLPrivate; enum _em_format_html_header_flags { EM_FORMAT_HTML_HEADER_TO = 1<<0, EM_FORMAT_HTML_HEADER_CC = 1<<1, - EM_FORMAT_HTML_HEADER_BCC = 1<<2, + EM_FORMAT_HTML_HEADER_BCC = 1<<2 }; typedef enum { diff --git a/mail/em-format.c b/mail/em-format.c index 89445ab35a..1d5570be96 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -82,7 +82,7 @@ static void emf_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart static gboolean emf_busy(EMFormat *emf); enum { EMF_COMPLETE, - EMF_LAST_SIGNAL, + EMF_LAST_SIGNAL }; static guint emf_signals[EMF_LAST_SIGNAL]; @@ -718,7 +718,7 @@ emf_format_clone(EMFormat *emf, CamelFolder *folder, const char *uid, CamelMimeM g_string_truncate(emf->part_id, 0); if (folder != NULL) /* TODO build some string based on the folder name/location? */ - g_string_append_printf(emf->part_id, ".%p", folder); + g_string_append_printf(emf->part_id, ".%p", (gpointer) folder); if (uid != NULL) g_string_append_printf(emf->part_id, ".%s", uid); } diff --git a/mail/em-format.h b/mail/em-format.h index 004d9c2e96..92c6b3dddf 100644 --- a/mail/em-format.h +++ b/mail/em-format.h @@ -71,7 +71,7 @@ typedef void (*EMFormatFunc) (EMFormat *md, CamelStream *stream, CamelMimePart * typedef enum _em_format_mode_t { EM_FORMAT_NORMAL, EM_FORMAT_ALLHEADERS, - EM_FORMAT_SOURCE, + EM_FORMAT_SOURCE } em_format_mode_t; /** @@ -103,7 +103,7 @@ struct _EMFormatHandler { **/ enum _em_format_handler_t { EM_FORMAT_HANDLER_INLINE = 1<<0, - EM_FORMAT_HANDLER_INLINE_DISPOSITION = 1<<1, + EM_FORMAT_HANDLER_INLINE_DISPOSITION = 1<<1 }; diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c index 07c7afa192..f671159369 100644 --- a/mail/em-inline-filter.c +++ b/mail/em-inline-filter.c @@ -102,7 +102,7 @@ enum { EMIF_BINHEX, EMIF_POSTSCRIPT, EMIF_PGPSIGNED, - EMIF_PGPENCRYPTED, + EMIF_PGPENCRYPTED }; static const struct { diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index e489e16826..9784f480b8 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -60,7 +60,7 @@ enum { HEADER_LIST_ENABLED_COLUMN, /* is the header enabled? */ HEADER_LIST_IS_DEFAULT_COLUMN, /* is this header a default header, eg From: */ HEADER_LIST_HEADER_COLUMN, /* the real name of this header */ - HEADER_LIST_N_COLUMNS, + HEADER_LIST_N_COLUMNS }; static GType col_types[] = { @@ -190,7 +190,7 @@ enum { enum { JH_LIST_COLUMN_NAME, - JH_LIST_COLUMN_VALUE, + JH_LIST_COLUMN_VALUE }; static void label_sensitive_buttons (EMMailerPrefs *prefs) @@ -356,7 +356,7 @@ jh_add_cb (GtkWidget *widget, gpointer user_data) char *tok; GSList *list = gconf_client_get_list (prefs->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL); - //FIXME: Validate the values + /* FIXME: Validate the values */ tok = g_strdup_printf ("%s=%s", name, value); list = g_slist_append (list, tok); @@ -842,18 +842,6 @@ custom_junk_button_toggled (GtkToggleButton *toggle, EMMailerPrefs *prefs) } -#if 0 -// not used at the moment, commenting out -static void -toggle_button_toggled_not (GtkToggleButton *toggle, EMMailerPrefs *prefs) -{ - const char *key; - - key = g_object_get_data ((GObject *) toggle, "key"); - gconf_client_set_bool (prefs->gconf, key, !gtk_toggle_button_get_active (toggle), NULL); -} -#endif - static void custom_font_changed (GtkToggleButton *toggle, EMMailerPrefs *prefs) { diff --git a/mail/em-menu.h b/mail/em-menu.h index 48fc96b7fc..08467fefd8 100644 --- a/mail/em-menu.h +++ b/mail/em-menu.h @@ -40,7 +40,7 @@ typedef struct _EMMenuClass EMMenuClass; /* Types of popup tagets */ enum _em_menu_target_t { EM_MENU_TARGET_SELECT, - EM_MENU_TARGET_WIDGET, + EM_MENU_TARGET_WIDGET }; /* Flags that describe a TARGET_SELECT */ diff --git a/mail/em-migrate.c b/mail/em-migrate.c index 8338bf56dc..1c58b6ca99 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -1347,7 +1347,7 @@ nofile: enum { CP_UNIQUE = 0, CP_OVERWRITE, - CP_APPEND, + CP_APPEND }; static int open_flags[3] = { @@ -2936,7 +2936,7 @@ migrate_to_db() i++; e_iterator_next (iter); } - //camel_session_set_online ((CamelSession *) session, TRUE); + /* camel_session_set_online ((CamelSession *) session, TRUE); */ g_object_unref (iter); em_migrate_close_progress_dialog (); } diff --git a/mail/em-popup.h b/mail/em-popup.h index 8df98a6488..870055140b 100644 --- a/mail/em-popup.h +++ b/mail/em-popup.h @@ -104,7 +104,7 @@ enum _em_popup_target_select_t { EM_POPUP_SELECT_FOLDER = 1<<15, /* do we have any folder at all? */ EM_POPUP_SELECT_JUNK = 1<<16, EM_POPUP_SELECT_NOT_JUNK = 1<<17, - EM_POPUP_SELECT_LAST = 1<<18, + EM_POPUP_SELECT_LAST = 1<<18 }; /** @@ -130,7 +130,7 @@ enum _em_popup_target_uri_t { **/ enum _em_popup_target_part_t { EM_POPUP_PART_MESSAGE = 1<<0, - EM_POPUP_PART_IMAGE = 1<<1, + EM_POPUP_PART_IMAGE = 1<<1 }; /** @@ -151,7 +151,7 @@ enum _em_popup_target_folder_t { EM_POPUP_FOLDER_DELETE = 1<<3, /* folder can be deleted/renamed */ EM_POPUP_FOLDER_SELECT = 1<<4, /* folder can be selected/opened */ EM_POPUP_FOLDER_OUTBOX = 1<<5, /* Outbox folder */ - EM_POPUP_FOLDER_NONSTATIC = 1<<6, /* Except static folders like Outbox.*/ + EM_POPUP_FOLDER_NONSTATIC = 1<<6 /* Except static folders like Outbox.*/ }; typedef struct _EMPopupTargetSelect EMPopupTargetSelect; diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c index ce388eea42..311c2e1b7a 100644 --- a/mail/em-sync-stream.c +++ b/mail/em-sync-stream.c @@ -39,7 +39,7 @@ enum _write_msg_t { EMSS_WRITE, EMSS_FLUSH, - EMSS_CLOSE, + EMSS_CLOSE }; struct _write_msg { diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index 6e12a0456d..a777faaefe 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -366,7 +366,7 @@ rule_copy(FilterRule *dest, FilterRule *src) enum { BUTTON_ADD, BUTTON_REMOVE, - BUTTON_LAST, + BUTTON_LAST }; struct _source_data { diff --git a/mail/em-vfolder-rule.h b/mail/em-vfolder-rule.h index 18f8c3156b..bc6a330c4b 100644 --- a/mail/em-vfolder-rule.h +++ b/mail/em-vfolder-rule.h @@ -37,7 +37,7 @@ enum _em_vfolder_rule_with_t { EM_VFOLDER_RULE_WITH_SPECIFIC, EM_VFOLDER_RULE_WITH_LOCAL_REMOTE_ACTIVE, EM_VFOLDER_RULE_WITH_REMOTE_ACTIVE, - EM_VFOLDER_RULE_WITH_LOCAL, + EM_VFOLDER_RULE_WITH_LOCAL }; typedef struct _EMVFolderRule EMVFolderRule; diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h index 9f2f66674a..bae8bd8313 100644 --- a/mail/mail-autofilter.h +++ b/mail/mail-autofilter.h @@ -35,7 +35,7 @@ enum { AUTO_SUBJECT = 1, AUTO_FROM = 2, AUTO_TO = 4, - AUTO_MLIST = 8, + AUTO_MLIST = 8 }; struct _FilterRule *em_vfolder_rule_from_message(struct _EMVFolderContext *context, struct _CamelMimeMessage *msg, int flags, const char *source); diff --git a/mail/mail-component.h b/mail/mail-component.h index 3aa088c890..c1215c61c4 100644 --- a/mail/mail-component.h +++ b/mail/mail-component.h @@ -47,7 +47,7 @@ enum _mail_component_folder_t { MAIL_COMPONENT_FOLDER_OUTBOX, MAIL_COMPONENT_FOLDER_SENT, MAIL_COMPONENT_FOLDER_TEMPLATES, - MAIL_COMPONENT_FOLDER_LOCAL_INBOX, + MAIL_COMPONENT_FOLDER_LOCAL_INBOX }; struct _MailComponent { diff --git a/mail/mail-mt.c b/mail/mail-mt.c index 5d26c13b3f..6388a56938 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -132,7 +132,7 @@ mail_msg_new (MailMsgInfo *info) #ifdef LOG_OPS if (log_ops) - fprintf(log, "%p: New\n", msg); + fprintf(log, "%p: New\n", (gpointer) msg); #endif MAIL_MT_UNLOCK(mail_msg_lock); diff --git a/mail/mail-mt.h b/mail/mail-mt.h index dba4adee16..b95620a000 100644 --- a/mail/mail-mt.h +++ b/mail/mail-mt.h @@ -100,7 +100,7 @@ typedef struct _MailAsyncEvent { typedef enum _mail_async_event_t { MAIL_ASYNC_GUI, - MAIL_ASYNC_THREAD, + MAIL_ASYNC_THREAD } mail_async_event_t; typedef void (*MailAsyncFunc)(void *, void *, void *); @@ -119,7 +119,7 @@ typedef enum { MAIL_CALL_p_ppp, MAIL_CALL_p_pppp, MAIL_CALL_p_ppppp, - MAIL_CALL_p_ppippp, + MAIL_CALL_p_ppippp } mail_call_t; typedef void *(*MailMainFunc)(); diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 896ec73aec..6feadd5b9c 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -1657,9 +1657,9 @@ refresh_folder_desc (struct _sync_folder_msg *m) static void refresh_folder_exec (struct _sync_folder_msg *m) { - //camel_folder_sync (m->folder, FALSE, &m->base.ex); + /* camel_folder_sync (m->folder, FALSE, &m->base.ex); */ - //if (!camel_exception_is_set (&m->base.ex)) + /* if (!camel_exception_is_set (&m->base.ex)) */ camel_folder_refresh_info(m->folder, &m->base.ex); } diff --git a/mail/message-list.c b/mail/message-list.c index 68177535e2..e2c23db51a 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -126,7 +126,7 @@ static struct { enum { DND_X_UID_LIST, /* x-uid-list */ DND_MESSAGE_RFC822, /* message/rfc822 */ - DND_TEXT_URI_LIST, /* text/uri-list */ + DND_TEXT_URI_LIST /* text/uri-list */ }; /* What we send */ @@ -170,7 +170,7 @@ enum { NORMALISED_SUBJECT, NORMALISED_FROM, NORMALISED_TO, - NORMALISED_LAST, + NORMALISED_LAST }; /* #define SMART_ADDRESS_COMPARE */ @@ -4169,7 +4169,7 @@ regen_list_exec (struct _regen_list_msg *m) e_profile_event_emit("list.threaduids", m->folder->full_name, 0); - //camel_folder_summary_reload_from_db (m->folder->summary, NULL); + /* camel_folder_summary_reload_from_db (m->folder->summary, NULL); */ if (!camel_operation_cancel_check(m->base.cancel)) { camel_folder_sort_uids (m->folder, showuids); diff --git a/mail/message-list.h b/mail/message-list.h index 47be897fd2..15dae0fcb7 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -73,7 +73,7 @@ enum { /* Invisible columns */ COL_DELETED, COL_UNREAD, - COL_COLOUR, + COL_COLOUR }; #define MESSAGE_LIST_COLUMN_IS_ACTIVE(col) (col == COL_MESSAGE_STATUS || \ @@ -178,7 +178,7 @@ typedef enum { MESSAGE_LIST_SELECT_NEXT = 0, MESSAGE_LIST_SELECT_PREVIOUS = 1, MESSAGE_LIST_SELECT_DIRECTION = 1, /* direction mask */ - MESSAGE_LIST_SELECT_WRAP = 1<<1, /* option bit */ + MESSAGE_LIST_SELECT_WRAP = 1<<1 /* option bit */ } MessageListSelectDirection; GType message_list_get_type (void); diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index 8634ce4000..08c1956303 100644 --- a/plugins/attachment-reminder/attachment-reminder.c +++ b/plugins/attachment-reminder/attachment-reminder.c @@ -65,7 +65,7 @@ typedef struct { enum { CLUE_KEYWORD_COLUMN, - CLUE_N_COLUMNS, + CLUE_N_COLUMNS }; int e_plugin_lib_enable (EPluginLib *ep, int enable); diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index 5d4a911c9a..f9745e8972 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -48,7 +48,7 @@ void backup_restore_abort (EPlugin *ep, EMConfigTargetAccount *target); typedef enum _br_flags { BR_OK = 1<<0, - BR_START = 1<<1, + BR_START = 1<<1 }br_flags; static void diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index fe1a73febb..85e275f2a0 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -55,7 +55,7 @@ typedef struct { enum { HEADER_KEY_COLUMN, HEADER_VALUE_COLUMN, - HEADER_N_COLUMNS, + HEADER_N_COLUMNS }; struct _EmailCustomHeaderOptionsDialogPrivate { @@ -350,7 +350,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) for (header_section_id = 0,label_row = 0,row = 0,column = 1; header_section_id < priv->email_custom_header_details->len; header_section_id++,row++,column++) { - // To create an empty label widget. Text will be added dynamically. + /* To create an empty label widget. Text will be added dynamically. */ priv->header_type_name_label = gtk_label_new (""); temp_header_ptr = &g_array_index(priv->email_custom_header_details, EmailCustomHeaderDetails,header_section_id); str = (temp_header_ptr->header_type_value)->str; diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index ae889247c8..ccfb6afb71 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -136,7 +136,7 @@ btn_chpass_clicked (GtkButton *button, gpointer data) /* "Cacel" button was hit */ return; } - //g_print ("Current password is \"%s\"\n", old_password); + /* g_print ("Current password is \"%s\"\n", old_password); */ result = exchange_account_set_password (account, old_password, new_password); if (result != EXCHANGE_ACCOUNT_CONNECT_SUCCESS) exchange_operations_report_error (account, result); diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index 2f60b34bff..bfe295447f 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -113,10 +113,10 @@ install_folder_response (EMFolderSelector *emfs, int response, gpointer *data) /*changes = camel_folder_change_info_new (); camel_folder_change_info_remove_uid (changes, (char *) item_id); camel_folder_summary_remove_uid (folder->summary, item_id);*/ - //camel_folder_delete_message (folder, item_id); + /* camel_folder_delete_message (folder, item_id); */ camel_folder_set_message_flags (folder, item_id, CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED); camel_folder_summary_touch (folder->summary); - //camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes); + /* camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes); */ uri = camel_url_to_string (((CamelService *) store)->url, CAMEL_URL_HIDE_ALL); account = mail_config_get_account_by_source_url (uri); uri = account->source->url; diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 0b811d0787..3a850b2a55 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -94,7 +94,7 @@ refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store) if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE)) return; em_folder_tree_model_add_store (model, store, account->name); - //camel_object_unref (store); + /* camel_object_unref (store); */ } void diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index d16c205758..9b3062b1c3 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -181,7 +181,7 @@ free_all (ShareFolder *sf) sf->users_list = NULL; } - //e_gw_connection_free_container_list (sf->container_list); + /* e_gw_connection_free_container_list (sf->container_list); */ } diff --git a/plugins/publish-calendar/publish-location.h b/plugins/publish-calendar/publish-location.h index ec627d18ce..327cd986fd 100644 --- a/plugins/publish-calendar/publish-location.h +++ b/plugins/publish-calendar/publish-location.h @@ -31,29 +31,25 @@ G_BEGIN_DECLS enum publish_frequency { URI_PUBLISH_DAILY, URI_PUBLISH_WEEKLY, - URI_PUBLISH_MANUAL, - /* URI_PUBLISH_AUTO, */ + URI_PUBLISH_MANUAL }; static const int publish_frequency_type_map[] = { URI_PUBLISH_DAILY, URI_PUBLISH_WEEKLY, URI_PUBLISH_MANUAL, - /* URI_PUBLISH_AUTO, */ -1, }; enum publish_format { URI_PUBLISH_AS_ICAL, - URI_PUBLISH_AS_FB, - /* URI_PUBLISH_AS_HTML, */ + URI_PUBLISH_AS_FB }; static const int publish_format_type_mask[] = { URI_PUBLISH_AS_ICAL, URI_PUBLISH_AS_FB, - /* URI_PUBLISH_AS_HTML, */ - -1, + -1 }; enum FBDurationType { diff --git a/plugins/publish-calendar/url-editor-dialog.h b/plugins/publish-calendar/url-editor-dialog.h index 3a85fc895e..94a1a71f00 100644 --- a/plugins/publish-calendar/url-editor-dialog.h +++ b/plugins/publish-calendar/url-editor-dialog.h @@ -40,7 +40,7 @@ enum { URL_LIST_ENABLED_COLUMN, URL_LIST_LOCATION_COLUMN, URL_LIST_URL_COLUMN, - URL_LIST_N_COLUMNS, + URL_LIST_N_COLUMNS }; enum { @@ -50,7 +50,7 @@ enum { TYPE_SMB, TYPE_DAV, TYPE_DAVS, - TYPE_URI, + TYPE_URI }; typedef struct _UrlEditorDialog UrlEditorDialog; diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 5114e9b386..8a15ce98ac 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -59,7 +59,6 @@ static pthread_mutex_t em_junk_sa_preferred_socket_path_lock = PTHREAD_MUTEX_INI static pthread_mutex_t em_junk_sa_spamd_restart_lock = PTHREAD_MUTEX_INITIALIZER; int e_plugin_lib_enable (EPluginLib *ep, int enable); -//static const char *em_junk_sa_get_name (void); gboolean em_junk_sa_check_junk (EPlugin *ep, EMJunkHookTarget *target); void em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target); void em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target); @@ -104,14 +103,6 @@ static gboolean em_junk_sa_allow_tell_tested = FALSE; char *em_junk_sa_spamc_gconf_binary = NULL; char *em_junk_sa_spamd_gconf_binary = NULL; -#if 0 -static const char * -em_junk_sa_get_name (void) -{ - return _("SpamAssassin (built-in)"); -} -#endif - static int pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, int wait_for_termination, GByteArray *output_buffer, GError **error) { diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index eae87721c4..537b8822bc 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -60,7 +60,7 @@ typedef struct { enum { CLUE_KEYWORD_COLUMN, CLUE_VALUE_COLUMN, - CLUE_N_COLUMNS, + CLUE_N_COLUMNS }; typedef struct { diff --git a/shell/e-component-registry.h b/shell/e-component-registry.h index fa0de9c5c1..474dba871d 100644 --- a/shell/e-component-registry.h +++ b/shell/e-component-registry.h @@ -59,7 +59,7 @@ struct _EComponentRegistryClass { enum _EComponentRegistryField { ECR_FIELD_ID, ECR_FIELD_ALIAS, - ECR_FIELD_SCHEMA, + ECR_FIELD_SCHEMA }; struct _EComponentInfo { diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 9d6905203b..548e987588 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -913,7 +913,7 @@ store_window_size (GtkWidget* widget) g_object_unref(client); E_SHELL_WINDOW (widget)->priv->store_window_size_timer = 0; - return FALSE; // remove this timeout + return FALSE; /* remove this timeout */ } static void diff --git a/shell/es-event.h b/shell/es-event.h index ca12eb22dd..ed248d11df 100644 --- a/shell/es-event.h +++ b/shell/es-event.h @@ -49,7 +49,7 @@ enum _es_event_target_t { /* Flags that qualify TARGET_STATE */ enum { ES_EVENT_STATE_ONLINE = 1<<0, - ES_EVENT_STATE_OFFLINE = 1<<1, + ES_EVENT_STATE_OFFLINE = 1<<1 }; typedef struct _ESEventTargetState ESEventTargetState; diff --git a/shell/es-menu.h b/shell/es-menu.h index 7ea4df5576..89f60112c6 100644 --- a/shell/es-menu.h +++ b/shell/es-menu.h @@ -39,13 +39,13 @@ typedef struct _ESMenuClass ESMenuClass; /* Current target description */ /* Types of popup tagets */ enum _es_menu_target_t { - ES_MENU_TARGET_SHELL, + ES_MENU_TARGET_SHELL }; /* Flags that describe a TARGET_SHELL */ enum { ES_MENU_SHELL_ONLINE = 1<<0, - ES_MENU_SHELL_OFFLINE = 1<<1, + ES_MENU_SHELL_OFFLINE = 1<<1 }; typedef struct _ESMenuTargetShell ESMenuTargetShell; diff --git a/smime/gui/e-cert-selector.h b/smime/gui/e-cert-selector.h index 130d90920c..542a211745 100644 --- a/smime/gui/e-cert-selector.h +++ b/smime/gui/e-cert-selector.h @@ -54,7 +54,7 @@ struct _ECertSelectorClass { enum _e_cert_selector_type { E_CERT_SELECTOR_SIGNER, - E_CERT_SELECTOR_RECIPIENT, + E_CERT_SELECTOR_RECIPIENT }; GType e_cert_selector_get_type (void); diff --git a/smime/lib/e-asn1-object.h b/smime/lib/e-asn1-object.h index b761730ec3..d0cdb05d27 100644 --- a/smime/lib/e-asn1-object.h +++ b/smime/lib/e-asn1-object.h @@ -65,7 +65,7 @@ enum { E_ASN1_OBJECT_TYPE_HIGH_TAG_NUMBER = 31, E_ASN1_OBJECT_TYPE_CONTEXT_SPECIFIC = 32, E_ASN1_OBJECT_TYPE_APPLICATION = 33, - E_ASN1_OBJECT_TYPE_PRIVATE = 34, + E_ASN1_OBJECT_TYPE_PRIVATE = 34 }; struct _EASN1Object { diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c index cbede0a5fe..2146fc3d32 100644 --- a/smime/lib/e-cert.c +++ b/smime/lib/e-cert.c @@ -1225,10 +1225,10 @@ e_cert_get_asn1_struct (ECert *cert) gboolean e_cert_mark_for_deletion (ECert *cert) { - // nsNSSShutDownPreventionLock locker; + /* nsNSSShutDownPreventionLock locker; */ #if 0 - // make sure user is logged in to the token + /* make sure user is logged in to the token */ nsCOMPtr ctx = new PipUIContext(); #endif diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c index 98f16d6e75..759a7fd1d6 100644 --- a/smime/lib/e-pkcs12.c +++ b/smime/lib/e-pkcs12.c @@ -271,7 +271,7 @@ import_from_file_helper (EPKCS12 *pkcs12, PK11SlotInfo *slot, #ifdef notyet /* XXX we need this to check the gerror */ if (NS_ERROR_ABORT == rv) { - // inputToDecoder indicated a NSS error + /* inputToDecoder indicated a NSS error */ srv = SECFailure; } #else diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c index 142806d514..bad4c20bc6 100644 --- a/widgets/menus/gal-view-instance-save-as-dialog.c +++ b/widgets/menus/gal-view-instance-save-as-dialog.c @@ -35,7 +35,7 @@ G_DEFINE_TYPE (GalViewInstanceSaveAsDialog, gal_view_instance_save_as_dialog, GT /* The arguments we take */ enum { PROP_0, - PROP_INSTANCE, + PROP_INSTANCE }; enum { diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c index 77cad661e1..4d300f01d4 100644 --- a/widgets/misc/e-canvas-background.c +++ b/widgets/misc/e-canvas-background.c @@ -74,7 +74,7 @@ enum { PROP_X1, PROP_X2, PROP_Y1, - PROP_Y2, + PROP_Y2 }; static void diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c index 3cb85c5839..903331576e 100644 --- a/widgets/misc/e-canvas.c +++ b/widgets/misc/e-canvas.c @@ -837,7 +837,7 @@ e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id) if (func) func(info->item, flags, info->id); g_message ("ECANVAS: free info (2): item %p, id %p", - info->item, info->id); + (gpointer) info->item, (gpointer) info->id); g_object_unref (info->item); g_free(info); } @@ -851,7 +851,7 @@ e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id) info->item = item; g_object_ref (info->item); info->id = id; - g_message ("ECANVAS: new info item %p, id %p", item, id); + g_message ("ECANVAS: new info item %p, id %p", (gpointer) item, (gpointer) id); flags = E_CANVAS_ITEM_SELECTION_SELECT | E_CANVAS_ITEM_SELECTION_CURSOR; func = (ECanvasItemSelectionFunc)g_object_get_data(G_OBJECT(item), @@ -920,7 +920,7 @@ e_canvas_item_add_selection (GnomeCanvasItem *item, gpointer id) info->item = item; g_object_ref (info->item); info->id = id; - g_message ("ECANVAS: new info (2): item %p, id %p", item, id); + g_message ("ECANVAS: new info (2): item %p, id %p", (gpointer) item, (gpointer) id); func = (ECanvasItemSelectionFunc)g_object_get_data(G_OBJECT(item), "ECanvasItem::selection_callback"); @@ -967,7 +967,7 @@ e_canvas_item_remove_selection (GnomeCanvasItem *item, gpointer id) canvas->cursor = NULL; g_message ("ECANVAS: removing info: item %p, info %p", - info->item, info->id); + (gpointer) info->item, (gpointer) info->id); g_object_unref (info->item); g_free(info); g_list_free_1(list); diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c index cf3f758ce7..87652974cb 100644 --- a/widgets/misc/e-charset-picker.c +++ b/widgets/misc/e-charset-picker.c @@ -49,7 +49,7 @@ typedef enum { E_CHARSET_TURKISH, E_CHARSET_UNICODE, E_CHARSET_WESTERN_EUROPEAN, - E_CHARSET_WESTERN_EUROPEAN_NEW, + E_CHARSET_WESTERN_EUROPEAN_NEW } ECharsetClass; static const char *classnames[] = { diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index a52756943c..ac5012b7d2 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -49,7 +49,7 @@ static ESearchBarClass *parent_class = NULL; enum { PROP_0, PROP_QUERY, - PROP_STATE, + PROP_STATE }; diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h index e1d4fc7def..be7e26c83b 100644 --- a/widgets/misc/e-filter-bar.h +++ b/widgets/misc/e-filter-bar.h @@ -98,7 +98,7 @@ enum { E_FILTERBAR_CURRENT_MESSAGE_ID = -6, E_FILTERBAR_CURRENT_FOLDER_ID = -7, E_FILTERBAR_CURRENT_ACCOUNT_ID = -8, - E_FILTERBAR_ALL_ACCOUNTS_ID = -9, + E_FILTERBAR_ALL_ACCOUNTS_ID = -9 }; #define E_FILTERBAR_SAVE { N_("_Save Search..."), E_FILTERBAR_SAVE_ID, 0 } diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 30cba7f074..9cf158021c 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -60,7 +60,7 @@ enum { PROP_0, PROP_ITEM_ID, PROP_SUBITEM_ID, - PROP_TEXT, + PROP_TEXT }; diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h index 1f7072d988..105777311c 100644 --- a/widgets/misc/e-search-bar.h +++ b/widgets/misc/e-search-bar.h @@ -49,7 +49,7 @@ G_BEGIN_DECLS enum _ESearchBarItemType { ESB_ITEMTYPE_NORMAL, ESB_ITEMTYPE_CHECK, - ESB_ITEMTYPE_RADIO, + ESB_ITEMTYPE_RADIO }; typedef enum _ESearchBarItemType ESearchBarItemType; diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c index b9a8544f57..f6cb11e509 100644 --- a/widgets/table/e-cell-hbox.c +++ b/widgets/table/e-cell-hbox.c @@ -152,15 +152,15 @@ ecv_draw (ECellView *ecell_view, GdkDrawable *drawable, /* Now cause our subcells to draw their contents, shifted by subcell_offset pixels */ int width = allotted_width * hbox_view->def_size_cols[i] / 100; - //e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row); -// if (width < hbox_view->def_size_cols[i]) - // width = hbox_view->def_size_cols[i]; -// printf("width of %d %d of %d\n", width,hbox_view->def_size_cols[i], allotted_width ); + /* e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row); + if (width < hbox_view->def_size_cols[i]) + width = hbox_view->def_size_cols[i]; + printf("width of %d %d of %d\n", width,hbox_view->def_size_cols[i], allotted_width ); */ e_cell_draw (hbox_view->subcell_views[i], drawable, hbox_view->model_cols[i], view_col, row, flags, x1 + subcell_offset , y1, x1 + subcell_offset + width, y2); - subcell_offset += width; //e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row); + subcell_offset += width; /* e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row); */ } } diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c index 8d90267a5e..892ff7cc5d 100644 --- a/widgets/table/e-table-col.c +++ b/widgets/table/e-table-col.c @@ -31,7 +31,7 @@ G_DEFINE_TYPE (ETableCol, e_table_col, G_TYPE_OBJECT) enum { PROP_0, - PROP_COMPARE_COL, + PROP_COMPARE_COL }; static void diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 5becaa30f2..510b5074f6 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -54,7 +54,7 @@ enum { enum { PROP_0, - PROP_STATE, + PROP_STATE }; enum { diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 69a300d950..f8321011b2 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -656,7 +656,7 @@ e_table_setup_header (ETable *e_table) gtk_widget_show (GTK_WIDGET (e_table->header_canvas)); - pointer = g_strdup_printf("%p", e_table); + pointer = g_strdup_printf("%p", (gpointer) e_table); e_table->header_item = gnome_canvas_item_new ( gnome_canvas_root (e_table->header_canvas), diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index 4eef7a9ad6..2b903ca0bc 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -36,7 +36,7 @@ enum { PROP_CURSOR_ROW, PROP_CURSOR_COL, PROP_MODEL, - PROP_ETTA, + PROP_ETTA }; struct ETreeSelectionModelPriv { diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index 0963229c94..2eba9d4a82 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -704,7 +704,7 @@ e_tree_setup_header (ETree *e_tree) gtk_widget_show (GTK_WIDGET (e_tree->priv->header_canvas)); - pointer = g_strdup_printf("%p", e_tree); + pointer = g_strdup_printf("%p", (gpointer) e_tree); e_tree->priv->header_item = gnome_canvas_item_new ( gnome_canvas_root (e_tree->priv->header_canvas), -- cgit v1.2.3 From e8a2bad7ec6be90bdf75f7bdcf12c24e15b620af Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 16 May 2009 14:26:50 -0400 Subject: =?UTF-8?q?Bug=20578478=20=E2=80=93=20Composer=20shows=20not=20all?= =?UTF-8?q?=20"From"=20information?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- widgets/misc/e-account-combo-box.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widgets/misc/e-account-combo-box.c b/widgets/misc/e-account-combo-box.c index ebde2b5c0e..21f30b697c 100644 --- a/widgets/misc/e-account-combo-box.c +++ b/widgets/misc/e-account-combo-box.c @@ -57,7 +57,7 @@ account_combo_box_has_dupes (GList *list, for (iter = list; iter != NULL; iter = iter->next) { EAccount *account = iter->data; - if (strcmp (account->id->address, address) == 0) + if (g_ascii_strcasecmp (account->id->address, address) == 0) count++; } -- cgit v1.2.3 From edb65e9547c1a11748e7388b379028dd4f1cede4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 16 May 2009 16:56:14 -0400 Subject: Move automatic CC/BCC handling to EComposerHeaderTable. --- composer/e-composer-header-table.c | 99 ++++++++++++++++++++++++++++++++++++++ composer/e-msg-composer.c | 93 ----------------------------------- 2 files changed, 99 insertions(+), 93 deletions(-) diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c index 461c11efa1..44a4919e0d 100644 --- a/composer/e-composer-header-table.c +++ b/composer/e-composer-header-table.c @@ -19,6 +19,7 @@ #include #include +#include #include #include "e-signature-combo-box.h" @@ -221,13 +222,90 @@ composer_header_table_bind_widget (const gchar *property_name, (gpointer) property_name); } +static EDestination ** +composer_header_table_update_destinations (EDestination **old_destinations, + const gchar *auto_addresses) +{ + CamelAddress *address; + CamelInternetAddress *inet_address; + EDestination **new_destinations; + EDestination *destination; + GList *list = NULL; + guint length; + gint ii; + + /* Include automatic recipients for the selected account. */ + + if (auto_addresses == NULL) + goto skip_auto; + + inet_address = camel_internet_address_new (); + address = CAMEL_ADDRESS (inet_address); + + if (camel_address_decode (address, auto_addresses) != -1) { + for (ii = 0; ii < camel_address_length (address); ii++) { + const gchar *name, *email; + + if (!camel_internet_address_get ( + inet_address, ii, &name, &email)) + continue; + + destination = e_destination_new (); + e_destination_set_auto_recipient (destination, TRUE); + + if (name != NULL) + e_destination_set_name (destination, name); + + if (email != NULL) + e_destination_set_email (destination, email); + + list = g_list_prepend (list, destination); + } + } + + camel_object_unref (inet_address); + +skip_auto: + + /* Include custom recipients for this message. */ + + if (old_destinations == NULL) + goto skip_custom; + + for (ii = 0; old_destinations[ii] != NULL; ii++) { + if (e_destination_is_auto_recipient (old_destinations[ii])) + continue; + + destination = e_destination_copy (old_destinations[ii]); + list = g_list_prepend (list, destination); + } + +skip_custom: + + list = g_list_reverse (list); + length = g_list_length (list); + + new_destinations = g_new0 (EDestination *, length + 1); + + for (ii = 0; list != NULL; ii++) { + new_destinations[ii] = E_DESTINATION (list->data); + list = g_list_delete_link (list, list); + } + + return new_destinations; +} + static void composer_header_table_from_changed_cb (EComposerHeaderTable *table) { EAccount *account; EComposerPostHeader *post_header; EComposerTextHeader *text_header; + EDestination **old_destinations; + EDestination **new_destinations; const gchar *reply_to; + gboolean always_cc; + gboolean always_bcc; /* Keep "Post-To" and "Reply-To" synchronized with "From" */ @@ -239,6 +317,27 @@ composer_header_table_from_changed_cb (EComposerHeaderTable *table) reply_to = (account != NULL) ? account->id->reply_to : NULL; text_header = E_COMPOSER_HEADER_TABLE_GET_REPLY_TO_HEADER (table); e_composer_text_header_set_text (text_header, reply_to); + + always_cc = (account != NULL && account->always_cc); + always_bcc = (account != NULL && account->always_bcc); + + /* Update automatic CC destinations. */ + old_destinations = + e_composer_header_table_get_destinations_cc (table); + new_destinations = + composer_header_table_update_destinations ( + old_destinations, always_cc ? account->cc_addrs : NULL); + e_composer_header_table_set_destinations_cc (table, new_destinations); + e_destination_freev (new_destinations); + + /* Update automatic BCC destinations. */ + old_destinations = + e_composer_header_table_get_destinations_bcc (table); + new_destinations = + composer_header_table_update_destinations ( + old_destinations, always_bcc ? account->bcc_addrs : NULL); + e_composer_header_table_set_destinations_bcc (table, new_destinations); + e_destination_freev (new_destinations); } static GObject * diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 32a2a40a9c..9325e0b770 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -1359,90 +1359,6 @@ msg_composer_subject_changed_cb (EMsgComposer *composer) gtk_window_set_title (GTK_WINDOW (composer), subject); } -enum { - UPDATE_AUTO_CC, - UPDATE_AUTO_BCC -}; - -static void -update_auto_recipients (EComposerHeaderTable *table, - gint mode, - const gchar *auto_addrs) -{ - EDestination *dest, **destv = NULL; - CamelInternetAddress *iaddr; - GList *list = NULL; - guint length; - gint i; - - if (auto_addrs) { - iaddr = camel_internet_address_new (); - if (camel_address_decode (CAMEL_ADDRESS (iaddr), auto_addrs) != -1) { - for (i = 0; i < camel_address_length (CAMEL_ADDRESS (iaddr)); i++) { - const gchar *name, *addr; - - if (!camel_internet_address_get (iaddr, i, &name, &addr)) - continue; - - dest = e_destination_new (); - e_destination_set_auto_recipient (dest, TRUE); - - if (name) - e_destination_set_name (dest, name); - - if (addr) - e_destination_set_email (dest, addr); - - list = g_list_prepend (list, dest); - } - } - - camel_object_unref (iaddr); - } - - switch (mode) { - case UPDATE_AUTO_CC: - destv = e_composer_header_table_get_destinations_cc (table); - break; - case UPDATE_AUTO_BCC: - destv = e_composer_header_table_get_destinations_bcc (table); - break; - default: - g_return_if_reached (); - } - - if (destv) { - for (i = 0; destv[i]; i++) { - if (!e_destination_is_auto_recipient (destv[i])) { - dest = e_destination_copy (destv[i]); - list = g_list_prepend (list, dest); - } - } - - e_destination_freev (destv); - } - - list = g_list_reverse (list); - - length = g_list_length (list); - destv = destination_list_to_vector_sized (list, length); - - g_list_free (list); - - switch (mode) { - case UPDATE_AUTO_CC: - e_composer_header_table_set_destinations_cc (table, destv); - break; - case UPDATE_AUTO_BCC: - e_composer_header_table_set_destinations_bcc (table, destv); - break; - default: - g_return_if_reached (); - } - - e_destination_freev (destv); -} - static void msg_composer_account_changed_cb (EMsgComposer *composer) { @@ -1453,8 +1369,6 @@ msg_composer_account_changed_cb (EMsgComposer *composer) EAccount *account; gboolean active; gboolean sensitive; - const gchar *cc_addrs = NULL; - const gchar *bcc_addrs = NULL; const gchar *uid; table = e_msg_composer_get_header_table (composer); @@ -1477,11 +1391,6 @@ msg_composer_account_changed_cb (EMsgComposer *composer) active = account->smime_encrypt_default; gtk_toggle_action_set_active (action, active); - if (account->always_cc) - cc_addrs = account->cc_addrs; - if (account->always_bcc) - bcc_addrs = account->bcc_addrs; - uid = account->id->sig_uid; signature = uid ? mail_config_get_signature_by_uid (uid) : NULL; e_composer_header_table_set_signature (table, signature); @@ -1494,8 +1403,6 @@ msg_composer_account_changed_cb (EMsgComposer *composer) gtk_action_set_sensitive (ACTION (SEND_OPTIONS), sensitive); exit: - update_auto_recipients (table, UPDATE_AUTO_CC, cc_addrs); - update_auto_recipients (table, UPDATE_AUTO_BCC, bcc_addrs); e_msg_composer_show_sig_file (composer); } -- cgit v1.2.3 From 152d43ec92989b4a416c1fedf3ec133b48bee6ae Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 16 May 2009 17:19:51 -0400 Subject: =?UTF-8?q?Bug=20582744=20=E2=80=93=20CC=20field=20autofill=20does?= =?UTF-8?q?n't=20work=20for=20replies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer/e-composer-header-table.c | 44 ++++++++++++++++++++++++++++++++++++++ composer/e-composer-header-table.h | 9 ++++++++ composer/e-composer-name-header.c | 29 +++++++++++++++++++------ composer/e-composer-name-header.h | 3 +++ mail/em-composer-utils.c | 5 ++++- 5 files changed, 82 insertions(+), 8 deletions(-) diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c index 44a4919e0d..d539565ad2 100644 --- a/composer/e-composer-header-table.c +++ b/composer/e-composer-header-table.c @@ -1002,6 +1002,22 @@ e_composer_header_table_get_destinations_bcc (EComposerHeaderTable *table) return e_composer_name_header_get_destinations (header); } +void +e_composer_header_table_add_destinations_bcc (EComposerHeaderTable *table, + EDestination **destinations) +{ + EComposerNameHeader *header; + + g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); + + header = E_COMPOSER_HEADER_TABLE_GET_BCC_HEADER (table); + e_composer_name_header_add_destinations (header, destinations); + + if (destinations != NULL && *destinations != NULL) + e_composer_header_table_set_header_visible ( + table, E_COMPOSER_HEADER_BCC, TRUE); +} + void e_composer_header_table_set_destinations_bcc (EComposerHeaderTable *table, EDestination **destinations) @@ -1029,6 +1045,22 @@ e_composer_header_table_get_destinations_cc (EComposerHeaderTable *table) return e_composer_name_header_get_destinations (header); } +void +e_composer_header_table_add_destinations_cc (EComposerHeaderTable *table, + EDestination **destinations) +{ + EComposerNameHeader *header; + + g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); + + header = E_COMPOSER_HEADER_TABLE_GET_CC_HEADER (table); + e_composer_name_header_add_destinations (header, destinations); + + if (destinations != NULL && *destinations != NULL) + e_composer_header_table_set_header_visible ( + table, E_COMPOSER_HEADER_CC, TRUE); +} + void e_composer_header_table_set_destinations_cc (EComposerHeaderTable *table, EDestination **destinations) @@ -1056,6 +1088,18 @@ e_composer_header_table_get_destinations_to (EComposerHeaderTable *table) return e_composer_name_header_get_destinations (header); } +void +e_composer_header_table_add_destinations_to (EComposerHeaderTable *table, + EDestination **destinations) +{ + EComposerNameHeader *header; + + g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); + + header = E_COMPOSER_HEADER_TABLE_GET_TO_HEADER (table); + e_composer_name_header_add_destinations (header, destinations); +} + void e_composer_header_table_set_destinations_to (EComposerHeaderTable *table, EDestination **destinations) diff --git a/composer/e-composer-header-table.h b/composer/e-composer-header-table.h index b3150c409a..91d64fe22a 100644 --- a/composer/e-composer-header-table.h +++ b/composer/e-composer-header-table.h @@ -112,16 +112,25 @@ EDestination ** e_composer_header_table_get_destinations (EComposerHeaderTable *table); EDestination ** e_composer_header_table_get_destinations_bcc (EComposerHeaderTable *table); +void e_composer_header_table_add_destinations_bcc + (EComposerHeaderTable *table, + EDestination **destination); void e_composer_header_table_set_destinations_bcc (EComposerHeaderTable *table, EDestination **destinations); EDestination ** e_composer_header_table_get_destinations_cc (EComposerHeaderTable *table); +void e_composer_header_table_add_destinations_cc + (EComposerHeaderTable *table, + EDestination **destination); void e_composer_header_table_set_destinations_cc (EComposerHeaderTable *table, EDestination **destinations); EDestination ** e_composer_header_table_get_destinations_to (EComposerHeaderTable *table); +void e_composer_header_table_add_destinations_to + (EComposerHeaderTable *table, + EDestination **destinations); void e_composer_header_table_set_destinations_to (EComposerHeaderTable *table, EDestination **destinations); diff --git a/composer/e-composer-name-header.c b/composer/e-composer-name-header.c index 70a126b1e0..5aab95d776 100644 --- a/composer/e-composer-name-header.c +++ b/composer/e-composer-name-header.c @@ -294,6 +294,27 @@ e_composer_name_header_get_destinations (EComposerNameHeader *header) return destinations; /* free with e_destination_freev() */ } +void +e_composer_name_header_add_destinations (EComposerNameHeader *header, + EDestination **destinations) +{ + EDestinationStore *store; + ENameSelectorEntry *entry; + gint ii; + + g_return_if_fail (E_IS_COMPOSER_NAME_HEADER (header)); + + entry = E_COMPOSER_NAME_HEADER_GET_ENTRY (header); + store = e_name_selector_entry_peek_destination_store (entry); + + if (destinations == NULL) + return; + + for (ii = 0; destinations[ii] != NULL; ii++) + e_destination_store_append_destination ( + store, destinations[ii]); +} + void e_composer_name_header_set_destinations (EComposerNameHeader *header, EDestination **destinations) @@ -301,7 +322,6 @@ e_composer_name_header_set_destinations (EComposerNameHeader *header, EDestinationStore *store; ENameSelectorEntry *entry; GList *list, *iter; - gint ii; g_return_if_fail (E_IS_COMPOSER_NAME_HEADER (header)); @@ -314,10 +334,5 @@ e_composer_name_header_set_destinations (EComposerNameHeader *header, e_destination_store_remove_destination (store, iter->data); g_list_free (list); - if (destinations == NULL) - return; - - for (ii = 0; destinations[ii] != NULL; ii++) - e_destination_store_append_destination ( - store, destinations[ii]); + e_composer_name_header_add_destinations (header, destinations); } diff --git a/composer/e-composer-name-header.h b/composer/e-composer-name-header.h index 04f7100241..f95c33fce3 100644 --- a/composer/e-composer-name-header.h +++ b/composer/e-composer-name-header.h @@ -66,6 +66,9 @@ ENameSelector * e_composer_name_header_get_name_selector (EComposerNameHeader *header); EDestination ** e_composer_name_header_get_destinations (EComposerNameHeader *header); +void e_composer_name_header_add_destinations + (EComposerNameHeader *header, + EDestination **destination); void e_composer_name_header_set_destinations (EComposerNameHeader *header, EDestination **destinations); diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 2336f3c798..0f9945b7d7 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1789,7 +1789,10 @@ reply_get_composer (CamelMimeMessage *message, EAccount *account, e_composer_header_table_set_account (table, account); e_composer_header_table_set_subject (table, subject); e_composer_header_table_set_destinations_to (table, tov); - e_composer_header_table_set_destinations_cc (table, ccv); + + /* Add destinations instead of setting, so we don't remove + * automatic CC addresses that have already been added. */ + e_composer_header_table_add_destinations_cc (table, ccv); g_free (subject); -- cgit v1.2.3 From 4219464afc72d2b5a166618c66a0aa14a8248a29 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 16 May 2009 17:35:14 -0400 Subject: =?UTF-8?q?Bug=20578176=20=E2=80=93=20"Send=20message=20to=20conta?= =?UTF-8?q?ct"=20does=20not=20honor=20"always=20BCC"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addressbook/gui/widgets/eab-gui-util.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 168c0bb7fa..49bcde21f6 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -839,16 +839,18 @@ eab_send_to_contact_and_email_num_list (GList *contact_list) * arrays are really the best argument type for passing a list of * destinations to the header table. */ - /* Add "To" destinations. */ + /* Set "To" destinations. */ convert.pdata = to_array->pdata; e_composer_header_table_set_destinations_to ( table, convert.destinations); g_ptr_array_free (to_array, FALSE); e_destination_freev (convert.destinations); - /* Add "Bcc" destinations. */ + /* Add "Bcc" destinations. + * Add destinations instead of setting, so we don't remove + * automatic BCC addresses that have already been added. */ convert.pdata = bcc_array->pdata; - e_composer_header_table_set_destinations_bcc ( + e_composer_header_table_add_destinations_bcc ( table, convert.destinations); g_ptr_array_free (bcc_array, FALSE); e_destination_freev (convert.destinations); -- cgit v1.2.3 From 39024ea8d22d39ddb193fc6839f546d9f56e787d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 16 May 2009 23:12:43 -0400 Subject: Fix compiler warnings. --- mail/mail-folder-cache.c | 5 +---- plugins/sa-junk-plugin/em-junk-filter.c | 8 ++++---- widgets/table/e-tree-table-adapter.c | 10 ---------- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index a1589cec79..ed3d583927 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -1048,10 +1048,7 @@ int mail_note_get_folder_from_uri(const char *uri, CamelFolder **folderp) gboolean mail_folder_cache_get_folder_info_flags (CamelFolder *folder, int *flags) { - char *uri; - - uri = mail_tools_folder_to_url (folder); - + char *uri = mail_tools_folder_to_url (folder); struct _find_info fi = { uri, NULL, NULL }; if (stores == NULL) diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 8a15ce98ac..39efa2f5ac 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -753,10 +753,6 @@ em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target) void em_junk_sa_commit_reports (EPlugin *ep) { - /* Only meaningful if we're using sa-learn */ - if (!no_allow_tell) - return; - char *sync_op = ((get_spamassassin_version () >= 3) ? "--sync": "--rebuild"); char *argv[4] = { "sa-learn", @@ -765,6 +761,10 @@ em_junk_sa_commit_reports (EPlugin *ep) NULL }; + /* Only meaningful if we're using sa-learn */ + if (!no_allow_tell) + return; + d(fprintf (stderr, "em_junk_sa_commit_reports\n")); if (em_junk_sa_is_available (NULL)) { diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index 10c29fbf10..416f8aa026 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -757,16 +757,6 @@ etta_proxy_no_change (ETreeModel *etm, ETreeTableAdapter *etta) e_table_model_no_change(E_TABLE_MODEL(etta)); } -static gboolean -remove_all (gpointer key, gpointer value, gpointer data) -{ - GNode *gn = (GNode *) data; - if (data) - g_free (gn->data); - - return TRUE; -} - static void etta_proxy_rebuilt (ETreeModel *etm, ETreeTableAdapter *etta) { -- cgit v1.2.3 From acabcb0be8e3c983e3400d7f7436f618e0000cfe Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 17 May 2009 11:11:27 -0400 Subject: Add e-attachment-handler-sendto.c to POTFILES.in. --- po/POTFILES.in | 1 + 1 file changed, 1 insertion(+) diff --git a/po/POTFILES.in b/po/POTFILES.in index 8ebac02e3a..39a35ece46 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -477,6 +477,7 @@ widgets/menus/gal-view-new-dialog.glade widgets/misc/e-attachment.c widgets/misc/e-attachment-dialog.c widgets/misc/e-attachment-handler-image.c +widgets/misc/e-attachment-handler-sendto.c widgets/misc/e-attachment-icon-view.c widgets/misc/e-attachment-paned.c widgets/misc/e-attachment-store.c -- cgit v1.2.3 From 432c803741d14c6f5f5316544248d23f85c595c4 Mon Sep 17 00:00:00 2001 From: Jorge Gonzalez Date: Mon, 18 May 2009 23:07:05 +0200 Subject: Updated Spanish translation --- po/es.po | 456 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 209 insertions(+), 247 deletions(-) diff --git a/po/es.po b/po/es.po index d2c8accd34..5a6ad30fbd 100644 --- a/po/es.po +++ b/po/es.po @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: evolution.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=evolution\n" -"POT-Creation-Date: 2009-05-06 15:05+0000\n" -"PO-Revision-Date: 2009-05-08 21:01+0200\n" +"POT-Creation-Date: 2009-05-17 03:19+0000\n" +"PO-Revision-Date: 2009-05-18 23:02+0200\n" "Last-Translator: Jorge González \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" @@ -388,10 +388,6 @@ msgid "Could not remove address book." msgstr "No se pudo eliminar la libreta de direcciones." #: ../addressbook/addressbook.error.xml.h:11 -#| msgid "" -#| "Currently you can access only GroupWise System Address Book from " -#| "Evolution. Please use some other GroupWise mail client once, to get your " -#| "GroupWise Frequent Contacts and GroupWise Personal Contacts folders." msgid "" "Currently you can only access the GroupWise System Address Book from " "Evolution. Please use some other GroupWise mail client once to get your " @@ -803,7 +799,7 @@ msgstr "" #: ../addressbook/gui/component/addressbook-config.c:1022 #: ../addressbook/gui/component/ldap-config.glade.h:17 -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20 #: ../calendar/gui/dialogs/calendar-setup.c:367 #: ../calendar/gui/dialogs/calendar-setup.c:378 #: ../calendar/gui/dialogs/calendar-setup.c:389 @@ -1147,7 +1143,6 @@ msgid "Search _filter:" msgstr "_Filtro de búsqueda:" #: ../addressbook/gui/component/ldap-config.glade.h:27 -#, fuzzy #| msgid "" #| "Search filter is the type of the objects searched for, while performing " #| "the search. If this is not modified, by default search will be performed " @@ -1156,9 +1151,9 @@ msgid "" "Search filter is the type of object to be searched for. If this is not " "modified, the default search will be performed on the type \"person\"." msgstr "" -"Filtro de búsqueda es el tipo de los objetos buscados, mientras se realiza " -"la búsqueda. Si esto no se modifica, la búsqueda por omisión se realizará " -"sobre la clase de objetos de tipo «person»." +"El filtro de búsqueda es el tipo de los objetos que buscar. Si no se " +"modifica, la búsqueda predeterminada se realizará sobre la clase de objetos " +"de tipo «person»." #: ../addressbook/gui/component/ldap-config.glade.h:28 msgid "Supported Search Bases" @@ -2264,16 +2259,16 @@ msgstr "Seleccionado" msgid "Has Cursor" msgstr "Tiene el cursor" -#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:549 +#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545 msgid "_Open Link in Browser" msgstr "_Abrir enlace en el navegador" #: ../addressbook/gui/widgets/eab-contact-display.c:170 -#: ../mail/em-folder-view.c:2756 +#: ../mail/em-folder-view.c:2755 msgid "_Copy Link Location" msgstr "_Copiar dirección del enlace" -#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:550 +#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546 msgid "_Send New Message To..." msgstr "_Enviar un mensaje nuevo a…" @@ -2331,7 +2326,7 @@ msgid "Calendar" msgstr "Calendario" #: ../addressbook/gui/widgets/eab-contact-display.c:629 -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18 #: ../calendar/gui/dialogs/event-editor.c:116 msgid "Free/Busy" msgstr "Disponibilidad" @@ -2669,22 +2664,22 @@ msgstr "Mover contactos a" msgid "Copy contacts to" msgstr "Copiar contactos a" -#: ../addressbook/gui/widgets/eab-gui-util.c:901 +#: ../addressbook/gui/widgets/eab-gui-util.c:903 msgid "Multiple vCards" msgstr "vCards múltiples" -#: ../addressbook/gui/widgets/eab-gui-util.c:908 +#: ../addressbook/gui/widgets/eab-gui-util.c:910 #, c-format msgid "vCard for %s" msgstr "vCard para %s" -#: ../addressbook/gui/widgets/eab-gui-util.c:920 -#: ../addressbook/gui/widgets/eab-gui-util.c:946 +#: ../addressbook/gui/widgets/eab-gui-util.c:922 +#: ../addressbook/gui/widgets/eab-gui-util.c:948 #, c-format msgid "Contact information" msgstr "Información de contacto" -#: ../addressbook/gui/widgets/eab-gui-util.c:948 +#: ../addressbook/gui/widgets/eab-gui-util.c:950 #, c-format msgid "Contact information for %s" msgstr "Información de contacto de %s" @@ -3442,7 +3437,7 @@ msgid "_Dismiss" msgstr "_Descartar" #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6 -#: ../calendar/gui/dialogs/comp-editor.c:1021 +#: ../calendar/gui/dialogs/comp-editor.c:1019 #: ../calendar/gui/dialogs/recurrence-page.glade.h:8 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:168 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15 @@ -4566,14 +4561,14 @@ msgid "A_dd" msgstr "Aña_dir" #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2 -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15 #: ../calendar/gui/dialogs/event-page.glade.h:4 msgid "Alarms" msgstr "Alertas" #: ../calendar/gui/dialogs/cal-attachment-select-file.c:81 #: ../widgets/misc/e-attachment-dialog.c:371 -#: ../widgets/misc/e-attachment-store.c:545 +#: ../widgets/misc/e-attachment-store.c:553 msgid "_Suggest automatic display of attachment" msgstr "_Sugerir mostrar automáticamente el adjunto" @@ -4584,7 +4579,7 @@ msgstr "Adjuntar archivo(s)" #. an empty string is the same as 'None' #: ../calendar/gui/dialogs/cal-prefs-dialog.c:137 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:186 -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32 #: ../calendar/gui/dialogs/event-page.c:2968 #: ../calendar/gui/e-cal-model-tasks.c:673 #: ../calendar/gui/e-day-view-time-item.c:788 @@ -4659,25 +4654,21 @@ msgstr "Tiempo" msgid "Work Week" msgstr "Semana laboral" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15 -msgid "Adjust for daylight sa_ving time" -msgstr "Ajustar a la hora de _verano" - -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16 msgid "Day _ends:" msgstr "La jornada _acaba a las:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 msgid "Display" msgstr "Mostrar" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19 #: ../calendar/gui/dialogs/recurrence-page.c:1107 #: ../calendar/gui/e-itip-control.c:731 msgid "Friday" msgstr "viernes" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21 msgid "" "Minutes\n" "Hours\n" @@ -4687,13 +4678,13 @@ msgstr "" "horas\n" "días" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24 #: ../calendar/gui/dialogs/recurrence-page.c:1103 #: ../calendar/gui/e-itip-control.c:727 msgid "Monday" msgstr "lunes" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25 msgid "" "Monday\n" "Tuesday\n" @@ -4711,182 +4702,182 @@ msgstr "" "sábado\n" "domingo" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33 #: ../mail/mail-config.glade.h:117 msgid "Pick a color" msgstr "Elija un color" #. Sunday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35 msgid "S_un" msgstr "_Dom" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36 #: ../calendar/gui/dialogs/recurrence-page.c:1108 #: ../calendar/gui/e-itip-control.c:732 msgid "Saturday" msgstr "sábado" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37 msgid "Sc_roll Month View by a week" msgstr "" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38 msgid "Se_cond zone:" msgstr "Zona se_cundaria:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 msgid "Select the calendars for alarm notification" msgstr "Seleccione los calendarios para las alertas de notificación" #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 msgid "Sh_ow a reminder" msgstr "M_ostrar un recordatorio" #. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 msgid "Show a _reminder" msgstr "Mostrar un _recordatorio" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 msgid "Show week _numbers in date navigator" msgstr "Mostrar los _números de las semanas en el navegador de fechas" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45 msgid "Show week n_umber in Day and Work Week View" msgstr "" "Mostrar los n_úmeros de las semanas en la Vista diaria y en la Vista de la " "semana laboral" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46 #: ../calendar/gui/dialogs/recurrence-page.c:1109 #: ../calendar/gui/e-itip-control.c:726 msgid "Sunday" msgstr "domingo" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47 msgid "T_asks due today:" msgstr "Ta_reas que vencen hoy:" #. Thursday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 msgid "T_hu" msgstr "_Jue" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50 msgid "Template:" msgstr "Plantilla:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51 #: ../calendar/gui/dialogs/recurrence-page.c:1106 #: ../calendar/gui/e-itip-control.c:730 msgid "Thursday" msgstr "jueves" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52 #: ../calendar/gui/dialogs/event-page.glade.h:12 msgid "Time _zone:" msgstr "_Zona horaria:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53 msgid "Time format:" msgstr "Formato de la hora:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54 #: ../calendar/gui/dialogs/recurrence-page.c:1104 #: ../calendar/gui/e-itip-control.c:728 msgid "Tuesday" msgstr "martes" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55 msgid "Use s_ystem time zone" msgstr "Usar la zona horaria del s_istema" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56 #: ../calendar/gui/dialogs/recurrence-page.c:1105 #: ../calendar/gui/e-itip-control.c:729 msgid "Wednesday" msgstr "miércoles" #. A weekday like "Monday" follows -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58 msgid "Wee_k starts on:" msgstr "La _semana empieza en:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59 msgid "Work days:" msgstr "Días laborables:" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60 msgid "_12 hour (AM/PM)" msgstr "_12 horas (AM/PM)" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61 msgid "_24 hour" msgstr "_24 horas" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62 msgid "_Ask for confirmation when deleting items" msgstr "Pedir confirm_ación al borrar elementos" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63 msgid "_Compress weekends in month view" msgstr "_Comprimir fines de semana en la vista mensual" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64 msgid "_Day begins:" msgstr "La jornada laboral _comienza a las:" #. Friday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66 msgid "_Fri" msgstr "_Vie" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:68 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67 msgid "_Hide completed tasks after" msgstr "_Ocultar tareas terminadas tras" #. Monday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69 msgid "_Mon" msgstr "_Lun" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70 msgid "_Overdue tasks:" msgstr "Tareas fuera de pla_zo:" #. Saturday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72 msgid "_Sat" msgstr "_Sáb" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73 msgid "_Show appointment end times in week and month view" msgstr "" "_Mostrar la hora del final de las citas en las vistas semanales y mensuales" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:74 msgid "_Time divisions:" msgstr "Divisiones de _hora:" #. Tuesday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76 msgid "_Tue" msgstr "_Mar" #. Wednesday -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:78 msgid "_Wed" msgstr "M_ié" #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:80 msgid "before every anniversary/birthday" msgstr "antes de cada aniversario/cumpleaños" #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment" -#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83 +#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:82 msgid "before every appointment" msgstr "antes de cada cita" @@ -5019,211 +5010,211 @@ msgid "Due " msgstr "Vence " #: ../calendar/gui/dialogs/comp-editor.c:245 -#: ../calendar/gui/dialogs/comp-editor.c:2677 ../mail/em-utils.c:373 +#: ../calendar/gui/dialogs/comp-editor.c:2675 ../mail/em-utils.c:373 #: ../plugins/prefer-plain/prefer-plain.c:91 msgid "attachment" msgstr "adjunto" -#: ../calendar/gui/dialogs/comp-editor.c:476 +#: ../calendar/gui/dialogs/comp-editor.c:474 msgid "Could not update object" msgstr "No es posible actualizar el objeto" -#: ../calendar/gui/dialogs/comp-editor.c:565 +#: ../calendar/gui/dialogs/comp-editor.c:563 msgid "Edit Appointment" msgstr "Editar cita" -#: ../calendar/gui/dialogs/comp-editor.c:572 +#: ../calendar/gui/dialogs/comp-editor.c:570 #, c-format msgid "Meeting - %s" msgstr "Reunión: %s" -#: ../calendar/gui/dialogs/comp-editor.c:574 +#: ../calendar/gui/dialogs/comp-editor.c:572 #, c-format msgid "Appointment - %s" msgstr "Cita: %s" -#: ../calendar/gui/dialogs/comp-editor.c:580 +#: ../calendar/gui/dialogs/comp-editor.c:578 #, c-format msgid "Assigned Task - %s" msgstr "Tarea asignada: %s" -#: ../calendar/gui/dialogs/comp-editor.c:582 +#: ../calendar/gui/dialogs/comp-editor.c:580 #, c-format msgid "Task - %s" msgstr "Tarea: %s" -#: ../calendar/gui/dialogs/comp-editor.c:587 +#: ../calendar/gui/dialogs/comp-editor.c:585 #, c-format msgid "Memo - %s" msgstr "Nota - %s" -#: ../calendar/gui/dialogs/comp-editor.c:603 +#: ../calendar/gui/dialogs/comp-editor.c:601 msgid "No Summary" msgstr "Sin resumen" -#: ../calendar/gui/dialogs/comp-editor.c:745 +#: ../calendar/gui/dialogs/comp-editor.c:743 msgid "Keep original item?" msgstr "¿Mantener el elemento original?" -#: ../calendar/gui/dialogs/comp-editor.c:951 +#: ../calendar/gui/dialogs/comp-editor.c:949 msgid "Click here to close the current window" msgstr "Pulse aquí para cerrar la ventana actual" -#: ../calendar/gui/dialogs/comp-editor.c:958 +#: ../calendar/gui/dialogs/comp-editor.c:956 msgid "Copy selected text to the clipboard" msgstr "Copia el texto seleccionado al portapapeles" -#: ../calendar/gui/dialogs/comp-editor.c:965 +#: ../calendar/gui/dialogs/comp-editor.c:963 msgid "Cut selected text to the clipboard" msgstr "Corta el texto seleccionado al portapapeles" -#: ../calendar/gui/dialogs/comp-editor.c:972 +#: ../calendar/gui/dialogs/comp-editor.c:970 msgid "Click here to view help available" msgstr "Pulse aquí para ver la ayuda disponible" -#: ../calendar/gui/dialogs/comp-editor.c:979 +#: ../calendar/gui/dialogs/comp-editor.c:977 msgid "Paste text from the clipboard" msgstr "Pega texto desde el portapapeles" -#: ../calendar/gui/dialogs/comp-editor.c:1000 +#: ../calendar/gui/dialogs/comp-editor.c:998 msgid "Click here to save the current window" msgstr "Pulse aquí para guardar la vista actual" -#: ../calendar/gui/dialogs/comp-editor.c:1007 +#: ../calendar/gui/dialogs/comp-editor.c:1005 msgid "Select all text" msgstr "Selecciona todo el texto" -#: ../calendar/gui/dialogs/comp-editor.c:1014 +#: ../calendar/gui/dialogs/comp-editor.c:1012 msgid "_Classification" msgstr "_Clasificación" -#: ../calendar/gui/dialogs/comp-editor.c:1028 +#: ../calendar/gui/dialogs/comp-editor.c:1026 #: ../mail/mail-signature-editor.c:208 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43 msgid "_File" msgstr "_Archivo" -#: ../calendar/gui/dialogs/comp-editor.c:1035 +#: ../calendar/gui/dialogs/comp-editor.c:1033 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24 #: ../ui/evolution.xml.h:46 msgid "_Help" msgstr "Ay_uda" -#: ../calendar/gui/dialogs/comp-editor.c:1042 +#: ../calendar/gui/dialogs/comp-editor.c:1040 msgid "_Insert" msgstr "_Insertar" -#: ../calendar/gui/dialogs/comp-editor.c:1049 +#: ../calendar/gui/dialogs/comp-editor.c:1047 msgid "_Options" msgstr "_Opciones" -#: ../calendar/gui/dialogs/comp-editor.c:1056 ../mail/em-folder-tree.c:2115 +#: ../calendar/gui/dialogs/comp-editor.c:1054 ../mail/em-folder-tree.c:2115 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30 #: ../ui/evolution.xml.h:55 msgid "_View" msgstr "_Ver" -#: ../calendar/gui/dialogs/comp-editor.c:1066 +#: ../calendar/gui/dialogs/comp-editor.c:1064 #: ../composer/e-composer-actions.c:413 msgid "_Attachment..." msgstr "_Adjunto…" -#: ../calendar/gui/dialogs/comp-editor.c:1068 +#: ../calendar/gui/dialogs/comp-editor.c:1066 msgid "Click here to attach a file" msgstr "Pulse aquí para adjuntar un archivo" -#: ../calendar/gui/dialogs/comp-editor.c:1076 +#: ../calendar/gui/dialogs/comp-editor.c:1074 msgid "_Categories" msgstr "_Categorías" -#: ../calendar/gui/dialogs/comp-editor.c:1078 +#: ../calendar/gui/dialogs/comp-editor.c:1076 msgid "Toggles whether to display categories" msgstr "Conmuta cuando se muestran las categorías" -#: ../calendar/gui/dialogs/comp-editor.c:1084 +#: ../calendar/gui/dialogs/comp-editor.c:1082 msgid "Time _Zone" msgstr "_Zona horaria" -#: ../calendar/gui/dialogs/comp-editor.c:1086 +#: ../calendar/gui/dialogs/comp-editor.c:1084 msgid "Toggles whether the time zone is displayed" msgstr "Conmuta cuando se muestra la «Zona horaria»" -#: ../calendar/gui/dialogs/comp-editor.c:1095 +#: ../calendar/gui/dialogs/comp-editor.c:1093 msgid "Pu_blic" msgstr "Pú_blico" -#: ../calendar/gui/dialogs/comp-editor.c:1097 +#: ../calendar/gui/dialogs/comp-editor.c:1095 msgid "Classify as public" msgstr "Clasificar como público" -#: ../calendar/gui/dialogs/comp-editor.c:1102 +#: ../calendar/gui/dialogs/comp-editor.c:1100 msgid "_Private" msgstr "_Privado" -#: ../calendar/gui/dialogs/comp-editor.c:1104 +#: ../calendar/gui/dialogs/comp-editor.c:1102 msgid "Classify as private" msgstr "Clasificar como privado" -#: ../calendar/gui/dialogs/comp-editor.c:1109 +#: ../calendar/gui/dialogs/comp-editor.c:1107 msgid "_Confidential" msgstr "_Confidencial" -#: ../calendar/gui/dialogs/comp-editor.c:1111 +#: ../calendar/gui/dialogs/comp-editor.c:1109 msgid "Classify as confidential" msgstr "Clasificar como confidencial" -#: ../calendar/gui/dialogs/comp-editor.c:1119 +#: ../calendar/gui/dialogs/comp-editor.c:1117 msgid "R_ole Field" msgstr "Campo «_Rol»" -#: ../calendar/gui/dialogs/comp-editor.c:1121 +#: ../calendar/gui/dialogs/comp-editor.c:1119 msgid "Toggles whether the Role field is displayed" msgstr "Conmuta cuando se muestra el campo «Rol»" -#: ../calendar/gui/dialogs/comp-editor.c:1127 +#: ../calendar/gui/dialogs/comp-editor.c:1125 msgid "_RSVP" msgstr "_Confirmar" -#: ../calendar/gui/dialogs/comp-editor.c:1129 +#: ../calendar/gui/dialogs/comp-editor.c:1127 msgid "Toggles whether the RSVP field is displayed" msgstr "Conmuta cuando se muestra el campo «Confirmar»" -#: ../calendar/gui/dialogs/comp-editor.c:1135 +#: ../calendar/gui/dialogs/comp-editor.c:1133 msgid "_Status Field" msgstr "Campo de _estado" -#: ../calendar/gui/dialogs/comp-editor.c:1137 +#: ../calendar/gui/dialogs/comp-editor.c:1135 msgid "Toggles whether the Status field is displayed" msgstr "Conmuta cuando se muestra el campo «Estado»" -#: ../calendar/gui/dialogs/comp-editor.c:1143 +#: ../calendar/gui/dialogs/comp-editor.c:1141 msgid "_Type Field" msgstr "Campo de _tipo" -#: ../calendar/gui/dialogs/comp-editor.c:1145 +#: ../calendar/gui/dialogs/comp-editor.c:1143 msgid "Toggles whether the Attendee Type is displayed" msgstr "Conmuta indicando si se muestra el campo «Tipo de participante»" -#: ../calendar/gui/dialogs/comp-editor.c:1169 +#: ../calendar/gui/dialogs/comp-editor.c:1167 #: ../composer/e-composer-private.c:66 msgid "Recent _Documents" msgstr "_Documentos recientes" -#: ../calendar/gui/dialogs/comp-editor.c:1595 +#: ../calendar/gui/dialogs/comp-editor.c:1593 #: ../composer/e-composer-actions.c:640 msgid "Attach" msgstr "Adjuntar" -#: ../calendar/gui/dialogs/comp-editor.c:1858 -#: ../calendar/gui/dialogs/comp-editor.c:1906 -#: ../calendar/gui/dialogs/comp-editor.c:2708 +#: ../calendar/gui/dialogs/comp-editor.c:1856 +#: ../calendar/gui/dialogs/comp-editor.c:1904 +#: ../calendar/gui/dialogs/comp-editor.c:2706 msgid "Changes made to this item may be discarded if an update arrives" msgstr "" "Los cambios efectuados a este elemento pueden descartarse si llega una " "actualización por correo" -#: ../calendar/gui/dialogs/comp-editor.c:2737 +#: ../calendar/gui/dialogs/comp-editor.c:2735 msgid "Unable to use current version!" msgstr "Imposible usar la versión actual." @@ -6000,7 +5991,7 @@ msgid "I_mport to Tasks" msgstr "I_mportar a las tareas" #: ../calendar/gui/e-cal-component-memo-preview.c:69 -#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3272 +#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3271 #, c-format msgid "Click to open %s" msgstr "Pulse para abrir %s" @@ -6114,7 +6105,6 @@ msgstr "Fecha de terminación" #: ../calendar/gui/e-cal-list-view.etspec.h:4 #: ../calendar/gui/e-calendar-table.etspec.h:9 #: ../calendar/gui/e-memo-table.etspec.h:4 -#| msgid "Modified" msgid "Last modified" msgstr "" @@ -6130,7 +6120,7 @@ msgstr "Libre" #: ../calendar/gui/e-cal-model-calendar.c:190 #: ../calendar/gui/e-calendar-table.c:641 -#: ../calendar/gui/e-meeting-time-sel.c:398 +#: ../calendar/gui/e-meeting-time-sel.c:397 msgid "Busy" msgstr "Ocupada" @@ -6284,7 +6274,7 @@ msgstr "Abrir página _web" #: ../calendar/gui/e-calendar-table.c:1600 #: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:939 -#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:498 +#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:494 msgid "_Save As..." msgstr "Guardar _como…" @@ -6443,7 +6433,7 @@ msgstr "_Responder" #: ../calendar/gui/e-calendar-view.c:1831 #: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1331 -#: ../mail/em-popup.c:503 ../ui/evolution-mail-message.xml.h:82 +#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:82 msgid "Reply to _All" msgstr "Responder a _todos" @@ -6478,7 +6468,7 @@ msgstr "Rehusado" #: ../calendar/gui/e-calendar-view.c:2294 #: ../calendar/gui/e-meeting-list-view.c:204 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199 -#: ../calendar/gui/e-meeting-time-sel.c:397 +#: ../calendar/gui/e-meeting-time-sel.c:396 msgid "Tentative" msgstr "Provisional" @@ -7073,7 +7063,7 @@ msgstr "En proceso" #. This is a strftime() format string %A = full weekday name, #. %B = full month name, %d = month day, %Y = full year. #: ../calendar/gui/e-meeting-time-sel-item.c:467 -#: ../calendar/gui/e-meeting-time-sel.c:2126 +#: ../calendar/gui/e-meeting-time-sel.c:2125 msgid "%A, %B %d, %Y" msgstr "%A, %d de %B, %Y" @@ -7082,7 +7072,7 @@ msgstr "%A, %d de %B, %Y" #. This is a strftime() format string %a = abbreviated weekday name, #. %m = month number, %d = month day, %Y = full year. #: ../calendar/gui/e-meeting-time-sel-item.c:471 -#: ../calendar/gui/e-meeting-time-sel.c:2157 +#: ../calendar/gui/e-meeting-time-sel.c:2156 msgid "%a %m/%d/%Y" msgstr "%a %d/%m/%Y" @@ -7092,67 +7082,67 @@ msgstr "%a %d/%m/%Y" msgid "%m/%d/%Y" msgstr "%e/%m/%Y" -#: ../calendar/gui/e-meeting-time-sel.c:399 +#: ../calendar/gui/e-meeting-time-sel.c:398 msgid "Out of Office" msgstr "Fuera de la oficina" -#: ../calendar/gui/e-meeting-time-sel.c:400 +#: ../calendar/gui/e-meeting-time-sel.c:399 msgid "No Information" msgstr "Sin información" -#: ../calendar/gui/e-meeting-time-sel.c:415 +#: ../calendar/gui/e-meeting-time-sel.c:414 msgid "A_ttendees..." msgstr "_Participantes…" -#: ../calendar/gui/e-meeting-time-sel.c:436 +#: ../calendar/gui/e-meeting-time-sel.c:435 msgid "O_ptions" msgstr "O_pciones" -#: ../calendar/gui/e-meeting-time-sel.c:453 +#: ../calendar/gui/e-meeting-time-sel.c:452 msgid "Show _only working hours" msgstr "Mostrar _sólo las horas de trabajo" -#: ../calendar/gui/e-meeting-time-sel.c:463 +#: ../calendar/gui/e-meeting-time-sel.c:462 msgid "Show _zoomed out" msgstr "Mostrar quitando _ampliación" -#: ../calendar/gui/e-meeting-time-sel.c:478 +#: ../calendar/gui/e-meeting-time-sel.c:477 msgid "_Update free/busy" msgstr "_Actualizar disponibilidad" -#: ../calendar/gui/e-meeting-time-sel.c:493 +#: ../calendar/gui/e-meeting-time-sel.c:492 msgid "_<<" msgstr "_<<" -#: ../calendar/gui/e-meeting-time-sel.c:511 +#: ../calendar/gui/e-meeting-time-sel.c:510 msgid "_Autopick" msgstr "_Auto-seleccionar" -#: ../calendar/gui/e-meeting-time-sel.c:526 +#: ../calendar/gui/e-meeting-time-sel.c:525 msgid ">_>" msgstr "_>>" -#: ../calendar/gui/e-meeting-time-sel.c:543 +#: ../calendar/gui/e-meeting-time-sel.c:542 msgid "_All people and resources" msgstr "_Todas las personas y los recursos" -#: ../calendar/gui/e-meeting-time-sel.c:552 +#: ../calendar/gui/e-meeting-time-sel.c:551 msgid "All _people and one resource" msgstr "Todas las _personas y un recurso" -#: ../calendar/gui/e-meeting-time-sel.c:561 +#: ../calendar/gui/e-meeting-time-sel.c:560 msgid "_Required people" msgstr "Personas _requeridas" -#: ../calendar/gui/e-meeting-time-sel.c:570 +#: ../calendar/gui/e-meeting-time-sel.c:569 msgid "Required people and _one resource" msgstr "Personas requeridas y _un recurso" -#: ../calendar/gui/e-meeting-time-sel.c:606 +#: ../calendar/gui/e-meeting-time-sel.c:605 msgid "_Start time:" msgstr "Hora de _inicio:" -#: ../calendar/gui/e-meeting-time-sel.c:633 +#: ../calendar/gui/e-meeting-time-sel.c:632 msgid "_End time:" msgstr "Hora de _fin:" @@ -9644,15 +9634,15 @@ msgstr "Conmutador que indica si se muestra el campo «Para»" msgid "Save Draft" msgstr "Guardar borrador" -#: ../composer/e-composer-header-table.c:64 +#: ../composer/e-composer-header-table.c:65 msgid "Enter the recipients of the message" msgstr "Escriba los destinatarios del mensaje" -#: ../composer/e-composer-header-table.c:66 +#: ../composer/e-composer-header-table.c:67 msgid "Enter the addresses that will receive a carbon copy of the message" msgstr "Escriba las direcciones que recibirán una copia del mensaje" -#: ../composer/e-composer-header-table.c:69 +#: ../composer/e-composer-header-table.c:70 msgid "" "Enter the addresses that will receive a carbon copy of the message without " "appearing in the recipient list of the message" @@ -9660,35 +9650,35 @@ msgstr "" "Escriba las direcciones que recibirán una copia del mensaje sin aparecer en " "la lista de destinatarios del mensaje" -#: ../composer/e-composer-header-table.c:643 +#: ../composer/e-composer-header-table.c:742 msgid "Fr_om:" msgstr "_De:" -#: ../composer/e-composer-header-table.c:652 +#: ../composer/e-composer-header-table.c:751 msgid "_Reply-To:" msgstr "_Responder a:" -#: ../composer/e-composer-header-table.c:656 +#: ../composer/e-composer-header-table.c:755 msgid "_To:" msgstr "_Para:" -#: ../composer/e-composer-header-table.c:661 +#: ../composer/e-composer-header-table.c:760 msgid "_Cc:" msgstr "_Cc:" -#: ../composer/e-composer-header-table.c:666 +#: ../composer/e-composer-header-table.c:765 msgid "_Bcc:" msgstr "Cc_o:" -#: ../composer/e-composer-header-table.c:671 +#: ../composer/e-composer-header-table.c:770 msgid "_Post To:" msgstr "_Publicar en:" -#: ../composer/e-composer-header-table.c:675 +#: ../composer/e-composer-header-table.c:774 msgid "S_ubject:" msgstr "_Asunto:" -#: ../composer/e-composer-header-table.c:684 +#: ../composer/e-composer-header-table.c:783 msgid "Si_gnature:" msgstr "_Firma:" @@ -9723,11 +9713,11 @@ msgstr "" "No es posible cifrar el mensaje saliente: no hay establecido un certificado " "de cifrado para esta cuenta" -#: ../composer/e-msg-composer.c:1357 ../composer/e-msg-composer.c:2311 +#: ../composer/e-msg-composer.c:1357 ../composer/e-msg-composer.c:2218 msgid "Compose Message" msgstr "Redactar un mensaje" -#: ../composer/e-msg-composer.c:3533 +#: ../composer/e-msg-composer.c:3440 msgid "" "(The composer contains a non-text message body, which cannot be edited.)" @@ -10502,7 +10492,7 @@ msgid "_Mail" msgstr "Co_rreo" #: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1332 -#: ../mail/em-popup.c:505 ../ui/evolution-mail-message.xml.h:109 +#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:109 msgid "_Forward" msgstr "Reen_viar" @@ -10687,14 +10677,14 @@ msgid "No account found to use, forward of the message has been cancelled." msgstr "" "No se encontró ninguna cuenta que usar, se canceló el reenvío del mensaje." -#: ../mail/em-composer-utils.c:2065 +#: ../mail/em-composer-utils.c:2068 msgid "an unknown sender" msgstr "un remitente desconocido" #. Note to translators: this is the attribution string used when quoting messages. #. * each ${Variable} gets replaced with a value. To see a full list of available #. * variables, see em-composer-utils.c:1514 -#: ../mail/em-composer-utils.c:2112 +#: ../mail/em-composer-utils.c:2115 msgid "" "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} " "${TimeZone}, ${Sender} wrote:" @@ -10702,7 +10692,7 @@ msgstr "" "El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a las ${24Hour}:${Minute} " "${TimeZone}, ${Sender} escribió:" -#: ../mail/em-composer-utils.c:2255 +#: ../mail/em-composer-utils.c:2258 msgid "-----Original Message-----" msgstr "-----Mensaje original-----" @@ -11382,33 +11372,29 @@ msgstr "No se pudo obtener el mensaje" msgid "Retrieving Message..." msgstr "Obteniendo mensaje…" -#: ../mail/em-folder-view.c:2755 -msgid "C_all To..." -msgstr "Ll_amar a…" - -#: ../mail/em-folder-view.c:2758 +#: ../mail/em-folder-view.c:2757 msgid "Create _Search Folder" msgstr "Crear carpeta de _búsqueda" -#: ../mail/em-folder-view.c:2759 +#: ../mail/em-folder-view.c:2758 msgid "_From this Address" msgstr "_Desde esta dirección" -#: ../mail/em-folder-view.c:2760 +#: ../mail/em-folder-view.c:2759 msgid "_To this Address" msgstr "_A esta dirección" -#: ../mail/em-folder-view.c:3253 +#: ../mail/em-folder-view.c:3252 #, c-format msgid "Click to mail %s" msgstr "Pulse para enviar correo a %s" -#: ../mail/em-folder-view.c:3265 +#: ../mail/em-folder-view.c:3264 #, c-format msgid "Click to call %s" msgstr "Pulse para llamar a %s" -#: ../mail/em-folder-view.c:3270 +#: ../mail/em-folder-view.c:3269 msgid "Click to hide/unhide addresses" msgstr "Pulse para ocultar/mostrar las direcciones" @@ -11670,7 +11656,7 @@ msgstr "Cco" #. pseudo-header #: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353 -#: ../mail/em-mailer-prefs.c:1451 +#: ../mail/em-mailer-prefs.c:1439 msgid "Mailer" msgstr "Transporte" @@ -11809,20 +11795,20 @@ msgid "Tag" msgstr "Etiqueta" #. May be a better text -#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133 +#: ../mail/em-mailer-prefs.c:1067 ../mail/em-mailer-prefs.c:1121 #, c-format msgid "%s plugin is available and the binary is installed." msgstr "El complemento %s está disponible y el binario está instalado." #. May be a better text -#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142 +#: ../mail/em-mailer-prefs.c:1075 ../mail/em-mailer-prefs.c:1130 #, c-format msgid "" "%s plugin is not available. Please check whether the package is installed." msgstr "" "El complemento %s no está disponible. Compruebe si el paquete está instalado." -#: ../mail/em-mailer-prefs.c:1108 +#: ../mail/em-mailer-prefs.c:1096 msgid "No Junk plugin available" msgstr "No hay complemento para SPAM disponible" @@ -11916,55 +11902,55 @@ msgstr "" "No es posible leer la configuración de la instalación anterior de Evolution, " "«evolution/config.xmldb» no existe o está corrompido." -#: ../mail/em-popup.c:368 +#: ../mail/em-popup.c:364 msgid "Save As..." msgstr "Guardar como…" -#: ../mail/em-popup.c:393 +#: ../mail/em-popup.c:389 #, c-format msgid "untitled_image.%s" msgstr "imagen-_sin-título.%s" -#: ../mail/em-popup.c:499 ../widgets/misc/e-attachment-handler-image.c:147 +#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147 msgid "Set as _Background" msgstr "Establecer como _fondo" -#: ../mail/em-popup.c:501 +#: ../mail/em-popup.c:497 msgid "_Reply to sender" msgstr "_Responder al remitente" -#: ../mail/em-popup.c:502 ../ui/evolution-mail-message.xml.h:83 +#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:83 msgid "Reply to _List" msgstr "Responder a la _lista" #. make it first item -#: ../mail/em-popup.c:551 ../mail/em-popup.c:751 +#: ../mail/em-popup.c:547 ../mail/em-popup.c:747 msgid "_Add to Address Book" msgstr "_Añadir a la libreta de direcciones" -#: ../mail/em-popup.c:730 +#: ../mail/em-popup.c:726 #, c-format msgid "Open in %s..." msgstr "Abrir en %s…" -#: ../mail/em-subscribe-editor.c:604 +#: ../mail/em-subscribe-editor.c:605 msgid "This store does not support subscriptions, or they are not enabled." msgstr "Este almacén no soporta suscripciones, o no están activadas." -#: ../mail/em-subscribe-editor.c:637 +#: ../mail/em-subscribe-editor.c:638 msgid "Subscribed" msgstr "Suscrito" -#: ../mail/em-subscribe-editor.c:641 +#: ../mail/em-subscribe-editor.c:642 msgid "Folder" msgstr "Carpeta" #. FIXME: This is just to get the shadow, is there a better way? -#: ../mail/em-subscribe-editor.c:857 +#: ../mail/em-subscribe-editor.c:858 msgid "Please select a server." msgstr "Seleccione un servidor." -#: ../mail/em-subscribe-editor.c:893 +#: ../mail/em-subscribe-editor.c:894 msgid "No server has been selected" msgstr "No se ha seleccionado ningún servidor" @@ -12234,7 +12220,6 @@ msgid "Enable or disable magic space bar" msgstr "Activa o desactiva la barra espaciadora mágica" #: ../mail/evolution-mail.schemas.in.h:49 -#| msgid "It disables/enables the prompt while marking multiple messages." msgid "Enable or disable the prompt whilst marking multiple messages." msgstr "Activar o desactivar la pregunta cuando se marcan varios mensajes." @@ -12279,10 +12264,6 @@ msgid "Encode file names in an Outlook/GMail way" msgstr "Codificar nombres de archivo de la forma Outlook/GMail" #: ../mail/evolution-mail.schemas.in.h:58 -#| msgid "" -#| "Encode file names in the mail headers same as Outlook or GMail does, to " -#| "let them understand localized file names sent by Evolution, because they " -#| "do not follow the RFC 2231, but uses incorrect RFC 2047 standard." msgid "" "Encode file names in the mail headers same as Outlook or GMail do, to let " "them display correctly file names with UTF-8 letters sent by Evolution, " @@ -15293,7 +15274,6 @@ msgstr "Contactos automáticos" #. Enable BBDB checkbox #: ../plugins/bbdb/bbdb.c:645 -#| msgid "_Auto-create address book entries when replying to messages" msgid "Create _address book entries when sending mails" msgstr "" "Crear entradas _automáticamente en la libreta de direcciones al enviar " @@ -16642,7 +16622,6 @@ msgstr "" "puede enviar correos en texto plano." #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2 -#| msgid "Default External Editor" msgid "External Editor" msgstr "Editor externo" @@ -16696,7 +16675,6 @@ msgstr "" #: ../plugins/external-editor/external-editor.c:308 #: ../plugins/external-editor/external-editor.c:310 -#| msgid "Compose in _External Editor" msgid "Compose in External Editor" msgstr "Redactar en un editor externo" @@ -17961,7 +17939,6 @@ msgid "_Inherit reminder" msgstr "_Heredar recordatorio" #: ../plugins/itip-formatter/itip-view.c:1914 -#| msgid "_Memos" msgid "_Memos:" msgstr "_Notas:" @@ -18175,9 +18152,6 @@ msgid "Cannot open calendar. %s" msgstr "No se puede abrir el calendario. %s" #: ../plugins/mail-to-task/mail-to-task.c:350 -#| msgid "" -#| "Selected source is read only, thus cannot create task there. Select other " -#| "source, please." msgid "" "Selected source is read only, thus cannot create event there. Select other " "source, please." @@ -18194,9 +18168,6 @@ msgstr "" "tarea en él. Seleccione otro origen." #: ../plugins/mail-to-task/mail-to-task.c:356 -#| msgid "" -#| "Selected source is read only, thus cannot create task there. Select other " -#| "source, please." msgid "" "Selected source is read only, thus cannot create memo there. Select other " "source, please." @@ -18211,7 +18182,6 @@ msgstr "No se pudo crear el objeto. %s" #: ../plugins/mail-to-task/mail-to-task.c:555 #, c-format -#| msgid "Cannot open source \"{2}\"." msgid "Cannot get source list. %s" msgstr "No se pudo obtener la lista de origen. %s" @@ -18254,17 +18224,14 @@ msgid "Mail to task" msgstr "Correo a tarea" #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1 -#| msgid "Convert the selected message to a new task" msgid "Convert the selected message to a new event" msgstr "Convertir el mensaje seleccionado en un acontecimiento nuevo" #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2 -#| msgid "Convert the selected message to a new task" msgid "Convert the selected message to a new meeting" msgstr "Convertir el mensaje seleccionado en una reunión nueva" #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3 -#| msgid "Convert the selected message to a new task" msgid "Convert the selected message to a new memo" msgstr "Convertir el mensaje seleccionado en una nota nueva" @@ -18709,7 +18676,6 @@ msgid "Service _type:" msgstr "_Tipo de servicio:" #: ../plugins/publish-calendar/publish-calendar.glade.h:21 -#| msgid "Time _zone:" msgid "Time _duration:" msgstr "_Duración:" @@ -18734,11 +18700,6 @@ msgid "_Username:" msgstr "_Usuario:" #: ../plugins/publish-calendar/publish-calendar.glade.h:29 -#| msgid "" -#| "day(s)\n" -#| "week(s)\n" -#| "month(s)\n" -#| "year(s)" msgid "" "days\n" "weeks\n" @@ -18795,51 +18756,47 @@ msgstr "Un complemento que carga otros complementos escritos en Python." msgid "Python Loader" msgstr "Cargador de Python" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:111 -msgid "SpamAssassin (built-in)" -msgstr "SpamAssassin (integrado)" - -#: ../plugins/sa-junk-plugin/em-junk-filter.c:137 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:128 #, c-format msgid "SpamAssassin not found, code: %d" msgstr "No se encontró SpamAssasin, código: %d" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:145 -#: ../plugins/sa-junk-plugin/em-junk-filter.c:153 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:136 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:144 #, c-format msgid "Failed to create pipe: %s" msgstr "Falló al crear la tubería: %s" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:192 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:183 #, c-format msgid "Error after fork: %s" msgstr "Error después de bifurcar: %s" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:247 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:238 #, c-format msgid "SpamAssassin child process does not respond, killing..." msgstr "El proceso hijo de SpamAssasin no está respondiendo, matándolo…" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:249 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:240 #, c-format msgid "Wait for SpamAssassin child process interrupted, terminating..." msgstr "Espere a que el proceso hijo de SpamAssasin se interrumpa, terminando…" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:258 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:249 #, c-format msgid "Pipe to SpamAssassin failed, error code: %d" msgstr "Falló la tubería hacia SpamAssasin, código de error: %d" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:521 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:512 #, c-format msgid "SpamAssassin is not available." msgstr "SpamAssasin no está disponible." -#: ../plugins/sa-junk-plugin/em-junk-filter.c:913 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:904 msgid "This will make SpamAssassin more reliable, but slower" msgstr "Esto hará que SpamAssasin sea más exacto, pero más lento" -#: ../plugins/sa-junk-plugin/em-junk-filter.c:919 +#: ../plugins/sa-junk-plugin/em-junk-filter.c:910 msgid "I_nclude remote tests" msgstr "I_ncluir tests remotos" @@ -19198,7 +19155,7 @@ msgstr "Vista inicial de adjunto" #: ../shell/apps_evolution_shell.schemas.in.h:16 msgid "Initial file chooser folder" -msgstr "" +msgstr "Carpeta inicial del selector de archivos" #: ../shell/apps_evolution_shell.schemas.in.h:17 msgid "Initial folder for GtkFileChooser dialogs." @@ -19506,7 +19463,6 @@ msgstr "" #: ../shell/e-shell-window-commands.c:78 #, c-format -#| msgid "Error executing %s." msgid "Error executing %s. (%s)" msgstr "Error al ejecutar %s. (%s)" @@ -21907,56 +21863,54 @@ msgstr "Tipo de vista" msgid "Type of view:" msgstr "Tipo de vista:" -#: ../widgets/misc/e-attachment.c:936 -#| msgid "Attached message" -#| msgid_plural "%d attached messages" +#: ../widgets/misc/e-attachment.c:940 msgid "Attached message" msgstr "Mensaje adjunto" #. Translators: Default attachment filename. -#: ../widgets/misc/e-attachment.c:1709 ../widgets/misc/e-attachment.c:2258 -#: ../widgets/misc/e-attachment-store.c:627 +#: ../widgets/misc/e-attachment.c:1719 ../widgets/misc/e-attachment.c:2270 +#: ../widgets/misc/e-attachment-store.c:635 msgid "attachment.dat" msgstr "attachment.dat" -#: ../widgets/misc/e-attachment.c:1756 ../widgets/misc/e-attachment.c:2560 +#: ../widgets/misc/e-attachment.c:1766 ../widgets/misc/e-attachment.c:2572 msgid "A load operation is already in progress" msgstr "Existe una operación de carga en progreso" -#: ../widgets/misc/e-attachment.c:1764 ../widgets/misc/e-attachment.c:2568 +#: ../widgets/misc/e-attachment.c:1774 ../widgets/misc/e-attachment.c:2580 msgid "A save operation is already in progress" msgstr "Existe una operación de guardado en progreso" -#: ../widgets/misc/e-attachment.c:1857 +#: ../widgets/misc/e-attachment.c:1867 #, c-format msgid "Could not load '%s'" msgstr "No se pudo cargar «%s»" -#: ../widgets/misc/e-attachment.c:1860 +#: ../widgets/misc/e-attachment.c:1870 #, c-format msgid "Could not load the attachment" msgstr "No se pudo cargar el adjunto" -#: ../widgets/misc/e-attachment.c:2135 +#: ../widgets/misc/e-attachment.c:2147 #, c-format msgid "Could not open '%s'" msgstr "No se pudo abrir «%s»" -#: ../widgets/misc/e-attachment.c:2138 +#: ../widgets/misc/e-attachment.c:2150 #, c-format msgid "Could not open the attachment" msgstr "No se pudo abrir el adjunto" -#: ../widgets/misc/e-attachment.c:2576 +#: ../widgets/misc/e-attachment.c:2588 msgid "Attachment contents not loaded" msgstr "No se cargó el contenido del adjunto" -#: ../widgets/misc/e-attachment.c:2653 +#: ../widgets/misc/e-attachment.c:2665 #, c-format msgid "Could not save '%s'" msgstr "No se pudo guardar «%s»" -#: ../widgets/misc/e-attachment.c:2656 +#: ../widgets/misc/e-attachment.c:2668 #, c-format msgid "Could not save the attachment" msgstr "No se pudo guardar el adjunto" @@ -21996,15 +21950,15 @@ msgstr "Ocultar _barra de adjuntos" msgid "Show _Attachment Bar" msgstr "Mostrar _barra de adjuntos" -#: ../widgets/misc/e-attachment-store.c:533 +#: ../widgets/misc/e-attachment-store.c:541 msgid "Add Attachment" msgstr "Añadir adjunto" -#: ../widgets/misc/e-attachment-store.c:536 +#: ../widgets/misc/e-attachment-store.c:544 msgid "A_ttach" msgstr "_Adjuntar" -#: ../widgets/misc/e-attachment-store.c:598 +#: ../widgets/misc/e-attachment-store.c:606 msgid "Save Attachment" msgid_plural "Save Attachments" msgstr[0] "Guarda el adjunto" @@ -22020,7 +21974,6 @@ msgstr "_Añadir adjunto…" #: ../widgets/misc/e-attachment-view.c:646 #, c-format -#| msgid "Opening %s" msgid "Open with \"%s\"" msgstr "Abrir con «%s»" @@ -23024,6 +22977,15 @@ msgstr "Contexto IM" msgid "Handle Popup" msgstr "Tirador emergente" +#~ msgid "Adjust for daylight sa_ving time" +#~ msgstr "Ajustar a la hora de _verano" + +#~ msgid "C_all To..." +#~ msgstr "Ll_amar a…" + +#~ msgid "SpamAssassin (built-in)" +#~ msgstr "SpamAssassin (integrado)" + #~ msgid "" #~ "Enable side bar search feature so that you can start interactive " #~ "searching by typing in the text. Use is that you can easily find a folder " -- cgit v1.2.3 From a1f287ca6bf35d27e5dcb9b89a10f76e9abbd057 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 20 May 2009 12:02:30 -0400 Subject: =?UTF-8?q?Bug=20274117=20=E2=80=93=20Difficult=20to=20post=20a=20?= =?UTF-8?q?new=20message=20to=20newsgroups?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Completely rewrite how composer headers are managed. There's now two sets of headers (with some overlap): one set is for sending an email message, the other is for posting to a newsgroup. The correct set of headers is chosen on-the-fly based on the currently selected account type. The user's "view" preferences for these two sets are stored separately, so that switching between an email account and a news account will no longer stomp on your preferences. This also eliminates the need for the "Post New Message to Folder" and "Post a Reply" actions, so they've been removed. Usenet users can now just highlight a newsgroup in the folder tree and click New or Reply, and the composer window will show the correct set of headers with the Post-To field filled in automatically. Comment #6 in the bug discusses other standard news reader behaviors we still don't get right, particularly the missing "Followup To" header. These will be dealt with separately. --- composer/e-composer-actions.c | 132 +-------- composer/e-composer-actions.h | 6 - composer/e-composer-header-table.c | 547 ++++++++++++++++++++++++++----------- composer/e-composer-header-table.h | 14 - composer/e-composer-header.c | 30 +- composer/e-composer-header.h | 2 +- composer/e-composer-private.c | 41 +++ composer/e-composer-private.h | 11 +- composer/e-msg-composer.c | 177 +----------- composer/e-msg-composer.h | 5 - composer/evolution-composer.ui | 7 +- mail/em-composer-utils.c | 220 +-------------- mail/em-composer-utils.h | 4 - mail/em-folder-browser.c | 9 - mail/em-folder-view.c | 16 -- mail/evolution-mail.schemas.in | 62 +++-- ui/evolution-mail-message.xml | 9 - 17 files changed, 511 insertions(+), 781 deletions(-) diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c index 56ec7c5db1..247ac7794f 100644 --- a/composer/e-composer-actions.c +++ b/composer/e-composer-actions.c @@ -308,104 +308,6 @@ action_smime_sign_cb (GtkToggleAction *action, gtkhtml_editor_set_changed (editor, TRUE); } -static void -action_view_bcc_cb (GtkToggleAction *action, - EMsgComposer *composer) -{ - EComposerHeaderTable *table; - gboolean active; - - table = e_msg_composer_get_header_table (composer); - active = gtk_toggle_action_get_active (action); - - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_BCC, active); -} - -static void -action_view_cc_cb (GtkToggleAction *action, - EMsgComposer *composer) -{ - EComposerHeaderTable *table; - gboolean active; - - table = e_msg_composer_get_header_table (composer); - active = gtk_toggle_action_get_active (action); - - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_CC, active); -} - -static void -action_view_from_cb (GtkToggleAction *action, - EMsgComposer *composer) -{ - EComposerHeaderTable *table; - gboolean active; - - table = e_msg_composer_get_header_table (composer); - active = gtk_toggle_action_get_active (action); - - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_FROM, active); -} - -static void -action_view_post_to_cb (GtkToggleAction *action, - EMsgComposer *composer) -{ - EComposerHeaderTable *table; - gboolean active; - - table = e_msg_composer_get_header_table (composer); - active = gtk_toggle_action_get_active (action); - - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_POST_TO, active); -} - -static void -action_view_reply_to_cb (GtkToggleAction *action, - EMsgComposer *composer) -{ - EComposerHeaderTable *table; - gboolean active; - - table = e_msg_composer_get_header_table (composer); - active = gtk_toggle_action_get_active (action); - - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_REPLY_TO, active); -} - -static void -action_view_subject_cb (GtkToggleAction *action, - EMsgComposer *composer) -{ - EComposerHeaderTable *table; - gboolean active; - - table = e_msg_composer_get_header_table (composer); - active = gtk_toggle_action_get_active (action); - - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_SUBJECT, active); -} - -static void -action_view_to_cb (GtkToggleAction *action, - EMsgComposer *composer) -{ - EComposerHeaderTable *table; - gboolean active; - - table = e_msg_composer_get_header_table (composer); - active = gtk_toggle_action_get_active (action); - - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_TO, active); -} - static GtkActionEntry entries[] = { { "attach", @@ -542,7 +444,7 @@ static GtkToggleActionEntry toggle_entries[] = { N_("S/MIME Sig_n"), NULL, N_("Sign this message with your S/MIME Signature Certificate"), - G_CALLBACK (action_smime_sign_cb), + NULL, /* Handled by property bindings */ FALSE }, { "view-bcc", @@ -550,7 +452,7 @@ static GtkToggleActionEntry toggle_entries[] = { N_("_Bcc Field"), NULL, N_("Toggles whether the BCC field is displayed"), - G_CALLBACK (action_view_bcc_cb), + NULL, /* Handled by property bindings */ FALSE }, { "view-cc", @@ -558,7 +460,7 @@ static GtkToggleActionEntry toggle_entries[] = { N_("_Cc Field"), NULL, N_("Toggles whether the CC field is displayed"), - G_CALLBACK (action_view_cc_cb), + NULL, /* Handled by property bindings */ FALSE }, { "view-from", @@ -566,15 +468,7 @@ static GtkToggleActionEntry toggle_entries[] = { N_("_From Field"), NULL, N_("Toggles whether the From chooser is displayed"), - G_CALLBACK (action_view_from_cb), - FALSE }, - - { "view-post-to", - NULL, - N_("_Post-To Field"), - NULL, - N_("Toggles whether the Post-To field is displayed"), - G_CALLBACK (action_view_post_to_cb), + NULL, /* Handled by property bindings */ FALSE }, { "view-reply-to", @@ -582,24 +476,8 @@ static GtkToggleActionEntry toggle_entries[] = { N_("_Reply-To Field"), NULL, N_("Toggles whether the Reply-To field is displayed"), - G_CALLBACK (action_view_reply_to_cb), + NULL, /* Handled by property bindings */ FALSE }, - - { "view-subject", - NULL, - N_("_Subject Field"), - NULL, - N_("Toggles whether the Subject field is displayed"), - G_CALLBACK (action_view_subject_cb), - FALSE }, - - { "view-to", - NULL, - N_("_To Field"), - NULL, - N_("Toggles whether the To field is displayed"), - G_CALLBACK (action_view_to_cb), - FALSE } }; void diff --git a/composer/e-composer-actions.h b/composer/e-composer-actions.h index c17f3ebc32..da3e470d81 100644 --- a/composer/e-composer-actions.h +++ b/composer/e-composer-actions.h @@ -61,13 +61,7 @@ E_COMPOSER_ACTION ((composer), "view-cc") #define E_COMPOSER_ACTION_VIEW_FROM(composer) \ E_COMPOSER_ACTION ((composer), "view-from") -#define E_COMPOSER_ACTION_VIEW_POST_TO(composer) \ - E_COMPOSER_ACTION ((composer), "view-post-to") #define E_COMPOSER_ACTION_VIEW_REPLY_TO(composer) \ E_COMPOSER_ACTION ((composer), "view-reply-to") -#define E_COMPOSER_ACTION_VIEW_SUBJECT(composer) \ - E_COMPOSER_ACTION ((composer), "view-subject") -#define E_COMPOSER_ACTION_VIEW_TO(composer) \ - E_COMPOSER_ACTION ((composer), "view-to") #endif /* E_COMPOSER_ACTIONS_H */ diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c index d539565ad2..267bfbf1e7 100644 --- a/composer/e-composer-header-table.c +++ b/composer/e-composer-header-table.c @@ -22,7 +22,9 @@ #include #include -#include "e-signature-combo-box.h" +#include "e-util/e-binding.h" +#include "e-util/gconf-bridge.h" +#include "widgets/misc/e-signature-combo-box.h" #include "e-composer-from-header.h" #include "e-composer-name-header.h" @@ -33,34 +35,6 @@ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_COMPOSER_HEADER_TABLE, EComposerHeaderTablePrivate)) -#define E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER(table) \ - (E_COMPOSER_FROM_HEADER (e_composer_header_table_get_header \ - (E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_FROM))) - -#define E_COMPOSER_HEADER_TABLE_GET_REPLY_TO_HEADER(table) \ - (E_COMPOSER_TEXT_HEADER (e_composer_header_table_get_header \ - (E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_REPLY_TO))) - -#define E_COMPOSER_HEADER_TABLE_GET_TO_HEADER(table) \ - (E_COMPOSER_NAME_HEADER (e_composer_header_table_get_header \ - (E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_TO))) - -#define E_COMPOSER_HEADER_TABLE_GET_CC_HEADER(table) \ - (E_COMPOSER_NAME_HEADER (e_composer_header_table_get_header \ - (E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_CC))) - -#define E_COMPOSER_HEADER_TABLE_GET_BCC_HEADER(table) \ - (E_COMPOSER_NAME_HEADER (e_composer_header_table_get_header \ - (E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_BCC))) - -#define E_COMPOSER_HEADER_TABLE_GET_POST_TO_HEADER(table) \ - (E_COMPOSER_POST_HEADER (e_composer_header_table_get_header \ - (E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_POST_TO))) - -#define E_COMPOSER_HEADER_TABLE_GET_SUBJECT_HEADER(table) \ - (E_COMPOSER_TEXT_HEADER (e_composer_header_table_get_header \ - (E_COMPOSER_HEADER_TABLE (table), E_COMPOSER_HEADER_SUBJECT))) - #define HEADER_TOOLTIP_TO \ _("Enter the recipients of the message") #define HEADER_TOOLTIP_CC \ @@ -71,6 +45,8 @@ "carbon copy of the message without appearing " \ "in the recipient list of the message") +#define GCONF_KEY_PREFIX "/apps/evolution/mail/composer" + enum { PROP_0, PROP_ACCOUNT, @@ -88,6 +64,7 @@ enum { struct _EComposerHeaderTablePrivate { EComposerHeader *headers[E_COMPOSER_NUM_HEADERS]; + guint gconf_bindings[E_COMPOSER_NUM_HEADERS]; GtkWidget *signature_label; GtkWidget *signature_combo_box; ENameSelector *name_selector; @@ -295,27 +272,161 @@ skip_custom: return new_destinations; } +static void +composer_header_table_setup_mail_headers (EComposerHeaderTable *table) +{ + GConfBridge *bridge; + gint ii; + + bridge = gconf_bridge_get (); + + for (ii = 0; ii < E_COMPOSER_NUM_HEADERS; ii++) { + EComposerHeader *header; + const gchar *key; + guint binding_id; + + binding_id = table->priv->gconf_bindings[ii]; + header = e_composer_header_table_get_header (table, ii); + + if (binding_id > 0) + gconf_bridge_unbind (bridge, binding_id); + + switch (ii) { + case E_COMPOSER_HEADER_BCC: + key = GCONF_KEY_PREFIX "/show_mail_bcc"; + break; + + case E_COMPOSER_HEADER_CC: + key = GCONF_KEY_PREFIX "/show_mail_cc"; + break; + + case E_COMPOSER_HEADER_FROM: + key = GCONF_KEY_PREFIX "/show_mail_from"; + break; + + case E_COMPOSER_HEADER_REPLY_TO: + key = GCONF_KEY_PREFIX "/show_mail_reply_to"; + break; + + default: + key = NULL; + break; + } + + switch (ii) { + case E_COMPOSER_HEADER_BCC: + case E_COMPOSER_HEADER_CC: + case E_COMPOSER_HEADER_FROM: + case E_COMPOSER_HEADER_REPLY_TO: + case E_COMPOSER_HEADER_SUBJECT: + case E_COMPOSER_HEADER_TO: + e_composer_header_set_sensitive (header, TRUE); + e_composer_header_set_visible (header, TRUE); + break; + + default: + e_composer_header_set_sensitive (header, FALSE); + e_composer_header_set_visible (header, FALSE); + break; + } + + if (key != NULL) + binding_id = gconf_bridge_bind_property ( + bridge, key, G_OBJECT (header), "visible"); + else + binding_id = 0; + + table->priv->gconf_bindings[ii] = binding_id; + } +} + +static void +composer_header_table_setup_post_headers (EComposerHeaderTable *table) +{ + GConfBridge *bridge; + gint ii; + + bridge = gconf_bridge_get (); + + for (ii = 0; ii < E_COMPOSER_NUM_HEADERS; ii++) { + EComposerHeader *header; + const gchar *key; + guint binding_id; + + binding_id = table->priv->gconf_bindings[ii]; + header = e_composer_header_table_get_header (table, ii); + + if (binding_id > 0) + gconf_bridge_unbind (bridge, binding_id); + + switch (ii) { + case E_COMPOSER_HEADER_FROM: + key = GCONF_KEY_PREFIX "/show_post_from"; + break; + + case E_COMPOSER_HEADER_REPLY_TO: + key = GCONF_KEY_PREFIX "/show_post_reply_to"; + break; + + default: + key = NULL; + break; + } + + switch (ii) { + case E_COMPOSER_HEADER_FROM: + case E_COMPOSER_HEADER_POST_TO: + case E_COMPOSER_HEADER_REPLY_TO: + case E_COMPOSER_HEADER_SUBJECT: + e_composer_header_set_sensitive (header, TRUE); + e_composer_header_set_visible (header, TRUE); + break; + + default: /* this includes TO, CC and BCC */ + e_composer_header_set_sensitive (header, FALSE); + e_composer_header_set_visible (header, FALSE); + break; + } + + if (key != NULL) + binding_id = gconf_bridge_bind_property ( + bridge, key, G_OBJECT (header), "visible"); + else + binding_id = 0; + + table->priv->gconf_bindings[ii] = binding_id; + } +} + static void composer_header_table_from_changed_cb (EComposerHeaderTable *table) { EAccount *account; + EComposerHeader *header; + EComposerHeaderType type; EComposerPostHeader *post_header; EComposerTextHeader *text_header; EDestination **old_destinations; EDestination **new_destinations; const gchar *reply_to; + const gchar *source_url; gboolean always_cc; gboolean always_bcc; /* Keep "Post-To" and "Reply-To" synchronized with "From" */ account = e_composer_header_table_get_account (table); + source_url = e_account_get_string (account, E_ACCOUNT_SOURCE_URL); - post_header = E_COMPOSER_HEADER_TABLE_GET_POST_TO_HEADER (table); + type = E_COMPOSER_HEADER_POST_TO; + header = e_composer_header_table_get_header (table, type); + post_header = E_COMPOSER_POST_HEADER (header); e_composer_post_header_set_account (post_header, account); + type = E_COMPOSER_HEADER_REPLY_TO; + header = e_composer_header_table_get_header (table, type); reply_to = (account != NULL) ? account->id->reply_to : NULL; - text_header = E_COMPOSER_HEADER_TABLE_GET_REPLY_TO_HEADER (table); + text_header = E_COMPOSER_TEXT_HEADER (header); e_composer_text_header_set_text (text_header, reply_to); always_cc = (account != NULL && account->always_cc); @@ -338,6 +449,27 @@ composer_header_table_from_changed_cb (EComposerHeaderTable *table) old_destinations, always_bcc ? account->bcc_addrs : NULL); e_composer_header_table_set_destinations_bcc (table, new_destinations); e_destination_freev (new_destinations); + + /* XXX We should NOT be checking specific account types here. + * Would prefer EAccount have a "send_method" enum item: + * + * E_ACCOUNT_SEND_METHOD_MAIL + * E_ACCOUNT_SEND_METHOD_POST + * + * And that would dictate which set of headers we show + * in the composer when an account is selected. Alas, + * EAccount has no private storage, so it would require + * an ABI break and I don't want to deal with that now. + * (But would anything besides Evolution be affected?) + * + * Currently only NNTP accounts use the "POST" fields. + */ + if (source_url == NULL) + composer_header_table_setup_mail_headers (table); + else if (g_ascii_strncasecmp (source_url, "nntp:", 5) == 0) + composer_header_table_setup_post_headers (table); + else + composer_header_table_setup_mail_headers (table); } static GObject * @@ -380,6 +512,14 @@ composer_header_table_constructor (GType type, priv->headers[ii]->input_widget, "right-attach", 2, NULL); + e_binding_new ( + G_OBJECT (priv->headers[ii]->input_widget), "visible", + G_OBJECT (priv->signature_label), "visible"); + + e_binding_new ( + G_OBJECT (priv->headers[ii]->input_widget), "visible", + G_OBJECT (priv->signature_combo_box), "visible"); + /* Now add the signature stuff. */ gtk_table_attach ( GTK_TABLE (object), priv->signature_label, @@ -686,6 +826,24 @@ composer_header_table_class_init (EComposerHeaderTableClass *class) element_spec, G_PARAM_READWRITE)); + /* floating reference */ + element_spec = g_param_spec_string ( + "value-array-element", + NULL, + NULL, + NULL, + G_PARAM_READWRITE); + + g_object_class_install_property ( + object_class, + PROP_POST_TO, + g_param_spec_value_array ( + "post-to", + NULL, + NULL, + element_spec, + G_PARAM_READWRITE)); + g_object_class_install_property ( object_class, PROP_REPLY_TO, @@ -733,6 +891,7 @@ composer_header_table_init (EComposerHeaderTable *table) EComposerHeader *header; ENameSelector *name_selector; GtkWidget *widget; + gint ii; table->priv = E_COMPOSER_HEADER_TABLE_GET_PRIVATE (table); @@ -784,6 +943,22 @@ composer_header_table_init (EComposerHeaderTable *table) gtk_label_set_mnemonic_widget ( GTK_LABEL (widget), table->priv->signature_combo_box); table->priv->signature_label = g_object_ref_sink (widget); + + /* XXX EComposerHeader ought to do this itself, but I need to + * make the title_widget and input_widget members private. */ + for (ii = 0; ii < E_COMPOSER_NUM_HEADERS; ii++) { + GObject *src_object; + GObject *dst_object; + + header = table->priv->headers[ii]; + src_object = G_OBJECT (header); + + dst_object = G_OBJECT (header->title_widget); + e_binding_new (src_object, "visible", dst_object, "visible"); + + dst_object = G_OBJECT (header->input_widget); + e_binding_new (src_object, "visible", dst_object, "visible"); + } } GType @@ -829,126 +1004,103 @@ e_composer_header_table_get_header (EComposerHeaderTable *table, return table->priv->headers[type]; } -gboolean -e_composer_header_table_get_header_visible (EComposerHeaderTable *table, - EComposerHeaderType type) -{ - EComposerHeader *header; - - header = e_composer_header_table_get_header (table, type); - return e_composer_header_get_visible (header); -} - -void -e_composer_header_table_set_header_visible (EComposerHeaderTable *table, - EComposerHeaderType type, - gboolean visible) -{ - EComposerHeader *header; - - header = e_composer_header_table_get_header (table, type); - e_composer_header_set_visible (header, visible); - - /* Signature widgets track the "From" header. */ - if (type == E_COMPOSER_HEADER_FROM) { - if (visible) { - gtk_widget_show (table->priv->signature_label); - gtk_widget_show (table->priv->signature_combo_box); - } else { - gtk_widget_hide (table->priv->signature_label); - gtk_widget_hide (table->priv->signature_combo_box); - } - } -} - -gboolean -e_composer_header_table_get_header_sensitive (EComposerHeaderTable *table, - EComposerHeaderType type) -{ - EComposerHeader *header; - - header = e_composer_header_table_get_header (table, type); - return e_composer_header_get_sensitive (header); -} - -void -e_composer_header_table_set_header_sensitive (EComposerHeaderTable *table, - EComposerHeaderType type, - gboolean sensitive) -{ - EComposerHeader *header; - - header = e_composer_header_table_get_header (table, type); - e_composer_header_set_sensitive (header, sensitive); -} - EAccount * e_composer_header_table_get_account (EComposerHeaderTable *table) { - EComposerFromHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerFromHeader *from_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL); - header = E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER (table); - return e_composer_from_header_get_active (header); + type = E_COMPOSER_HEADER_FROM; + header = e_composer_header_table_get_header (table, type); + from_header = E_COMPOSER_FROM_HEADER (header); + + return e_composer_from_header_get_active (from_header); } gboolean e_composer_header_table_set_account (EComposerHeaderTable *table, EAccount *account) { - EComposerFromHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerFromHeader *from_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), FALSE); - header = E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER (table); - return e_composer_from_header_set_active (header, account); + type = E_COMPOSER_HEADER_FROM; + header = e_composer_header_table_get_header (table, type); + from_header = E_COMPOSER_FROM_HEADER (header); + + return e_composer_from_header_set_active (from_header, account); } EAccountList * e_composer_header_table_get_account_list (EComposerHeaderTable *table) { - EComposerFromHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerFromHeader *from_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL); - header = E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER (table); - return e_composer_from_header_get_account_list (header); + type = E_COMPOSER_HEADER_FROM; + header = e_composer_header_table_get_header (table, type); + from_header = E_COMPOSER_FROM_HEADER (header); + + return e_composer_from_header_get_account_list (from_header); } void e_composer_header_table_set_account_list (EComposerHeaderTable *table, EAccountList *account_list) { - EComposerFromHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerFromHeader *from_header; g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); - header = E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER (table); - e_composer_from_header_set_account_list (header, account_list); + type = E_COMPOSER_HEADER_FROM; + header = e_composer_header_table_get_header (table, type); + from_header = E_COMPOSER_FROM_HEADER (header); + + e_composer_from_header_set_account_list (from_header, account_list); } const gchar * e_composer_header_table_get_account_name (EComposerHeaderTable *table) { - EComposerFromHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerFromHeader *from_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL); - header = E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER (table); - return e_composer_from_header_get_active_name (header); + type = E_COMPOSER_HEADER_FROM; + header = e_composer_header_table_get_header (table, type); + from_header = E_COMPOSER_FROM_HEADER (header); + + return e_composer_from_header_get_active_name (from_header); } gboolean e_composer_header_table_set_account_name (EComposerHeaderTable *table, const gchar *account_name) { - EComposerFromHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerFromHeader *from_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), FALSE); - header = E_COMPOSER_HEADER_TABLE_GET_FROM_HEADER (table); - return e_composer_from_header_set_active_name (header, account_name); + type = E_COMPOSER_HEADER_FROM; + header = e_composer_header_table_get_header (table, type); + from_header = E_COMPOSER_FROM_HEADER (header); + + return e_composer_from_header_set_active_name (from_header, account_name); } EDestination ** @@ -994,133 +1146,179 @@ e_composer_header_table_get_destinations (EComposerHeaderTable *table) EDestination ** e_composer_header_table_get_destinations_bcc (EComposerHeaderTable *table) { - EComposerNameHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerNameHeader *name_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL); - header = E_COMPOSER_HEADER_TABLE_GET_BCC_HEADER (table); - return e_composer_name_header_get_destinations (header); + type = E_COMPOSER_HEADER_BCC; + header = e_composer_header_table_get_header (table, type); + name_header = E_COMPOSER_NAME_HEADER (header); + + return e_composer_name_header_get_destinations (name_header); } void e_composer_header_table_add_destinations_bcc (EComposerHeaderTable *table, EDestination **destinations) { - EComposerNameHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerNameHeader *name_header; g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); - header = E_COMPOSER_HEADER_TABLE_GET_BCC_HEADER (table); - e_composer_name_header_add_destinations (header, destinations); + type = E_COMPOSER_HEADER_BCC; + header = e_composer_header_table_get_header (table, type); + name_header = E_COMPOSER_NAME_HEADER (header); + + e_composer_name_header_add_destinations (name_header, destinations); if (destinations != NULL && *destinations != NULL) - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_BCC, TRUE); + e_composer_header_set_visible (header, TRUE); } void e_composer_header_table_set_destinations_bcc (EComposerHeaderTable *table, EDestination **destinations) { - EComposerNameHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerNameHeader *name_header; g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); - header = E_COMPOSER_HEADER_TABLE_GET_BCC_HEADER (table); - e_composer_name_header_set_destinations (header, destinations); + type = E_COMPOSER_HEADER_BCC; + header = e_composer_header_table_get_header (table, type); + name_header = E_COMPOSER_NAME_HEADER (header); + + e_composer_name_header_set_destinations (name_header, destinations); if (destinations != NULL && *destinations != NULL) - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_BCC, TRUE); + e_composer_header_set_visible (header, TRUE); } EDestination ** e_composer_header_table_get_destinations_cc (EComposerHeaderTable *table) { - EComposerNameHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerNameHeader *name_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL); - header = E_COMPOSER_HEADER_TABLE_GET_CC_HEADER (table); - return e_composer_name_header_get_destinations (header); + type = E_COMPOSER_HEADER_CC; + header = e_composer_header_table_get_header (table, type); + name_header = E_COMPOSER_NAME_HEADER (header); + + return e_composer_name_header_get_destinations (name_header); } void e_composer_header_table_add_destinations_cc (EComposerHeaderTable *table, EDestination **destinations) { - EComposerNameHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerNameHeader *name_header; g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); - header = E_COMPOSER_HEADER_TABLE_GET_CC_HEADER (table); - e_composer_name_header_add_destinations (header, destinations); + type = E_COMPOSER_HEADER_CC; + header = e_composer_header_table_get_header (table, type); + name_header = E_COMPOSER_NAME_HEADER (header); + + e_composer_name_header_add_destinations (name_header, destinations); if (destinations != NULL && *destinations != NULL) - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_CC, TRUE); + e_composer_header_set_visible (header, TRUE); } void e_composer_header_table_set_destinations_cc (EComposerHeaderTable *table, EDestination **destinations) { - EComposerNameHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerNameHeader *name_header; g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); - header = E_COMPOSER_HEADER_TABLE_GET_CC_HEADER (table); - e_composer_name_header_set_destinations (header, destinations); + type = E_COMPOSER_HEADER_CC; + header = e_composer_header_table_get_header (table, type); + name_header = E_COMPOSER_NAME_HEADER (header); + + e_composer_name_header_set_destinations (name_header, destinations); if (destinations != NULL && *destinations != NULL) - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_CC, TRUE); + e_composer_header_set_visible (header, TRUE); } EDestination ** e_composer_header_table_get_destinations_to (EComposerHeaderTable *table) { - EComposerNameHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerNameHeader *name_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL); - header = E_COMPOSER_HEADER_TABLE_GET_TO_HEADER (table); - return e_composer_name_header_get_destinations (header); + type = E_COMPOSER_HEADER_TO; + header = e_composer_header_table_get_header (table, type); + name_header = E_COMPOSER_NAME_HEADER (header); + + return e_composer_name_header_get_destinations (name_header); } void e_composer_header_table_add_destinations_to (EComposerHeaderTable *table, EDestination **destinations) { - EComposerNameHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerNameHeader *name_header; g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); - header = E_COMPOSER_HEADER_TABLE_GET_TO_HEADER (table); - e_composer_name_header_add_destinations (header, destinations); + type = E_COMPOSER_HEADER_TO; + header = e_composer_header_table_get_header (table, type); + name_header = E_COMPOSER_NAME_HEADER (header); + + e_composer_name_header_add_destinations (name_header, destinations); } void e_composer_header_table_set_destinations_to (EComposerHeaderTable *table, EDestination **destinations) { - EComposerNameHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerNameHeader *name_header; g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); - header = E_COMPOSER_HEADER_TABLE_GET_TO_HEADER (table); - e_composer_name_header_set_destinations (header, destinations); + type = E_COMPOSER_HEADER_TO; + header = e_composer_header_table_get_header (table, type); + name_header = E_COMPOSER_NAME_HEADER (header); + + e_composer_name_header_set_destinations (name_header, destinations); } GList * e_composer_header_table_get_post_to (EComposerHeaderTable *table) { - EComposerPostHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerPostHeader *post_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL); - header = E_COMPOSER_HEADER_TABLE_GET_POST_TO_HEADER (table); - return e_composer_post_header_get_folders (header); + type = E_COMPOSER_HEADER_POST_TO; + header = e_composer_header_table_get_header (table, type); + post_header = E_COMPOSER_POST_HEADER (header); + + return e_composer_post_header_get_folders (post_header); } void @@ -1128,51 +1326,70 @@ e_composer_header_table_set_post_to_base (EComposerHeaderTable *table, const gchar *base_url, const gchar *folders) { - EComposerPostHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerPostHeader *post_header; g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); - header = E_COMPOSER_HEADER_TABLE_GET_POST_TO_HEADER (table); - e_composer_post_header_set_folders_base (header, base_url, folders); + type = E_COMPOSER_HEADER_POST_TO; + header = e_composer_header_table_get_header (table, type); + post_header = E_COMPOSER_POST_HEADER (header); + + e_composer_post_header_set_folders_base (post_header, base_url, folders); } void e_composer_header_table_set_post_to_list (EComposerHeaderTable *table, GList *folders) { - EComposerPostHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerPostHeader *post_header; g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); - header = E_COMPOSER_HEADER_TABLE_GET_POST_TO_HEADER (table); - e_composer_post_header_set_folders (header, folders); + type = E_COMPOSER_HEADER_POST_TO; + header = e_composer_header_table_get_header (table, type); + post_header = E_COMPOSER_POST_HEADER (header); + + e_composer_post_header_set_folders (post_header, folders); } const gchar * e_composer_header_table_get_reply_to (EComposerHeaderTable *table) { - EComposerTextHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerTextHeader *text_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL); - header = E_COMPOSER_HEADER_TABLE_GET_REPLY_TO_HEADER (table); - return e_composer_text_header_get_text (header); + type = E_COMPOSER_HEADER_REPLY_TO; + header = e_composer_header_table_get_header (table, type); + text_header = E_COMPOSER_TEXT_HEADER (header); + + return e_composer_text_header_get_text (text_header); } void e_composer_header_table_set_reply_to (EComposerHeaderTable *table, const gchar *reply_to) { - EComposerTextHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerTextHeader *text_header; g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); - header = E_COMPOSER_HEADER_TABLE_GET_REPLY_TO_HEADER (table); - e_composer_text_header_set_text (header, reply_to); + type = E_COMPOSER_HEADER_REPLY_TO; + header = e_composer_header_table_get_header (table, type); + text_header = E_COMPOSER_TEXT_HEADER (header); + + e_composer_text_header_set_text (text_header, reply_to); if (reply_to != NULL && *reply_to != '\0') - e_composer_header_table_set_header_visible ( - table, E_COMPOSER_HEADER_REPLY_TO, TRUE); + e_composer_header_set_visible (header, TRUE); } ESignature * @@ -1224,22 +1441,32 @@ e_composer_header_table_set_signature_list (EComposerHeaderTable *table, const gchar * e_composer_header_table_get_subject (EComposerHeaderTable *table) { - EComposerTextHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerTextHeader *text_header; g_return_val_if_fail (E_IS_COMPOSER_HEADER_TABLE (table), NULL); - header = E_COMPOSER_HEADER_TABLE_GET_SUBJECT_HEADER (table); - return e_composer_text_header_get_text (header); + type = E_COMPOSER_HEADER_SUBJECT; + header = e_composer_header_table_get_header (table, type); + text_header = E_COMPOSER_TEXT_HEADER (header); + + return e_composer_text_header_get_text (text_header); } void e_composer_header_table_set_subject (EComposerHeaderTable *table, const gchar *subject) { - EComposerTextHeader *header; + EComposerHeader *header; + EComposerHeaderType type; + EComposerTextHeader *text_header; g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (table)); - header = E_COMPOSER_HEADER_TABLE_GET_SUBJECT_HEADER (table); - e_composer_text_header_set_text (header, subject); + type = E_COMPOSER_HEADER_SUBJECT; + header = e_composer_header_table_get_header (table, type); + text_header = E_COMPOSER_TEXT_HEADER (header); + + e_composer_text_header_set_text (text_header, subject); } diff --git a/composer/e-composer-header-table.h b/composer/e-composer-header-table.h index 91d64fe22a..817863031c 100644 --- a/composer/e-composer-header-table.h +++ b/composer/e-composer-header-table.h @@ -79,20 +79,6 @@ GtkWidget * e_composer_header_table_new (void); EComposerHeader * e_composer_header_table_get_header (EComposerHeaderTable *table, EComposerHeaderType type); -gboolean e_composer_header_table_get_header_sensitive - (EComposerHeaderTable *table, - EComposerHeaderType type); -void e_composer_header_table_set_header_sensitive - (EComposerHeaderTable *table, - EComposerHeaderType type, - gboolean sensitive); -gboolean e_composer_header_table_get_header_visible - (EComposerHeaderTable *table, - EComposerHeaderType type); -void e_composer_header_table_set_header_visible - (EComposerHeaderTable *table, - EComposerHeaderType type, - gboolean visible); EAccount * e_composer_header_table_get_account (EComposerHeaderTable *table); gboolean e_composer_header_table_set_account diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c index 8cbcf64f1f..272556969d 100644 --- a/composer/e-composer-header.c +++ b/composer/e-composer-header.c @@ -41,6 +41,9 @@ enum { struct _EComposerHeaderPrivate { gchar *label; gboolean button; + + guint sensitive : 1; + guint visible : 1; }; static gpointer parent_class; @@ -302,15 +305,9 @@ e_composer_header_get_label (EComposerHeader *header) gboolean e_composer_header_get_sensitive (EComposerHeader *header) { - gboolean sensitive; - g_return_val_if_fail (E_IS_COMPOSER_HEADER (header), FALSE); - sensitive = GTK_WIDGET_SENSITIVE (header->title_widget); - if (GTK_WIDGET_SENSITIVE (header->input_widget) != sensitive) - g_warning ("%s: Sensitivity is out of sync", G_STRFUNC); - - return sensitive; + return header->priv->sensitive; } void @@ -319,8 +316,7 @@ e_composer_header_set_sensitive (EComposerHeader *header, { g_return_if_fail (E_IS_COMPOSER_HEADER (header)); - gtk_widget_set_sensitive (header->title_widget, sensitive); - gtk_widget_set_sensitive (header->input_widget, sensitive); + header->priv->sensitive = sensitive; g_object_notify (G_OBJECT (header), "sensitive"); } @@ -328,15 +324,9 @@ e_composer_header_set_sensitive (EComposerHeader *header, gboolean e_composer_header_get_visible (EComposerHeader *header) { - gboolean visible; - g_return_val_if_fail (E_IS_COMPOSER_HEADER (header), FALSE); - visible = GTK_WIDGET_VISIBLE (header->title_widget); - if (GTK_WIDGET_VISIBLE (header->input_widget) != visible) - g_warning ("%s: Visibility is out of sync", G_STRFUNC); - - return visible; + return header->priv->visible; } void @@ -345,13 +335,7 @@ e_composer_header_set_visible (EComposerHeader *header, { g_return_if_fail (E_IS_COMPOSER_HEADER (header)); - if (visible) { - gtk_widget_show (header->title_widget); - gtk_widget_show (header->input_widget); - } else { - gtk_widget_hide (header->title_widget); - gtk_widget_hide (header->input_widget); - } + header->priv->visible = visible; g_object_notify (G_OBJECT (header), "visible"); } diff --git a/composer/e-composer-header.h b/composer/e-composer-header.h index d1edd110fe..db9582dc3f 100644 --- a/composer/e-composer-header.h +++ b/composer/e-composer-header.h @@ -59,7 +59,7 @@ struct _EComposerHeaderClass { GType e_composer_header_get_type (void); gchar * e_composer_header_get_label (EComposerHeader *header); gboolean e_composer_header_get_sensitive (EComposerHeader *header); -void e_composer_header_set_sensitive (EComposerHeader *header, +void e_composer_header_set_sensitive (EComposerHeader *header, gboolean sensitive); gboolean e_composer_header_get_visible (EComposerHeader *header); void e_composer_header_set_visible (EComposerHeader *header, diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c index 1729aae9fa..fe5b66ceee 100644 --- a/composer/e-composer-private.c +++ b/composer/e-composer-private.c @@ -90,6 +90,7 @@ e_composer_private_init (EMsgComposer *composer) GtkWidget *send_widget; const gchar *path; gchar *filename; + gint ii; GError *error = NULL; editor = GTKHTML_EDITOR (composer); @@ -165,6 +166,46 @@ e_composer_private_init (EMsgComposer *composer) GTK_BOX (container), widget, TRUE, TRUE, 0, GTK_PACK_START); composer_setup_recent_menu (composer); + + /* Bind headers to their corresponding actions. */ + + for (ii = 0; ii < E_COMPOSER_NUM_HEADERS; ii++) { + EComposerHeaderTable *table; + EComposerHeader *header; + GtkAction *action; + + table = E_COMPOSER_HEADER_TABLE (priv->header_table); + header = e_composer_header_table_get_header (table, ii); + + switch (ii) { + case E_COMPOSER_HEADER_BCC: + action = ACTION (VIEW_BCC); + break; + + case E_COMPOSER_HEADER_CC: + action = ACTION (VIEW_CC); + break; + + case E_COMPOSER_HEADER_FROM: + action = ACTION (VIEW_FROM); + break; + + case E_COMPOSER_HEADER_REPLY_TO: + action = ACTION (VIEW_REPLY_TO); + break; + + default: + continue; + } + + e_mutual_binding_new ( + G_OBJECT (header), "sensitive", + G_OBJECT (action), "sensitive"); + + e_mutual_binding_new ( + G_OBJECT (header), "visible", + G_OBJECT (action), "active"); + } } void diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h index 669af31235..8dc9b4be93 100644 --- a/composer/e-composer-private.h +++ b/composer/e-composer-private.h @@ -28,6 +28,7 @@ #include "e-composer-actions.h" #include "e-composer-autosave.h" #include "e-composer-header-table.h" +#include "e-util/e-binding.h" #include "e-util/gconf-bridge.h" #include "widgets/misc/e-attachment-paned.h" #include "widgets/misc/e-attachment-store.h" @@ -65,16 +66,6 @@ COMPOSER_GCONF_PREFIX "/send_html" #define COMPOSER_GCONF_SPELL_LANGUAGES_KEY \ COMPOSER_GCONF_PREFIX "/spell_languages" -#define COMPOSER_GCONF_VIEW_BCC_KEY \ - COMPOSER_GCONF_PREFIX "/view/Bcc" -#define COMPOSER_GCONF_VIEW_CC_KEY \ - COMPOSER_GCONF_PREFIX "/view/Cc" -#define COMPOSER_GCONF_VIEW_FROM_KEY \ - COMPOSER_GCONF_PREFIX "/view/From" -#define COMPOSER_GCONF_VIEW_POST_TO_KEY \ - COMPOSER_GCONF_PREFIX "/view/PostTo" -#define COMPOSER_GCONF_VIEW_REPLY_TO_KEY \ - COMPOSER_GCONF_PREFIX "/view/ReplyTo" #define COMPOSER_GCONF_WINDOW_PREFIX \ COMPOSER_GCONF_PREFIX "/window" diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 9325e0b770..9b526f63ac 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -113,37 +113,6 @@ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MSG_COMPOSER, EMsgComposerPrivate)) -#define E_MSG_COMPOSER_VISIBLE_MASK_SENDER \ - (E_MSG_COMPOSER_VISIBLE_FROM | \ - E_MSG_COMPOSER_VISIBLE_REPLYTO) - -#define E_MSG_COMPOSER_VISIBLE_MASK_BASIC \ - (E_MSG_COMPOSER_VISIBLE_MASK_SENDER | \ - E_MSG_COMPOSER_VISIBLE_SUBJECT) - -#define E_MSG_COMPOSER_VISIBLE_MASK_RECIPIENTS \ - (E_MSG_COMPOSER_VISIBLE_TO | \ - E_MSG_COMPOSER_VISIBLE_CC | \ - E_MSG_COMPOSER_VISIBLE_BCC) - -#define E_MSG_COMPOSER_VISIBLE_MASK_MAIL \ - (E_MSG_COMPOSER_VISIBLE_MASK_BASIC | \ - E_MSG_COMPOSER_VISIBLE_MASK_RECIPIENTS) - -#define E_MSG_COMPOSER_VISIBLE_MASK_POST \ - (E_MSG_COMPOSER_VISIBLE_MASK_BASIC | \ - E_MSG_COMPOSER_VISIBLE_POSTTO) - -typedef enum { - E_MSG_COMPOSER_VISIBLE_FROM = (1 << 0), - E_MSG_COMPOSER_VISIBLE_REPLYTO = (1 << 1), - E_MSG_COMPOSER_VISIBLE_TO = (1 << 2), - E_MSG_COMPOSER_VISIBLE_CC = (1 << 3), - E_MSG_COMPOSER_VISIBLE_BCC = (1 << 4), - E_MSG_COMPOSER_VISIBLE_POSTTO = (1 << 5), - E_MSG_COMPOSER_VISIBLE_SUBJECT = (1 << 7) -} EMsgComposerHeaderVisibleFlags; - enum { SEND, SAVE_DRAFT, @@ -399,6 +368,7 @@ build_message_headers (EMsgComposer *composer, gboolean redirect) { EComposerHeaderTable *table; + EComposerHeader *header; EAccount *account; const gchar *subject; const gchar *reply_to; @@ -449,9 +419,9 @@ build_message_headers (EMsgComposer *composer, } /* To:, Cc:, Bcc: */ - if (e_composer_header_table_get_header_visible (table, E_COMPOSER_HEADER_TO) || - e_composer_header_table_get_header_visible (table, E_COMPOSER_HEADER_CC) || - e_composer_header_table_get_header_visible (table, E_COMPOSER_HEADER_BCC)) { + header = e_composer_header_table_get_header ( + table, E_COMPOSER_HEADER_TO); + if (e_composer_header_get_visible (header)) { EDestination **to, **cc, **bcc; to = e_composer_header_table_get_destinations_to (table); @@ -466,7 +436,9 @@ build_message_headers (EMsgComposer *composer, } /* X-Evolution-PostTo: */ - if (e_composer_header_table_get_header_visible (table, E_COMPOSER_HEADER_POST_TO)) { + header = e_composer_header_table_get_header ( + table, E_COMPOSER_HEADER_POST_TO); + if (e_composer_header_get_visible (header)) { CamelMedium *medium = CAMEL_MEDIUM (msg); const gchar *name = "X-Evolution-PostTo"; GList *list, *iter; @@ -1541,36 +1513,6 @@ msg_composer_constructor (GType type, G_OBJECT (composer), "current-folder"); g_array_append_val (array, binding_id); - binding_id = gconf_bridge_bind_property ( - gconf_bridge_get (), - COMPOSER_GCONF_VIEW_BCC_KEY, - G_OBJECT (ACTION (VIEW_BCC)), "active"); - g_array_append_val (array, binding_id); - - binding_id = gconf_bridge_bind_property ( - gconf_bridge_get (), - COMPOSER_GCONF_VIEW_CC_KEY, - G_OBJECT (ACTION (VIEW_CC)), "active"); - g_array_append_val (array, binding_id); - - binding_id = gconf_bridge_bind_property ( - gconf_bridge_get (), - COMPOSER_GCONF_VIEW_FROM_KEY, - G_OBJECT (ACTION (VIEW_FROM)), "active"); - g_array_append_val (array, binding_id); - - binding_id = gconf_bridge_bind_property ( - gconf_bridge_get (), - COMPOSER_GCONF_VIEW_POST_TO_KEY, - G_OBJECT (ACTION (VIEW_POST_TO)), "active"); - g_array_append_val (array, binding_id); - - binding_id = gconf_bridge_bind_property ( - gconf_bridge_get (), - COMPOSER_GCONF_VIEW_REPLY_TO_KEY, - G_OBJECT (ACTION (VIEW_REPLY_TO)), "active"); - g_array_append_val (array, binding_id); - binding_id = gconf_bridge_bind_window ( gconf_bridge_get (), COMPOSER_GCONF_WINDOW_PREFIX, @@ -2322,87 +2264,6 @@ e_msg_composer_get_type (void) /* Callbacks. */ -static EMsgComposer * -create_composer (gint visible_mask) -{ - EMsgComposer *composer; - EComposerHeaderTable *table; - GtkToggleAction *action; - gboolean active; - - composer = g_object_new (E_TYPE_MSG_COMPOSER, NULL); - table = E_COMPOSER_HEADER_TABLE (composer->priv->header_table); - - /* Configure View Menu */ - - /* If we're mailing, you cannot disable "To". */ - action = GTK_TOGGLE_ACTION (ACTION (VIEW_TO)); - active = visible_mask & E_MSG_COMPOSER_VISIBLE_TO; - gtk_action_set_sensitive (ACTION (VIEW_TO), active); - gtk_toggle_action_set_active (action, active); - - /* Ditto for "Post-To". */ - action = GTK_TOGGLE_ACTION (ACTION (VIEW_POST_TO)); - active = visible_mask & E_MSG_COMPOSER_VISIBLE_POSTTO; - gtk_action_set_sensitive (ACTION (VIEW_POST_TO), active); - gtk_toggle_action_set_active (action, active); - - /* Disable "Cc" if we're posting. */ - if (!(visible_mask & E_MSG_COMPOSER_VISIBLE_CC)) { - action = GTK_TOGGLE_ACTION (ACTION (VIEW_CC)); - gtk_toggle_action_set_active (action, FALSE); - } - - /* Disable "Bcc" if we're posting. */ - if (!(visible_mask & E_MSG_COMPOSER_VISIBLE_BCC)) { - action = GTK_TOGGLE_ACTION (ACTION (VIEW_BCC)); - gtk_toggle_action_set_active (action, FALSE); - } - - action = GTK_TOGGLE_ACTION (ACTION (VIEW_SUBJECT)); - gtk_toggle_action_set_active (action, TRUE); - - return composer; -} - -/** - * e_msg_composer_new_with_type: - * - * Create a new message composer widget. The type can be - * E_MSG_COMPOSER_MAIL, E_MSG_COMPOSER_POST or E_MSG_COMPOSER_MAIL_POST. - * - * Returns: A pointer to the newly created widget - **/ - -EMsgComposer * -e_msg_composer_new_with_type (int type) -{ - EMsgComposer *composer; - gint visible_mask; - - switch (type) { - case E_MSG_COMPOSER_MAIL: - visible_mask = E_MSG_COMPOSER_VISIBLE_MASK_MAIL; - break; - - case E_MSG_COMPOSER_POST: - visible_mask = E_MSG_COMPOSER_VISIBLE_MASK_POST; - break; - - default: - visible_mask = - E_MSG_COMPOSER_VISIBLE_MASK_MAIL | - E_MSG_COMPOSER_VISIBLE_MASK_POST; - break; - } - - composer = create_composer (visible_mask); - - set_editor_text (composer, "", TRUE); - - return composer; -} - /** * e_msg_composer_new: * @@ -2413,7 +2274,7 @@ e_msg_composer_new_with_type (int type) EMsgComposer * e_msg_composer_new (void) { - return e_msg_composer_new_with_type (E_MSG_COMPOSER_MAIL); + return g_object_new (E_TYPE_MSG_COMPOSER, NULL); } static void @@ -2839,25 +2700,13 @@ e_msg_composer_new_with_message (CamelMimeMessage *message) GtkToggleAction *action; struct _camel_header_raw *xev; gint len, i; - EMsgComposerPrivate *p; for (headers = CAMEL_MIME_PART (message)->headers;headers;headers = headers->next) { if (!strcmp (headers->name, "X-Evolution-PostTo")) postto = g_list_append (postto, g_strstrip (g_strdup (headers->value))); } - if (postto != NULL) - composer = create_composer (E_MSG_COMPOSER_VISIBLE_MASK_POST); - else - composer = create_composer (E_MSG_COMPOSER_VISIBLE_MASK_MAIL); - p = composer->priv; - - if (!composer) { - g_list_foreach (postto, (GFunc)g_free, NULL); - g_list_free (postto); - return NULL; - } - + composer = e_msg_composer_new (); table = e_msg_composer_get_header_table (composer); if (postto) { @@ -3061,8 +2910,12 @@ e_msg_composer_new_with_message (CamelMimeMessage *message) while (headers) { if (g_ascii_strcasecmp (headers->name, "References") == 0 || g_ascii_strcasecmp (headers->name, "In-Reply-To") == 0) { - g_ptr_array_add (p->extra_hdr_names, g_strdup (headers->name)); - g_ptr_array_add (p->extra_hdr_values, g_strdup (headers->value)); + g_ptr_array_add ( + composer->priv->extra_hdr_names, + g_strdup (headers->name)); + g_ptr_array_add ( + composer->priv->extra_hdr_values, + g_strdup (headers->value)); } headers = headers->next; diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h index 54520ec941..7a279ba230 100644 --- a/composer/e-msg-composer.h +++ b/composer/e-msg-composer.h @@ -68,13 +68,8 @@ struct _EMsgComposerClass { struct _EAttachmentBar; -#define E_MSG_COMPOSER_MAIL 1 -#define E_MSG_COMPOSER_POST 2 -#define E_MSG_COMPOSER_MAIL_POST E_MSG_COMPOSER_MAIL|E_MSG_COMPOSER_POST - GType e_msg_composer_get_type (void); EMsgComposer * e_msg_composer_new (void); -EMsgComposer * e_msg_composer_new_with_type (gint type); EMsgComposer * e_msg_composer_new_with_message (CamelMimeMessage *msg); EMsgComposer * e_msg_composer_new_from_url (const gchar *url); EMsgComposer * e_msg_composer_new_redirect (CamelMimeMessage *message, diff --git a/composer/evolution-composer.ui b/composer/evolution-composer.ui index dc77aae183..c22368383c 100644 --- a/composer/evolution-composer.ui +++ b/composer/evolution-composer.ui @@ -9,9 +9,9 @@ - + - + @@ -29,12 +29,9 @@ - - - diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 0f9945b7d7..f427feca6d 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -660,13 +660,18 @@ create_new_composer (const char *subject, const char *fromuri, gboolean use_defa EAccount *account = NULL; composer = e_msg_composer_new (); - if (composer == NULL) - return NULL; + table = e_msg_composer_get_header_table (composer); + + if (fromuri != NULL) { + GList *list; - if (fromuri) account = mail_config_get_account_by_source_url(fromuri); - table = e_msg_composer_get_header_table (composer); + list = g_list_prepend (NULL, (gpointer) fromuri); + e_composer_header_table_set_post_to_list (table, list); + g_list_free (list); + } + e_composer_header_table_set_account (table, account); e_composer_header_table_set_subject (table, subject); @@ -729,82 +734,6 @@ em_utils_compose_new_message_with_mailto (const char *url, const char *fromuri) gdk_window_raise (((GtkWidget *) composer)->window); } -/** - * em_utils_post_to_folder: - * @folder: folder - * - * Opens a new composer window as a child window of @parent's toplevel - * window. If @folder is non-NULL, the composer will default to posting - * mail to the folder specified by @folder. - **/ -void -em_utils_post_to_folder (CamelFolder *folder) -{ - EMsgComposer *composer; - EComposerHeaderTable *table; - EAccount *account; - - composer = e_msg_composer_new_with_type (E_MSG_COMPOSER_POST); - table = e_msg_composer_get_header_table (composer); - - if (folder != NULL) { - char *url = mail_tools_folder_to_url (folder); - GList *list = g_list_prepend (NULL, url); - - e_composer_header_table_set_post_to_list (table, list); - - g_list_free (list); - g_free (url); - - url = camel_url_to_string (CAMEL_SERVICE (folder->parent_store)->url, CAMEL_URL_HIDE_ALL); - account = mail_config_get_account_by_source_url (url); - g_free (url); - - if (account) - e_composer_header_table_set_account_name ( - table, account->name); - } - - em_composer_utils_setup_default_callbacks (composer); - - composer_set_no_change (composer, TRUE, TRUE); - - gtk_widget_show ((GtkWidget *) composer); - gdk_window_raise (((GtkWidget *) composer)->window); -} - -/** - * em_utils_post_to_url: - * @url: mailto url - * - * Opens a new composer window as a child window of @parent's toplevel - * window. If @url is non-NULL, the composer will default to posting - * mail to the folder specified by @url. - **/ -void -em_utils_post_to_url (const char *url) -{ - EMsgComposer *composer; - EComposerHeaderTable *table; - - composer = e_msg_composer_new_with_type (E_MSG_COMPOSER_POST); - table = e_msg_composer_get_header_table (composer); - - if (url != NULL) { - GList *list = NULL; - - list = g_list_prepend (list, (gpointer) url); - e_composer_header_table_set_post_to_list (table, list); - g_list_free (list); - } - - em_composer_utils_setup_default_callbacks (composer); - - composer_set_no_change (composer, TRUE, TRUE); - - gtk_widget_show ((GtkWidget *) composer); -} - /* Editing messages... */ static void @@ -1763,18 +1692,12 @@ reply_get_composer (CamelMimeMessage *message, EAccount *account, g_return_val_if_fail (to == NULL || CAMEL_IS_INTERNET_ADDRESS (to), NULL); g_return_val_if_fail (cc == NULL || CAMEL_IS_INTERNET_ADDRESS (cc), NULL); + composer = e_msg_composer_new (); + /* construct the tov/ccv */ tov = em_utils_camel_address_to_destination (to); ccv = em_utils_camel_address_to_destination (cc); - if (tov || ccv) { - if (postto && camel_address_length((CamelAddress *)postto)) - composer = e_msg_composer_new_with_type (E_MSG_COMPOSER_MAIL_POST); - else - composer = e_msg_composer_new_with_type (E_MSG_COMPOSER_MAIL); - } else - composer = e_msg_composer_new_with_type (E_MSG_COMPOSER_POST); - /* Set the subject of the new message. */ if ((subject = (char *) camel_mime_message_get_subject (message))) { if (g_ascii_strncasecmp (subject, "Re: ", 4) != 0) @@ -2403,124 +2326,3 @@ em_utils_reply_to_message(CamelFolder *folder, const char *uid, CamelMimeMessage gtk_widget_show (GTK_WIDGET (composer)); } - -/* Posting replies... */ - -static void -post_reply_to_message (CamelFolder *folder, const char *uid, CamelMimeMessage *message, void *user_data) -{ - /* FIXME: would be nice if this shared more code with reply_get_composer() */ - const char *message_id, *references; - CamelInternetAddress *to; - EDestination **tov = NULL; - CamelFolder *real_folder; - EMsgComposer *composer; - EComposerHeaderTable *table; - char *subject, *url; - EAccount *account; - char *real_uid; - guint32 flags; - GList *list = NULL; - - if (message == NULL) - return; - - if (CAMEL_IS_VEE_FOLDER (folder)) { - CamelMessageInfo *info; - - info = camel_folder_get_message_info (folder, uid); - real_folder = camel_vee_folder_get_location ((CamelVeeFolder *) folder, (struct _CamelVeeMessageInfo *) info, &real_uid); - camel_folder_free_message_info (folder, info); - } else { - real_folder = folder; - camel_object_ref (folder); - real_uid = g_strdup (uid); - } - - account = guess_account (message, real_folder); - flags = CAMEL_MESSAGE_ANSWERED | CAMEL_MESSAGE_SEEN; - - to = camel_internet_address_new(); - get_reply_sender (message, to, NULL); - - composer = e_msg_composer_new_with_type (E_MSG_COMPOSER_MAIL_POST); - - /* construct the tov/ccv */ - tov = em_utils_camel_address_to_destination (to); - - /* Set the subject of the new message. */ - if ((subject = (char *) camel_mime_message_get_subject (message))) { - if (g_ascii_strncasecmp (subject, "Re: ", 4) != 0) - subject = g_strdup_printf ("Re: %s", subject); - else - subject = g_strdup (subject); - } else { - subject = g_strdup (""); - } - - table = e_msg_composer_get_header_table (composer); - e_composer_header_table_set_account (table, account); - e_composer_header_table_set_subject (table, subject); - e_composer_header_table_set_destinations_to (table, tov); - - g_free (subject); - - url = mail_tools_folder_to_url (real_folder); - list = g_list_prepend (list, url); - - e_composer_header_table_set_post_to_list (table, list); - - g_list_free (list); - g_free (url); - - /* Add In-Reply-To and References. */ - message_id = camel_medium_get_header (CAMEL_MEDIUM (message), "Message-Id"); - references = camel_medium_get_header (CAMEL_MEDIUM (message), "References"); - if (message_id) { - char *reply_refs; - - e_msg_composer_add_header (composer, "In-Reply-To", message_id); - - if (references) - reply_refs = g_strdup_printf ("%s %s", references, message_id); - else - reply_refs = g_strdup (message_id); - - e_msg_composer_add_header (composer, "References", reply_refs); - g_free (reply_refs); - } else if (references) { - e_msg_composer_add_header (composer, "References", references); - } - - e_msg_composer_add_message_attachments (composer, message, TRUE); - - composer_set_body (composer, message, NULL); - - em_composer_utils_setup_callbacks (composer, real_folder, real_uid, flags, flags, NULL, NULL); - - composer_set_no_change (composer, TRUE, FALSE); - - gtk_widget_show (GTK_WIDGET (composer)); - - camel_object_unref (real_folder); - camel_object_unref(to); - g_free (real_uid); -} - -/** - * em_utils_post_reply_to_message_by_uid: - * @folder: folder containing message to reply to - * @uid: message uid - * @mode: reply mode - * - * Creates a new composer (post mode) ready to reply to the message - * referenced by @folder and @uid. - **/ -void -em_utils_post_reply_to_message_by_uid (CamelFolder *folder, const char *uid) -{ - g_return_if_fail (CAMEL_IS_FOLDER (folder)); - g_return_if_fail (uid != NULL); - - mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); -} diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h index d17a98caa3..c46f808879 100644 --- a/mail/em-composer-utils.h +++ b/mail/em-composer-utils.h @@ -50,8 +50,6 @@ void em_utils_compose_new_message (const char *fromuri); /* FIXME: mailto? url? should make up its mind what its called. imho use 'uri' */ void em_utils_compose_new_message_with_mailto (const char *url, const char *fromuri); -void em_utils_post_to_folder (struct _CamelFolder *folder); -void em_utils_post_to_url (const char *url); void em_utils_edit_message (struct _CamelMimeMessage *message, struct _CamelFolder *folder); void em_utils_edit_messages (struct _CamelFolder *folder, GPtrArray *uids, gboolean replace); @@ -79,8 +77,6 @@ enum { void em_utils_reply_to_message (struct _CamelFolder *, const char *uid, struct _CamelMimeMessage *message, int mode, struct _EMFormat *source); -void em_utils_post_reply_to_message_by_uid (struct _CamelFolder *folder, const char *uid); - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 7a3e690e2b..9a80a0c254 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -164,7 +164,6 @@ static const EMFolderViewEnable emfb_enable_map[] = { { "FolderRename", EM_POPUP_SELECT_FOLDER }, { "FolderRefresh", EM_POPUP_SELECT_FOLDER }, { "ChangeFolderProperties", EM_POPUP_SELECT_FOLDER }, - { "MailPost", EM_POPUP_SELECT_FOLDER }, { "MessageMarkAllAsRead", EM_POPUP_SELECT_FOLDER }, { "ViewHideSelected", EM_POPUP_SELECT_MANY }, { "ViewThreadsCollapseAll", EM_FOLDER_VIEW_SELECT_THREADED}, @@ -1693,13 +1692,6 @@ emfb_mail_stop(BonoboUIComponent *uid, void *data, const char *path) mail_cancel_all(); } -static void -emfb_mail_post(BonoboUIComponent *uid, void *data, const char *path) -{ - EMFolderView *emfv = data; - em_utils_post_to_folder (emfv->folder); -} - static void emfb_tools_filters(BonoboUIComponent *uid, void *data, const char *path) { @@ -1779,7 +1771,6 @@ static BonoboUIVerb emfb_verbs[] = { BONOBO_UI_UNSAFE_VERB ("FolderCreate", emfb_folder_create), BONOBO_UI_UNSAFE_VERB ("HelpDebug", emfb_help_debug), - BONOBO_UI_UNSAFE_VERB ("MailPost", emfb_mail_post), BONOBO_UI_UNSAFE_VERB ("MailStop", emfb_mail_stop), BONOBO_UI_UNSAFE_VERB ("ToolsFilters", emfb_tools_filters), BONOBO_UI_UNSAFE_VERB ("ToolsSubscriptions", emfb_tools_subscriptions), diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 42037b5a33..e31d8d727c 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -185,7 +185,6 @@ static const EMFolderViewEnable emfv_enable_map[] = { { "MessageFollowUpClear", EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_FLAG_CLEAR }, { "MessageMove", EM_POPUP_SELECT_MANY }, { "MessageOpen", EM_POPUP_SELECT_MANY }, - { "MessagePostReply", EM_POPUP_SELECT_ONE }, { "MessageReplyAll", EM_POPUP_SELECT_ONE }, { "MessageReplyList", EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST }, { "MessageReplySender", EM_POPUP_SELECT_ONE }, @@ -1726,20 +1725,6 @@ emfv_message_redirect (BonoboUIComponent *uic, void *data, const char *path) em_utils_redirect_message_by_uid (emfv->folder, emfv->list->cursor_uid); } -static void -emfv_message_post_reply (BonoboUIComponent *uic, void *data, const char *path) -{ - EMFolderView *emfv = data; - - if (emfv->list->cursor_uid == NULL) - return; - - if (!em_utils_check_user_can_send_mail ((GtkWidget *) emfv)) - return; - - em_utils_post_reply_to_message_by_uid (emfv->folder, emfv->list->cursor_uid); -} - static gboolean html_contains_nonwhitespace (const char *html, gint len) { @@ -2073,7 +2058,6 @@ static BonoboUIVerb emfv_message_verbs[] = { BONOBO_UI_UNSAFE_VERB ("MessageFollowUpClear", emfv_message_followup_clear), BONOBO_UI_UNSAFE_VERB ("MessageMove", emfv_message_move), BONOBO_UI_UNSAFE_VERB ("MessageOpen", emfv_message_open), - BONOBO_UI_UNSAFE_VERB ("MessagePostReply", emfv_message_post_reply), BONOBO_UI_UNSAFE_VERB ("MessageReplyAll", emfv_message_reply_all), BONOBO_UI_UNSAFE_VERB ("MessageReplyList", emfv_message_reply_list), BONOBO_UI_UNSAFE_VERB ("MessageReplySender", emfv_message_reply_sender), diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in index e63d9eec4a..fbc23eb746 100644 --- a/mail/evolution-mail.schemas.in +++ b/mail/evolution-mail.schemas.in @@ -116,71 +116,91 @@ - /schemas/apps/evolution/mail/composer/view/From - /apps/evolution/mail/composer/view/From + /schemas/apps/evolution/mail/composer/show_mail_bcc + /apps/evolution/mail/composer/show_mail_bcc + evolution-mail + bool + false + + Show "Bcc" field when sending a mail message + + Show the "Bcc" field when sending a mail message. This is + controlled from the View menu when a mail account is chosen. + + + + + + /schemas/apps/evolution/mail/composer/show_mail_cc + /apps/evolution/mail/composer/show_mail_cc evolution-mail bool true - View/From menu item is checked + Show "Cc" field when sending a mail message - View/From menu item is checked. + Show the "Cc" field when sending a mail message. This is + controlled from the View menu when a mail account is chosen. - /schemas/apps/evolution/mail/composer/view/PostTo - /apps/evolution/mail/composer/view/PostTo + /schemas/apps/evolution/mail/composer/show_mail_from + /apps/evolution/mail/composer/show_mail_from evolution-mail bool true - View/PostTo menu item is checked + Show "From" field when sending a mail message - View/PostTo menu item is checked. + Show the "From" field when sending a mail message. This is + controlled from the View menu when a mail account is chosen. - /schemas/apps/evolution/mail/composer/view/ReplyTo - /apps/evolution/mail/composer/view/ReplyTo + /schemas/apps/evolution/mail/composer/show_mail_reply_to + /apps/evolution/mail/composer/show_mail_reply_to evolution-mail bool false - View/ReplyTo menu item is checked + Show "Reply To" field when sending a mail message - View/ReplyTo menu item is checked. + Show the "Reply To" field when sending a mail message. This + is controlled from the View menu when a mail account is chosen. - /schemas/apps/evolution/mail/composer/view/Cc - /apps/evolution/mail/composer/view/Cc + /schemas/apps/evolution/mail/composer/show_post_from + /apps/evolution/mail/composer/show_post_from evolution-mail bool - false + true - View/Cc menu item is checked + Show "From" field when posting to a newsgroup - View/Cc menu item is checked. + Show the "From" field when posting to a newsgroup. This is + controlled from the View menu when a news account is chosen. - /schemas/apps/evolution/mail/composer/view/Bcc - /apps/evolution/mail/composer/view/Bcc + /schemas/apps/evolution/mail/composer/show_post_reply_to + /apps/evolution/mail/composer/show_post_reply_to evolution-mail bool false - View/Bcc menu item is checked + Show "Reply To" field when posting to a newsgroup - View/Bcc menu item is checked. + Show the "Reply To" field when posting to a newsgroup. This + is controlled from the View menu when a news account is chosen. diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml index 0acbc44647..f90e737c24 100644 --- a/ui/evolution-mail-message.xml +++ b/ui/evolution-mail-message.xml @@ -127,13 +127,6 @@ _tip="Open the selected messages in a new window" accel="*Control*o"/> - - - - @@ -301,7 +294,6 @@ - @@ -325,7 +317,6 @@ - -- cgit v1.2.3 From 43f43118634d29618cea74d8950346640142e883 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 20 May 2009 16:50:04 -0400 Subject: Use proper ngettext support in vcard-inline.c --- plugins/vcard-inline/vcard-inline.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c index 2d6a93a91d..e2b9e17272 100644 --- a/plugins/vcard-inline/vcard-inline.c +++ b/plugins/vcard-inline/vcard-inline.c @@ -222,8 +222,11 @@ org_gnome_vcard_inline_embed (EMFormatHTML *format, } else if (length > 2) { gchar *text; - text = g_strdup_printf ( - _("There are %d other contacts."), length - 1); + /* Translators: This will always be two or more. */ + text = g_strdup_printf (ngettext ( + "There is %d other contact.", + "There are %d other contacts.", + length - 1), length - 1); gtk_label_set_text (GTK_LABEL (widget), text); gtk_widget_show (widget); g_free (text); -- cgit v1.2.3 From 5d12f06367a0939387381f66cea77766a873aea6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 20 May 2009 18:09:34 -0400 Subject: =?UTF-8?q?Bug=20580925=20=E2=80=93=20Better=20search=20bar=20for?= =?UTF-8?q?=20word=20searches?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make the word search bar more like Firefox and get rid of the "Current Message" search scope in the folder search bar. Shift+Ctrl+F now activates the word search bar. --- data/icons/Makefile.am | 22 +- data/icons/hicolor_status_16x16_wrapped.png | Bin 0 -> 680 bytes mail/Makefile.am | 2 + mail/e-mail-search-bar.c | 774 ++++++++++++++++++++++++++++ mail/e-mail-search-bar.h | 85 +++ mail/e-searching-tokenizer.c | 4 +- mail/e-searching-tokenizer.h | 2 +- mail/em-folder-browser.c | 75 +-- mail/em-folder-view.c | 24 +- mail/em-folder-view.h | 3 + mail/em-format-html-display.c | 338 ------------ mail/em-format-html-display.h | 2 - mail/em-format.c | 38 +- mail/em-format.h | 10 +- mail/em-message-browser.c | 38 +- mail/em-utils.c | 2 +- widgets/misc/e-filter-bar.c | 6 - widgets/misc/e-filter-bar.h | 2 - 18 files changed, 1013 insertions(+), 414 deletions(-) create mode 100644 data/icons/hicolor_status_16x16_wrapped.png create mode 100644 mail/e-mail-search-bar.c create mode 100644 mail/e-mail-search-bar.h diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 23f4d9de09..54b5f4bbf4 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -34,19 +34,19 @@ private_icons = \ hicolor_actions_16x16_folder-move.png \ hicolor_actions_16x16_mail-copy.png \ hicolor_actions_16x16_mail-move.png \ - hicolor_actions_16x16_go-today.png \ + hicolor_actions_16x16_go-today.png \ hicolor_actions_16x16_view-calendar-day.png \ hicolor_actions_16x16_view-calendar-list.png \ hicolor_actions_16x16_view-calendar-month.png \ hicolor_actions_16x16_view-calendar-week.png \ hicolor_actions_16x16_view-calendar-workweek.png \ - hicolor_actions_22x22_go-today.png \ + hicolor_actions_22x22_go-today.png \ hicolor_actions_22x22_view-calendar-day.png \ hicolor_actions_22x22_view-calendar-list.png \ hicolor_actions_22x22_view-calendar-month.png \ hicolor_actions_22x22_view-calendar-week.png \ hicolor_actions_22x22_view-calendar-workweek.png \ - hicolor_actions_24x24_go-today.png \ + hicolor_actions_24x24_go-today.png \ hicolor_actions_24x24_query-free-busy.png \ hicolor_actions_24x24_view-calendar-day.png \ hicolor_actions_24x24_view-calendar-list.png \ @@ -79,18 +79,28 @@ private_icons = \ hicolor_places_24x24_mail-inbox.png \ hicolor_places_24x24_mail-outbox.png \ hicolor_places_24x24_mail-sent.png \ + hicolor_status_16x16_wrapped.png \ hicolor_status_32x32_offline.png \ hicolor_status_32x32_online.png \ $(NULL) +# hicolor_status_16x16_wrapped.png was copied from Firefox +# (toolkit/themes/gnomestripe/global/icons/wrap.png), which +# contained the following notice: +# +# All files in this directory are assumed to be licensed under the +# tri-license (MPL/GPL/LGPL) used throughout this codebase. +# +# There is no corresponding SVG file. */ + noinst_DATA = \ - hicolor_actions_16x16_go-today.svg \ + hicolor_actions_16x16_go-today.svg \ hicolor_actions_16x16_view-calendar-day.svg \ hicolor_actions_16x16_view-calendar-list.svg \ hicolor_actions_16x16_view-calendar-month.svg \ hicolor_actions_16x16_view-calendar-week.svg \ hicolor_actions_16x16_view-calendar-workweek.svg \ - hicolor_actions_22x22_go-today.svg \ + hicolor_actions_22x22_go-today.svg \ hicolor_actions_22x22_view-calendar-day.svg \ hicolor_actions_22x22_view-calendar-list.svg \ hicolor_actions_22x22_view-calendar-month.svg \ @@ -109,7 +119,7 @@ noinst_DATA = \ hicolor_places_22x22_mail-sent.svg \ hicolor_status_32x32_offline.svg \ hicolor_status_32x32_online.svg \ - $(NULL) + $(NULL) EXTRA_DIST = \ $(public_icons) \ diff --git a/data/icons/hicolor_status_16x16_wrapped.png b/data/icons/hicolor_status_16x16_wrapped.png new file mode 100644 index 0000000000..32492d5e8b Binary files /dev/null and b/data/icons/hicolor_status_16x16_wrapped.png differ diff --git a/mail/Makefile.am b/mail/Makefile.am index 96ed893007..793d5c3a1e 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -55,6 +55,7 @@ idl_DATA = $(MAIL_IDL) mailinclude_HEADERS = \ $(MAIL_IDL_GENERATED_H) \ e-mail-attachment-bar.h \ + e-mail-search-bar.h \ em-composer-utils.h \ em-config.h \ em-event.h \ @@ -97,6 +98,7 @@ libevolution_mail_la_SOURCES = \ e-attachment-handler-mail.c \ e-attachment-handler-mail.h \ e-mail-attachment-bar.c \ + e-mail-search-bar.c \ e-searching-tokenizer.c \ e-searching-tokenizer.h \ em-account-editor.c \ diff --git a/mail/e-mail-search-bar.c b/mail/e-mail-search-bar.c new file mode 100644 index 0000000000..4d555857ca --- /dev/null +++ b/mail/e-mail-search-bar.c @@ -0,0 +1,774 @@ +/* + * e-mail-search-bar.c + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ + +#include "e-mail-search-bar.h" + +#include +#include +#include + +#include "e-util/e-binding.h" + +#define E_MAIL_SEARCH_BAR_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_MAIL_SEARCH_BAR, EMailSearchBarPrivate)) + +struct _EMailSearchBarPrivate { + GtkHTML *html; + GtkWidget *entry; + GtkWidget *case_sensitive_button; + GtkWidget *wrapped_next_box; + GtkWidget *wrapped_prev_box; + GtkWidget *matches_label; + + ESearchingTokenizer *tokenizer; + gchar *active_search; + + guint rerun_search : 1; +}; + +enum { + PROP_0, + PROP_CASE_SENSITIVE, + PROP_HTML, + PROP_TEXT +}; + +enum { + CHANGED, + CLEAR, + LAST_SIGNAL +}; + +static gpointer parent_class; +static guint signals[LAST_SIGNAL]; + +static void +mail_search_bar_update_matches (EMailSearchBar *search_bar) +{ + ESearchingTokenizer *tokenizer; + GtkWidget *matches_label; + gint matches; + gchar *text; + + tokenizer = e_mail_search_bar_get_tokenizer (search_bar); + matches_label = search_bar->priv->matches_label; + + matches = e_searching_tokenizer_match_count (tokenizer); + text = g_strdup_printf (_("Matches: %d"), matches); + + gtk_label_set_text (GTK_LABEL (matches_label), text); + gtk_widget_show (matches_label); + + g_free (text); +} + +static void +mail_search_bar_update_tokenizer (EMailSearchBar *search_bar) +{ + ESearchingTokenizer *tokenizer; + gboolean case_sensitive; + gchar *active_search; + + tokenizer = e_mail_search_bar_get_tokenizer (search_bar); + case_sensitive = e_mail_search_bar_get_case_sensitive (search_bar); + + if (GTK_WIDGET_VISIBLE (search_bar)) + active_search = search_bar->priv->active_search; + else + active_search = NULL; + + e_searching_tokenizer_set_primary_case_sensitivity ( + tokenizer, case_sensitive); + e_searching_tokenizer_set_primary_search_string ( + tokenizer, active_search); + + e_mail_search_bar_changed (search_bar); +} + +static void +mail_search_bar_find (EMailSearchBar *search_bar, + gboolean search_forward) +{ + GtkHTML *html; + GtkWidget *widget; + gboolean case_sensitive; + gboolean new_search; + gboolean wrapped = FALSE; + gchar *text; + + html = e_mail_search_bar_get_html (search_bar); + case_sensitive = e_mail_search_bar_get_case_sensitive (search_bar); + text = e_mail_search_bar_get_text (search_bar); + + if (text == NULL || *text == '\0') + gtk_widget_hide (search_bar->priv->matches_label); + + new_search = + (search_bar->priv->active_search == NULL) || + (g_strcmp0 (text, search_bar->priv->active_search) != 0); + + /* XXX On a new search, the HTMLEngine's search state gets + * destroyed when we redraw the message with highlighted + * matches (EMHTMLStream's write() method triggers this, + * but it's really GtkHtml's fault). That's why the first + * match isn't selected automatically. It also causes + * gtk_html_engine_search_next() to return FALSE, which we + * assume to mean the search wrapped. + * + * So to avoid mistakenly thinking the search wrapped when + * it hasn't, we have to trap the first button click after a + * search and re-run the search to recreate the HTMLEngine's + * search state, so that gtk_html_engine_search_next() will + * succeed. */ + if (new_search) { + g_free (search_bar->priv->active_search); + search_bar->priv->active_search = text; + search_bar->priv->rerun_search = TRUE; + mail_search_bar_update_tokenizer (search_bar); + } else if (search_bar->priv->rerun_search) { + gtk_html_engine_search ( + html, search_bar->priv->active_search, + case_sensitive, search_forward, FALSE); + search_bar->priv->rerun_search = FALSE; + g_free (text); + } else { + gtk_html_engine_search_set_forward (html, search_forward); + if (!gtk_html_engine_search_next (html)) + wrapped = TRUE; + g_free (text); + } + + if (new_search || wrapped) + gtk_html_engine_search ( + html, search_bar->priv->active_search, + case_sensitive, search_forward, FALSE); + + /* Update wrapped label visibility. */ + + widget = search_bar->priv->wrapped_next_box; + + if (wrapped && search_forward) + gtk_widget_show (widget); + else + gtk_widget_hide (widget); + + widget = search_bar->priv->wrapped_prev_box; + + if (wrapped && !search_forward) + gtk_widget_show (widget); + else + gtk_widget_hide (widget); +} + +static void +mail_search_bar_changed_cb (EMailSearchBar *search_bar) +{ + g_object_notify (G_OBJECT (search_bar), "text"); +} + +static void +mail_search_bar_find_next_cb (EMailSearchBar *search_bar) +{ + mail_search_bar_find (search_bar, TRUE); +} + +static void +mail_search_bar_find_previous_cb (EMailSearchBar *search_bar) +{ + mail_search_bar_find (search_bar, FALSE); +} + +static void +mail_search_bar_icon_release_cb (EMailSearchBar *search_bar, + GtkEntryIconPosition icon_pos, + GdkEvent *event) +{ + g_return_if_fail (icon_pos == GTK_ENTRY_ICON_SECONDARY); + + e_mail_search_bar_clear (search_bar); + gtk_widget_grab_focus (search_bar->priv->entry); +} + +static void +mail_search_bar_toggled_cb (EMailSearchBar *search_bar) +{ + g_free (search_bar->priv->active_search); + search_bar->priv->active_search = NULL; + + g_object_notify (G_OBJECT (search_bar), "case-sensitive"); +} + +static void +mail_search_bar_set_html (EMailSearchBar *search_bar, + GtkHTML *html) +{ + ESearchingTokenizer *tokenizer; + + g_return_if_fail (search_bar->priv->html == NULL); + + search_bar->priv->html = g_object_ref (html); + + tokenizer = e_mail_search_bar_get_tokenizer (search_bar); + gtk_html_set_tokenizer (html, HTML_TOKENIZER (tokenizer)); +} + +static void +mail_search_bar_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + switch (property_id) { + case PROP_CASE_SENSITIVE: + e_mail_search_bar_set_case_sensitive ( + E_MAIL_SEARCH_BAR (object), + g_value_get_boolean (value)); + return; + + case PROP_HTML: + mail_search_bar_set_html ( + E_MAIL_SEARCH_BAR (object), + g_value_get_object (value)); + return; + + case PROP_TEXT: + e_mail_search_bar_set_text ( + E_MAIL_SEARCH_BAR (object), + g_value_get_string (value)); + return; + } + + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +} + +static void +mail_search_bar_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + switch (property_id) { + case PROP_CASE_SENSITIVE: + g_value_set_boolean ( + value, e_mail_search_bar_get_case_sensitive ( + E_MAIL_SEARCH_BAR (object))); + return; + + case PROP_HTML: + g_value_set_object ( + value, e_mail_search_bar_get_html ( + E_MAIL_SEARCH_BAR (object))); + return; + + case PROP_TEXT: + g_value_take_string ( + value, e_mail_search_bar_get_text ( + E_MAIL_SEARCH_BAR (object))); + return; + } + + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +} + +static void +mail_search_bar_dispose (GObject *object) +{ + EMailSearchBarPrivate *priv; + + priv = E_MAIL_SEARCH_BAR_GET_PRIVATE (object); + + if (priv->html != NULL) { + g_object_unref (priv->html); + priv->html = NULL; + } + + if (priv->entry != NULL) { + g_object_unref (priv->entry); + priv->entry = NULL; + } + + if (priv->case_sensitive_button != NULL) { + g_object_unref (priv->case_sensitive_button); + priv->case_sensitive_button = NULL; + } + + if (priv->wrapped_next_box != NULL) { + g_object_unref (priv->wrapped_next_box); + priv->wrapped_next_box = NULL; + } + + if (priv->wrapped_prev_box != NULL) { + g_object_unref (priv->wrapped_prev_box); + priv->wrapped_prev_box = NULL; + } + + if (priv->matches_label != NULL) { + g_object_unref (priv->matches_label); + priv->matches_label = NULL; + } + + if (priv->tokenizer != NULL) { + g_object_unref (priv->tokenizer); + priv->tokenizer = NULL; + } + + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (parent_class)->dispose (object); +} + +static void +mail_search_bar_finalize (GObject *object) +{ + EMailSearchBarPrivate *priv; + + priv = E_MAIL_SEARCH_BAR_GET_PRIVATE (object); + + g_free (priv->active_search); + + /* Chain up to parent's finalize() method. */ + G_OBJECT_CLASS (parent_class)->finalize (object); +} + +static void +mail_search_bar_constructed (GObject *object) +{ + EMailSearchBarPrivate *priv; + + priv = E_MAIL_SEARCH_BAR_GET_PRIVATE (object); + + e_mutual_binding_new ( + G_OBJECT (object), "case-sensitive", + G_OBJECT (priv->case_sensitive_button), "active"); +} + +static void +mail_search_bar_show (GtkWidget *widget) +{ + EMailSearchBar *search_bar; + + search_bar = E_MAIL_SEARCH_BAR (widget); + + /* Chain up to parent's show() method. */ + GTK_WIDGET_CLASS (parent_class)->show (widget); + + gtk_widget_grab_focus (search_bar->priv->entry); + + mail_search_bar_update_tokenizer (search_bar); +} + +static void +mail_search_bar_hide (GtkWidget *widget) +{ + EMailSearchBar *search_bar; + + search_bar = E_MAIL_SEARCH_BAR (widget); + + /* Chain up to parent's hide() method. */ + GTK_WIDGET_CLASS (parent_class)->hide (widget); + + mail_search_bar_update_tokenizer (search_bar); +} + +static gboolean +mail_search_bar_key_press_event (GtkWidget *widget, + GdkEventKey *event) +{ + if (event->keyval == GDK_Escape) { + gtk_widget_hide (widget); + return TRUE; + } + + /* Chain up to parent's key_press_event() method. */ + return GTK_WIDGET_CLASS (parent_class)-> + key_press_event (widget, event); +} + +static void +mail_search_bar_clear (EMailSearchBar *search_bar) +{ + g_free (search_bar->priv->active_search); + search_bar->priv->active_search = NULL; + + gtk_widget_hide (search_bar->priv->wrapped_next_box); + gtk_widget_hide (search_bar->priv->wrapped_prev_box); + gtk_widget_hide (search_bar->priv->matches_label); + + mail_search_bar_update_tokenizer (search_bar); +} + +static void +mail_search_bar_class_init (EMailSearchBarClass *class) +{ + GObjectClass *object_class; + GtkWidgetClass *widget_class; + + parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EMailSearchBarPrivate)); + + object_class = G_OBJECT_CLASS (class); + object_class->set_property = mail_search_bar_set_property; + object_class->get_property = mail_search_bar_get_property; + object_class->dispose = mail_search_bar_dispose; + object_class->finalize = mail_search_bar_finalize; + object_class->constructed = mail_search_bar_constructed; + + widget_class = GTK_WIDGET_CLASS (class); + widget_class->show = mail_search_bar_show; + widget_class->hide = mail_search_bar_hide; + widget_class->key_press_event = mail_search_bar_key_press_event; + + class->clear = mail_search_bar_clear; + + g_object_class_install_property ( + object_class, + PROP_CASE_SENSITIVE, + g_param_spec_boolean ( + "case-sensitive", + "Case Sensitive", + NULL, + FALSE, + G_PARAM_READWRITE)); + + g_object_class_install_property ( + object_class, + PROP_HTML, + g_param_spec_object ( + "html", + "HTML Display", + NULL, + GTK_TYPE_HTML, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); + + g_object_class_install_property ( + object_class, + PROP_TEXT, + g_param_spec_string ( + "text", + "Search Text", + NULL, + NULL, + G_PARAM_READWRITE)); + + signals[CHANGED] = g_signal_new ( + "changed", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (EMailSearchBarClass, changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + signals[CLEAR] = g_signal_new ( + "clear", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (EMailSearchBarClass, clear), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); +} + +static void +mail_search_bar_init (EMailSearchBar *search_bar) +{ + GtkWidget *label; + GtkWidget *widget; + GtkWidget *container; + + search_bar->priv = E_MAIL_SEARCH_BAR_GET_PRIVATE (search_bar); + search_bar->priv->tokenizer = e_searching_tokenizer_new (); + + g_signal_connect_swapped ( + search_bar->priv->tokenizer, "match", + G_CALLBACK (mail_search_bar_update_matches), search_bar); + + gtk_box_set_spacing (GTK_BOX (search_bar), 12); + + container = GTK_WIDGET (search_bar); + + widget = gtk_hbox_new (FALSE, 1); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); + gtk_widget_show (widget); + + container = widget; + + widget = gtk_button_new (); + gtk_button_set_image ( + GTK_BUTTON (widget), gtk_image_new_from_stock ( + GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU)); + gtk_button_set_relief (GTK_BUTTON (widget), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text (widget, _("Close the find bar")); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); + gtk_widget_show (widget); + + g_signal_connect_swapped ( + widget, "clicked", + G_CALLBACK (gtk_widget_hide), search_bar); + + widget = gtk_label_new_with_mnemonic (_("Fin_d:")); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 3); + gtk_widget_show (widget); + + label = widget; + + widget = gtk_entry_new (); + gtk_entry_set_icon_from_stock ( + GTK_ENTRY (widget), GTK_ENTRY_ICON_SECONDARY, + GTK_STOCK_CLEAR); + gtk_entry_set_icon_tooltip_text ( + GTK_ENTRY (widget), GTK_ENTRY_ICON_SECONDARY, + _("Clear the search")); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); + gtk_widget_set_size_request (widget, 200, -1); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); + search_bar->priv->entry = g_object_ref (widget); + gtk_widget_show (widget); + + g_signal_connect_swapped ( + widget, "activate", + G_CALLBACK (mail_search_bar_find_next_cb), search_bar); + + g_signal_connect_swapped ( + widget, "changed", + G_CALLBACK (mail_search_bar_changed_cb), search_bar); + + g_signal_connect_swapped ( + widget, "icon-release", + G_CALLBACK (mail_search_bar_icon_release_cb), search_bar); + + widget = gtk_button_new_with_mnemonic (_("_Previous")); + gtk_button_set_image ( + GTK_BUTTON (widget), gtk_image_new_from_stock ( + GTK_STOCK_GO_BACK, GTK_ICON_SIZE_MENU)); + gtk_button_set_relief (GTK_BUTTON (widget), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text ( + widget, _("Find the previous occurrence of the phrase")); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); + gtk_widget_show (widget); + + g_signal_connect_swapped ( + widget, "clicked", + G_CALLBACK (mail_search_bar_find_previous_cb), search_bar); + + widget = gtk_button_new_with_mnemonic (_("_Next")); + gtk_button_set_image ( + GTK_BUTTON (widget), gtk_image_new_from_stock ( + GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_MENU)); + gtk_button_set_relief (GTK_BUTTON (widget), GTK_RELIEF_NONE); + gtk_widget_set_tooltip_text ( + widget, _("Find the next occurrence of the phrase")); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); + gtk_widget_show (widget); + + g_signal_connect_swapped ( + widget, "clicked", + G_CALLBACK (mail_search_bar_find_next_cb), search_bar); + + widget = gtk_check_button_new_with_mnemonic (_("Mat_ch case")); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); + search_bar->priv->case_sensitive_button = g_object_ref (widget); + gtk_widget_show (widget); + + g_signal_connect_swapped ( + widget, "toggled", + G_CALLBACK (mail_search_bar_toggled_cb), search_bar); + + g_signal_connect_swapped ( + widget, "toggled", + G_CALLBACK (mail_search_bar_find_next_cb), search_bar); + + container = GTK_WIDGET (search_bar); + + widget = gtk_hbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); + search_bar->priv->wrapped_next_box = g_object_ref (widget); + gtk_widget_hide (widget); + + container = widget; + + widget = gtk_image_new_from_icon_name ( + "wrapped", GTK_ICON_SIZE_MENU); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); + gtk_widget_show (widget); + + widget = gtk_label_new ( + _("Reached bottom of page, continued from top")); + gtk_label_set_ellipsize ( + GTK_LABEL (widget), PANGO_ELLIPSIZE_END); + gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); + gtk_widget_show (widget); + + container = GTK_WIDGET (search_bar); + + widget = gtk_hbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); + search_bar->priv->wrapped_prev_box = g_object_ref (widget); + gtk_widget_hide (widget); + + container = widget; + + widget = gtk_image_new_from_icon_name ( + "wrapped", GTK_ICON_SIZE_MENU); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); + gtk_widget_show (widget); + + widget = gtk_label_new ( + _("Reached top of page, continued from bottom")); + gtk_label_set_ellipsize ( + GTK_LABEL (widget), PANGO_ELLIPSIZE_END); + gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); + gtk_widget_show (widget); + + container = GTK_WIDGET (search_bar); + + widget = gtk_label_new (NULL); + gtk_box_pack_end (GTK_BOX (container), widget, FALSE, FALSE, 12); + search_bar->priv->matches_label = g_object_ref (widget); + gtk_widget_show (widget); +} + +GType +e_mail_search_bar_get_type (void) +{ + static GType type = 0; + + if (G_UNLIKELY (type == 0)) { + static const GTypeInfo type_info = { + sizeof (EMailSearchBarClass), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) mail_search_bar_class_init, + (GClassFinalizeFunc) NULL, + NULL, /* class_data */ + sizeof (EMailSearchBar), + 0, /* n_preallocs */ + (GInstanceInitFunc) mail_search_bar_init, + NULL /* value_table */ + }; + + type = g_type_register_static ( + GTK_TYPE_HBOX, "EMailSearchBar", &type_info, 0); + } + + return type; +} + +GtkWidget * +e_mail_search_bar_new (GtkHTML *html) +{ + g_return_val_if_fail (GTK_IS_HTML (html), NULL); + + return g_object_new (E_TYPE_MAIL_SEARCH_BAR, "html", html, NULL); +} + +void +e_mail_search_bar_clear (EMailSearchBar *search_bar) +{ + g_return_if_fail (E_IS_MAIL_SEARCH_BAR (search_bar)); + + g_signal_emit (search_bar, signals[CLEAR], 0); +} + +void +e_mail_search_bar_changed (EMailSearchBar *search_bar) +{ + g_return_if_fail (E_IS_MAIL_SEARCH_BAR (search_bar)); + + g_signal_emit (search_bar, signals[CHANGED], 0); +} + +GtkHTML * +e_mail_search_bar_get_html (EMailSearchBar *search_bar) +{ + g_return_val_if_fail (E_IS_MAIL_SEARCH_BAR (search_bar), NULL); + + return search_bar->priv->html; +} + +ESearchingTokenizer * +e_mail_search_bar_get_tokenizer (EMailSearchBar *search_bar) +{ + g_return_val_if_fail (E_IS_MAIL_SEARCH_BAR (search_bar), NULL); + + return search_bar->priv->tokenizer; +} + +gboolean +e_mail_search_bar_get_case_sensitive (EMailSearchBar *search_bar) +{ + GtkToggleButton *button; + + g_return_val_if_fail (E_IS_MAIL_SEARCH_BAR (search_bar), FALSE); + + button = GTK_TOGGLE_BUTTON (search_bar->priv->case_sensitive_button); + + return gtk_toggle_button_get_active (button); +} + +void +e_mail_search_bar_set_case_sensitive (EMailSearchBar *search_bar, + gboolean case_sensitive) +{ + GtkToggleButton *button; + + g_return_if_fail (E_IS_MAIL_SEARCH_BAR (search_bar)); + + button = GTK_TOGGLE_BUTTON (search_bar->priv->case_sensitive_button); + + gtk_toggle_button_set_active (button, case_sensitive); + + g_object_notify (G_OBJECT (search_bar), "case-sensitive"); +} + +gchar * +e_mail_search_bar_get_text (EMailSearchBar *search_bar) +{ + GtkEntry *entry; + const gchar *text; + + g_return_val_if_fail (E_IS_MAIL_SEARCH_BAR (search_bar), NULL); + + entry = GTK_ENTRY (search_bar->priv->entry); + text = gtk_entry_get_text (entry); + + return g_strstrip (g_strdup (text)); +} + +void +e_mail_search_bar_set_text (EMailSearchBar *search_bar, + const gchar *text) +{ + GtkEntry *entry; + + g_return_if_fail (E_IS_MAIL_SEARCH_BAR (search_bar)); + + entry = GTK_ENTRY (search_bar->priv->entry); + + if (text == NULL) + text = ""; + + /* This will trigger a "notify::text" signal. */ + gtk_entry_set_text (entry, text); +} diff --git a/mail/e-mail-search-bar.h b/mail/e-mail-search-bar.h new file mode 100644 index 0000000000..7f19e176b7 --- /dev/null +++ b/mail/e-mail-search-bar.h @@ -0,0 +1,85 @@ +/* + * e-mail-search-bar.h + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ + +#ifndef E_MAIL_SEARCH_BAR_H +#define E_MAIL_SEARCH_BAR_H + +#include +#include +#include + +/* Standard GObject macros */ +#define E_TYPE_MAIL_SEARCH_BAR \ + (e_mail_search_bar_get_type ()) +#define E_MAIL_SEARCH_BAR(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST \ + ((obj), E_TYPE_MAIL_SEARCH_BAR, EMailSearchBar)) +#define E_MAIL_SEARCH_BAR_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_CAST \ + ((cls), E_TYPE_MAIL_SEARCH_BAR, EMailSearchBarClass)) +#define E_IS_MAIL_SEARCH_BAR(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE \ + ((obj), E_TYPE_MAIL_SEARCH_BAR)) +#define E_IS_MAIL_SEARCH_BAR_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_TYPE \ + ((cls), E_TYPE_MAIL_SEARCH_BAR)) +#define E_MAIL_SEARCH_BAR_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS \ + ((obj), E_TYPE_MAIL_SEARCH_BAR, EMailSearchBarClass)) + +G_BEGIN_DECLS + +typedef struct _EMailSearchBar EMailSearchBar; +typedef struct _EMailSearchBarClass EMailSearchBarClass; +typedef struct _EMailSearchBarPrivate EMailSearchBarPrivate; + +struct _EMailSearchBar { + GtkHBox parent; + EMailSearchBarPrivate *priv; +}; + +struct _EMailSearchBarClass { + GtkHBoxClass parent_class; + + /* Signals */ + void (*changed) (EMailSearchBar *search_bar); + void (*clear) (EMailSearchBar *search_bar); +}; + +GType e_mail_search_bar_get_type (void); +GtkWidget * e_mail_search_bar_new (GtkHTML *html); +void e_mail_search_bar_clear (EMailSearchBar *search_bar); +void e_mail_search_bar_changed (EMailSearchBar *search_bar); +GtkHTML * e_mail_search_bar_get_html (EMailSearchBar *search_bar); +ESearchingTokenizer * + e_mail_search_bar_get_tokenizer (EMailSearchBar *search_bar); +gboolean e_mail_search_bar_get_case_sensitive + (EMailSearchBar *search_bar); +void e_mail_search_bar_set_case_sensitive + (EMailSearchBar *search_bar, + gboolean case_sensitive); +gchar * e_mail_search_bar_get_text (EMailSearchBar *search_bar); +void e_mail_search_bar_set_text (EMailSearchBar *search_bar, + const gchar *text); + +G_END_DECLS + +#endif /* E_MAIL_SEARCH_BAR_H */ diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c index 9704ebb96d..3d98cdeb4f 100644 --- a/mail/e-searching-tokenizer.c +++ b/mail/e-searching-tokenizer.c @@ -1052,10 +1052,10 @@ e_searching_tokenizer_get_type (void) return type; } -HTMLTokenizer * +ESearchingTokenizer * e_searching_tokenizer_new (void) { - return (HTMLTokenizer *) g_object_new (E_TYPE_SEARCHING_TOKENIZER, NULL); + return g_object_new (E_TYPE_SEARCHING_TOKENIZER, NULL); } /** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** ** **/ diff --git a/mail/e-searching-tokenizer.h b/mail/e-searching-tokenizer.h index ecc914dab7..37a0048c0c 100644 --- a/mail/e-searching-tokenizer.h +++ b/mail/e-searching-tokenizer.h @@ -52,7 +52,7 @@ struct _ESearchingTokenizerClass { GType e_searching_tokenizer_get_type (void); -HTMLTokenizer *e_searching_tokenizer_new (void); +ESearchingTokenizer *e_searching_tokenizer_new (void); /* For now, just a simple API */ diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 9a80a0c254..0aba4c1045 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -79,6 +79,7 @@ #include "e-util/e-error.h" #include "e-util/e-util-private.h" #include "e-util/e-util-labels.h" +#include "e-mail-search-bar.h" #include "em-utils.h" #include "em-composer-utils.h" #include "em-format-html-display.h" @@ -106,6 +107,7 @@ CamelStore *vfolder_store; /* the 1 static vfolder store */ struct _EMFolderBrowserPrivate { GtkWidget *preview; /* container for message display */ GtkWidget *scroll; + GtkWidget *search_bar; GtkWidget *subscribe_editor; @@ -239,7 +241,6 @@ static ESearchBarItem emfb_search_scope_items[] = { E_FILTERBAR_CURRENT_FOLDER, E_FILTERBAR_CURRENT_ACCOUNT, E_FILTERBAR_ALL_ACCOUNTS, - E_FILTERBAR_CURRENT_MESSAGE, { NULL, -1, 0 } }; @@ -485,6 +486,7 @@ emfb_init(GObject *o) EMFolderBrowser *emfb = (EMFolderBrowser *)o; RuleContext *search_context = mail_component_peek_search_context (mail_component_peek ()); struct _EMFolderBrowserPrivate *p; + GtkWidget *html; EMEvent *eme; EMEventTargetFolderBrowser *target; @@ -527,7 +529,6 @@ emfb_init(GObject *o) efb->account_search_cancel = NULL; e_search_bar_set_menu ((ESearchBar *)emfb->search, emfb_search_items); e_search_bar_set_scopeoption ((ESearchBar *)emfb->search, emfb_search_scope_items); - e_search_bar_scope_enable ((ESearchBar *)emfb->search, E_FILTERBAR_CURRENT_MESSAGE_ID, FALSE); emfb->priv->scope_restricted = TRUE; g_signal_connect(emfb, "realize", G_CALLBACK(emfb_realize), NULL); gtk_widget_show((GtkWidget *)emfb->search); @@ -561,14 +562,21 @@ emfb_init(GObject *o) gtk_scrolled_window_set_shadow_type((GtkScrolledWindow *)p->scroll, GTK_SHADOW_IN); gtk_widget_show(p->scroll); - p->preview = gtk_vbox_new (FALSE, 6); - gtk_container_add((GtkContainer *)p->scroll, (GtkWidget *)emfb->view.preview->formathtml.html); - gtk_widget_show((GtkWidget *)emfb->view.preview->formathtml.html); + html = GTK_WIDGET (emfb->view.preview->formathtml.html); + + p->preview = gtk_vbox_new (FALSE, 1); + p->search_bar = e_mail_search_bar_new (GTK_HTML (html)); + gtk_container_add((GtkContainer *)p->scroll, html); + gtk_widget_show(html); gtk_box_pack_start ((GtkBox *)p->preview, p->scroll, TRUE, TRUE, 0); - gtk_box_pack_start ((GtkBox *)p->preview, em_format_html_get_search_dialog (emfb->view.preview), FALSE, FALSE, 0); + gtk_box_pack_start ((GtkBox *)p->preview, p->search_bar, FALSE, FALSE, 0); gtk_paned_pack2 (GTK_PANED (emfb->vpane), p->preview, TRUE, FALSE); gtk_widget_show(p->preview); + g_signal_connect_swapped ( + p->search_bar, "changed", + G_CALLBACK (em_format_redraw), emfb->view.preview); + /** @HookPoint-EMFolderBrower: Folder Browser * @Id: emfb.created * @Class: org.gnome.evolution.mail.events:1.0 @@ -637,6 +645,14 @@ emfb_destroy(GtkObject *o) ((GtkObjectClass *)emfb_parent)->destroy(o); } +static void +emfb_show_search_bar (EMFolderView *folder_view) +{ + EMFolderBrowser *browser = (EMFolderBrowser *) folder_view; + + gtk_widget_show (browser->priv->search_bar); +} + static void emfb_class_init(GObjectClass *klass) { @@ -666,6 +682,7 @@ emfb_class_init(GObjectClass *klass) ((GtkObjectClass *)klass)->destroy = emfb_destroy; ((EMFolderViewClass *)klass)->set_folder = emfb_set_folder; ((EMFolderViewClass *)klass)->activate = emfb_activate; + ((EMFolderViewClass *)klass)->show_search_bar = emfb_show_search_bar; } GType @@ -711,7 +728,6 @@ void em_folder_browser_show_preview(EMFolderBrowser *emfb, gboolean state) if ((emfb->view.preview_active ^ state) == 0 || emfb->view.list == NULL) { if (state && emfb->priv->scope_restricted && emfb->view.list->cursor_uid && *(emfb->view.list->cursor_uid)) { - e_search_bar_scope_enable ((ESearchBar *)emfb->search, E_FILTERBAR_CURRENT_MESSAGE_ID, TRUE); emfb->priv->scope_restricted = FALSE; } @@ -733,7 +749,6 @@ void em_folder_browser_show_preview(EMFolderBrowser *emfb, gboolean state) if (emfb->view.list->cursor_uid) { char *uid = g_alloca(strlen(emfb->view.list->cursor_uid)+1); - e_search_bar_scope_enable ((ESearchBar *)emfb->search, E_FILTERBAR_CURRENT_MESSAGE_ID, TRUE); emfb->priv->scope_restricted = FALSE; strcpy(uid, emfb->view.list->cursor_uid); em_folder_view_set_message(&emfb->view, uid, FALSE); @@ -749,7 +764,6 @@ void em_folder_browser_show_preview(EMFolderBrowser *emfb, gboolean state) emfb->view.displayed_uid = NULL; gtk_widget_hide(emfb->priv->preview); - e_search_bar_scope_enable ((ESearchBar *)emfb->search, E_FILTERBAR_CURRENT_MESSAGE_ID, FALSE); emfb->priv->scope_restricted = TRUE; /* mail_display_set_message (emfb->mail_display, NULL, NULL, NULL); @@ -841,6 +855,8 @@ static void emfb_search_config_search(EFilterBar *efb, FilterRule *rule, int id, const char *query, void *data) { EMFolderBrowser *emfb = data; + EMailSearchBar *search_bar; + ESearchingTokenizer *tokenizer; GList *partl; struct _camel_search_words *words; int i; @@ -877,15 +893,26 @@ emfb_search_config_search(EFilterBar *efb, FilterRule *rule, int id, const char partl = partl->next; } - em_format_html_display_set_search(emfb->view.preview, - EM_FORMAT_HTML_DISPLAY_SEARCH_SECONDARY|EM_FORMAT_HTML_DISPLAY_SEARCH_ICASE, - strings); - while (strings) { - GSList *n = strings->next; - g_free(strings->data); - g_slist_free_1(strings); - strings = n; + search_bar = E_MAIL_SEARCH_BAR (emfb->priv->search_bar); + + /* XXX This is a hack, but this code is on its way out anyway. + * Function is called once before the search bar is created. */ + if (!E_IS_MAIL_SEARCH_BAR (search_bar)) + return; + + tokenizer = e_mail_search_bar_get_tokenizer (search_bar); + + e_searching_tokenizer_set_secondary_case_sensitivity (tokenizer, FALSE); + e_searching_tokenizer_set_secondary_search_string (tokenizer, NULL); + + while (strings != NULL) { + e_searching_tokenizer_add_secondary_search_string ( + tokenizer, strings->data); + g_free (strings->data); + strings = g_slist_delete_link (strings, strings); } + + e_mail_search_bar_changed (search_bar); } static char * @@ -1125,18 +1152,6 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb) id = e_search_bar_get_search_scope (esb); switch (id) { - case E_FILTERBAR_CURRENT_MESSAGE_ID: - word = e_search_bar_get_text (esb); - if ( word && *word ) { - gtk_widget_set_sensitive (esb->option_button, FALSE); - em_format_html_display_search_with (emfb->view.preview, word); - } else { - em_format_html_display_search_close (emfb->view.preview); - } - g_free (word); - return; - break; - case E_FILTERBAR_CURRENT_FOLDER_ID: g_object_get (esb, "query", &search_word, NULL); break; @@ -1386,10 +1401,8 @@ emfb_list_message_selected (MessageList *ml, const char *uid, EMFolderBrowser *e return; if (uid && *uid && emfb->priv->scope_restricted && emfb->view.preview_active) { - e_search_bar_scope_enable ((ESearchBar *)emfb->search, E_FILTERBAR_CURRENT_MESSAGE_ID, TRUE); emfb->priv->scope_restricted = FALSE; } else if ( !(uid && *uid) && !emfb->priv->scope_restricted) { - e_search_bar_scope_enable ((ESearchBar *)emfb->search, E_FILTERBAR_CURRENT_MESSAGE_ID, FALSE); emfb->priv->scope_restricted = TRUE; } diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index e31d8d727c..62bab8a48f 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -956,7 +956,7 @@ emfv_popup_flag_completed(EPopup *ep, EPopupItem *pitem, void *data) em_utils_flag_for_followup_completed((GtkWidget *)emfv, emfv->folder, uids); if (emfv->preview) - em_format_redraw (emfv->preview); + em_format_redraw (EM_FORMAT (emfv->preview)); } static void @@ -968,7 +968,7 @@ emfv_popup_flag_clear(EPopup *ep, EPopupItem *pitem, void *data) em_utils_flag_for_followup_clear((GtkWidget *)emfv, emfv->folder, uids); if (emfv->preview) - em_format_redraw (emfv->preview); + em_format_redraw (EM_FORMAT (emfv->preview)); } static void @@ -1808,13 +1808,7 @@ emfv_message_search(BonoboUIComponent *uic, void *data, const char *path) { EMFolderView *emfv = data; - if (!emfv->list_active) /* We are in new mail window */ - em_format_html_display_search(emfv->preview); - else { - /* We are in top level. Just grab focus to Search Bar */ - gtk_widget_grab_focus (((ESearchBar *)((EMFolderBrowser *) emfv)->search)->entry); - gtk_option_menu_set_history (GTK_OPTION_MENU (((ESearchBar *)((EMFolderBrowser *) emfv)->search)->scopeoption), 3); - } + em_folder_view_show_search_bar (emfv); } static void @@ -3271,3 +3265,15 @@ emfv_on_html_button_released_cb (GtkHTML *html, GdkEventButton *button, EMFolder return FALSE; } +void +em_folder_view_show_search_bar (EMFolderView *emfv) +{ + EMFolderViewClass *class; + + g_return_if_fail (EM_IS_FOLDER_VIEW (emfv)); + + class = EM_FOLDER_VIEW_GET_CLASS (emfv); + g_return_if_fail (class->show_search_bar != NULL); + + class->show_search_bar (emfv); +} diff --git a/mail/em-folder-view.h b/mail/em-folder-view.h index 4af4760cac..b69a4a1a05 100644 --- a/mail/em-folder-view.h +++ b/mail/em-folder-view.h @@ -124,6 +124,8 @@ struct _EMFolderViewClass { void (*set_folder)(EMFolderView *emfv, struct _CamelFolder *folder, const char *uri); void (*set_message)(EMFolderView *emfv, const char *uid, int nomarkseen); + void (*show_search_bar)(EMFolderView *emfv); + /* Signals */ void (*on_url)(EMFolderView *emfv, const char *uri, const char *nice_uri); @@ -153,6 +155,7 @@ guint32 em_folder_view_disable_mask(EMFolderView *emfv); void em_folder_view_set_statusbar(EMFolderView *emfv, gboolean statusbar); void em_folder_view_set_hide_deleted(EMFolderView *emfv, gboolean status); void em_folder_view_setup_view_instance (EMFolderView *emfv); +void em_folder_view_show_search_bar (EMFolderView *emfv); G_END_DECLS diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index aba9c64069..cf1626ecd0 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -40,7 +40,6 @@ #include #include -#include #include @@ -76,7 +75,6 @@ #include "e-mail-attachment-bar.h" #include "em-format-html-display.h" -#include "e-searching-tokenizer.h" #include "em-icon-stream.h" #include "em-utils.h" #include "em-popup.h" @@ -97,17 +95,6 @@ #define d(x) struct _EMFormatHTMLDisplayPrivate { - /* For the interactive search dialogue */ - /* TODO: Should this be more subtle, like the mozilla one? */ - GtkHBox *search_dialog; - GtkWidget *search_entry; - GtkWidget *search_entry_box; - GtkWidget *search_matches_label; - GtkWidget *search_case_check; - char *search_text; - int search_wrap; /* are we doing a wrap search */ - gboolean search_active; /* if the search is active */ - GtkWidget *attachment_view; /* weak reference */ }; @@ -167,7 +154,6 @@ static void efhd_format_source(EMFormat *, CamelStream *, CamelMimePart *); static void efhd_format_attachment(EMFormat *, CamelStream *, CamelMimePart *, const char *, const EMFormatHandler *); static void efhd_format_optional(EMFormat *, CamelStream *, CamelMimePart *, CamelStream *); static void efhd_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart *part, CamelCipherValidity *valid); -static void efhd_complete(EMFormat *); static void efhd_builtin_init(EMFormatHTMLDisplayClass *efhc); @@ -246,9 +232,6 @@ efhd_init(GObject *o) efhd->priv = g_malloc0(sizeof(*efhd->priv)); - efhd->search_tok = (ESearchingTokenizer *)e_searching_tokenizer_new(); - gtk_html_set_tokenizer (efh->html, (HTMLTokenizer *)efhd->search_tok); - g_signal_connect(efh->html, "realize", G_CALLBACK(efhd_gtkhtml_realise), o); g_signal_connect(efh->html, "style-set", G_CALLBACK(efhd_gtkhtml_style_set), o); /* we want to convert url's etc */ @@ -265,7 +248,6 @@ efhd_finalise(GObject *o) /* check pending stuff */ - g_free(efhd->priv->search_text); g_free(efhd->priv); ((GObjectClass *)efhd_parent)->finalize(o); @@ -291,7 +273,6 @@ efhd_class_init(GObjectClass *klass) ((EMFormatClass *)klass)->format_attachment = efhd_format_attachment; ((EMFormatClass *)klass)->format_optional = efhd_format_optional; ((EMFormatClass *)klass)->format_secure = efhd_format_secure; - ((EMFormatClass *)klass)->complete = efhd_complete; klass->finalize = efhd_finalise; @@ -400,316 +381,6 @@ void em_format_html_display_set_caret_mode(EMFormatHTMLDisplay *efhd, gboolean s gtk_html_set_caret_mode(((EMFormatHTML *)efhd)->html, state); } -void -em_format_html_display_set_search(EMFormatHTMLDisplay *efhd, int type, GSList *strings) -{ - switch(type&3) { - case EM_FORMAT_HTML_DISPLAY_SEARCH_PRIMARY: - e_searching_tokenizer_set_primary_case_sensitivity(efhd->search_tok, (type&EM_FORMAT_HTML_DISPLAY_SEARCH_ICASE) == 0); - e_searching_tokenizer_set_primary_search_string(efhd->search_tok, NULL); - while (strings) { - e_searching_tokenizer_add_primary_search_string(efhd->search_tok, strings->data); - strings = strings->next; - } - break; - case EM_FORMAT_HTML_DISPLAY_SEARCH_SECONDARY: - default: - e_searching_tokenizer_set_secondary_case_sensitivity(efhd->search_tok, (type&EM_FORMAT_HTML_DISPLAY_SEARCH_ICASE) == 0); - e_searching_tokenizer_set_secondary_search_string(efhd->search_tok, NULL); - while (strings) { - e_searching_tokenizer_add_secondary_search_string(efhd->search_tok, strings->data); - strings = strings->next; - } - break; - } - - d(printf("redrawing with search\n")); - em_format_redraw((EMFormat *)efhd); -} - -static void -efhd_update_matches(EMFormatHTMLDisplay *efhd) -{ - struct _EMFormatHTMLDisplayPrivate *p = efhd->priv; - char *str; - /* message-search popup match count string */ - char *fmt = _("Matches: %d"); - - if (p->search_dialog) { - str = alloca(strlen(fmt)+32); - sprintf(str, fmt, e_searching_tokenizer_match_count(efhd->search_tok)); - gtk_label_set_text((GtkLabel *)p->search_matches_label, str); - } - gtk_widget_show((GtkWidget *)p->search_matches_label); - -} - -static void -efhd_update_search(EMFormatHTMLDisplay *efhd) -{ - struct _EMFormatHTMLDisplayPrivate *p = efhd->priv; - GSList *words = NULL; - int flags = 0; - - if (!gtk_toggle_button_get_active((GtkToggleButton *)p->search_case_check)) - flags = EM_FORMAT_HTML_DISPLAY_SEARCH_ICASE | EM_FORMAT_HTML_DISPLAY_SEARCH_PRIMARY; - else - flags = EM_FORMAT_HTML_DISPLAY_SEARCH_PRIMARY; - - if (p->search_text) - words = g_slist_append(words, p->search_text); - - em_format_html_display_set_search(efhd, flags, words); - g_slist_free(words); -} - -static void -efhd_search_response(GtkWidget *w, EMFormatHTMLDisplay *efhd) -{ - struct _EMFormatHTMLDisplayPrivate *p = efhd->priv; - - char *txt = g_strdup(gtk_entry_get_text((GtkEntry *)p->search_entry)); - - g_strstrip(txt); - if (p->search_text && strcmp(p->search_text, txt) == 0 && !p->search_wrap) { - gtk_html_engine_search_set_forward (((EMFormatHTML *)efhd)->html, TRUE); - if (!gtk_html_engine_search_next(((EMFormatHTML *)efhd)->html)) - p->search_wrap = TRUE; - g_free(txt); - } else { - g_free(p->search_text); - p->search_text = txt; - if (!p->search_wrap) - efhd_update_search(efhd); - p->search_wrap = FALSE; - gtk_html_engine_search(((EMFormatHTML *)efhd)->html, txt, - gtk_toggle_button_get_active((GtkToggleButton *)p->search_case_check), - TRUE, FALSE); - } -} - - -static void -efhd_search_response_back (GtkWidget *w, EMFormatHTMLDisplay *efhd) -{ - struct _EMFormatHTMLDisplayPrivate *p = efhd->priv; - - char *txt = g_strdup(gtk_entry_get_text((GtkEntry *)p->search_entry)); - - g_strstrip(txt); - if (p->search_text && strcmp(p->search_text, txt) == 0 && !p->search_wrap) { - gtk_html_engine_search_set_forward (((EMFormatHTML *)efhd)->html, FALSE); - if (!gtk_html_engine_search_next(((EMFormatHTML *)efhd)->html)) - p->search_wrap = TRUE; - g_free(txt); - } else { - g_free(p->search_text); - p->search_text = txt; - if (!p->search_wrap) - efhd_update_search(efhd); - p->search_wrap = FALSE; - gtk_html_engine_search(((EMFormatHTML *)efhd)->html, txt, - gtk_toggle_button_get_active((GtkToggleButton *)p->search_case_check), - FALSE, FALSE); - } -} - - -static void -efhd_search_destroy(GtkWidget *w, EMFormatHTMLDisplay *efhd) -{ - struct _EMFormatHTMLDisplayPrivate *p = efhd->priv; - g_free(p->search_text); - p->search_text = NULL; - gtk_widget_hide((GtkWidget *)p->search_dialog); - em_format_html_display_set_search(efhd, EM_FORMAT_HTML_DISPLAY_SEARCH_PRIMARY, NULL); - p->search_active = FALSE; -} - -static void -efhd_search_case_toggled(GtkWidget *w, EMFormatHTMLDisplay *efhd) -{ - struct _EMFormatHTMLDisplayPrivate *p = efhd->priv; - - g_free(p->search_text); - p->search_text = NULL; - efhd_search_response(w, efhd); -} - -static gboolean -efhd_key_pressed (GtkWidget *w, GdkEventKey *event, EMFormatHTMLDisplay *efhd) -{ - if (event->keyval == GDK_Escape){ - efhd_search_destroy (w, efhd); - return TRUE; - } - return FALSE; -} - -static void -clear_button_clicked_cb (GtkWidget *widget, gpointer dummy, EMFormatHTMLDisplay *efhd) -{ - struct _EMFormatHTMLDisplayPrivate *p = efhd->priv; - - gtk_entry_set_text (GTK_ENTRY (p->search_entry), ""); - - g_signal_emit_by_name (p->search_entry, "activate", efhd); -} - -/* Controlls the visibility of icon_entry's visibility */ -static void -icon_entry_changed_cb (GtkWidget *widget, GtkWidget *clear_button) -{ - const char *text = gtk_entry_get_text (GTK_ENTRY (widget)); - - if (text && *text) - gtk_widget_show (clear_button); - else - gtk_widget_hide (clear_button); -} - -GtkWidget * -em_format_html_get_search_dialog (EMFormatHTMLDisplay *efhd) -{ - struct _EMFormatHTMLDisplayPrivate *p = efhd->priv; - GtkWidget *hbox2, *button3, *button2, *label1; - GtkWidget *icon_entry, *clear_button; - - p->search_entry_box = gtk_hbox_new (FALSE, 0); - - label1 = gtk_label_new_with_mnemonic (_("Fin_d:")); - gtk_widget_show (label1); - gtk_box_pack_start ((GtkBox *)(p->search_entry_box), label1, FALSE, FALSE, 5); - - /* Icon entry */ - icon_entry = e_icon_entry_new (); - p->search_entry = e_icon_entry_get_entry (E_ICON_ENTRY (icon_entry)); - gtk_label_set_mnemonic_widget (GTK_LABEL (label1), p->search_entry); - gtk_widget_show (p->search_entry); - clear_button = e_icon_entry_create_button ("gtk-clear"); - e_icon_entry_pack_widget (E_ICON_ENTRY (icon_entry), clear_button, FALSE); - gtk_widget_show_all (icon_entry); - gtk_widget_hide (clear_button); - - g_signal_connect (G_OBJECT (clear_button), "button-press-event", (GCallback) clear_button_clicked_cb, efhd); - g_signal_connect (G_OBJECT (p->search_entry), "changed", (GCallback) icon_entry_changed_cb, clear_button); - - gtk_box_pack_start ((GtkBox *)(p->search_entry_box), icon_entry, FALSE, FALSE, 0); - /* gtk_box_pack_start ((GtkBox *)(p->search_entry_box), icon_entry, TRUE, TRUE, 0); */ - - hbox2 = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, FALSE, FALSE, 5); - /* gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5); */ - - button3 = gtk_button_new_with_mnemonic (_("_Previous")); - gtk_button_set_image (GTK_BUTTON (button3), GTK_WIDGET(gtk_image_new_from_stock(GTK_STOCK_GO_BACK, GTK_ICON_SIZE_BUTTON))); - gtk_widget_show (button3); - gtk_box_pack_start (GTK_BOX (hbox2), button3, FALSE, FALSE, 5); - - button2 = gtk_button_new_with_mnemonic (_("_Next")); - gtk_button_set_image (GTK_BUTTON (button2), gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON)); - gtk_widget_show (button2); - gtk_box_pack_start (GTK_BOX (hbox2), button2, FALSE, FALSE, 5); - - p->search_case_check = gtk_check_button_new_with_mnemonic (_("M_atch case")); - gtk_widget_show (p->search_case_check); - gtk_box_pack_start (GTK_BOX (hbox2), p->search_case_check, FALSE, FALSE, 0); - - p->search_matches_label = gtk_label_new (""); - gtk_widget_show (p->search_matches_label); - gtk_box_pack_start (GTK_BOX (hbox2), p->search_matches_label, TRUE, TRUE, 0); - p->search_dialog = GTK_HBOX (hbox2); - - p->search_wrap = FALSE; - - g_signal_connect (p->search_entry, "activate", G_CALLBACK(efhd_search_response), efhd); - g_signal_connect (p->search_entry, "key-press-event", G_CALLBACK(efhd_key_pressed), efhd); - g_signal_connect (p->search_case_check, "toggled", G_CALLBACK(efhd_search_case_toggled), efhd); - g_signal_connect (button2, "clicked", G_CALLBACK(efhd_search_response), efhd); - g_signal_connect (button3, "clicked", G_CALLBACK(efhd_search_response_back), efhd); - - p->search_active = FALSE; - - efhd_update_matches(efhd); - - return (GtkWidget *)p->search_dialog; - -} - -static void -set_focus_cb (GtkWidget *window, GtkWidget *widget, EMFormatHTMLDisplay *efhd) -{ - struct _EMFormatHTMLDisplayPrivate *p = efhd->priv; - GtkWidget *sbar = GTK_WIDGET (p->search_dialog); - - while (widget != NULL && widget != sbar) { - widget = widget->parent; - } - - if (widget != sbar) - efhd_search_destroy(widget, efhd); -} - -/** - * em_format_html_display_search: - * @efhd: - * - * Run an interactive search dialogue. - **/ -void -em_format_html_display_search(EMFormatHTMLDisplay *efhd) -{ - struct _EMFormatHTMLDisplayPrivate *p = efhd->priv; - - if (p->search_dialog){ - GtkWidget *toplevel; - - gtk_widget_show (GTK_WIDGET (p->search_dialog)); - gtk_widget_grab_focus (p->search_entry); - gtk_widget_show (p->search_entry_box); - - p->search_active = TRUE; - - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (p->search_dialog)); - - g_signal_connect (toplevel, "set-focus", - G_CALLBACK (set_focus_cb), efhd); - } - -} -/** - * em_format_html_display_search_with: - * @efhd: - * - * Run an interactive search dialogue. - **/ -void -em_format_html_display_search_with (EMFormatHTMLDisplay *efhd, char *word) -{ - struct _EMFormatHTMLDisplayPrivate *p = efhd->priv; - - if (p->search_dialog){ - gtk_widget_show (GTK_WIDGET (p->search_dialog)); - p->search_active = TRUE; - - /* Set the query */ - gtk_entry_set_text (GTK_ENTRY (p->search_entry), word); - gtk_widget_hide (p->search_entry_box); - - /* Trigger the search */ - g_signal_emit_by_name (p->search_entry, "activate", efhd); - } -} - -void -em_format_html_display_search_close (EMFormatHTMLDisplay *efhd) -{ - struct _EMFormatHTMLDisplayPrivate *p = efhd->priv; - - if (p->search_dialog && p->search_active) - efhd_search_destroy(GTK_WIDGET (p->search_dialog), efhd); -} - void em_format_html_display_cut (EMFormatHTMLDisplay *efhd) { @@ -889,15 +560,6 @@ efhd_html_on_url (GtkHTML *html, const char *url, EMFormatHTMLDisplay *efhd) g_signal_emit((GObject *)efhd, efhd_signals[EFHD_ON_URL], 0, url); } -static void -efhd_complete(EMFormat *emf) -{ - EMFormatHTMLDisplay *efhd = (EMFormatHTMLDisplay *)emf; - - if (efhd->priv->search_dialog && efhd->priv->search_active) - efhd_update_matches(efhd); -} - /* ********************************************************************** */ /* TODO: move the dialogue elsehwere */ diff --git a/mail/em-format-html-display.h b/mail/em-format-html-display.h index 10a379d7f6..99234e9c1e 100644 --- a/mail/em-format-html-display.h +++ b/mail/em-format-html-display.h @@ -105,8 +105,6 @@ void em_format_html_display_search_with void em_format_html_display_search_close (EMFormatHTMLDisplay *efhd); -GtkWidget * em_format_html_get_search_dialog(EMFormatHTMLDisplay *efhd); - void em_format_html_display_cut (EMFormatHTMLDisplay *efhd); void em_format_html_display_copy (EMFormatHTMLDisplay *efhd); void em_format_html_display_paste (EMFormatHTMLDisplay *efhd); diff --git a/mail/em-format.c b/mail/em-format.c index 1d5570be96..826ef11b63 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -772,7 +772,43 @@ emf_busy(EMFormat *emf) * a display refresh, or it can be used to generate an identical layout, * e.g. to print what the user has shown inline. **/ -/* e_format_format_clone is a macro */ +void +em_format_format_clone (EMFormat *emf, + CamelFolder *folder, + const gchar *uid, + CamelMimeMessage *message, + EMFormat *source) +{ + EMFormatClass *class; + + g_return_if_fail (EM_IS_FORMAT (emf)); + g_return_if_fail (folder == NULL || CAMEL_IS_FOLDER (folder)); + g_return_if_fail (message == NULL || CAMEL_IS_MIME_MESSAGE (message)); + g_return_if_fail (source == NULL || EM_IS_FORMAT (source)); + + class = EM_FORMAT_GET_CLASS (emf); + g_return_if_fail (class->format_clone != NULL); + class->format_clone (emf, folder, uid, message, source); +} + +void +em_format_format (EMFormat *emf, + CamelFolder *folder, + const gchar *uid, + CamelMimeMessage *message) +{ + /* em_format_format_clone() will check the arguments. */ + em_format_format_clone (emf, folder, uid, message, NULL); +} + +void +em_format_redraw (EMFormat *emf) +{ + g_return_if_fail (EM_IS_FORMAT (emf)); + + em_format_format_clone ( + emf, emf->folder, emf->uid, emf->message, emf); +} /** * em_format_set_session: diff --git a/mail/em-format.h b/mail/em-format.h index 92c6b3dddf..f11e73937a 100644 --- a/mail/em-format.h +++ b/mail/em-format.h @@ -324,14 +324,10 @@ void em_format_push_level(EMFormat *emf); void em_format_pull_level(EMFormat *emf); /* clones inline state/view and format, or use to redraw */ -#define em_format_format_clone(emf, folder, uid, msg, src) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_clone((emf), (folder), (uid), (msg), (src)) +void em_format_format_clone (EMFormat *emf, CamelFolder *folder, const gchar *uid, CamelMimeMessage *message, EMFormat *source); /* formats a new message */ -#define em_format_format(emf, folder, uid, msg) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_clone((emf), (folder), (uid), (msg), NULL) -#define em_format_redraw(emf) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_clone((EMFormat *)(emf), \ - ((EMFormat *)(emf))->folder, \ - ((EMFormat *)(emf))->uid, \ - ((EMFormat *)(emf))->message, \ - (EMFormat *)(emf)) +void em_format_format(EMFormat *emf, CamelFolder *folder, const gchar *uid, CamelMimeMessage *message); +void em_format_redraw(EMFormat *emf); void em_format_format_error(EMFormat *emf, CamelStream *stream, const char *fmt, ...); #define em_format_format_attachment(emf, stream, msg, type, info) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_attachment((emf), (stream), (msg), (type), (info)) #define em_format_format_source(emf, stream, msg) ((EMFormatClass *)G_OBJECT_GET_CLASS(emf))->format_source((emf), (stream), (msg)) diff --git a/mail/em-message-browser.c b/mail/em-message-browser.c index 728b27ec43..973708bc2b 100644 --- a/mail/em-message-browser.c +++ b/mail/em-message-browser.c @@ -48,6 +48,7 @@ #include "e-util/e-util-private.h" +#include "e-mail-search-bar.h" #include "em-format-html-display.h" #include "em-message-browser.h" #include "em-menu.h" @@ -63,6 +64,7 @@ struct _EMMessageBrowserPrivate { GtkWidget *preview; /* container for message display */ + GtkWidget *search_bar; }; static gpointer parent_class; @@ -224,6 +226,14 @@ emmb_destroy (GtkObject *gtk_object) GTK_OBJECT_CLASS (parent_class)->destroy (gtk_object); } +static void +emmb_show_search_bar (EMFolderView *folder_view) +{ + EMMessageBrowser *browser = EM_MESSAGE_BROWSER (folder_view); + + gtk_widget_show (browser->priv->search_bar); +} + static void emmb_class_init (EMMessageBrowserClass *class) { @@ -240,12 +250,14 @@ emmb_class_init (EMMessageBrowserClass *class) folder_view_class->update_message_style = FALSE; folder_view_class->set_message = emmb_set_message; folder_view_class->activate = emmb_activate; + folder_view_class->show_search_bar = emmb_show_search_bar; } static void emmb_init (EMMessageBrowser *emmb) { EMFolderView *emfv = EM_FOLDER_VIEW (emmb); + GtkWidget *container; GtkWidget *widget; gchar *filename; @@ -265,25 +277,35 @@ emmb_init (EMMessageBrowser *emmb) EVOLUTION_UIDIR, "evolution-mail-message.xml", NULL); emfv->ui_files = g_slist_append (emfv->ui_files, filename); + gtk_box_set_spacing (GTK_BOX (emmb), 1); + + container = GTK_WIDGET (emmb); + widget = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW (widget), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type ( GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN); - gtk_widget_show (widget); + gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); emmb->priv->preview = widget; + gtk_widget_show (widget); + + widget = e_mail_search_bar_new (emfv->preview->formathtml.html); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); + emmb->priv->search_bar = widget; + gtk_widget_hide (widget); + + g_signal_connect_swapped ( + widget, "changed", + G_CALLBACK (em_format_redraw), emfv->preview); + + container = emmb->priv->preview; widget = GTK_WIDGET (emfv->preview->formathtml.html); - gtk_container_add (GTK_CONTAINER (emmb->priv->preview), widget); + gtk_container_add (GTK_CONTAINER (container), widget); gtk_widget_show (widget); - gtk_box_pack_start ( - GTK_BOX (emmb), emmb->priv->preview, TRUE, TRUE, 0); - gtk_box_pack_start( - GTK_BOX (emmb), em_format_html_get_search_dialog ( - emfv->preview), FALSE, FALSE, 0); - /** @HookPoint-EMMenu: Standalone Message View Menu * @Id: org.gnome.evolution.mail.messagebrowser * @Class: org.gnome.evolution.mail.bonobomenu:1.0 diff --git a/mail/em-utils.c b/mail/em-utils.c index 7685e76845..958864647d 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -804,7 +804,7 @@ tag_editor_response (GtkWidget *dialog, int button, struct ted_t *ted) camel_tag_list_free (&tags); if (ted->emfv->preview) - em_format_redraw(ted->emfv->preview); + em_format_redraw (EM_FORMAT (ted->emfv->preview)); } gtk_widget_destroy (dialog); diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index ac5012b7d2..aeb4fa36f3 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -325,12 +325,6 @@ option_changed (ESearchBar *esb, void *data) d(printf("option changed, id = %d, setquery = %s %d\n", id, efb->setquery ? "true" : "false", esb->block_search)); - if (esb->scopeitem_id == E_FILTERBAR_CURRENT_MESSAGE_ID) { - gtk_widget_set_sensitive (esb->option_button, FALSE); - } else { - gtk_widget_set_sensitive (esb->option_button, TRUE); - } - if (efb->setquery) return; diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h index be7e26c83b..41e3bde4ba 100644 --- a/widgets/misc/e-filter-bar.h +++ b/widgets/misc/e-filter-bar.h @@ -95,7 +95,6 @@ enum { /* preset option options */ E_FILTERBAR_ADVANCED_ID = -5, - E_FILTERBAR_CURRENT_MESSAGE_ID = -6, E_FILTERBAR_CURRENT_FOLDER_ID = -7, E_FILTERBAR_CURRENT_ACCOUNT_ID = -8, E_FILTERBAR_ALL_ACCOUNTS_ID = -9 @@ -107,7 +106,6 @@ enum { #define E_FILTERBAR_ALL_ACCOUNTS { N_("All Accounts"), E_FILTERBAR_ALL_ACCOUNTS_ID, ESB_ITEMTYPE_RADIO } #define E_FILTERBAR_CURRENT_ACCOUNT { N_("Current Account"), E_FILTERBAR_CURRENT_ACCOUNT_ID, ESB_ITEMTYPE_RADIO } #define E_FILTERBAR_CURRENT_FOLDER { N_("Current Folder"), E_FILTERBAR_CURRENT_FOLDER_ID, ESB_ITEMTYPE_RADIO } -#define E_FILTERBAR_CURRENT_MESSAGE { N_("Current Message"), E_FILTERBAR_CURRENT_MESSAGE_ID, ESB_ITEMTYPE_RADIO } #define E_FILTERBAR_SEPARATOR { NULL, 0, 0 } #ifdef JUST_FOR_TRANSLATORS -- cgit v1.2.3 From 66687b22ec92a829f752c39fa9418be33b16c0bd Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Thu, 21 May 2009 14:06:28 +0530 Subject: Fixes bug 499107 (bnc) - delete all the recurring instances from the folder. Reset the index properly so that all the recurring instances are deleted once the mail is processed. --- plugins/itip-formatter/itip-formatter.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index 6eebfdee92..c2f64a1a17 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -1876,6 +1877,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) camel_message_info_free (mi); if (tag) { int i = 0, count; + GSList *list = NULL; count = camel_folder_summary_count (pitip->folder->summary); for (i = 0; i < count; i++) { @@ -1884,12 +1886,18 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) continue; camel_message_info_ref (mi); if ( camel_message_info_user_tag (mi, "recurrence-key") && g_str_equal (camel_message_info_user_tag (mi, "recurrence-key"), tag)) { + camel_folder_summary_remove_uid_fast (pitip->folder->summary, (char *)(mi->uid)); + camel_folder_change_info_remove_uid (changes, (char *) mi->uid); + list = g_slist_prepend (list, (gpointer) mi->uid); - camel_folder_summary_remove_uid(pitip->folder->summary, (char *)(mi->uid)); - camel_folder_change_info_remove_uid (changes, (char *)(mi->uid)); + /* step back once to have the right index */ + count--; + i--; } camel_message_info_free (mi); } + camel_db_delete_uids (pitip->folder->parent_store->cdb_w, pitip->folder->full_name, list, NULL); + g_slist_free (list); } } else { /* Either not a recurring appointment or "apply-to-all" is not selected. So just delete this instance alone */ -- cgit v1.2.3 From 3b946037007857c3d2be0c39db0782f9dbaef461 Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Thu, 21 May 2009 14:10:36 +0530 Subject: Adds the resend feature to GroupWise features. --- calendar/gui/dialogs/comp-editor.c | 7 +- calendar/gui/e-calendar-view.c | 12 +- calendar/gui/e-calendar-view.h | 2 + plugins/groupwise-features/Makefile.am | 2 + .../org-gnome-groupwise-features.eplug.xml | 5 + .../org-gnome-shared-folder.error.xml | 18 -- plugins/groupwise-features/process-meeting.c | 264 ++++++++++++++++++++- 7 files changed, 281 insertions(+), 29 deletions(-) diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 2a1513327e..545fca4448 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -1848,7 +1848,7 @@ comp_editor_set_summary (CompEditor *editor, !editor->priv->warned && !(editor->priv->flags & COMP_EDITOR_DELEGATE) && editor->priv->existing_org && - !editor->priv->user_org; + !editor->priv->user_org && !(editor->priv->flags & COMP_EDITOR_NEW_ITEM); if (show_warning) { e_notice ( @@ -1896,7 +1896,8 @@ comp_editor_set_changed (CompEditor *editor, show_warning = changed && !editor->priv->warned && !(editor->priv->flags & COMP_EDITOR_DELEGATE) && - editor->priv->existing_org && !editor->priv->user_org; + editor->priv->existing_org && !editor->priv->user_org + && !(editor->priv->flags & COMP_EDITOR_NEW_ITEM); if (show_warning) { e_notice ( @@ -2701,7 +2702,7 @@ page_dates_changed_cb (CompEditor *editor, if (page != (CompEditorPage *) l->data) comp_editor_page_set_dates (l->data, dates); - if (!priv->warned && priv->existing_org && !priv->user_org) { + if (!priv->warned && priv->existing_org && !priv->user_org && !(editor->priv->flags & COMP_EDITOR_NEW_ITEM)) { e_notice (priv->notebook, GTK_MESSAGE_INFO, _("Changes made to this item may be discarded if an update arrives")); priv->warned = TRUE; diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index a99149ae2e..ffb08bbee0 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -78,7 +78,6 @@ struct _ECalendarViewPrivate { static void e_calendar_view_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec); static void e_calendar_view_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); static void e_calendar_view_destroy (GtkObject *object); -static void open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *icalcomp, guint32 flags); extern ECompEditorRegistry *comp_editor_registry; @@ -1602,7 +1601,7 @@ on_delegate (EPopup *ep, EPopupItem *pitem, void *data) flags |= COMP_EDITOR_MEETING | COMP_EDITOR_DELEGATE; - open_event_with_flags (cal_view, event->comp_data->client, clone, flags); + e_calendar_view_open_event_with_flags (cal_view, event->comp_data->client, clone, flags); icalcomponent_free (clone); g_list_free (selected); @@ -2013,7 +2012,7 @@ e_calendar_view_new_appointment_for (ECalendarView *cal_view, flags |= COMP_EDITOR_USER_ORG; } - open_event_with_flags (cal_view, default_client, + e_calendar_view_open_event_with_flags (cal_view, default_client, icalcomp, flags); g_object_unref (comp); @@ -2102,8 +2101,8 @@ object_created_cb (CompEditor *ce, ECalendarView *cal_view) gnome_calendar_emit_user_created_signal (cal_view, e_calendar_view_get_calendar (cal_view), comp_editor_get_client (ce)); } -static void -open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *icalcomp, guint32 flags) +CompEditor * +e_calendar_view_open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *icalcomp, guint32 flags) { CompEditor *ce; const char *uid; @@ -2131,6 +2130,7 @@ open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *ica gtk_window_present (GTK_WINDOW (ce)); + return ce; } /** @@ -2165,7 +2165,7 @@ e_calendar_view_edit_appointment (ECalendarView *cal_view, } - open_event_with_flags (cal_view, client, icalcomp, flags); + e_calendar_view_open_event_with_flags (cal_view, client, icalcomp, flags); } void diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h index 1f18e67241..eedef31856 100644 --- a/calendar/gui/e-calendar-view.h +++ b/calendar/gui/e-calendar-view.h @@ -28,6 +28,7 @@ #include "e-cal-model.h" #include "gnome-cal.h" #include "e-activity-handler.h" +#include "dialogs/comp-editor.h" G_BEGIN_DECLS @@ -144,6 +145,7 @@ void e_calendar_view_paste_clipboard (ECalendarView *cal_view); void e_calendar_view_delete_selected_event (ECalendarView *cal_view); void e_calendar_view_delete_selected_events (ECalendarView *cal_view); void e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view); +CompEditor* e_calendar_view_open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *icalcomp, guint32 flags); GtkMenu *e_calendar_view_create_popup_menu (ECalendarView *cal_view); diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am index 3b0a83021d..5746b72a40 100644 --- a/plugins/groupwise-features/Makefile.am +++ b/plugins/groupwise-features/Makefile.am @@ -64,6 +64,7 @@ glade_DATA = \ error_DATA = \ org-gnome-shared-folder.error \ + org-gnome-process-meeting.error \ org-gnome-proxy.error \ org-gnome-proxy-login.error \ org-gnome-mail-retract.error @@ -77,6 +78,7 @@ EXTRA_DIST = \ org-gnome-compose-send-options.xml \ org-gnome-groupwise-features.eplug.xml \ org-gnome-shared-folder.error.xml \ + org-gnome-process-meeting.error.xml \ org-gnome-proxy.error.xml \ org-gnome-proxy-login.error.xml \ org-gnome-mail-retract.error.xml diff --git a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml index 7a707fdcc9..226872b6a8 100644 --- a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml +++ b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml @@ -92,6 +92,11 @@ + + + + + diff --git a/plugins/groupwise-features/org-gnome-shared-folder.error.xml b/plugins/groupwise-features/org-gnome-shared-folder.error.xml index ca63ad80aa..8ef056728b 100644 --- a/plugins/groupwise-features/org-gnome-shared-folder.error.xml +++ b/plugins/groupwise-features/org-gnome-shared-folder.error.xml @@ -15,23 +15,5 @@ You cannot share this folder with the specified user "{0}" - -<_primary>This is a recurring meeting - -<_secondary>Would you like to accept it? -