[evolution-kolab/ek-wip-porting] CamelIMAPXExtdServer: (API) object types cleanup
- From: Christian Hilberg <chilberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab/ek-wip-porting] CamelIMAPXExtdServer: (API) object types cleanup
- Date: Fri, 13 Jan 2012 19:02:36 +0000 (UTC)
commit 410bc370d19559eeec193b77266c7fc6f881c3a7
Author: Christian Hilberg <hilberg kernelconcepts de>
Date: Fri Jan 13 19:41:29 2012 +0100
CamelIMAPXExtdServer: (API) object types cleanup
* use the most general Camel* types in API and
class functions
* this is to allow CamelIMAPXExtdServer to be
used as CamelIMAPXServer
* assert the CamelIMAPXExtdServer object type
in the class functions
.../providers/imapx/camel-imapx-extd-server.c | 236 ++++++++------------
.../providers/imapx/camel-imapx-extd-server.h | 101 ++++-----
2 files changed, 138 insertions(+), 199 deletions(-)
---
diff --git a/src/camel/providers/imapx/camel-imapx-extd-server.c b/src/camel/providers/imapx/camel-imapx-extd-server.c
index abb3d5f..69dab25 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-server.c
+++ b/src/camel/providers/imapx/camel-imapx-extd-server.c
@@ -95,31 +95,28 @@ camel_imapx_extd_server_finalize (GObject *object)
/* class functions */
static gboolean
-imapx_extd_server_connect (CamelIMAPXExtdServer *self,
+imapx_extd_server_connect (CamelIMAPXServer *self,
GCancellable *cancellable,
GError **err)
{
- CamelIMAPXServer *is = NULL;
gboolean ok = FALSE;
- g_assert (CAMEL_IS_IMAPX_EXTD_STORE (self));
+ g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (self));
/* cancellable may be NULL */
g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
- is = CAMEL_IMAPX_SERVER (self);
- ok = camel_imapx_server_connect (is,
+ ok = camel_imapx_server_connect (self,
cancellable,
err);
return ok;
}
static CamelAuthenticationResult
-imapx_extd_server_authenticate (CamelIMAPXExtdServer *self,
+imapx_extd_server_authenticate (CamelIMAPXServer *self,
const gchar *mechanism,
GCancellable *cancellable,
GError **err)
{
- CamelIMAPXServer *is = NULL;
CamelAuthenticationResult result = CAMEL_AUTHENTICATION_ERROR;
g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (self));
@@ -127,8 +124,7 @@ imapx_extd_server_authenticate (CamelIMAPXExtdServer *self,
/* cancellable may be NULL */
g_return_val_if_fail (err == NULL || *err == NULL, CAMEL_AUTHENTICATION_ERROR);
- is = CAMEL_IMAPX_SERVER (self);
- result = camel_imapx_server_authenticate (is,
+ result = camel_imapx_server_authenticate (self,
mechanism,
cancellable,
err);
@@ -136,14 +132,13 @@ imapx_extd_server_authenticate (CamelIMAPXExtdServer *self,
}
static GPtrArray*
-imapx_extd_server_list (CamelIMAPXExtdServer *self,
+imapx_extd_server_list (CamelIMAPXServer *self,
const gchar *top,
guint32 flags,
const gchar *ext,
GCancellable *cancellable,
GError **err)
{
- CamelIMAPXServer *is = NULL;
GPtrArray *list = NULL;
g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (self));
@@ -152,8 +147,7 @@ imapx_extd_server_list (CamelIMAPXExtdServer *self,
/* cancellable may be NULL */
g_return_val_if_fail (err == NULL || *err == NULL, NULL);
- is = CAMEL_IMAPX_SERVER (self);
- list = camel_imapx_server_list (is,
+ list = camel_imapx_server_list (self,
top,
flags,
ext,
@@ -163,127 +157,102 @@ imapx_extd_server_list (CamelIMAPXExtdServer *self,
}
static gboolean
-imapx_extd_server_refresh_info (CamelIMAPXExtdServer *self,
- CamelIMAPXExtdFolder *folder,
+imapx_extd_server_refresh_info (CamelIMAPXServer *self,
+ CamelFolder *folder,
GCancellable *cancellable,
GError **err)
{
- CamelIMAPXServer *is = NULL;
- CamelFolder *cfolder = NULL;
gboolean ok = FALSE;
g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (self));
- g_assert (CAMEL_IS_IMAPX_EXTD_FOLDER (folder));
+ g_assert (CAMEL_IS__FOLDER (folder));
/* cancellable may be NULL */
g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
- is = CAMEL_IMAPX_SERVER (self);
- cfolder = CAMEL_FOLDER (folder);
-
- ok = camel_imapx_server_refresh_info (is,
- cfolder,
+ ok = camel_imapx_server_refresh_info (self,
+ folder,
cancellable,
err);
return ok;
}
static gboolean
-imapx_extd_server_sync_changes (CamelIMAPXExtdServer *self,
- CamelIMAPXExtdFolder *folder,
+imapx_extd_server_sync_changes (CamelIMAPXServer *self,
+ CamelFolder *folder,
GCancellable *cancellable,
GError **err)
{
- CamelIMAPXServer *is = NULL;
- CamelFolder *cfolder = NULL;
gboolean ok = FALSE;
g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (self));
- g_assert (CAMEL_IS_IMAPX_EXTD_FOLDER (folder));
+ g_assert (CAMEL_IS_FOLDER (folder));
/* cancellable may be NULL */
g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
- is = CAMEL_IMAPX_SERVER (self);
- cfolder = CAMEL_FOLDER (folder);
-
- ok = camel_imapx_server_sync_changes (is,
- cfolder,
+ ok = camel_imapx_server_sync_changes (self,
+ folder,
cancellable,
err);
return ok;
}
static gboolean
-imapx_extd_server_expunge (CamelIMAPXExtdServer *self,
- CamelIMAPXExtdFolder *folder,
+imapx_extd_server_expunge (CamelIMAPXServer *self,
+ CamelFolder *folder,
GCancellable *cancellable,
GError **err)
{
- CamelIMAPXServer *is = NULL;
- CamelFolder *cfolder = NULL;
gboolean ok = FALSE;
g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (self));
- g_assert (CAMEL_IS_IMAPX_EXTD_FOLDER (folder));
+ g_assert (CAMEL_IS_FOLDER (folder));
/* cancellable may be NULL */
g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
- is = CAMEL_IMAPX_SERVER (self);
- cfolder = CAMEL_FOLDER (folder);
-
- ok = camel_imapx_server_expunge (is,
- cfolder,
+ ok = camel_imapx_server_expunge (self,
+ folder,
cancellable,
err);
return ok;
}
static gboolean
-imapx_extd_server_noop (CamelIMAPXExtdServer *self,
- CamelIMAPXExtdFolder *folder,
+imapx_extd_server_noop (CamelIMAPXServer *self,
+ CamelFolder *folder,
GCancellable *cancellable,
GError **err)
{
- CamelIMAPXServer *is = NULL;
- CamelFolder *cfolder = NULL;
gboolean ok = FALSE;
g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (self));
- g_assert (CAMEL_IS_IMAPX_EXTD_FOLDER (folder));
+ g_assert (CAMEL_IS_FOLDER (folder));
/* cancellable may be NULL */
g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
- is = CAMEL_IMAPX_SERVER (self);
- cfolder = CAMEL_FOLDER (folder);
-
- ok = camel_imapx_server_noop (is,
- cfolder,
+ ok = camel_imapx_server_noop (self,
+ folder,
cancellable,
err);
return ok;
}
static CamelStream*
-imapx_extd_server_get_message (CamelIMAPXExtdServer *self,
- CamelIMAPXExtdFolder *folder,
+imapx_extd_server_get_message (CamelIMAPXServer *self,
+ CamelFolder *folder,
const gchar *uid,
GCancellable *cancellable,
GError **err)
{
- CamelIMAPXServer *is = NULL;
- CamelFolder *cfolder = NULL;
CamelStream *stream = NULL;
g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (self));
- g_assert (CAMEL_IS_IMAPX_EXTD_FOLDER (folder));
+ g_assert (CAMEL_IS_FOLDER (folder));
g_assert (uid != NULL); /* FIXME correct? */
/* cancellable may be NULL */
g_return_val_if_fail (err == NULL || *err == NULL, NULL);
- is = CAMEL_IMAPX_SERVER (self);
- cfolder = CAMEL_FOLDER (folder);
-
- stream = camel_imapx_server_get_message (is,
- cfolder,
+ stream = camel_imapx_server_get_message (self,
+ folder,
uid,
cancellable,
err);
@@ -292,33 +261,26 @@ imapx_extd_server_get_message (CamelIMAPXExtdServer *self,
}
static gboolean
-imapx_extd_server_copy_message (CamelIMAPXExtdServer *self,
- CamelIMAPXExtdFolder *source,
- CamelIMAPXExtdFolder *dest,
+imapx_extd_server_copy_message (CamelIMAPXServer *self,
+ CamelFolder *source,
+ CamelFolder *dest,
GPtrArray *uids,
gboolean delete_originals,
GCancellable *cancellable,
GError **err)
{
- CamelIMAPXServer *is = NULL;
- CamelFolder *csource = NULL;
- CamelFolder *cdest = NULL;
gboolean ok = FALSE;
g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (self));
- g_assert (CAMEL_IS_IMAPX_EXTD_FOLDER (source));
- g_assert (CAMEL_IS_IMAPX_EXTD_FOLDER (dest));
+ g_assert (CAMEL_IS_FOLDER (source));
+ g_assert (CAMEL_IS_FOLDER (dest));
g_assert (uids != NULL); /* FIXME correct? */
/* cancellable may be NULL */
g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
- is = CAMEL_IMAPX_SERVER (self);
- csource = CAMEL_FOLDER (source);
- cdest = CAMEL_FOLDER (dest);
-
- ok = camel_imapx_server_copy_message (is,
- csource,
- cdest,
+ ok = camel_imapx_server_copy_message (self,
+ source,
+ dest,
uids,
delete_originals,
cancellable,
@@ -327,29 +289,24 @@ imapx_extd_server_copy_message (CamelIMAPXExtdServer *self,
}
static gboolean
-imapx_extd_server_append_message (CamelIMAPXExtdServer *self,
- CamelIMAPXExtdFolder *folder,
+imapx_extd_server_append_message (CamelIMAPXServer *self,
+ CamelFolder *folder,
CamelMimeMessage *message,
const CamelMessageInfo *mi,
GCancellable *cancellable,
GError **err)
{
- CamelIMAPXServer *is = NULL;
- CamelFolder *cfolder = NULL;
gboolean ok = FALSE;
g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (self));
- g_assert (CAMEL_IS_IMAPX_EXTD_FOLDER (folder));
+ g_assert (CAMEL_IS_FOLDER (folder));
g_assert (CAMEL_IS_MIME_MESSAGE (message));
g_assert (mi != NULL); /* FIXME correct? */
/* cancellable may be NULL */
g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
- is = CAMEL_IMAPX_SERVER (self);
- cfolder = CAMEL_FOLDER (folder);
-
- ok = camel_imapx_server_append_message (is,
- cfolder,
+ ok = camel_imapx_server_append_message (self,
+ folder,
message,
mi,
cancellable,
@@ -358,27 +315,22 @@ imapx_extd_server_append_message (CamelIMAPXExtdServer *self,
}
static gboolean
-imapx_extd_server_sync_message (CamelIMAPXExtdServer *self,
- CamelIMAPXExtdFolder *folder,
+imapx_extd_server_sync_message (CamelIMAPXServer *self,
+ CamelFolder *folder,
const gchar *uid,
GCancellable *cancellable,
GError **err)
{
- CamelIMAPXServer *is = NULL;
- CamelFolder *cfolder = NULL;
gboolean ok = FALSE;
g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (self));
- g_assert (CAMEL_IS_IMAPX_EXTD_FOLDER (folder));
+ g_assert (CAMEL_IS_FOLDER (folder));
g_assert (uid != NULL); /* FIXME correct? */
/* cancellable may be NULL */
g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
- is = CAMEL_IMAPX_SERVER (self);
- cfolder = CAMEL_FOLDER (folder);
-
- ok = camel_imapx_server_sync_message (is,
- cfolder,
+ ok = camel_imapx_server_sync_message (self,
+ folder,
uid,
cancellable,
err);
@@ -386,13 +338,12 @@ imapx_extd_server_sync_message (CamelIMAPXExtdServer *self,
}
static gboolean
-imapx_extd_server_manage_subscription (CamelIMAPXExtdServer *self,
+imapx_extd_server_manage_subscription (CamelIMAPXServer *self,
const gchar *foldername,
gboolean subscribe,
GCancellable *cancellable,
GError **err)
{
- CamelIMAPXServer *is = NULL;
gboolean ok = FALSE;
g_assert (CAMEL_IS_IMAPX_EXTD_FOLDER (self));
@@ -400,9 +351,7 @@ imapx_extd_server_manage_subscription (CamelIMAPXExtdServer *self,
/* cancellable may be NULL */
g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
- is = CAMEL_IMAPX_SERVER (self);
-
- ok = camel_imapx_server_manage_subscription (is,
+ ok = camel_imapx_server_manage_subscription (self,
foldername,
subscribe,
cancellable,
@@ -411,12 +360,11 @@ imapx_extd_server_manage_subscription (CamelIMAPXExtdServer *self,
}
static gboolean
-imapx_extd_server_create_folder (CamelIMAPXExtdServer *self,
+imapx_extd_server_create_folder (CamelIMAPXServer *self,
const gchar *foldername,
GCancellable *cancellable,
GError **err)
{
- CamelIMAPXServer *is = NULL;
gboolean ok = FALSE;
g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (self));
@@ -424,9 +372,7 @@ imapx_extd_server_create_folder (CamelIMAPXExtdServer *self,
/* cancellable may be NULL */
g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
- is = CAMEL_IMAPX_SERVER (self);
-
- ok = camel_imapx_server_create_folder (is,
+ ok = camel_imapx_server_create_folder (self,
foldername,
cancellable,
err);
@@ -434,12 +380,11 @@ imapx_extd_server_create_folder (CamelIMAPXExtdServer *self,
}
static gboolean
-imapx_extd_server_delete_folder (CamelIMAPXExtdServer *self,
+imapx_extd_server_delete_folder (CamelIMAPXServer *self,
const gchar *foldername,
GCancellable *cancellable,
GError **err)
{
- CamelIMAPXServer *is = NULL;
gboolean ok = FALSE;
g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (self));
@@ -447,9 +392,7 @@ imapx_extd_server_delete_folder (CamelIMAPXExtdServer *self,
/* cancellable may be NULL */
g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
- is = CAMEL_IMAPX_SERVER (self);
-
- ok = camel_imapx_server_delete_folder (is,
+ ok = camel_imapx_server_delete_folder (self,
foldername,
cancellable,
err);
@@ -457,13 +400,12 @@ imapx_extd_server_delete_folder (CamelIMAPXExtdServer *self,
}
static gboolean
-imapx_extd_server_rename_folder (CamelIMAPXExtdServer *self,
+imapx_extd_server_rename_folder (CamelIMAPXServer *self,
const gchar *oldname,
const gchar *newname,
GCancellable *cancellable,
GError **err)
{
- CamelIMAPXServer *is = NULL;
gboolean ok = FALSE;
g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (self));
@@ -472,9 +414,7 @@ imapx_extd_server_rename_folder (CamelIMAPXExtdServer *self,
/* cancellable may be NULL */
g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
- is = CAMEL_IMAPX_SERVER (self);
-
- ok = camel_imapx_server_rename_folder (is,
+ ok = camel_imapx_server_rename_folder (self,
oldname,
newname,
cancellable,
@@ -483,16 +423,13 @@ imapx_extd_server_rename_folder (CamelIMAPXExtdServer *self,
}
static struct _IMAPXJobQueueInfo*
-imapx_extd_server_get_job_queue_info (CamelIMAPXExtdServer *self)
+imapx_extd_server_get_job_queue_info (CamelIMAPXServer *self)
{
- CamelIMAPXServer *is = NULL;
struct _IMAPXJobQueueInfo *qi = NULL;
g_assert (CAMEL_IS_IMAPX_EXTD_SERVER (self));
- is = CAMEL_IMAPX_SERVER (self);
-
- qi = camel_imapx_server_get_job_queue_info (is);
+ qi = camel_imapx_server_get_job_queue_info (self);
return qi;
}
@@ -577,6 +514,7 @@ camel_imapx_extd_server_class_init (CamelIMAPXExtdServerClass *klass)
object_class->dispose = camel_imapx_extd_server_dispose;
object_class->finalize = camel_imapx_extd_server_finalize;
+ /* parent class functions (not yet virtualized in parent) */
klass->connect = imapx_extd_server_connect;
klass->authenticate = imapx_extd_server_authenticate;
klass->list = imapx_extd_server_list;
@@ -593,6 +531,8 @@ camel_imapx_extd_server_class_init (CamelIMAPXExtdServerClass *klass)
klass->delete_folder = imapx_extd_server_delete_folder;
klass->rename_folder = imapx_extd_server_rename_folder;
klass->get_job_queue_info = imapx_extd_server_get_job_queue_info;
+
+ /* true CamelIMAPXExtdServer class functions */
klass->metadata_get_proto = imapx_extd_server_metadata_get_proto;
klass->get_metadata = imapx_extd_server_get_metadata;
klass->set_metadata = imapx_extd_server_set_metadata;
@@ -615,7 +555,7 @@ camel_imapx_extd_server_new (CamelIMAPXExtdStore *store)
}
gboolean
-camel_imapx_extd_server_connect (CamelIMAPXExtdServer *self,
+camel_imapx_extd_server_connect (CamelIMAPXServer *self,
GCancellable *cancellable,
GError **err)
{
@@ -632,7 +572,7 @@ camel_imapx_extd_server_connect (CamelIMAPXExtdServer *self,
}
CamelAuthenticationResult
-camel_imapx_extd_server_authenticate (CamelIMAPXExtdServer *self,
+camel_imapx_extd_server_authenticate (CamelIMAPXServer *self,
const gchar *mechanism,
GCancellable *cancellable,
GError **err)
@@ -651,7 +591,7 @@ camel_imapx_extd_server_authenticate (CamelIMAPXExtdServer *self,
}
GPtrArray*
-camel_imapx_extd_server_list (CamelIMAPXExtdServer *self,
+camel_imapx_extd_server_list (CamelIMAPXServer *self,
const gchar *top,
guint32 flags,
const gchar *ext,
@@ -674,8 +614,8 @@ camel_imapx_extd_server_list (CamelIMAPXExtdServer *self,
}
gboolean
-camel_imapx_extd_server_refresh_info (CamelIMAPXExtdServer *self,
- CamelIMAPXExtdFolder *folder,
+camel_imapx_extd_server_refresh_info (CamelIMAPXServer *self,
+ CamelFolder *folder,
GCancellable *cancellable,
GError **err)
{
@@ -693,8 +633,8 @@ camel_imapx_extd_server_refresh_info (CamelIMAPXExtdServer *self,
}
gboolean
-camel_imapx_extd_server_sync_changes (CamelIMAPXExtdServer *self,
- CamelIMAPXExtdFolder *folder,
+camel_imapx_extd_server_sync_changes (CamelIMAPXServer *self,
+ CamelFolder *folder,
GCancellable *cancellable,
GError **err)
{
@@ -712,8 +652,8 @@ camel_imapx_extd_server_sync_changes (CamelIMAPXExtdServer *self,
}
gboolean
-camel_imapx_extd_server_expunge (CamelIMAPXExtdServer *self,
- CamelIMAPXExtdFolder *folder,
+camel_imapx_extd_server_expunge (CamelIMAPXServer *self,
+ CamelFolder *folder,
GCancellable *cancellable,
GError **err)
{
@@ -731,8 +671,8 @@ camel_imapx_extd_server_expunge (CamelIMAPXExtdServer *self,
}
gboolean
-camel_imapx_extd_server_noop (CamelIMAPXExtdServer *self,
- CamelIMAPXExtdFolder *folder,
+camel_imapx_extd_server_noop (CamelIMAPXServer *self,
+ CamelFolder *folder,
GCancellable *cancellable,
GError **err)
{
@@ -750,8 +690,8 @@ camel_imapx_extd_server_noop (CamelIMAPXExtdServer *self,
}
CamelStream*
-camel_imapx_extd_server_get_message (CamelIMAPXExtdServer *self,
- CamelIMAPXExtdFolder *folder,
+camel_imapx_extd_server_get_message (CamelIMAPXServer *self,
+ CamelFolder *folder,
const gchar *uid,
GCancellable *cancellable,
GError **err)
@@ -771,9 +711,9 @@ camel_imapx_extd_server_get_message (CamelIMAPXExtdServer *self,
}
gboolean
-camel_imapx_extd_server_copy_message (CamelIMAPXExtdServer *self,
- CamelIMAPXExtdFolder *source,
- CamelIMAPXExtdFolder *dest,
+camel_imapx_extd_server_copy_message (CamelIMAPXServer *self,
+ CamelFolder *source,
+ CamelFolder *dest,
GPtrArray *uids,
gboolean delete_originals,
GCancellable *cancellable,
@@ -796,8 +736,8 @@ camel_imapx_extd_server_copy_message (CamelIMAPXExtdServer *self,
}
gboolean
-camel_imapx_extd_server_append_message (CamelIMAPXExtdServer *self,
- CamelIMAPXExtdFolder *folder,
+camel_imapx_extd_server_append_message (CamelIMAPXServer *self,
+ CamelFolder *folder,
CamelMimeMessage *message,
const CamelMessageInfo *mi,
GCancellable *cancellable,
@@ -820,8 +760,8 @@ camel_imapx_extd_server_append_message (CamelIMAPXExtdServer *self,
gboolean
-camel_imapx_extd_server_sync_message (CamelIMAPXExtdServer *self,
- CamelIMAPXExtdFolder *folder,
+camel_imapx_extd_server_sync_message (CamelIMAPXServer *self,
+ CamelFolder *folder,
const gchar *uid,
GCancellable *cancellable,
GError **err)
@@ -841,7 +781,7 @@ camel_imapx_extd_server_sync_message (CamelIMAPXExtdServer *self,
}
gboolean
-camel_imapx_extd_server_manage_subscription (CamelIMAPXExtdServer *self,
+camel_imapx_extd_server_manage_subscription (CamelIMAPXServer *self,
const gchar *foldername,
gboolean subscribe,
GCancellable *cancellable,
@@ -862,7 +802,7 @@ camel_imapx_extd_server_manage_subscription (CamelIMAPXExtdServer *self,
}
gboolean
-camel_imapx_extd_server_create_folder (CamelIMAPXExtdServer *self,
+camel_imapx_extd_server_create_folder (CamelIMAPXServer *self,
const gchar *foldername,
GCancellable *cancellable,
GError **err)
@@ -881,7 +821,7 @@ camel_imapx_extd_server_create_folder (CamelIMAPXExtdServer *self,
}
gboolean
-camel_imapx_extd_server_delete_folder (CamelIMAPXExtdServer *self,
+camel_imapx_extd_server_delete_folder (CamelIMAPXServer *self,
const gchar *foldername,
GCancellable *cancellable,
GError **err)
@@ -900,7 +840,7 @@ camel_imapx_extd_server_delete_folder (CamelIMAPXExtdServer *self,
}
gboolean
-camel_imapx_extd_server_rename_folder (CamelIMAPXExtdServer *self,
+camel_imapx_extd_server_rename_folder (CamelIMAPXServer *self,
const gchar *oldname,
const gchar *newname,
GCancellable *cancellable,
@@ -921,7 +861,7 @@ camel_imapx_extd_server_rename_folder (CamelIMAPXExtdServer *self,
}
struct _IMAPXJobQueueInfo*
-camel_imapx_extd_server_get_job_queue_info (CamelIMAPXExtdServer *self)
+camel_imapx_extd_server_get_job_queue_info (CamelIMAPXServer *self)
{
CamelIMAPXExtdServerClass *klass = NULL;
struct _IMAPXJobQueueInfo *qi = NULL;
diff --git a/src/camel/providers/imapx/camel-imapx-extd-server.h b/src/camel/providers/imapx/camel-imapx-extd-server.h
index 4c58eb4..a27e5e1 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-server.h
+++ b/src/camel/providers/imapx/camel-imapx-extd-server.h
@@ -40,7 +40,6 @@
/*----------------------------------------------------------------------------*/
struct _CamelIMAPXExtdStore;
-struct _CamelIMAPXExtdFolder;
/*----------------------------------------------------------------------------*/
/* Standard GObject macros */
@@ -75,92 +74,92 @@ struct _CamelIMAPXExtdServer {
struct _CamelIMAPXExtdServerClass {
CamelIMAPXServerClass parent_class;
- gboolean (*connect) (CamelIMAPXExtdServer *self,
+ gboolean (*connect) (CamelIMAPXServer *self,
GCancellable *cancellable,
GError **err);
- CamelAuthenticationResult (*authenticate) (CamelIMAPXExtdServer *self,
+ CamelAuthenticationResult (*authenticate) (CamelIMAPXServer *self,
const gchar *mechanism,
GCancellable *cancellable,
GError **err);
- GPtrArray* (*list) (CamelIMAPXExtdServer *self,
+ GPtrArray* (*list) (CamelIMAPXServer *self,
const gchar *top,
guint32 flags,
const gchar *ext,
GCancellable *cancellable,
GError **err);
- gboolean (*refresh_info) (CamelIMAPXExtdServer *self,
- struct _CamelIMAPXExtdFolder *folder,
+ gboolean (*refresh_info) (CamelIMAPXServer *self,
+ CamelFolder *folder,
GCancellable *cancellable,
GError **err);
- gboolean (*sync_changes) (CamelIMAPXExtdServer *self,
- struct _CamelIMAPXExtdFolder *folder,
+ gboolean (*sync_changes) (CamelIMAPXServer *self,
+ CamelFolder *folder,
GCancellable *cancellable,
GError **err);
- gboolean (*expunge) (CamelIMAPXExtdServer *self,
- struct _CamelIMAPXExtdFolder *folder,
+ gboolean (*expunge) (CamelIMAPXServer *self,
+ CamelFolder *folder,
GCancellable *cancellable,
GError **err);
- gboolean (*noop) (CamelIMAPXExtdServer *self,
- struct _CamelIMAPXExtdFolder *folder,
+ gboolean (*noop) (CamelIMAPXServer *self,
+ CamelFolder *folder,
GCancellable *cancellable,
GError **err);
- CamelStream* (*get_message) (CamelIMAPXExtdServer *self,
- struct _CamelIMAPXExtdFolder *folder,
+ CamelStream* (*get_message) (CamelIMAPXServer *self,
+ CamelFolder *folder,
const gchar *uid,
GCancellable *cancellable,
GError **err);
- gboolean (*copy_message) (CamelIMAPXExtdServer *self,
- struct _CamelIMAPXExtdFolder *source,
- struct _CamelIMAPXExtdFolder *dest,
+ gboolean (*copy_message) (CamelIMAPXServer *self,
+ CamelFolder *source,
+ CamelFolder *dest,
GPtrArray *uids,
gboolean delete_originals,
GCancellable *cancellable,
GError **err);
- gboolean (*append_message) (CamelIMAPXExtdServer *self,
- struct _CamelIMAPXExtdFolder *folder,
+ gboolean (*append_message) (CamelIMAPXServer *self,
+ CamelFolder *folder,
CamelMimeMessage *message,
const CamelMessageInfo *mi,
GCancellable *cancellable,
GError **err);
- gboolean (*sync_message) (CamelIMAPXExtdServer *self,
- struct _CamelIMAPXExtdFolder *folder,
+ gboolean (*sync_message) (CamelIMAPXServer *self,
+ CamelFolder *folder,
const gchar *uid,
GCancellable *cancellable,
GError **err);
- gboolean (*manage_subscription) (CamelIMAPXExtdServer *self,
+ gboolean (*manage_subscription) (CamelIMAPXServer *self,
const gchar *foldername,
gboolean subscribe,
GCancellable *cancellable,
GError **err);
- gboolean (*create_folder) (CamelIMAPXExtdServer *self,
+ gboolean (*create_folder) (CamelIMAPXServer *self,
const gchar *foldername,
GCancellable *cancellable,
GError **err);
- gboolean (*delete_folder) (CamelIMAPXExtdServer *self,
+ gboolean (*delete_folder) (CamelIMAPXServer *self,
const gchar *foldername,
GCancellable *cancellable,
GError **err);
- gboolean (*rename_folder) (CamelIMAPXExtdServer *is,
+ gboolean (*rename_folder) (CamelIMAPXServer *is,
const gchar *oldname,
const gchar *newname,
GCancellable *cancellable,
GError **err);
- struct _IMAPXJobQueueInfo* (*get_job_queue_info) (CamelIMAPXExtdServer *self);
+ struct _IMAPXJobQueueInfo* (*get_job_queue_info) (CamelIMAPXServer *self);
camel_imapx_metadata_proto_t (*metadata_get_proto) (CamelIMAPXExtdServer *self);
@@ -181,105 +180,105 @@ CamelIMAPXExtdServer*
camel_imapx_extd_server_new (struct _CamelIMAPXExtdStore *store);
gboolean
-camel_imapx_extd_server_connect (CamelIMAPXExtdServer *self,
+camel_imapx_extd_server_connect (CamelIMAPXServer *self,
GCancellable *cancellable,
GError **err);
CamelAuthenticationResult
-camel_imapx_extd_server_authenticate (CamelIMAPXExtdServer *self,
+camel_imapx_extd_server_authenticate (CamelIMAPXServer *self,
const gchar *mechanism,
GCancellable *cancellable,
GError **err);
GPtrArray*
-camel_imapx_extd_server_list (CamelIMAPXExtdServer *self,
+camel_imapx_extd_server_list (CamelIMAPXServer *self,
const gchar *top,
guint32 flags,
const gchar *ext,
GCancellable *cancellable,
GError **err);
gboolean
-camel_imapx_extd_server_refresh_info (CamelIMAPXExtdServer *self,
- struct _CamelIMAPXExtdFolder *folder,
+camel_imapx_extd_server_refresh_info (CamelIMAPXServer *self,
+ CamelFolder *folder,
GCancellable *cancellable,
GError **err);
gboolean
-camel_imapx_extd_server_sync_changes (CamelIMAPXExtdServer *self,
- struct _CamelIMAPXExtdFolder *folder,
+camel_imapx_extd_server_sync_changes (CamelIMAPXServer *self,
+ CamelFolder *folder,
GCancellable *cancellable,
GError **err);
gboolean
-camel_imapx_extd_server_expunge (CamelIMAPXExtdServer *self,
- struct _CamelIMAPXExtdFolder *folder,
+camel_imapx_extd_server_expunge (CamelIMAPXServer *self,
+ CamelFolder *folder,
GCancellable *cancellable,
GError **err);
gboolean
-camel_imapx_extd_server_noop (CamelIMAPXExtdServer *self,
- struct _CamelIMAPXExtdFolder *folder,
+camel_imapx_extd_server_noop (CamelIMAPXServer *self,
+ CamelFolder *folder,
GCancellable *cancellable,
GError **err);
CamelStream*
-camel_imapx_extd_server_get_message (CamelIMAPXExtdServer *self,
- struct _CamelIMAPXExtdFolder *folder,
+camel_imapx_extd_server_get_message (CamelIMAPXServer *self,
+ CamelFolder *folder,
const gchar *uid,
GCancellable *cancellable,
GError **err);
gboolean
-camel_imapx_extd_server_copy_message (CamelIMAPXExtdServer *self,
- struct _CamelIMAPXExtdFolder *source,
- struct _CamelIMAPXExtdFolder *dest,
+camel_imapx_extd_server_copy_message (CamelIMAPXServer *self,
+ CamelFolder *source,
+ CamelFolder *dest,
GPtrArray *uids,
gboolean delete_originals,
GCancellable *cancellable,
GError **err);
gboolean
-camel_imapx_extd_server_append_message (CamelIMAPXExtdServer *self,
- struct _CamelIMAPXExtdFolder *folder,
+camel_imapx_extd_server_append_message (CamelIMAPXServer *self,
+ CamelFolder *folder,
CamelMimeMessage *message,
const CamelMessageInfo *mi,
GCancellable *cancellable,
GError **err);
gboolean
-camel_imapx_extd_server_sync_message (CamelIMAPXExtdServer *self,
- struct _CamelIMAPXExtdFolder *folder,
+camel_imapx_extd_server_sync_message (CamelIMAPXServer *self,
+ CamelFolder *folder,
const gchar *uid,
GCancellable *cancellable,
GError **err);
gboolean
-camel_imapx_extd_server_manage_subscription (CamelIMAPXExtdServer *self,
+camel_imapx_extd_server_manage_subscription (CamelIMAPXServer *self,
const gchar *foldername,
gboolean subscribe,
GCancellable *cancellable,
GError **err);
gboolean
-camel_imapx_extd_server_create_folder (CamelIMAPXExtdServer *self,
+camel_imapx_extd_server_create_folder (CamelIMAPXServer *self,
const gchar *foldername,
GCancellable *cancellable,
GError **err);
gboolean
-camel_imapx_extd_server_delete_folder (CamelIMAPXExtdServer *self,
+camel_imapx_extd_server_delete_folder (CamelIMAPXServer *self,
const gchar *foldername,
GCancellable *cancellable,
GError **err);
gboolean
-camel_imapx_extd_server_rename_folder (CamelIMAPXExtdServer *is,
+camel_imapx_extd_server_rename_folder (CamelIMAPXServer *is,
const gchar *oldname,
const gchar *newname,
GCancellable *cancellable,
GError **err);
struct _IMAPXJobQueueInfo*
-camel_imapx_extd_server_get_job_queue_info (CamelIMAPXExtdServer *self);
+camel_imapx_extd_server_get_job_queue_info (CamelIMAPXServer *self);
camel_imapx_metadata_proto_t
camel_imapx_extd_server_metadata_get_proto (CamelIMAPXExtdServer *self);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
