From fc64e418c2d638f438c4d67b306abd1999f1f0a9 Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 10 Feb 2004 06:23:12 +0000 Subject: Update to 1.5.4. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1807 df743ca5-7f9a-e211-a948-0013205c9059 --- mail/evolution/Makefile | 3 +- mail/evolution/distinfo | 3 +- ...addressbook_gui_component_addressbook-migrate.c | 547 --------------------- .../evolution/files/patch-camel_camel-vee-folder.c | 20 - mail/evolution/files/patch-ltmain.sh | 30 +- mail/evolution/pkg-plist | 15 +- 6 files changed, 30 insertions(+), 588 deletions(-) delete mode 100644 mail/evolution/files/patch-addressbook_gui_component_addressbook-migrate.c delete mode 100644 mail/evolution/files/patch-camel_camel-vee-folder.c (limited to 'mail') diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 550155503..9827a0e74 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -6,8 +6,7 @@ # PORTNAME= evolution -PORTVERSION= 1.5.3 -PORTREVISION= 3 +PORTVERSION= 1.5.4 CATEGORIES= mail gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.5 diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index 9f1fa9296..e36b765ba 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1 +1,2 @@ -MD5 (gnome2/evolution-1.5.3.tar.bz2) = c8692b117b6a9e140ea989f52ebf1283 +MD5 (gnome2/evolution-1.5.4.tar.bz2) = ad3a511525d169f9994ccbc2c00bde89 +SIZE (gnome2/evolution-1.5.4.tar.bz2) = 11762732 diff --git a/mail/evolution/files/patch-addressbook_gui_component_addressbook-migrate.c b/mail/evolution/files/patch-addressbook_gui_component_addressbook-migrate.c deleted file mode 100644 index a682342da..000000000 --- a/mail/evolution/files/patch-addressbook_gui_component_addressbook-migrate.c +++ /dev/null @@ -1,547 +0,0 @@ ---- addressbook/gui/component/addressbook-migrate.c Mon Jan 26 23:55:13 2004 -+++ /home/kaeru/cvs/gnome/evolution/addressbook/gui/component/addressbook-migrate.c Fri Jan 30 03:07:34 2004 -@@ -33,76 +33,88 @@ - #include - #include - --static GtkWidget *window; --static GtkLabel *label; --static GtkProgressBar *progress; -+typedef struct { -+ /* this hash table maps old folder uris to new uids. It's -+ build in migrate_contact_folder and it's used in -+ migrate_completion_folders. */ -+ GHashTable *folder_uid_map; -+ -+ ESourceList *source_list; -+ -+ AddressbookComponent *component; -+ -+ GtkWidget *window; -+ GtkLabel *label; -+ GtkProgressBar *progress; -+} MigrationContext; - - static void --setup_progress_dialog (void) -+setup_progress_dialog (MigrationContext *context) - { - GtkWidget *vbox, *hbox, *w; -- -- window = gtk_window_new (GTK_WINDOW_TOPLEVEL); -- gtk_window_set_title ((GtkWindow *) window, _("Migrating...")); -- gtk_window_set_modal ((GtkWindow *) window, TRUE); -- gtk_container_set_border_width ((GtkContainer *) window, 6); -+ -+ context->window = gtk_window_new (GTK_WINDOW_TOPLEVEL); -+ gtk_window_set_title (GTK_WINDOW (context->window), _("Migrating...")); -+ gtk_window_set_modal (GTK_WINDOW (context->window), TRUE); -+ gtk_container_set_border_width (GTK_CONTAINER (context->window), 6); - - vbox = gtk_vbox_new (FALSE, 6); - gtk_widget_show (vbox); -- gtk_container_add ((GtkContainer *) window, vbox); -+ gtk_container_add (GTK_CONTAINER (context->window), vbox); - - w = gtk_label_new (_("The location and hierarchy of the Evolution contact " - "folders has changed since Evolution 1.x.\n\nPlease be " - "patient while Evolution migrates your folders...")); -- gtk_label_set_line_wrap ((GtkLabel *) w, TRUE); -+ gtk_label_set_line_wrap (GTK_LABEL (w), TRUE); - gtk_widget_show (w); -- gtk_box_pack_start_defaults ((GtkBox *) vbox, w); -+ gtk_box_pack_start_defaults (GTK_BOX (vbox), w); - - hbox = gtk_hbox_new (FALSE, 6); - gtk_widget_show (hbox); -- gtk_box_pack_start_defaults ((GtkBox *) vbox, hbox); -+ gtk_box_pack_start_defaults (GTK_BOX (vbox), hbox); - -- label = (GtkLabel *) gtk_label_new (""); -- gtk_widget_show ((GtkWidget *) label); -- gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) label); -+ context->label = GTK_LABEL (gtk_label_new ("")); -+ gtk_widget_show (GTK_WIDGET (context->label)); -+ gtk_box_pack_start_defaults (GTK_BOX (hbox), GTK_WIDGET (context->label)); - -- progress = (GtkProgressBar *) gtk_progress_bar_new (); -- gtk_widget_show ((GtkWidget *) progress); -- gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) progress); -+ context->progress = GTK_PROGRESS_BAR (gtk_progress_bar_new ()); -+ gtk_widget_show (GTK_WIDGET (context->progress)); -+ gtk_box_pack_start_defaults (GTK_BOX (hbox), GTK_WIDGET (context->progress)); - -- gtk_widget_show (window); -+ gtk_widget_show (context->window); -+ - } - - static void --dialog_close (void) -+dialog_close (MigrationContext *context) - { -- gtk_widget_destroy ((GtkWidget *) window); -+ gtk_widget_destroy (context->window); - } - - static void --dialog_set_folder_name (const char *folder_name) -+dialog_set_folder_name (MigrationContext *context, const char *folder_name) - { - char *text; - - text = g_strdup_printf (_("Migrating `%s':"), folder_name); -- gtk_label_set_text (label, text); -+ gtk_label_set_text (context->label, text); - g_free (text); - -- gtk_progress_bar_set_fraction (progress, 0.0); -+ gtk_progress_bar_set_fraction (context->progress, 0.0); - - while (gtk_events_pending ()) - gtk_main_iteration (); - } - - static void --dialog_set_progress (double percent) -+dialog_set_progress (MigrationContext *context, double percent) - { - char text[5]; - - snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f)); - -- gtk_progress_bar_set_fraction (progress, percent); -- gtk_progress_bar_set_text (progress, text); -+ gtk_progress_bar_set_fraction (context->progress, percent); -+ gtk_progress_bar_set_text (context->progress, text); - - while (gtk_events_pending ()) - gtk_main_iteration (); -@@ -170,7 +182,7 @@ - } - - static void --migrate_contacts (EBook *old_book, EBook *new_book) -+migrate_contacts (MigrationContext *context, EBook *old_book, EBook *new_book) - { - EBookQuery *query = e_book_query_any_field_contains (""); - GList *l, *contacts; -@@ -277,29 +289,25 @@ - - num_added ++; - -- dialog_set_progress ((double)num_added / num_contacts); -+ dialog_set_progress (context, (double)num_added / num_contacts); - } - } - - static void --migrate_contact_folder (char *old_path, ESourceGroup *dest_group, char *source_name) -+migrate_contact_folder_to_source (MigrationContext *context, char *old_path, ESource *new_source) - { - char *old_uri = g_strdup_printf ("file://%s", old_path); - GError *e = NULL; - - EBook *old_book = NULL, *new_book = NULL; - ESource *old_source; -- ESource *new_source; - ESourceGroup *group; - - group = e_source_group_new ("", old_uri); - old_source = e_source_new ("", ""); -- e_source_set_group (old_source, group); -- -- new_source = e_source_new (source_name, source_name); -- e_source_set_group (new_source, dest_group); -+ e_source_group_add_source (group, old_source, -1); - -- dialog_set_folder_name (source_name); -+ dialog_set_folder_name (context, e_source_peek_name (new_source)); - - old_book = e_book_new (); - if (!e_book_load_source (old_book, old_source, TRUE, &e)) { -@@ -313,12 +321,10 @@ - goto finish; - } - -- migrate_contacts (old_book, new_book); -+ migrate_contacts (context, old_book, new_book); - - finish: -- g_object_unref (new_source); - g_object_unref (old_source); -- g_object_unref (dest_group); - g_object_unref (group); - if (old_book) - g_object_unref (old_book); -@@ -327,30 +333,46 @@ - g_free (old_uri); - } - -+static void -+migrate_contact_folder (MigrationContext *context, char *old_path, ESourceGroup *dest_group, char *source_name) -+{ -+ ESource *new_source; -+ -+ new_source = e_source_new (source_name, source_name); -+ e_source_set_relative_uri (new_source, e_source_peek_uid (new_source)); -+ e_source_group_add_source (dest_group, new_source, -1); -+ -+ g_hash_table_insert (context->folder_uid_map, g_strdup (old_path), g_strdup (e_source_peek_uid (new_source))); -+ -+ migrate_contact_folder_to_source (context, old_path, new_source); -+ -+ g_object_unref (new_source); -+} -+ - #define LDAP_BASE_URI "ldap://" --#define PERSONAL_RELATIVE_URI "Personal" -+#define PERSONAL_RELATIVE_URI "system" - - static void --create_groups (AddressbookComponent *component, -- ESourceList *source_list, -+create_groups (MigrationContext *context, - ESourceGroup **on_this_computer, -- ESourceGroup **on_ldap_servers) -+ ESourceGroup **on_ldap_servers, -+ ESource **personal_source) - { - GSList *groups; - ESourceGroup *group; -- ESource *personal_source = NULL; -- char *base_uri, *base_uri_proto, *new_dir; -+ ESource *source = NULL; -+ char *base_uri, *base_uri_proto; - - *on_this_computer = NULL; - *on_ldap_servers = NULL; - -- base_uri = g_build_filename (addressbook_component_peek_base_directory (component), -- "/addressbook/local/OnThisComputer/", -+ base_uri = g_build_filename (addressbook_component_peek_base_directory (context->component), -+ "/addressbook/local/", - NULL); - - base_uri_proto = g_strconcat ("file://", base_uri, NULL); - -- groups = e_source_list_peek_groups (source_list); -+ groups = e_source_list_peek_groups (context->source_list); - if (groups) { - /* groups are already there, we need to search for things... */ - GSList *g; -@@ -359,10 +381,10 @@ - - group = E_SOURCE_GROUP (g->data); - -- if (!strcmp (base_uri_proto, e_source_group_peek_base_uri (group))) -- *on_this_computer = group; -- else if (!strcmp (LDAP_BASE_URI, e_source_group_peek_base_uri (group))) -- *on_ldap_servers = group; -+ if (!*on_this_computer && !strcmp (base_uri_proto, e_source_group_peek_base_uri (group))) -+ *on_this_computer = g_object_ref (group); -+ else if (!*on_ldap_servers && !strcmp (LDAP_BASE_URI, e_source_group_peek_base_uri (group))) -+ *on_ldap_servers = g_object_ref (group); - } - } - -@@ -374,7 +396,7 @@ - for (s = sources; s; s = s->next) { - ESource *source = E_SOURCE (s->data); - if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { -- personal_source = source; -+ *personal_source = g_object_ref (source); - break; - } - } -@@ -382,25 +404,23 @@ - else { - /* create the local source group */ - group = e_source_group_new (_("On This Computer"), base_uri_proto); -- e_source_list_add_group (source_list, group, -1); -+ e_source_list_add_group (context->source_list, group, -1); - - *on_this_computer = group; - } - -- if (!personal_source) { -+ if (!source) { - /* Create the default Person addressbook */ -- new_dir = g_build_filename (base_uri, "Personal/", NULL); -- if (!e_mkdir_hier (new_dir, 0700)) { -- personal_source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI); -- e_source_group_add_source (*on_this_computer, personal_source, -1); -- } -- g_free (new_dir); -+ source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI); -+ e_source_group_add_source (*on_this_computer, source, -1); -+ -+ *personal_source = source; - } - - if (!*on_ldap_servers) { - /* Create the LDAP source group */ - group = e_source_group_new (_("On LDAP Servers"), LDAP_BASE_URI); -- e_source_list_add_group (source_list, group, -1); -+ e_source_list_add_group (context->source_list, group, -1); - - *on_ldap_servers = group; - } -@@ -410,31 +430,33 @@ - } - - static gboolean --migrate_local_folders (AddressbookComponent *component, ESourceGroup *on_this_computer) -+migrate_local_folders (MigrationContext *context, ESourceGroup *on_this_computer, ESource *personal_source) - { - char *old_path = NULL; -- char *local_contact_folder = NULL; -- char *source_name = NULL; - GSList *dirs, *l; -+ char *local_contact_folder = NULL; - - old_path = g_strdup_printf ("%s/evolution/local", g_get_home_dir ()); - - dirs = e_folder_map_local_folders (old_path, "contacts"); - -- /* migrate the local addressbook first, to OnThisComputer/Personal */ -+ /* migrate the local addressbook first, to local/system */ - local_contact_folder = g_build_filename (g_get_home_dir (), "/evolution/local/Contacts", - NULL); -- source_name = _("Personal"); -- migrate_contact_folder (local_contact_folder, on_this_computer, source_name); -+ if (personal_source) -+ - - for (l = dirs; l; l = l->next) { -- /* skip the local contact folder, since we handle that -- specifically, mapping it to Personal */ -- if (!strcmp ((char*)l->data, local_contact_folder)) -+ char *source_name; -+ /* we handle the system folder differently */ -+ if (personal_source && !strcmp ((char*)l->data, local_contact_folder)) { -+ g_hash_table_insert (context->folder_uid_map, g_strdup (l->data), g_strdup (e_source_peek_uid (personal_source))); -+ migrate_contact_folder_to_source (context, local_contact_folder, personal_source); - continue; -+ } - - source_name = get_source_name (on_this_computer, (char*)l->data); -- migrate_contact_folder (l->data, on_this_computer, source_name); -+ migrate_contact_folder (context, l->data, on_this_computer, source_name); - g_free (source_name); - } - -@@ -494,7 +516,7 @@ - } - - static gboolean --migrate_ldap_servers (AddressbookComponent *component, ESourceGroup *on_ldap_servers) -+migrate_ldap_servers (MigrationContext *context, ESourceGroup *on_ldap_servers) - { - char *sources_xml = g_strdup_printf ("%s/evolution/addressbook-sources.xml", - g_get_home_dir ()); -@@ -526,7 +548,7 @@ - } - printf ("found %d contact servers to migrate\n", num_contactservers); - -- dialog_set_folder_name (_("LDAP Servers")); -+ dialog_set_folder_name (context, _("LDAP Servers")); - - servernum = 0; - for (child = root->children; child; child = child->next) { -@@ -581,7 +603,7 @@ - g_free (description); - - servernum++; -- dialog_set_progress ((double)servernum/num_contactservers); -+ dialog_set_progress (context, (double)servernum/num_contactservers); - } - } - -@@ -630,9 +652,9 @@ - } - - static gboolean --migrate_completion_folders (AddressbookComponent *component, ESourceList *source_list) -+migrate_completion_folders (MigrationContext *context) - { -- char *uris_xml = gconf_client_get_string (addressbook_component_peek_gconf_client (component), -+ char *uris_xml = gconf_client_get_string (addressbook_component_peek_gconf_client (context->component), - "/apps/evolution/addressbook/completion/uris", - NULL); - -@@ -646,7 +668,7 @@ - if (!doc) - return FALSE; - -- dialog_set_folder_name (_("Autocompletion Settings")); -+ dialog_set_folder_name (context, _("Autocompletion Settings")); - - root = xmlDocGetRootElement (doc); - if (root == NULL || strcmp (root->name, "EvolutionFolderList") != 0) { -@@ -657,13 +679,13 @@ - for (child = root->children; child; child = child->next) { - if (!strcmp (child->name, "folder")) { - char *physical_uri = e_xml_get_string_prop_by_name (child, "physical-uri"); -- char *uri; -- ESource *source; -+ ESource *source = NULL; - -- /* if the physical uri is -- file://... we need to convert the -- path to the new directory -- structure. -+ /* if the physical uri is file://... -+ we look it up in our folder_uid_map -+ hashtable. If it's a folder we -+ converted over, we should get back -+ a uid we can search for. - - if the physical_uri is anything - else, we strip off the args -@@ -671,45 +693,25 @@ - for the uri. */ - - if (!strncmp (physical_uri, "file://", 7)) { -- char *local_path = g_build_filename (g_get_home_dir (), -- "/evolution/local/", -- NULL); -- -- if (!strncmp (physical_uri + 7, local_path, strlen (local_path))) { -- char *path_extra; -- char *path; -- -- if (!strcmp (physical_uri + 7 + strlen (local_path), "Contacts")) -- /* special case the ~/evolution/local/Contacts folder */ -- path_extra = "Personal"; -- else -- path_extra = physical_uri + 7 + strlen (local_path); -- -- path = g_build_filename (g_get_home_dir (), -- "/.evolution/addressbook/local/OnThisComputer", -- path_extra, -- NULL); -- uri = g_strdup_printf ("file://%s", path); -- g_free (path); -- } -- else { -- /* if they somehow created a folder that lies -- outside the evolution folder tree, just pass -- the uri straight on */ -- uri = g_strdup (physical_uri); -- } -+ char *uid = g_hash_table_lookup (context->folder_uid_map, -+ physical_uri + 7); - -- g_free (local_path); -+ if (uid) -+ source = e_source_list_peek_source_by_uid (context->source_list, uid); - } - else { -+ char *uri; - char *semi = strchr (physical_uri, ';'); - if (semi) - uri = g_strndup (physical_uri, semi - physical_uri); - else - uri = g_strdup (physical_uri); -+ -+ source = get_source_by_uri (context->source_list, uri); -+ -+ g_free (uri); - } - -- source = get_source_by_uri (source_list, uri); - if (source) { - e_source_set_property (source, "completion", "true"); - } -@@ -719,7 +721,6 @@ - } - - g_free (physical_uri); -- g_free (uri); - } - } - -@@ -732,19 +733,47 @@ - return TRUE; - } - -+static MigrationContext* -+migration_context_new (AddressbookComponent *component) -+{ -+ MigrationContext *context = g_new (MigrationContext, 1); -+ -+ /* set up the mapping from old uris to new uids */ -+ context->folder_uid_map = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, (GDestroyNotify)g_free); -+ -+ context->source_list = addressbook_component_peek_source_list (component); -+ -+ /* initialize our dialog */ -+ setup_progress_dialog (context); -+ -+ context->component = component; -+ -+ return context; -+} -+ -+static void -+migration_context_free (MigrationContext *context) -+{ -+ e_source_list_sync (context->source_list, NULL); -+ -+ g_hash_table_destroy (context->folder_uid_map); -+ g_free (context); -+} -+ - int - addressbook_migrate (AddressbookComponent *component, int major, int minor, int revision) - { -- ESourceList *source_list = addressbook_component_peek_source_list (component); - ESourceGroup *on_this_computer; - ESourceGroup *on_ldap_servers; -+ ESource *personal_source; -+ MigrationContext *context = migration_context_new (component); - - printf ("addressbook_migrate (%d.%d.%d)\n", major, minor, revision); - - /* we call this unconditionally now - create_groups either - creates the groups/sources or it finds the necessary - groups/sources. */ -- create_groups (component, source_list, &on_this_computer, &on_ldap_servers); -+ create_groups (context, &on_this_computer, &on_ldap_servers, &personal_source); - - if (major <= 1) { - -@@ -756,19 +785,24 @@ - /* we're 0.x */ - (major == 0)) { - -- setup_progress_dialog (); -- if (on_this_computer) -- migrate_local_folders (component, on_this_computer); -- if (on_ldap_servers) -- migrate_ldap_servers (component, on_ldap_servers); -+ if (on_this_computer) { -+ migrate_local_folders (context, on_this_computer, personal_source); -+ g_object_unref (on_this_computer); -+ } -+ if (on_ldap_servers) { -+ migrate_ldap_servers (context, on_ldap_servers); -+ g_object_unref (on_ldap_servers); -+ } -+ if (personal_source) -+ g_object_unref (personal_source); - -- migrate_completion_folders (component, source_list); -+ migrate_completion_folders (context); - -- dialog_close (); -+ dialog_close (context); - } - } - -- e_source_list_sync (source_list, NULL); -+ migration_context_free (context); - - return TRUE; - } diff --git a/mail/evolution/files/patch-camel_camel-vee-folder.c b/mail/evolution/files/patch-camel_camel-vee-folder.c deleted file mode 100644 index 019d60919..000000000 --- a/mail/evolution/files/patch-camel_camel-vee-folder.c +++ /dev/null @@ -1,20 +0,0 @@ ---- camel/camel-vee-folder.c.orig Mon Jun 23 13:59:58 2003 -+++ camel/camel-vee-folder.c Tue Oct 21 20:04:10 2003 -@@ -969,7 +969,7 @@ - } - if ((vf->flags & CAMEL_STORE_FOLDER_PRIVATE) == 0) { - if (still) { -- if (g_hash_table_lookup_extended(unmatched_uids, uid, (void **)&oldkey, (void **)&n)) { -+ if (g_hash_table_lookup_extended(unmatched_uids, uid, (void **)&oldkey, (void **)&n) && n > 0) { - if (n == 1) { - g_hash_table_remove(unmatched_uids, oldkey); - if (vee_folder_add_uid(folder_unmatched, source, oldkey+8, hash)) -@@ -1290,7 +1290,7 @@ - camel_folder_change_info_add_uid(folder_unmatched->changes, oldkey); - } - } else { -- if (g_hash_table_lookup_extended(unmatched_uids, vuid, (void **)&oldkey, (void **)&n)) { -+ if (g_hash_table_lookup_extended(unmatched_uids, vuid, (void **)&oldkey, (void **)&n) && n > 0) { - g_hash_table_remove(unmatched_uids, oldkey); - g_free(oldkey); - } diff --git a/mail/evolution/files/patch-ltmain.sh b/mail/evolution/files/patch-ltmain.sh index 58384ee38..96b9d2d83 100644 --- a/mail/evolution/files/patch-ltmain.sh +++ b/mail/evolution/files/patch-ltmain.sh @@ -1,15 +1,15 @@ ---- ltmain.sh.orig Sat Dec 6 14:47:45 2003 -+++ ltmain.sh Tue Dec 9 14:09:01 2003 -@@ -1280,7 +1280,7 @@ +--- ltmain.sh.orig Sat Feb 8 09:47:44 2003 ++++ ltmain.sh Mon Feb 9 20:07:47 2004 +@@ -1075,7 +1075,7 @@ esac - elif test "X$arg" = "X-lc_r"; then - case $host in + elif test "X$arg" = "X-lc_r"; then + case $host in - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1290,8 +1290,16 @@ + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -1085,8 +1085,16 @@ continue ;; @@ -26,17 +26,17 @@ continue ;; -@@ -3000,6 +3008,9 @@ - # problems, so we reset it completely - verstring= +@@ -2503,6 +2511,9 @@ + *-*-openbsd* | *-*-freebsd*) + # Do not include libc due to us having libc/libc_r. ;; + *-*-freebsd*) + # FreeBSD doesn't need this... + ;; *) - verstring="0.0" - ;; -@@ -5428,10 +5439,12 @@ + # Add libc to deplibs on all other systems if necessary. + if test $build_libtool_need_lc = "yes"; then +@@ -4330,10 +4341,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist index 5eb80dcec..bb71ff51b 100644 --- a/mail/evolution/pkg-plist +++ b/mail/evolution/pkg-plist @@ -22,6 +22,7 @@ etc/gconf/gconf.xml.defaults/apps/evolution/mail/filters/%gconf.xml etc/gconf/gconf.xml.defaults/apps/evolution/mail/format/%gconf.xml etc/gconf/gconf.xml.defaults/apps/evolution/mail/junk/%gconf.xml etc/gconf/gconf.xml.defaults/apps/evolution/mail/junk/sa/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/evolution/mail/message_window/%gconf.xml etc/gconf/gconf.xml.defaults/apps/evolution/mail/notify/%gconf.xml etc/gconf/gconf.xml.defaults/apps/evolution/mail/prompts/%gconf.xml etc/gconf/gconf.xml.defaults/apps/evolution/mail/trash/%gconf.xml @@ -54,6 +55,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/filters/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/format/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/junk/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/junk/sa/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/message_window/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/notify/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/prompts/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/trash/%gconf.xml @@ -244,15 +246,13 @@ include/evolution-%%VERSION%%/importer/evolution-importer-listener.h include/evolution-%%VERSION%%/importer/evolution-importer.h include/evolution-%%VERSION%%/importer/evolution-intelligent-importer.h include/evolution-%%VERSION%%/shell/Evolution.h -include/evolution-%%VERSION%%/shell/e-activity-handler.h include/evolution-%%VERSION%%/shell/e-icon-factory.h include/evolution-%%VERSION%%/shell/e-shell-corba-icon-utils.h include/evolution-%%VERSION%%/shell/e-shell-utils.h -include/evolution-%%VERSION%%/shell/e-task-bar.h -include/evolution-%%VERSION%%/shell/e-task-widget.h include/evolution-%%VERSION%%/shell/evolution-config-control.h include/evolution-%%VERSION%%/shell/evolution-shell-component-utils.h include/evolution-%%VERSION%%/shell/evolution-wizard.h +include/evolution-%%VERSION%%/widgets/e-activity-handler.h include/evolution-%%VERSION%%/widgets/e-calendar-item.h include/evolution-%%VERSION%%/widgets/e-calendar.h include/evolution-%%VERSION%%/widgets/e-cell-date-edit.h @@ -266,11 +266,14 @@ include/evolution-%%VERSION%%/widgets/e-config-page.h include/evolution-%%VERSION%%/widgets/e-dateedit.h include/evolution-%%VERSION%%/widgets/e-dropdown-button.h include/evolution-%%VERSION%%/widgets/e-expander.h +include/evolution-%%VERSION%%/widgets/e-image-chooser.h include/evolution-%%VERSION%%/widgets/e-map.h include/evolution-%%VERSION%%/widgets/e-multi-config-dialog.h include/evolution-%%VERSION%%/widgets/e-search-bar.h include/evolution-%%VERSION%%/widgets/e-source-option-menu.h include/evolution-%%VERSION%%/widgets/e-source-selector.h +include/evolution-%%VERSION%%/widgets/e-task-bar.h +include/evolution-%%VERSION%%/widgets/e-task-widget.h include/evolution-%%VERSION%%/widgets/e-title-bar.h include/evolution-%%VERSION%%/widgets/e-url-entry.h lib/evolution/%%VERSION%%/camel-providers/libcamelgroupwise.so @@ -396,6 +399,7 @@ share/gnome/evolution/%%VERSION%%/glade/task-page.glade share/gnome/evolution/%%VERSION%%/glade/thankyou.png share/gnome/evolution/%%VERSION%%/glade/timezone-48.png share/gnome/evolution/%%VERSION%%/glade/url-editor-dialog.glade +share/gnome/evolution/%%VERSION%%/help/quickref/C/quickref.pdf share/gnome/evolution/%%VERSION%%/images/16_copy.png share/gnome/evolution/%%VERSION%%/images/16_customize.png share/gnome/evolution/%%VERSION%%/images/16_cut.png @@ -796,6 +800,9 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo @dirrm share/gnome/evolution/%%VERSION%%/images/conduits @dirrm share/gnome/evolution/%%VERSION%%/images/buttons @dirrm share/gnome/evolution/%%VERSION%%/images +@dirrm share/gnome/evolution/%%VERSION%%/help/quickref/C +@dirrm share/gnome/evolution/%%VERSION%%/help/quickref +@dirrm share/gnome/evolution/%%VERSION%%/help @dirrm share/gnome/evolution/%%VERSION%%/glade @dirrm share/gnome/evolution/%%VERSION%%/etspec @dirrm share/gnome/evolution/%%VERSION%%/ecps @@ -829,6 +836,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/trash @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/prompts @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/notify +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/message_window @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/junk/sa @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/junk @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/evolution/mail/format @@ -861,6 +869,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/trash @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/prompts @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/notify +@dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/message_window @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/junk/sa @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/junk @dirrm etc/gconf/gconf.xml.defaults/apps/evolution/mail/format -- cgit v1.2.3