diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2003-10-25 03:31:22 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-10-25 03:31:22 +0800 |
| commit | 5ae78b362fa270a49077335c32277ea52779c49a (patch) | |
| tree | 4a08143be69fbb784ccee2ae4261d078d7c1173a /mail/mail-config-factory.c | |
| parent | 602ee2f49664f532de6ba5f44b323dcb26192012 (diff) | |
| download | gsoc2013-evolution-5ae78b362fa270a49077335c32277ea52779c49a.tar.gz gsoc2013-evolution-5ae78b362fa270a49077335c32277ea52779c49a.tar.zst gsoc2013-evolution-5ae78b362fa270a49077335c32277ea52779c49a.zip | |
Re-Namespaced mail-accounts.c
2003-10-24 Jeffrey Stedfast <fejj@ximian.com>
* em-account-prefs.[c,h]: Re-Namespaced mail-accounts.c
* em-composer-prefs.[c,h]: Re-Namespaced mail-composer-prefs.c
* em-mailer-prefs.[c,h]: Re-Namespaced mail-preferences.c
* mail-accounts.[c,h]: Removed.
* mail-composer-prefs.[c,h]: Removed.
* mail-preferences.[c,h]: Removed.
* mail-account-editor.c: Updated.
* mail-account-gui.c: Updated.
* mail-config-factory.c: Updated.
* mail-component-factory.c: Updated.
svn path=/trunk/; revision=23066
Diffstat (limited to 'mail/mail-config-factory.c')
| -rw-r--r-- | mail/mail-config-factory.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/mail/mail-config-factory.c b/mail/mail-config-factory.c index 50fddb9be9..e2c205de94 100644 --- a/mail/mail-config-factory.c +++ b/mail/mail-config-factory.c @@ -27,9 +27,10 @@ #include <string.h> -#include "mail-accounts.h" -#include "mail-preferences.h" -#include "mail-composer-prefs.h" +#include "em-account-prefs.h" +#include "em-composer-prefs.h" +#include "em-mailer-prefs.h" + #include "mail-config-factory.h" #define CONFIG_CONTROL_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ConfigControlFactory" @@ -67,16 +68,15 @@ mail_config_control_factory_cb (BonoboGenericFactory *factory, const char *compo data = g_new (struct _config_data, 1); - /* TODO: should use ascii_str*cmp? */ - if (!strcmp (component_id, MAIL_ACCOUNTS_CONTROL_ID)) { - prefs = mail_accounts_tab_new (shell); - data->apply = (ApplyFunc) mail_accounts_tab_apply; - } else if (!strcmp (component_id, MAIL_PREFERENCES_CONTROL_ID)) { - prefs = mail_preferences_new (); - data->apply = (ApplyFunc) mail_preferences_apply; - } else if (!strcmp (component_id, MAIL_COMPOSER_PREFS_CONTROL_ID)) { - prefs = mail_composer_prefs_new (); - data->apply = (ApplyFunc) mail_composer_prefs_apply; + if (!strcmp (component_id, EM_ACCOUNT_PREFS_CONTROL_ID)) { + prefs = em_account_prefs_new (shell); + data->apply = (ApplyFunc) em_account_prefs_apply; + } else if (!strcmp (component_id, EM_MAILER_PREFS_CONTROL_ID)) { + prefs = em_mailer_prefs_new (); + data->apply = (ApplyFunc) em_mailer_prefs_apply; + } else if (!strcmp (component_id, EM_COMPOSER_PREFS_CONTROL_ID)) { + prefs = em_composer_prefs_new (); + data->apply = (ApplyFunc) em_composer_prefs_apply; } else { g_assert_not_reached (); } @@ -88,12 +88,12 @@ mail_config_control_factory_cb (BonoboGenericFactory *factory, const char *compo control = evolution_config_control_new (prefs); - if (!strcmp (component_id, MAIL_ACCOUNTS_CONTROL_ID)) { + if (!strcmp (component_id, EM_ACCOUNT_PREFS_CONTROL_ID)) { /* nothing to do here... */ - } else if (!strcmp (component_id, MAIL_PREFERENCES_CONTROL_ID)) { - MAIL_PREFERENCES (prefs)->control = control; - } else if (!strcmp (component_id, MAIL_COMPOSER_PREFS_CONTROL_ID)) { - MAIL_COMPOSER_PREFS (prefs)->control = control; + } else if (!strcmp (component_id, EM_MAILER_PREFS_CONTROL_ID)) { + EM_MAILER_PREFS (prefs)->control = control; + } else if (!strcmp (component_id, EM_COMPOSER_PREFS_CONTROL_ID)) { + EM_COMPOSER_PREFS (prefs)->control = control; } else { g_assert_not_reached (); } |