aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/addressbook-file/addressbook-file.c4
-rw-r--r--plugins/groupwise-account-setup/camel-gw-listener.h1
-rw-r--r--plugins/groupwise-features/junk-settings.h44
-rw-r--r--plugins/groupwise-features/share-folder.h50
-rw-r--r--plugins/hula-account-setup/camel-hula-listener.h1
-rw-r--r--plugins/mail-to-task/Makefile.am1
-rw-r--r--plugins/mail-to-task/mail-to-task.c4
-rw-r--r--plugins/publish-calendar/Makefile.am1
-rw-r--r--plugins/save-calendar/Makefile.am1
9 files changed, 42 insertions, 65 deletions
diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c
index d651ad4a56..960c844aa4 100644
--- a/plugins/addressbook-file/addressbook-file.c
+++ b/plugins/addressbook-file/addressbook-file.c
@@ -25,9 +25,9 @@
#include <libedataserver/e-source.h>
#include <string.h>
-struct _GtkWidget *e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data);
+GtkWidget *e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data);
-struct _GtkWidget *
+GtkWidget *
e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data)
{
EABConfigTargetSource *t = (EABConfigTargetSource *) data->target;
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.h b/plugins/groupwise-account-setup/camel-gw-listener.h
index 9682a6877b..1c4cedbe5a 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.h
+++ b/plugins/groupwise-account-setup/camel-gw-listener.h
@@ -40,6 +40,7 @@ G_BEGIN_DECLS
typedef struct _CamelGwListener CamelGwListener;
typedef struct _CamelGwListenerClass CamelGwListenerClass;
typedef struct _CamelGwListenerPrivate CamelGwListenerPrivate;
+
struct _CamelGwListener {
GObject parent;
diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h
index fd728cbb21..3216ed9d9b 100644
--- a/plugins/groupwise-features/junk-settings.h
+++ b/plugins/groupwise-features/junk-settings.h
@@ -39,41 +39,27 @@ G_BEGIN_DECLS
typedef struct _JunkSettings JunkSettings;
typedef struct _JunkSettingsClass JunkSettingsClass;
-struct _GtkWidget;
-struct _GladeXML;
-struct _GtkButton;
-struct _GtkTreeView;
-struct _GtkLabel;
-struct _GtkEntry;
-struct _GtkWindow;
-struct _GtkRadioButton;
-struct _GtkListStore;
-struct _GtkCellRenderer;
-struct _GtkTreeViewColumn;
-struct _GtkFrame;
-struct _GtkVBox;
-
struct _JunkSettings {
GtkVBox parent_object;
- struct _GladeXML *xml;
+ GladeXML *xml;
/* General tab */
/* Default Behavior */
- struct _GtkTreeView *entry_list;
- struct _GtkButton *add_button;
- struct _GtkButton *remove;
- struct _GtkEntry *entry;
- struct _GtkRadioButton *enable;
- struct _GtkRadioButton *disable;
- struct _GtkWidget *scrolled_window;
- struct _GtkListStore *model;
- struct _GtkCellRenderer *cell;
- struct _GtkTreeViewColumn *column;
- struct _GtkVBox *vbox;
- struct _GtkVBox *table;
- struct _GtkWidget *window;
+ GtkTreeView *entry_list;
+ GtkButton *add_button;
+ GtkButton *remove;
+ GtkEntry *entry;
+ GtkRadioButton *enable;
+ GtkRadioButton *disable;
+ GtkWidget *scrolled_window;
+ GtkListStore *model;
+ GtkCellRenderer *cell;
+ GtkTreeViewColumn *column;
+ GtkVBox *vbox;
+ GtkVBox *table;
+ GtkWidget *window;
GList *junk_list;
gint users;
@@ -89,7 +75,7 @@ struct _JunkSettingsClass {
};
GType junk_settings_get_type (void);
-struct _JunkSettings * junk_settings_new (EGwConnection *ccnc);
+JunkSettings * junk_settings_new (EGwConnection *ccnc);
void commit_changes (JunkSettings *js);
G_END_DECLS
diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h
index d95d9732a4..5108d02c19 100644
--- a/plugins/groupwise-features/share-folder.h
+++ b/plugins/groupwise-features/share-folder.h
@@ -40,45 +40,31 @@ G_BEGIN_DECLS
typedef struct _ShareFolder ShareFolder;
typedef struct _ShareFolderClass ShareFolderClass;
-struct _GtkWidget;
-struct _GladeXML;
-struct _GtkButton;
-struct _GtkTreeView;
-struct _GtkLabel;
-struct _GtkEntry;
-struct _GtkWindow;
-struct _GtkRadioButton;
-struct _GtkListStore;
-struct _GtkCellRenderer;
-struct _GtkTreeViewColumn;
-struct _GtkFrame;
-struct _GtkVBox;
-
struct _ShareFolder {
GtkVBox parent_object;
- struct _GladeXML *xml;
+ GladeXML *xml;
/* General tab */
/* Default Behavior */
- struct _GtkTreeView *user_list;
- struct _GtkTextView *message;
- struct _GtkButton *add_button;
- struct _GtkButton *remove;
- struct _GtkButton *add_book;
- struct _GtkButton *notification;
- struct _GtkEntry *name;
- struct _GtkEntry *subject;
- struct _GtkRadioButton *shared;
- struct _GtkRadioButton *not_shared;
- struct _GtkWidget *scrolled_window;
- struct _GtkListStore *model;
- struct _GtkCellRenderer *cell;
- struct _GtkTreeViewColumn *column;
- struct _GtkVBox *vbox;
- struct _GtkVBox *table;
- struct _GtkWidget *window;
+ GtkTreeView *user_list;
+ GtkTextView *message;
+ GtkButton *add_button;
+ GtkButton *remove;
+ GtkButton *add_book;
+ GtkButton *notification;
+ GtkEntry *name;
+ GtkEntry *subject;
+ GtkRadioButton *shared;
+ GtkRadioButton *not_shared;
+ GtkWidget *scrolled_window;
+ GtkListStore *model;
+ GtkCellRenderer *cell;
+ GtkTreeViewColumn *column;
+ GtkVBox *vbox;
+ GtkVBox *table;
+ GtkWidget *window;
GList *users_list;
EGwContainer *gcontainer;
diff --git a/plugins/hula-account-setup/camel-hula-listener.h b/plugins/hula-account-setup/camel-hula-listener.h
index 9a0c3642eb..97c1b33919 100644
--- a/plugins/hula-account-setup/camel-hula-listener.h
+++ b/plugins/hula-account-setup/camel-hula-listener.h
@@ -40,6 +40,7 @@ G_BEGIN_DECLS
typedef struct _CamelHulaListener CamelHulaListener;
typedef struct _CamelHulaListenerClass CamelHulaListenerClass;
typedef struct _CamelHulaListenerPrivate CamelHulaListenerPrivate;
+
struct _CamelHulaListener {
GObject parent;
diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am
index 9a3749d676..5261fbcf97 100644
--- a/plugins/mail-to-task/Makefile.am
+++ b/plugins/mail-to-task/Makefile.am
@@ -1,5 +1,6 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/widgets \
$(EVOLUTION_CALENDAR_CFLAGS) \
$(EVOLUTION_MAIL_CFLAGS)
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 78fd37b999..e7fa727ff1 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -323,7 +323,7 @@ report_error_idle (const gchar *format, const gchar *param)
typedef struct {
ECal *client;
- struct _CamelFolder *folder;
+ CamelFolder *folder;
GPtrArray *uids;
gchar *selected_text;
gboolean with_attendees;
@@ -333,7 +333,7 @@ static gboolean
do_mail_to_event (AsyncData *data)
{
ECal *client = data->client;
- struct _CamelFolder *folder = data->folder;
+ CamelFolder *folder = data->folder;
GPtrArray *uids = data->uids;
GError *err = NULL;
gboolean readonly = FALSE;
diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am
index 3c794393b2..c8119f48bb 100644
--- a/plugins/publish-calendar/Makefile.am
+++ b/plugins/publish-calendar/Makefile.am
@@ -1,5 +1,6 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/widgets \
-I$(top_builddir)/shell \
$(EVOLUTION_CALENDAR_CFLAGS) \
-DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" \
diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am
index 6894e6b21e..8336dd12ec 100644
--- a/plugins/save-calendar/Makefile.am
+++ b/plugins/save-calendar/Makefile.am
@@ -1,5 +1,6 @@
INCLUDES = \
-I$(top_srcdir) \
+ -I$(top_srcdir)/widgets \
$(EVOLUTION_CALENDAR_CFLAGS)
@EVO_PLUGIN_RULE@