[evolution-data-server] Bug 759214 - Make CamelFilterDriver introspection friendly

[Milan Crha <mcrha src gnome org>]

commit a06c602777c34e9da55d7b8361605a908d74e1ce
Author: Corentin Noël <corentin elementary io>
Date:   Mon Dec 14 17:37:04 2015 +0100

    Bug 759214 - Make CamelFilterDriver introspection friendly

 camel/camel-filter-driver.c |   16 ++++++++--------
 camel/camel-filter-driver.h |   16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c
index 75681aa..6f98b58 100644
--- a/camel/camel-filter-driver.c
+++ b/camel/camel-filter-driver.c
@@ -79,16 +79,16 @@ struct _CamelFilterDriverPrivate {
 
        CamelFolder *defaultfolder;        /* defualt folder */
 
-       CamelFilterStatusFunc *statusfunc; /* status callback */
+       CamelFilterStatusFunc statusfunc; /* status callback */
        gpointer statusdata;                  /* status callback data */
 
-       CamelFilterShellFunc *shellfunc;    /* execute shell command callback */
+       CamelFilterShellFunc shellfunc;    /* execute shell command callback */
        gpointer shelldata;                    /* execute shell command callback data */
 
-       CamelFilterPlaySoundFunc *playfunc; /* play-sound command callback */
+       CamelFilterPlaySoundFunc playfunc; /* play-sound command callback */
        gpointer playdata;                     /* play-sound command callback data */
 
-       CamelFilterSystemBeepFunc *beep;    /* system beep callback */
+       CamelFilterSystemBeepFunc beep;    /* system beep callback */
        gpointer beepdata;                     /* system beep callback data */
 
        /* for callback */
@@ -321,7 +321,7 @@ camel_filter_driver_set_logfile (CamelFilterDriver *d,
 
 void
 camel_filter_driver_set_status_func (CamelFilterDriver *d,
-                                     CamelFilterStatusFunc *func,
+                                     CamelFilterStatusFunc func,
                                      gpointer data)
 {
        d->priv->statusfunc = func;
@@ -330,7 +330,7 @@ camel_filter_driver_set_status_func (CamelFilterDriver *d,
 
 void
 camel_filter_driver_set_shell_func (CamelFilterDriver *d,
-                                    CamelFilterShellFunc *func,
+                                    CamelFilterShellFunc func,
                                     gpointer data)
 {
        d->priv->shellfunc = func;
@@ -339,7 +339,7 @@ camel_filter_driver_set_shell_func (CamelFilterDriver *d,
 
 void
 camel_filter_driver_set_play_sound_func (CamelFilterDriver *d,
-                                         CamelFilterPlaySoundFunc *func,
+                                         CamelFilterPlaySoundFunc func,
                                          gpointer data)
 {
        d->priv->playfunc = func;
@@ -348,7 +348,7 @@ camel_filter_driver_set_play_sound_func (CamelFilterDriver *d,
 
 void
 camel_filter_driver_set_system_beep_func (CamelFilterDriver *d,
-                                          CamelFilterSystemBeepFunc *func,
+                                          CamelFilterSystemBeepFunc func,
                                           gpointer data)
 {
        d->priv->beep = func;
diff --git a/camel/camel-filter-driver.h b/camel/camel-filter-driver.h
index f010ec6..b28225c 100644
--- a/camel/camel-filter-driver.h
+++ b/camel/camel-filter-driver.h
@@ -76,12 +76,12 @@ enum camel_filter_status_t {
 typedef CamelFolder * (*CamelFilterGetFolderFunc) (CamelFilterDriver *driver, const gchar *uri,
                                                   gpointer data, GError **error);
 /* report status */
-typedef void (CamelFilterStatusFunc) (CamelFilterDriver *driver, enum camel_filter_status_t status,
+typedef void (*CamelFilterStatusFunc) (CamelFilterDriver *driver, enum camel_filter_status_t status,
                                      gint pc, const gchar *desc, gpointer data);
 
-typedef void (CamelFilterShellFunc)      (CamelFilterDriver *driver, gint argc, gchar **argv, gpointer data);
-typedef void (CamelFilterPlaySoundFunc)  (CamelFilterDriver *driver, const gchar *filename, gpointer data);
-typedef void (CamelFilterSystemBeepFunc) (CamelFilterDriver *driver, gpointer data);
+typedef void (*CamelFilterShellFunc)      (CamelFilterDriver *driver, gint argc, gchar **argv, gpointer 
data);
+typedef void (*CamelFilterPlaySoundFunc)  (CamelFilterDriver *driver, const gchar *filename, gpointer data);
+typedef void (*CamelFilterSystemBeepFunc) (CamelFilterDriver *driver, gpointer data);
 
 GType          camel_filter_driver_get_type (void);
 CamelFilterDriver  *camel_filter_driver_new     (struct _CamelSession *);
@@ -89,10 +89,10 @@ CamelFilterDriver  *camel_filter_driver_new     (struct _CamelSession *);
 /* modifiers */
 void camel_filter_driver_set_logfile          (CamelFilterDriver *d, FILE *logfile);
 
-void camel_filter_driver_set_status_func      (CamelFilterDriver *d, CamelFilterStatusFunc *func, gpointer 
data);
-void camel_filter_driver_set_shell_func       (CamelFilterDriver *d, CamelFilterShellFunc *func, gpointer 
data);
-void camel_filter_driver_set_play_sound_func  (CamelFilterDriver *d, CamelFilterPlaySoundFunc *func, 
gpointer data);
-void camel_filter_driver_set_system_beep_func (CamelFilterDriver *d, CamelFilterSystemBeepFunc *func, 
gpointer data);
+void camel_filter_driver_set_status_func      (CamelFilterDriver *d, CamelFilterStatusFunc func, gpointer 
data);
+void camel_filter_driver_set_shell_func       (CamelFilterDriver *d, CamelFilterShellFunc func, gpointer 
data);
+void camel_filter_driver_set_play_sound_func  (CamelFilterDriver *d, CamelFilterPlaySoundFunc func, gpointer 
data);
+void camel_filter_driver_set_system_beep_func (CamelFilterDriver *d, CamelFilterSystemBeepFunc func, 
gpointer data);
 void camel_filter_driver_set_folder_func      (CamelFilterDriver *d, CamelFilterGetFolderFunc fetcher, 
gpointer data);
 
 void camel_filter_driver_set_default_folder   (CamelFilterDriver *d, CamelFolder *def);