[evolution-kolab] KolabMailImapClient: removed 'kolab_' prefix from names of static functions
- From: Christian Hilberg <chilberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab] KolabMailImapClient: removed 'kolab_' prefix from names of static functions
- Date: Thu, 26 Jul 2012 14:07:40 +0000 (UTC)
commit aa7f242786578358098ef7e5c16c37d284990ce7
Author: Christian Hilberg <hilberg kernelconcepts de>
Date: Thu Jul 26 15:32:09 2012 +0200
KolabMailImapClient: removed 'kolab_' prefix from names of static functions
src/libekolab/kolab-mail-imap-client.c | 260 ++++++++++++++++----------------
1 files changed, 130 insertions(+), 130 deletions(-)
---
diff --git a/src/libekolab/kolab-mail-imap-client.c b/src/libekolab/kolab-mail-imap-client.c
index a534fb4..93773da 100644
--- a/src/libekolab/kolab-mail-imap-client.c
+++ b/src/libekolab/kolab-mail-imap-client.c
@@ -174,10 +174,10 @@ kolab_mail_imap_client_class_init (KolabMailImapClientClass *klass)
/* camel helpers */
static CamelFolder*
-kolab_mail_imap_client_camel_get_folder (KolabMailImapClient *self,
- const gchar *foldername,
- GCancellable *cancellable,
- GError **err)
+mail_imap_client_camel_get_folder (KolabMailImapClient *self,
+ const gchar *foldername,
+ GCancellable *cancellable,
+ GError **err)
{
KolabMailImapClientPrivate *priv = NULL;
CamelFolder *folder = NULL;
@@ -234,12 +234,12 @@ kolab_mail_imap_client_camel_get_folder (KolabMailImapClient *self,
}
static GHashTable*
-kolab_mail_imap_client_camel_gen_summaries (KolabMailImapClient *self,
- const gchar *foldername,
- KolabFolderTypeID foldertype,
- KolabFolderContextID foldercontext,
- GCancellable *cancellable,
- GError **err)
+mail_imap_client_camel_gen_summaries (KolabMailImapClient *self,
+ const gchar *foldername,
+ KolabFolderTypeID foldertype,
+ KolabFolderContextID foldercontext,
+ GCancellable *cancellable,
+ GError **err)
{
/* KolabMailImapClientPrivate *priv = NULL; */
CamelFolder *folder = NULL;
@@ -259,10 +259,10 @@ kolab_mail_imap_client_camel_gen_summaries (KolabMailImapClient *self,
g_return_val_if_fail (err == NULL || *err == NULL, NULL);
/* priv = KOLAB_MAIL_IMAP_CLIENT_PRIVATE (self); */
- folder = kolab_mail_imap_client_camel_get_folder (self,
- foldername,
- cancellable,
- &tmp_err);
+ folder = mail_imap_client_camel_get_folder (self,
+ foldername,
+ cancellable,
+ &tmp_err);
if (folder == NULL) {
g_propagate_error (err, tmp_err);
return NULL;
@@ -354,12 +354,12 @@ kolab_mail_imap_client_camel_gen_summaries (KolabMailImapClient *self,
}
static CamelMimeMessage*
-kolab_mail_imap_client_camel_get_msg_imap_uid (KolabMailImapClient *self,
- const gchar *foldername,
- const gchar *imap_uid,
- const gchar *kolab_uid,
- GCancellable *cancellable,
- GError **err)
+mail_imap_client_camel_get_msg_imap_uid (KolabMailImapClient *self,
+ const gchar *foldername,
+ const gchar *imap_uid,
+ const gchar *kolab_uid,
+ GCancellable *cancellable,
+ GError **err)
{
KolabMailImapClientPrivate *priv = NULL;
CamelFolder *folder = NULL;
@@ -378,10 +378,10 @@ kolab_mail_imap_client_camel_get_msg_imap_uid (KolabMailImapClient *self,
g_assert (priv->is_up == TRUE);
- folder = kolab_mail_imap_client_camel_get_folder (self,
- foldername,
- cancellable,
- &tmp_err);
+ folder = mail_imap_client_camel_get_folder (self,
+ foldername,
+ cancellable,
+ &tmp_err);
if (folder == NULL) {
g_propagate_error (err, tmp_err);
return NULL;
@@ -449,11 +449,11 @@ kolab_mail_imap_client_camel_get_msg_imap_uid (KolabMailImapClient *self,
}
static CamelMimeMessage*
-kolab_mail_imap_client_camel_get_msg_kolab_uid (KolabMailImapClient *self,
- const gchar *foldername,
- const gchar *kolab_uid,
- GCancellable *cancellable,
- GError **err)
+mail_imap_client_camel_get_msg_kolab_uid (KolabMailImapClient *self,
+ const gchar *foldername,
+ const gchar *kolab_uid,
+ GCancellable *cancellable,
+ GError **err)
{
KolabMailImapClientPrivate *priv = NULL;
CamelFolder *folder = NULL;
@@ -472,10 +472,10 @@ kolab_mail_imap_client_camel_get_msg_kolab_uid (KolabMailImapClient *self,
g_assert (priv->is_up == TRUE);
- folder = kolab_mail_imap_client_camel_get_folder (self,
- foldername,
- cancellable,
- &tmp_err);
+ folder = mail_imap_client_camel_get_folder (self,
+ foldername,
+ cancellable,
+ &tmp_err);
if (folder == NULL) {
g_propagate_error (err, tmp_err);
return NULL;
@@ -505,12 +505,12 @@ kolab_mail_imap_client_camel_get_msg_kolab_uid (KolabMailImapClient *self,
continue;
}
- message = kolab_mail_imap_client_camel_get_msg_imap_uid (self,
- foldername,
- imap_uid,
- NULL,
- cancellable,
- &tmp_err);
+ message = mail_imap_client_camel_get_msg_imap_uid (self,
+ foldername,
+ imap_uid,
+ NULL,
+ cancellable,
+ &tmp_err);
if (tmp_err != NULL) {
if (message != NULL) {
g_object_unref (message);
@@ -550,10 +550,10 @@ kolab_mail_imap_client_camel_get_msg_kolab_uid (KolabMailImapClient *self,
/* folder helpers */
static gboolean
-kolab_mail_imap_client_update_folder (KolabMailImapClient *self,
- const gchar *foldername,
- GCancellable *cancellable,
- GError **err)
+mail_imap_client_update_folder (KolabMailImapClient *self,
+ const gchar *foldername,
+ GCancellable *cancellable,
+ GError **err)
{
KolabMailImapClientPrivate *priv = NULL;
CamelFolder *folder = NULL;
@@ -566,10 +566,10 @@ kolab_mail_imap_client_update_folder (KolabMailImapClient *self,
priv = KOLAB_MAIL_IMAP_CLIENT_PRIVATE (self);
- folder = kolab_mail_imap_client_camel_get_folder (self,
- foldername,
- cancellable,
- &tmp_err);
+ folder = mail_imap_client_camel_get_folder (self,
+ foldername,
+ cancellable,
+ &tmp_err);
if (folder == NULL) {
g_propagate_error (err, tmp_err);
return FALSE;
@@ -760,7 +760,7 @@ kolab_mail_imap_client_configure (KolabMailImapClient *self,
}
static void
-kolab_mail_imap_client_configure_store_settings (KolabMailImapClient *self)
+mail_imap_client_configure_store_settings (KolabMailImapClient *self)
{
KolabMailImapClientPrivate *priv = NULL;
CamelService *service = NULL;
@@ -850,7 +850,7 @@ kolab_mail_imap_client_bringup (KolabMailImapClient *self,
}
/* configure the service with settings from KolabSettingsHandler */
- kolab_mail_imap_client_configure_store_settings (self);
+ mail_imap_client_configure_store_settings (self);
/* set offline state */
ok = camel_offline_store_set_online_sync (CAMEL_OFFLINE_STORE (priv->store),
@@ -1136,7 +1136,7 @@ kolab_mail_imap_client_query_folder_info_online (KolabMailImapClient *self,
priv = KOLAB_MAIL_IMAP_CLIENT_PRIVATE (self);
- if (! camel_session_get_online (priv->session)) {
+ if (! camel_session_get_online (CAMEL_SESSION (priv->session))) {
g_set_error (err,
KOLAB_CAMEL_ERROR,
KOLAB_CAMEL_ERROR_GENERIC,
@@ -1184,10 +1184,10 @@ kolab_mail_imap_client_query_folder_info_online (KolabMailImapClient *self,
}
static guint64
-kolab_mail_imap_client_get_folder_uidvalidity (KolabMailImapClient *self,
- const gchar *foldername,
- GCancellable *cancellable,
- GError **err)
+mail_imap_client_get_folder_uidvalidity (KolabMailImapClient *self,
+ const gchar *foldername,
+ GCancellable *cancellable,
+ GError **err)
{
/* KolabMailImapClientPrivate *priv = NULL; */
CamelFolder *folder = NULL;
@@ -1201,10 +1201,10 @@ kolab_mail_imap_client_get_folder_uidvalidity (KolabMailImapClient *self,
/* priv = KOLAB_MAIL_IMAP_CLIENT_PRIVATE (self); */
- folder = kolab_mail_imap_client_camel_get_folder (self,
- foldername,
- cancellable,
- &tmp_err);
+ folder = mail_imap_client_camel_get_folder (self,
+ foldername,
+ cancellable,
+ &tmp_err);
if (folder == NULL) {
g_propagate_error (err, tmp_err);
return 0;
@@ -1256,10 +1256,10 @@ kolab_mail_imap_client_query_folder_summary (KolabMailImapClient *self,
return NULL;
}
- uidvalidity = kolab_mail_imap_client_get_folder_uidvalidity (self,
- foldername,
- cancellable,
- &tmp_err);
+ uidvalidity = mail_imap_client_get_folder_uidvalidity (self,
+ foldername,
+ cancellable,
+ &tmp_err);
if (tmp_err != NULL) {
g_propagate_error (err, tmp_err);
return NULL;
@@ -1426,10 +1426,10 @@ kolab_mail_imap_client_query_summaries (KolabMailImapClient *self,
/* update the CamelFolder */
if (update) {
- ok = kolab_mail_imap_client_update_folder (self,
- foldername,
- cancellable,
- &tmp_err);
+ ok = mail_imap_client_update_folder (self,
+ foldername,
+ cancellable,
+ &tmp_err);
if (! ok) {
g_propagate_error (err, tmp_err);
return NULL;
@@ -1437,12 +1437,12 @@ kolab_mail_imap_client_query_summaries (KolabMailImapClient *self,
}
/* generate summaries table. may be NULL */
- summaries = kolab_mail_imap_client_camel_gen_summaries (self,
- foldername,
- foldertype,
- foldercontext,
- cancellable,
- &tmp_err);
+ summaries = mail_imap_client_camel_gen_summaries (self,
+ foldername,
+ foldertype,
+ foldercontext,
+ cancellable,
+ &tmp_err);
if (tmp_err != NULL) {
g_propagate_error (err, tmp_err);
return NULL;
@@ -1515,19 +1515,19 @@ kolab_mail_imap_client_store (KolabMailImapClient *self,
/* update the CamelFolder */
if (update) {
- ok = kolab_mail_imap_client_update_folder (self,
- foldername,
- cancellable,
- &tmp_err);
+ ok = mail_imap_client_update_folder (self,
+ foldername,
+ cancellable,
+ &tmp_err);
if (! ok)
goto cleanup;
}
/* normal store operation (handle_foldername may be unset) */
- folder = kolab_mail_imap_client_camel_get_folder (self,
- foldername,
- cancellable,
- &tmp_err);
+ folder = mail_imap_client_camel_get_folder (self,
+ foldername,
+ cancellable,
+ &tmp_err);
if (tmp_err != NULL)
goto cleanup;
@@ -1548,12 +1548,12 @@ kolab_mail_imap_client_store (KolabMailImapClient *self,
kolab_uid = kolab_mail_handle_get_uid (kmailhandle);
if (imap_uid != NULL) {
- orig_message = kolab_mail_imap_client_camel_get_msg_imap_uid (self,
- foldername,
- imap_uid,
- kolab_uid,
- cancellable,
- &tmp_err);
+ orig_message = mail_imap_client_camel_get_msg_imap_uid (self,
+ foldername,
+ imap_uid,
+ kolab_uid,
+ cancellable,
+ &tmp_err);
if (tmp_err != NULL) {
g_warning ("%s: %s", __func__, tmp_err->message);
g_error_free (tmp_err);
@@ -1563,11 +1563,11 @@ kolab_mail_imap_client_store (KolabMailImapClient *self,
/* if no luck with imap uid, we'll need to search messages for kolab uid */
if (orig_message == NULL) {
- orig_message = kolab_mail_imap_client_camel_get_msg_kolab_uid (self,
- foldername,
- kolab_uid,
- cancellable,
- &tmp_err);
+ orig_message = mail_imap_client_camel_get_msg_kolab_uid (self,
+ foldername,
+ kolab_uid,
+ cancellable,
+ &tmp_err);
if (tmp_err != NULL) {
g_warning ("%s: %s", __func__, tmp_err->message);
g_error_free (tmp_err);
@@ -1632,11 +1632,11 @@ kolab_mail_imap_client_store (KolabMailImapClient *self,
* in the IMAPX offline store, but the IMAP UID of the freshly stored message
* is exactly what IMAPX does not provide us with here (see above)
*/
- stored_message = kolab_mail_imap_client_camel_get_msg_kolab_uid (self,
- foldername,
- kolab_uid,
- cancellable,
- &tmp_err);
+ stored_message = mail_imap_client_camel_get_msg_kolab_uid (self,
+ foldername,
+ kolab_uid,
+ cancellable,
+ &tmp_err);
if (tmp_err != NULL)
goto cleanup;
@@ -1808,10 +1808,10 @@ kolab_mail_imap_client_retrieve (KolabMailImapClient *self,
/* update the CamelFolder */
if (update) {
- ok = kolab_mail_imap_client_update_folder (self,
- foldername,
- cancellable,
- &tmp_err);
+ ok = mail_imap_client_update_folder (self,
+ foldername,
+ cancellable,
+ &tmp_err);
if (! ok) {
g_propagate_error (err, tmp_err);
return FALSE;
@@ -1823,12 +1823,12 @@ kolab_mail_imap_client_retrieve (KolabMailImapClient *self,
KOLAB_MAIL_SUMMARY_CHAR_FIELD_IMAP_UID);
if (imap_uid != NULL) {
- camel_message = kolab_mail_imap_client_camel_get_msg_imap_uid (self,
- foldername,
- imap_uid,
- kolab_uid,
- cancellable,
- &tmp_err);
+ camel_message = mail_imap_client_camel_get_msg_imap_uid (self,
+ foldername,
+ imap_uid,
+ kolab_uid,
+ cancellable,
+ &tmp_err);
if (tmp_err != NULL) {
g_warning ("%s: %s", __func__, tmp_err->message);
g_error_free (tmp_err);
@@ -1838,11 +1838,11 @@ kolab_mail_imap_client_retrieve (KolabMailImapClient *self,
/* if no luck with imap uid, we'll need to search messages for kolab uid */
if (camel_message == NULL) {
- camel_message = kolab_mail_imap_client_camel_get_msg_kolab_uid (self,
- foldername,
- kolab_uid,
- cancellable,
- &tmp_err);
+ camel_message = mail_imap_client_camel_get_msg_kolab_uid (self,
+ foldername,
+ kolab_uid,
+ cancellable,
+ &tmp_err);
if (tmp_err != NULL) {
g_propagate_error (err, tmp_err);
return FALSE;
@@ -1936,10 +1936,10 @@ kolab_mail_imap_client_delete (KolabMailImapClient *self,
/* update the CamelFolder */
if (update) {
- ok = kolab_mail_imap_client_update_folder (self,
- foldername,
- cancellable,
- &tmp_err);
+ ok = mail_imap_client_update_folder (self,
+ foldername,
+ cancellable,
+ &tmp_err);
if (! ok) {
g_propagate_error (err, tmp_err);
return FALSE;
@@ -1947,10 +1947,10 @@ kolab_mail_imap_client_delete (KolabMailImapClient *self,
}
/* get the CamelFolder */
- folder = kolab_mail_imap_client_camel_get_folder (self,
- foldername,
- cancellable,
- &tmp_err);
+ folder = mail_imap_client_camel_get_folder (self,
+ foldername,
+ cancellable,
+ &tmp_err);
if (tmp_err != NULL) {
g_propagate_error (err, tmp_err);
return FALSE;
@@ -1971,12 +1971,12 @@ kolab_mail_imap_client_delete (KolabMailImapClient *self,
KOLAB_MAIL_SUMMARY_CHAR_FIELD_IMAP_UID));
if (imap_uid != NULL) {
- camel_message = kolab_mail_imap_client_camel_get_msg_imap_uid (self,
- foldername,
- imap_uid,
- kolab_uid,
- cancellable,
- &tmp_err);
+ camel_message = mail_imap_client_camel_get_msg_imap_uid (self,
+ foldername,
+ imap_uid,
+ kolab_uid,
+ cancellable,
+ &tmp_err);
if (tmp_err != NULL) {
g_warning ("%s: %s", __func__, tmp_err->message);
g_error_free (tmp_err);
@@ -1990,11 +1990,11 @@ kolab_mail_imap_client_delete (KolabMailImapClient *self,
/* if no luck with imap uid, we'll need to search messages for kolab uid */
if (camel_message == NULL) {
- camel_message = kolab_mail_imap_client_camel_get_msg_kolab_uid (self,
- foldername,
- kolab_uid,
- cancellable,
- &tmp_err);
+ camel_message = mail_imap_client_camel_get_msg_kolab_uid (self,
+ foldername,
+ kolab_uid,
+ cancellable,
+ &tmp_err);
if (tmp_err != NULL) {
g_warning ("%s: %s", __func__, tmp_err->message);
g_error_free (tmp_err);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
