From c0a255eb90769638d57ae4122932f75c46e4e531 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 11 Sep 2008 15:34:29 +0000 Subject: Merge revisions 36016:36303 from trunk. svn path=/branches/kill-bonobo/; revision=36307 --- mail/mail-ops.h | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'mail/mail-ops.h') diff --git a/mail/mail-ops.h b/mail/mail-ops.h index 64879676c5..14654aa0b4 100644 --- a/mail/mail-ops.h +++ b/mail/mail-ops.h @@ -1,25 +1,24 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - /* - * Authors: - * Peter Williams - * Michael Zucchi - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Peter Williams + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA */ #ifndef MAIL_OPS_H -- cgit v1.2.3 From b2cda1d0c6d44f53f71bad9e256f41188677dfba Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 1 Oct 2008 20:56:04 +0000 Subject: Merge revisions 36016:36533 from trunk. svn path=/branches/kill-bonobo/; revision=36534 --- mail/mail-ops.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mail/mail-ops.h') diff --git a/mail/mail-ops.h b/mail/mail-ops.h index 14654aa0b4..e615a9121d 100644 --- a/mail/mail-ops.h +++ b/mail/mail-ops.h @@ -111,8 +111,8 @@ int mail_get_folderinfo (CamelStore *store, CamelOperation *op, void *data); /* remove an existing folder */ -void mail_remove_folder (const char *uri, - void (*done) (char *uri, gboolean removed, void *data), +void mail_remove_folder (CamelFolder *folder, + void (*done) (CamelFolder *folder, gboolean removed, CamelException *ex, void *data), void *data); /* transfer (copy/move) a folder */ -- cgit v1.2.3 From 54b80a7271e8ce1b2f3ccc68bb553940a24b80e2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 17 Oct 2008 03:48:03 +0000 Subject: Get the mail folder tree compiling, though I'm not yet sure why it's not showing anything. Probably something stupid. Also enabled the composer. svn path=/branches/kill-bonobo/; revision=36623 --- mail/mail-ops.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mail/mail-ops.h') diff --git a/mail/mail-ops.h b/mail/mail-ops.h index e615a9121d..68ae9037df 100644 --- a/mail/mail-ops.h +++ b/mail/mail-ops.h @@ -74,7 +74,8 @@ int mail_get_folder (const char *uri, guint32 flags, /* get quota information for a folder */ int mail_get_folder_quota (CamelFolder *folder, - void (*done)(CamelFolder *folder, CamelFolderQuotaInfo *quota, void *data), + const gchar *folder_uri, + void (*done)(CamelFolder *folder, const gchar *folder_uri, CamelFolderQuotaInfo *quota, void *data), void *data, MailMsgDispatchFunc dispatch); /* and for a store */ -- cgit v1.2.3 From c3205a427adcc910f0614cb83249622816440c56 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Fri, 22 May 2009 17:30:14 +0530 Subject: Mail changes required for Anjal. --- mail/mail-ops.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/mail-ops.h') diff --git a/mail/mail-ops.h b/mail/mail-ops.h index 68ae9037df..327a35174b 100644 --- a/mail/mail-ops.h +++ b/mail/mail-ops.h @@ -57,7 +57,7 @@ void mail_get_message (CamelFolder *folder, const char *uid, void *data, MailMsgDispatchFunc dispatch); -void +CamelOperation * mail_get_messagex(CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *), void *data, MailMsgDispatchFunc dispatch); -- cgit v1.2.3 From e4afd3f9fb962ea1295a0657ec9f83a427829171 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 23:21:02 -0400 Subject: Remove trailing whitespace, again. --- mail/mail-ops.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/mail-ops.h') diff --git a/mail/mail-ops.h b/mail/mail-ops.h index df92df4e32..39905fb06c 100644 --- a/mail/mail-ops.h +++ b/mail/mail-ops.h @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: -- cgit v1.2.3 From 948235c3d1076dbe6ed2e57a24c16a083bbd9f01 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 27 May 2009 10:29:19 -0400 Subject: Prefer GLib basic types over C types. --- mail/mail-ops.h | 142 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 71 insertions(+), 71 deletions(-) (limited to 'mail/mail-ops.h') diff --git a/mail/mail-ops.h b/mail/mail-ops.h index 55816ca24b..2fc570ca93 100644 --- a/mail/mail-ops.h +++ b/mail/mail-ops.h @@ -40,114 +40,114 @@ extern "C" { #include "libedataserver/e-account.h" void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info, - void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, int ok, - const char *appended_uid, void *data), - void *data); + void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, gint ok, + const gchar *appended_uid, gpointer data), + gpointer data); void mail_transfer_messages (CamelFolder *source, GPtrArray *uids, gboolean delete_from_source, - const char *dest_uri, + const gchar *dest_uri, guint32 dest_flags, - void (*done) (gboolean ok, void *data), - void *data); + void (*done) (gboolean ok, gpointer data), + gpointer data); /* get a single message, asynchronously */ -void mail_get_message (CamelFolder *folder, const char *uid, - void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data), - void *data, +void mail_get_message (CamelFolder *folder, const gchar *uid, + void (*done) (CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, gpointer data), + gpointer data, MailMsgDispatchFunc dispatch); CamelOperation * -mail_get_messagex(CamelFolder *folder, const char *uid, - void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *), - void *data, MailMsgDispatchFunc dispatch); +mail_get_messagex(CamelFolder *folder, const gchar *uid, + void (*done) (CamelFolder *folder, const gchar *uid, CamelMimeMessage *msg, gpointer data, CamelException *), + gpointer data, MailMsgDispatchFunc dispatch); /* get several messages */ void mail_get_messages (CamelFolder *folder, GPtrArray *uids, - void (*done) (CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, void *data), - void *data); + void (*done) (CamelFolder *folder, GPtrArray *uids, GPtrArray *msgs, gpointer data), + gpointer data); /* same for a folder */ -int mail_get_folder (const char *uri, guint32 flags, - void (*done) (char *uri, CamelFolder *folder, void *data), void *data, +gint mail_get_folder (const gchar *uri, guint32 flags, + void (*done) (gchar *uri, CamelFolder *folder, gpointer data), gpointer data, MailMsgDispatchFunc dispatch); /* get quota information for a folder */ -int mail_get_folder_quota (CamelFolder *folder, +gint mail_get_folder_quota (CamelFolder *folder, const gchar *folder_uri, - void (*done)(CamelFolder *folder, const gchar *folder_uri, CamelFolderQuotaInfo *quota, void *data), - void *data, MailMsgDispatchFunc dispatch); + void (*done)(CamelFolder *folder, const gchar *folder_uri, CamelFolderQuotaInfo *quota, gpointer data), + gpointer data, MailMsgDispatchFunc dispatch); /* and for a store */ -int mail_get_store (const char *uri, CamelOperation *op, - void (*done) (char *uri, CamelStore *store, void *data), void *data); +gint mail_get_store (const gchar *uri, CamelOperation *op, + void (*done) (gchar *uri, CamelStore *store, gpointer data), gpointer data); /* build an attachment */ void mail_build_attachment (CamelFolder *folder, GPtrArray *uids, void (*done)(CamelFolder *folder, GPtrArray *messages, - CamelMimePart *part, char *subject, void *data), - void *data); + CamelMimePart *part, gchar *subject, gpointer data), + gpointer data); void mail_sync_folder (CamelFolder *folder, - void (*done) (CamelFolder *folder, void *data), void *data); + void (*done) (CamelFolder *folder, gpointer data), gpointer data); -void mail_sync_store(CamelStore *store, int expunge, - void (*done) (CamelStore *store, void *data), void *data); +void mail_sync_store(CamelStore *store, gint expunge, + void (*done) (CamelStore *store, gpointer data), gpointer data); void mail_refresh_folder (CamelFolder *folder, - void (*done) (CamelFolder *folder, void *data), - void *data); + void (*done) (CamelFolder *folder, gpointer data), + gpointer data); void mail_expunge_folder (CamelFolder *folder, - void (*done) (CamelFolder *folder, void *data), - void *data); + void (*done) (CamelFolder *folder, gpointer data), + gpointer data); void mail_empty_trash (EAccount *account, - void (*done) (EAccount *account, void *data), - void *data); + void (*done) (EAccount *account, gpointer data), + gpointer data); /* get folder info asynchronously */ -int mail_get_folderinfo (CamelStore *store, CamelOperation *op, - gboolean (*done)(CamelStore *store, CamelFolderInfo *info, void *data), - void *data); +gint mail_get_folderinfo (CamelStore *store, CamelOperation *op, + gboolean (*done)(CamelStore *store, CamelFolderInfo *info, gpointer data), + gpointer data); /* remove an existing folder */ void mail_remove_folder (CamelFolder *folder, - void (*done) (CamelFolder *folder, gboolean removed, CamelException *ex, void *data), - void *data); + void (*done) (CamelFolder *folder, gboolean removed, CamelException *ex, gpointer data), + gpointer data); /* transfer (copy/move) a folder */ -void mail_xfer_folder (const char *src_uri, const char *dest_uri, gboolean remove_source, - void (*done) (char *src_uri, char *dest_uri, gboolean remove_source, - CamelFolder *folder, void *data), - void *data); +void mail_xfer_folder (const gchar *src_uri, const gchar *dest_uri, gboolean remove_source, + void (*done) (gchar *src_uri, gchar *dest_uri, gboolean remove_source, + CamelFolder *folder, gpointer data), + gpointer data); /* save messages */ -int mail_save_messages (CamelFolder *folder, GPtrArray *uids, const char *path, - void (*done) (CamelFolder *folder, GPtrArray *uids, char *path, void *data), - void *data); +gint mail_save_messages (CamelFolder *folder, GPtrArray *uids, const gchar *path, + void (*done) (CamelFolder *folder, GPtrArray *uids, gchar *path, gpointer data), + gpointer data); -int mail_save_part (CamelMimePart *part, const char *path, - void (*done)(CamelMimePart *part, char *path, int saved, void *data), - void *data, gboolean readonly); +gint mail_save_part (CamelMimePart *part, const gchar *path, + void (*done)(CamelMimePart *part, gchar *path, gint saved, gpointer data), + gpointer data, gboolean readonly); /* yeah so this is messy, but it does a lot, maybe i can consolidate all user_data's to be the one */ -void mail_send_queue (CamelFolder *queue, const char *destination, - const char *type, CamelOperation *cancel, - CamelFilterGetFolderFunc get_folder, void *get_data, - CamelFilterStatusFunc *status, void *status_data, - void (*done)(const char *destination, void *data), - void *data); - -void mail_fetch_mail (const char *source, int keep, - const char *type, CamelOperation *cancel, - CamelFilterGetFolderFunc get_folder, void *get_data, - CamelFilterStatusFunc *status, void *status_data, - void (*done)(const char *source, void *data), - void *data); +void mail_send_queue (CamelFolder *queue, const gchar *destination, + const gchar *type, CamelOperation *cancel, + CamelFilterGetFolderFunc get_folder, gpointer get_data, + CamelFilterStatusFunc *status, gpointer status_data, + void (*done)(const gchar *destination, gpointer data), + gpointer data); + +void mail_fetch_mail (const gchar *source, gint keep, + const gchar *type, CamelOperation *cancel, + CamelFilterGetFolderFunc get_folder, gpointer get_data, + CamelFilterStatusFunc *status, gpointer status_data, + void (*done)(const gchar *source, gpointer data), + gpointer data); void mail_filter_folder (CamelFolder *source_folder, GPtrArray *uids, - const char *type, gboolean notify, + const gchar *type, gboolean notify, CamelOperation *cancel); /* convenience functions for above */ @@ -155,19 +155,19 @@ void mail_filter_on_demand (CamelFolder *folder, GPtrArray *uids); void mail_filter_junk (CamelFolder *folder, GPtrArray *uids); /* Work Offline */ -void mail_prep_offline(const char *uri, CamelOperation *cancel, - void (*done)(const char *, void *data), - void *data); -int mail_store_set_offline(CamelStore *store, gboolean offline, - void (*done)(CamelStore *, void *data), - void *data); -int mail_store_prepare_offline (CamelStore *store); +void mail_prep_offline(const gchar *uri, CamelOperation *cancel, + void (*done)(const gchar *, gpointer data), + gpointer data); +gint mail_store_set_offline(CamelStore *store, gboolean offline, + void (*done)(CamelStore *, gpointer data), + gpointer data); +gint mail_store_prepare_offline (CamelStore *store); /* filter driver execute shell command async callback */ -void mail_execute_shell_command (CamelFilterDriver *driver, int argc, char **argv, void *data); +void mail_execute_shell_command (CamelFilterDriver *driver, gint argc, gchar **argv, gpointer data); -int mail_check_service(const char *url, CamelProviderType type, - void (*done)(const char *url, CamelProviderType type, GList *authtypes, void *data), void *data); +gint mail_check_service(const gchar *url, CamelProviderType type, + void (*done)(const gchar *url, CamelProviderType type, GList *authtypes, gpointer data), gpointer data); #ifdef __cplusplus } -- cgit v1.2.3 From 00d56cd32c5d0a7f49567d5241ba0d6fd80940bb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Jun 2009 10:50:51 -0400 Subject: Use G_BEGIN_DECLS / G_END_DECLS macros. --- mail/mail-ops.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'mail/mail-ops.h') diff --git a/mail/mail-ops.h b/mail/mail-ops.h index 2fc570ca93..3233f03219 100644 --- a/mail/mail-ops.h +++ b/mail/mail-ops.h @@ -24,10 +24,7 @@ #ifndef MAIL_OPS_H #define MAIL_OPS_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS #include "mail-mt.h" @@ -169,8 +166,6 @@ void mail_execute_shell_command (CamelFilterDriver *driver, gint argc, gchar **a gint mail_check_service(const gchar *url, CamelProviderType type, void (*done)(const gchar *url, CamelProviderType type, GList *authtypes, gpointer data), gpointer data); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* MAIL_OPS_H */ -- cgit v1.2.3