aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog5
-rw-r--r--camel/camel-store.c12
-rw-r--r--camel/camel-store.h1
-rw-r--r--camel/camel-vee-folder.c2
4 files changed, 18 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 807feae583..9fea232e7b 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,7 +1,12 @@
2001-10-21 <NotZed@Ximian.com>
+ * camel-store.c (CS_CLASS): Dont do the macro stuff - basically so
+ you can actually debug calls.
+ (camel_store_uri_cmp): New function to compare store objects.
+
* camel-vee-folder.c (vee_folder_add_info): oops, dont free the
vuid, since its alloca'd now.
+ (folder_changed_change): Kill a compile warning.
2001-10-20 <NotZed@Ximian.com>
diff --git a/camel/camel-store.c b/camel/camel-store.c
index df2f5bebb2..0f104b057b 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -43,7 +43,7 @@
static CamelServiceClass *parent_class = NULL;
/* Returns the class for a CamelStore */
-#define CS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
+#define CS_CLASS(so) ((CamelStoreClass *)((CamelObject *)(so))->classfuncs)
static CamelFolder *get_folder (CamelStore *store, const char *folder_name,
guint32 flags, CamelException *ex);
@@ -1028,3 +1028,13 @@ camel_mkdir_hier (const char *path, mode_t mode)
g_free (copy);
return 0;
}
+
+
+/* Return true if these uri's refer to the same object */
+gboolean
+camel_store_uri_cmp(CamelStore *store, const char *uria, const char *urib)
+{
+ g_assert(CAMEL_IS_STORE(store));
+
+ return CS_CLASS(store)->compare_folder_name(uria, urib);
+}
diff --git a/camel/camel-store.h b/camel/camel-store.h
index 2cb1e4c7fb..a95f1a025a 100644
--- a/camel/camel-store.h
+++ b/camel/camel-store.h
@@ -196,6 +196,7 @@ void camel_store_unsubscribe_folder (CamelStore *store,
const char *folder_name,
CamelException *ex);
+gboolean camel_store_uri_cmp (CamelStore *store, const char *uria, const char *urib);
/* utility needed by some stores */
int camel_mkdir_hier (const char *path, mode_t mode);
diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index cb720debee..37bca4767b 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -1307,7 +1307,7 @@ folder_changed_change(CamelSession *session, CamelSessionThreadMsg *msg)
dd(printf(" Vfolder %supdate\nuids match:", (vf->flags & CAMEL_STORE_VEE_FOLDER_AUTO)?"auto-":""));
matches_hash = g_hash_table_new(g_str_hash, g_str_equal);
for (i=0;i<matches->len;i++) {
- dd(printf(" %s", matches->pdata[i]));
+ dd(printf(" %s", (char *)matches->pdata[i]));
g_hash_table_insert(matches_hash, matches->pdata[i], matches->pdata[i]);
}
dd(printf("\n"));