[evolution-data-server] Forgot to change property name for folder creation.



commit d01e4a90b46d14649099b59c3676f9798b0512aa
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat May 7 12:10:53 2011 -0400

    Forgot to change property name for folder creation.

 camel/camel-vee-folder.c                     |    2 +-
 camel/camel-vee-store.c                      |    3 ++-
 camel/camel-vtrash-folder.c                  |    2 +-
 camel/providers/imap/camel-imap-folder.c     |    2 +-
 camel/providers/imapx/camel-imapx-folder.c   |    2 +-
 camel/providers/local/camel-maildir-folder.c |    2 +-
 camel/providers/local/camel-mbox-folder.c    |    2 +-
 camel/providers/local/camel-mh-folder.c      |    2 +-
 camel/providers/local/camel-spool-folder.c   |    2 +-
 camel/providers/nntp/camel-nntp-folder.c     |    2 +-
 camel/providers/pop3/camel-pop3-folder.c     |    2 +-
 11 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index c3f3ad4..b82a4f3 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -2041,7 +2041,7 @@ camel_vee_folder_new (CamelStore *parent_store, const gchar *full, guint32 flags
 			name++;
 		vf = g_object_new (
 			CAMEL_TYPE_VEE_FOLDER,
-			"name", name, "full-name", full,
+			"display-name", name, "full-name", full,
 			"parent-store", parent_store, NULL);
 		camel_vee_folder_construct (vf, flags);
 	}
diff --git a/camel/camel-vee-store.c b/camel/camel-vee-store.c
index fadfae0..8da872c 100644
--- a/camel/camel-vee-store.c
+++ b/camel/camel-vee-store.c
@@ -122,7 +122,8 @@ vee_store_constructed (GObject *object)
 	vee_store->folder_unmatched = g_object_new (
 		CAMEL_TYPE_VEE_FOLDER,
 		"full-name", CAMEL_UNMATCHED_NAME,
-		"name", _("Unmatched"), "parent-store", vee_store, NULL);
+		"display-name", _("Unmatched"),
+		"parent-store", vee_store, NULL);
 	camel_vee_folder_construct (
 		vee_store->folder_unmatched, CAMEL_STORE_FOLDER_PRIVATE);
 	camel_db_create_vfolder (
diff --git a/camel/camel-vtrash-folder.c b/camel/camel-vtrash-folder.c
index efdf45b..5ff3fa0 100644
--- a/camel/camel-vtrash-folder.c
+++ b/camel/camel-vtrash-folder.c
@@ -222,7 +222,7 @@ camel_vtrash_folder_new (CamelStore *parent_store, camel_vtrash_folder_t type)
 	vtrash = g_object_new (
 		CAMEL_TYPE_VTRASH_FOLDER,
 		"full-name", vdata[type].full_name,
-		"name", gettext (vdata[type].name),
+		"display-name", gettext (vdata[type].name),
 		"parent-store", parent_store, NULL);
 
 	camel_vee_folder_construct (
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 8d2499f..0aea814 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -379,7 +379,7 @@ camel_imap_folder_new (CamelStore *parent, const gchar *folder_name,
 	folder = g_object_new (
 		CAMEL_TYPE_IMAP_FOLDER,
 		"full-name", folder_name,
-		"name", short_name,
+		"display-name", short_name,
 		"parent-store", parent, NULL);
 
 	summary_file = g_strdup_printf ("%s/summary", folder_dir);
diff --git a/camel/providers/imapx/camel-imapx-folder.c b/camel/providers/imapx/camel-imapx-folder.c
index 02457cb..65e9e22 100644
--- a/camel/providers/imapx/camel-imapx-folder.c
+++ b/camel/providers/imapx/camel-imapx-folder.c
@@ -59,7 +59,7 @@ camel_imapx_folder_new (CamelStore *store, const gchar *folder_dir, const gchar
 
 	folder = g_object_new (
 		CAMEL_TYPE_IMAPX_FOLDER,
-		"name", short_name,
+		"display-name", short_name,
 		"full_name", folder_name,
 		"parent-store", store, NULL);
 	ifolder = (CamelIMAPXFolder *) folder;
diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c
index 488e4d0..043d3a1 100644
--- a/camel/providers/local/camel-maildir-folder.c
+++ b/camel/providers/local/camel-maildir-folder.c
@@ -437,7 +437,7 @@ camel_maildir_folder_new (CamelStore *parent_store,
 
 	folder = g_object_new (
 		CAMEL_TYPE_MAILDIR_FOLDER,
-		"name", basename, "full-name", full_name,
+		"display-name", basename, "full-name", full_name,
 		"parent-store", parent_store, NULL);
 
 	if (parent_store->flags & CAMEL_STORE_FILTER_INBOX
diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c
index 8174904..571b12c 100644
--- a/camel/providers/local/camel-mbox-folder.c
+++ b/camel/providers/local/camel-mbox-folder.c
@@ -499,7 +499,7 @@ camel_mbox_folder_new (CamelStore *parent_store,
 
 	folder = g_object_new (
 		CAMEL_TYPE_MBOX_FOLDER,
-		"name", basename, "full-name", full_name,
+		"display-name", basename, "full-name", full_name,
 		"parent-store", parent_store, NULL);
 	folder = (CamelFolder *)camel_local_folder_construct (
 		(CamelLocalFolder *)folder, flags, cancellable, error);
diff --git a/camel/providers/local/camel-mh-folder.c b/camel/providers/local/camel-mh-folder.c
index 59147ef..3d422e7 100644
--- a/camel/providers/local/camel-mh-folder.c
+++ b/camel/providers/local/camel-mh-folder.c
@@ -242,7 +242,7 @@ camel_mh_folder_new (CamelStore *parent_store,
 
 	folder = g_object_new (
 		CAMEL_TYPE_MH_FOLDER,
-		"name", basename, "full-name", full_name,
+		"display-name", basename, "full-name", full_name,
 		"parent-store", parent_store, NULL);
 	folder = (CamelFolder *) camel_local_folder_construct (
 		CAMEL_LOCAL_FOLDER (folder), flags, cancellable, error);
diff --git a/camel/providers/local/camel-spool-folder.c b/camel/providers/local/camel-spool-folder.c
index 48e1a48..004e42f 100644
--- a/camel/providers/local/camel-spool-folder.c
+++ b/camel/providers/local/camel-spool-folder.c
@@ -147,7 +147,7 @@ camel_spool_folder_new (CamelStore *parent_store,
 
 	folder = g_object_new (
 		CAMEL_TYPE_SPOOL_FOLDER,
-		"name", basename, "full-name", full_name,
+		"display-name", basename, "full-name", full_name,
 		"parent-store", parent_store, NULL);
 
 	if (parent_store->flags & CAMEL_STORE_FILTER_INBOX
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index 07c44f3..c4aa6ab 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -665,7 +665,7 @@ camel_nntp_folder_new (CamelStore *parent,
 
 	folder = g_object_new (
 		CAMEL_TYPE_NNTP_FOLDER,
-		"name", folder_name,
+		"display-name", folder_name,
 		"full-name", folder_name,
 		"parent-store", parent, NULL);
 	nntp_folder = (CamelNNTPFolder *)folder;
diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index 991eff8..ddae12a 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -656,7 +656,7 @@ camel_pop3_folder_new (CamelStore *parent,
 
 	folder = g_object_new (
 		CAMEL_TYPE_POP3_FOLDER,
-		"full-name", "inbox", "name", "inbox",
+		"full-name", "inbox", "display-name", "inbox",
 		"parent-store", parent, NULL);
 
 	/* mt-ok, since we dont have the folder-lock for new() */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]