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/em-account-editor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mail/em-account-editor.h') diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h index fdd25b8f78..e17236e865 100644 --- a/mail/em-account-editor.h +++ b/mail/em-account-editor.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/em-account-editor.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mail/em-account-editor.h') diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h index e17236e865..4567f36cbe 100644 --- a/mail/em-account-editor.h +++ b/mail/em-account-editor.h @@ -66,10 +66,10 @@ struct _EMAccountEditorClass { GType em_account_editor_get_type(void); -EMAccountEditor *em_account_editor_new(struct _EAccount *account, em_account_editor_t type, const char *id); -EMAccountEditor *em_account_editor_new_for_pages(struct _EAccount *account, em_account_editor_t type, char *id, struct _GtkWidget **pages); +EMAccountEditor *em_account_editor_new(struct _EAccount *account, em_account_editor_t type, const gchar *id); +EMAccountEditor *em_account_editor_new_for_pages(struct _EAccount *account, em_account_editor_t type, gchar *id, struct _GtkWidget **pages); void em_account_editor_commit (EMAccountEditor *emae); -void em_account_editor_check (EMAccountEditor *emae, const char *page); +void em_account_editor_check (EMAccountEditor *emae, const gchar *page); gboolean em_account_editor_save (EMAccountEditor *gui); void em_account_editor_destroy (EMAccountEditor *gui); @@ -79,7 +79,7 @@ gboolean em_account_editor_source_complete (EMAccountEditor *gui, struct _GtkWid gboolean em_account_editor_transport_complete (EMAccountEditor *gui, struct _GtkWidget **incomplete); gboolean em_account_editor_management_complete (EMAccountEditor *gui, struct _GtkWidget **incomplete); -void em_account_editor_build_extra_conf (EMAccountEditor *gui, const char *url); +void em_account_editor_build_extra_conf (EMAccountEditor *gui, const gchar *url); void em_account_editor_auto_detect_extra_conf (EMAccountEditor *gui); -- 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/em-account-editor.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'mail/em-account-editor.h') diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h index 4567f36cbe..01d9dbd221 100644 --- a/mail/em-account-editor.h +++ b/mail/em-account-editor.h @@ -26,10 +26,7 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS struct _EAccount; @@ -83,8 +80,6 @@ void em_account_editor_build_extra_conf (EMAccountEditor *gui, const gchar *url) void em_account_editor_auto_detect_extra_conf (EMAccountEditor *gui); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* EM_ACCOUNT_EDITOR_H */ -- cgit v1.2.3 From c0d998229d5a3d2b65445b9025de7b23112f4063 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 18 Jun 2009 15:26:21 -0400 Subject: Stop abusing forward declarations. --- mail/em-account-editor.h | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'mail/em-account-editor.h') diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h index 01d9dbd221..d8d96f58f0 100644 --- a/mail/em-account-editor.h +++ b/mail/em-account-editor.h @@ -26,12 +26,13 @@ #include -G_BEGIN_DECLS +#include -struct _EAccount; +G_BEGIN_DECLS typedef struct _EMAccountEditor EMAccountEditor; typedef struct _EMAccountEditorClass EMAccountEditorClass; +typedef struct _EMAccountEditorPrivate EMAccountEditorPrivate; typedef enum { EMAE_NOTEBOOK, @@ -42,15 +43,15 @@ typedef enum { struct _EMAccountEditor { GObject gobject; - struct _EMAccountEditorPrivate *priv; + EMAccountEditorPrivate *priv; em_account_editor_t type; - struct _GtkWidget *editor; /* gtknotebook or druid, depending on type */ + GtkWidget *editor; /* gtknotebook or druid, depending on type */ - struct _EMConfig *config; /* driver object */ + EMConfig *config; /* driver object */ - struct _EAccount *account; /* working account, must instant apply to this */ - struct _EAccount *original; /* original account, not changed unless commit is invoked */ + EAccount *account; /* working account, must instant apply to this */ + EAccount *original; /* original account, not changed unless commit is invoked */ GtkWidget **pages; /* Pages for Anjal's page type editor */ @@ -63,18 +64,18 @@ struct _EMAccountEditorClass { GType em_account_editor_get_type(void); -EMAccountEditor *em_account_editor_new(struct _EAccount *account, em_account_editor_t type, const gchar *id); -EMAccountEditor *em_account_editor_new_for_pages(struct _EAccount *account, em_account_editor_t type, gchar *id, struct _GtkWidget **pages); +EMAccountEditor *em_account_editor_new(EAccount *account, em_account_editor_t type, const gchar *id); +EMAccountEditor *em_account_editor_new_for_pages(EAccount *account, em_account_editor_t type, gchar *id, GtkWidget **pages); void em_account_editor_commit (EMAccountEditor *emae); void em_account_editor_check (EMAccountEditor *emae, const gchar *page); gboolean em_account_editor_save (EMAccountEditor *gui); void em_account_editor_destroy (EMAccountEditor *gui); -gboolean em_account_editor_identity_complete (EMAccountEditor *gui, struct _GtkWidget **incomplete); -gboolean em_account_editor_source_complete (EMAccountEditor *gui, struct _GtkWidget **incomplete); -gboolean em_account_editor_transport_complete (EMAccountEditor *gui, struct _GtkWidget **incomplete); -gboolean em_account_editor_management_complete (EMAccountEditor *gui, struct _GtkWidget **incomplete); +gboolean em_account_editor_identity_complete (EMAccountEditor *gui, GtkWidget **incomplete); +gboolean em_account_editor_source_complete (EMAccountEditor *gui, GtkWidget **incomplete); +gboolean em_account_editor_transport_complete (EMAccountEditor *gui, GtkWidget **incomplete); +gboolean em_account_editor_management_complete (EMAccountEditor *gui, GtkWidget **incomplete); void em_account_editor_build_extra_conf (EMAccountEditor *gui, const gchar *url); -- cgit v1.2.3 From f0d3f3afdfa314e1e8cd7d8da790878008a46aad Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 24 Jun 2009 12:59:33 -0400 Subject: Radically reorganize source code. - Collect all shell modules into a new top-level 'modules' directory: $(top_srcdir)/modules/addressbook $(top_srcdir)/modules/calendar $(top_srcdir)/modules/mail Nothing is allowed to link to these, not plugins nor other modules. THIS SOLVES BUG #571275 AND OPENS THE DOOR TO PORTING TO MAC OS X. - Mimic the libevolution-mail-shared library from master (except drop the "shared" suffix) and have libevolution-mail-importers and all mail-related plugins link to it. - Discard the a11y subdirectories and have the files live alongside their counterpart widgets. --- mail/em-account-editor.h | 86 ------------------------------------------------ 1 file changed, 86 deletions(-) delete mode 100644 mail/em-account-editor.h (limited to 'mail/em-account-editor.h') diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h deleted file mode 100644 index d8d96f58f0..0000000000 --- a/mail/em-account-editor.h +++ /dev/null @@ -1,86 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * 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 - * 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: - * Jeffrey Stedfast - * Dan Winship - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifndef EM_ACCOUNT_EDITOR_H -#define EM_ACCOUNT_EDITOR_H - -#include - -#include - -G_BEGIN_DECLS - -typedef struct _EMAccountEditor EMAccountEditor; -typedef struct _EMAccountEditorClass EMAccountEditorClass; -typedef struct _EMAccountEditorPrivate EMAccountEditorPrivate; - -typedef enum { - EMAE_NOTEBOOK, - EMAE_DRUID, - EMAE_PAGES -} em_account_editor_t; - -struct _EMAccountEditor { - GObject gobject; - - EMAccountEditorPrivate *priv; - - em_account_editor_t type; - GtkWidget *editor; /* gtknotebook or druid, depending on type */ - - EMConfig *config; /* driver object */ - - EAccount *account; /* working account, must instant apply to this */ - EAccount *original; /* original account, not changed unless commit is invoked */ - - GtkWidget **pages; /* Pages for Anjal's page type editor */ - - guint do_signature:1; /* allow editing signature */ -}; - -struct _EMAccountEditorClass { - GObjectClass gobject_class; -}; - -GType em_account_editor_get_type(void); - -EMAccountEditor *em_account_editor_new(EAccount *account, em_account_editor_t type, const gchar *id); -EMAccountEditor *em_account_editor_new_for_pages(EAccount *account, em_account_editor_t type, gchar *id, GtkWidget **pages); -void em_account_editor_commit (EMAccountEditor *emae); -void em_account_editor_check (EMAccountEditor *emae, const gchar *page); - -gboolean em_account_editor_save (EMAccountEditor *gui); -void em_account_editor_destroy (EMAccountEditor *gui); - -gboolean em_account_editor_identity_complete (EMAccountEditor *gui, GtkWidget **incomplete); -gboolean em_account_editor_source_complete (EMAccountEditor *gui, GtkWidget **incomplete); -gboolean em_account_editor_transport_complete (EMAccountEditor *gui, GtkWidget **incomplete); -gboolean em_account_editor_management_complete (EMAccountEditor *gui, GtkWidget **incomplete); - -void em_account_editor_build_extra_conf (EMAccountEditor *gui, const gchar *url); - -void em_account_editor_auto_detect_extra_conf (EMAccountEditor *gui); - -G_END_DECLS - -#endif /* EM_ACCOUNT_EDITOR_H */ -- cgit v1.2.3 From 8dc6bbd250891bcef9130a789c9b74a01be7f1cb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 30 Jun 2009 10:47:59 -0400 Subject: Get the "startup-wizard" plugin working again. --- mail/em-account-editor.h | 119 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 mail/em-account-editor.h (limited to 'mail/em-account-editor.h') diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h new file mode 100644 index 0000000000..0c2f5e38aa --- /dev/null +++ b/mail/em-account-editor.h @@ -0,0 +1,119 @@ +/* + * This program is free software; you can redistribute it and/or + * 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 + * 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: + * Jeffrey Stedfast + * Dan Winship + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ + +#ifndef EM_ACCOUNT_EDITOR_H +#define EM_ACCOUNT_EDITOR_H + +#include +#include + +/* Standard GObject macros */ +#define EM_TYPE_ACCOUNT_EDITOR \ + (em_account_editor_get_type ()) +#define EM_ACCOUNT_EDITOR(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST \ + ((obj), EM_TYPE_ACCOUNT_EDITOR, EMAccountEditor)) +#define EM_ACCOUNT_EDITOR_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_CAST \ + ((cls), EM_TYPE_ACCOUNT_EDITOR, EMAccountEditorClass)) +#define EM_IS_ACCOUNT_EDITOR(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE \ + ((obj), EM_TYPE_ACCOUNT_EDITOR)) +#define EM_IS_ACCOUNT_EDITOR_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_TYPE \ + ((cls), EM_TYPE_ACCOUNT_EDITOR)) +#define EM_ACCOUNT_EDITOR_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS \ + ((obj), EM_TYPE_ACCOUNT_EDITOR, EMAccountEditorClass)) + +G_BEGIN_DECLS + +typedef struct _EMAccountEditor EMAccountEditor; +typedef struct _EMAccountEditorClass EMAccountEditorClass; +typedef struct _EMAccountEditorPrivate EMAccountEditorPrivate; + +typedef enum { + EMAE_NOTEBOOK, + EMAE_DRUID, + EMAE_PAGES +} EMAccountEditorType; + +struct _EMAccountEditor { + GObject parent; + + EMAccountEditorPrivate *priv; + + EMAccountEditorType type; + GtkWidget *editor; /* gtknotebook or druid, depending on type */ + + EMConfig *config; /* driver object */ + + GtkWidget **pages; /* Pages for Anjal's page type editor */ + + guint do_signature:1; /* allow editing signature */ +}; + +struct _EMAccountEditorClass { + GObjectClass parent_class; +}; + +GType em_account_editor_get_type (void); +EMAccountEditor * + em_account_editor_new (EAccount *account, + EMAccountEditorType type, + const gchar *id); +EMAccountEditor * + em_account_editor_new_for_pages (EAccount *account, + EMAccountEditorType type, + const gchar *id, + GtkWidget **pages); +EAccount * em_account_editor_get_modified_account + (EMAccountEditor *emae); +EAccount * em_account_editor_get_original_account + (EMAccountEditor *emae); +void em_account_editor_commit (EMAccountEditor *emae); +void em_account_editor_check (EMAccountEditor *emae, + const gchar *page); +gboolean em_account_editor_save (EMAccountEditor *emae); +void em_account_editor_destroy (EMAccountEditor *emae); +gboolean em_account_editor_identity_complete + (EMAccountEditor *emae, + GtkWidget **incomplete); +gboolean em_account_editor_source_complete + (EMAccountEditor *emae, + GtkWidget **incomplete); +gboolean EMAccountEditorTyperansport_complete + (EMAccountEditor *emae, + GtkWidget **incomplete); +gboolean em_account_editor_management_complete + (EMAccountEditor *emae, + GtkWidget **incomplete); +void em_account_editor_build_extra_conf + (EMAccountEditor *emae, + const gchar *url); +void em_account_editor_auto_detect_extra_conf + (EMAccountEditor *emae); + +G_END_DECLS + +#endif /* EM_ACCOUNT_EDITOR_H */ -- cgit v1.2.3 From de528db6c18b7ecee83bb8b52850d935c1244ebf Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 18 Aug 2009 10:00:23 -0400 Subject: =?UTF-8?q?Bug=C2=A0567260=20-=20Migrate=20from=20GnomeDruid=20to?= =?UTF-8?q?=20GtkAssistant?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mail/em-account-editor.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mail/em-account-editor.h') diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h index b8913e2a83..83e9cd4885 100644 --- a/mail/em-account-editor.h +++ b/mail/em-account-editor.h @@ -54,7 +54,7 @@ typedef struct _EMAccountEditorPrivate EMAccountEditorPrivate; typedef enum { EMAE_NOTEBOOK, - EMAE_DRUID, + EMAE_ASSISTANT, EMAE_PAGES } EMAccountEditorType; @@ -64,7 +64,7 @@ struct _EMAccountEditor { EMAccountEditorPrivate *priv; EMAccountEditorType type; - GtkWidget *editor; /* gtknotebook or druid, depending on type */ + GtkWidget *editor; /* gtknotebook or gtkassistant, depending on type */ EMConfig *config; /* driver object */ -- cgit v1.2.3