diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/em-config.c | 28 | ||||
| -rw-r--r-- | mail/em-config.h | 13 |
2 files changed, 0 insertions, 41 deletions
diff --git a/mail/em-config.c b/mail/em-config.c index 352e16b4b1..ca8e117d7e 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -52,9 +52,6 @@ em_config_set_target (EConfig *ep, case EM_CONFIG_TARGET_FOLDER: { /*EMConfigTargetFolder *s = (EMConfigTargetFolder *)t;*/ break; } - case EM_CONFIG_TARGET_PREFS: { - /*EMConfigTargetPrefs *s = (EMConfigTargetPrefs *)t;*/ - break; } case EM_CONFIG_TARGET_SETTINGS: { EMConfigTargetSettings *s = (EMConfigTargetSettings *) t; @@ -78,8 +75,6 @@ em_config_target_free (EConfig *ep, switch (t->type) { case EM_CONFIG_TARGET_FOLDER: break; - case EM_CONFIG_TARGET_PREFS: - break; case EM_CONFIG_TARGET_SETTINGS: { EMConfigTargetSettings *s = (EMConfigTargetSettings *) t; @@ -95,12 +90,6 @@ em_config_target_free (EConfig *ep, g_object_unref (s->folder); break; } - case EM_CONFIG_TARGET_PREFS: { - EMConfigTargetPrefs *s = (EMConfigTargetPrefs *) t; - - if (s->gconf) - g_object_unref (s->gconf); - break; } case EM_CONFIG_TARGET_SETTINGS: { EMConfigTargetSettings *s = (EMConfigTargetSettings *) t; @@ -157,23 +146,6 @@ em_config_target_new_folder (EMConfig *emp, return t; } -EMConfigTargetPrefs * -em_config_target_new_prefs (EMConfig *emp, - GConfClient *gconf) -{ - EMConfigTargetPrefs *t; - - t = e_config_target_new ( - &emp->config, EM_CONFIG_TARGET_PREFS, sizeof (*t)); - - if (GCONF_IS_CLIENT (gconf)) - t->gconf = g_object_ref (gconf); - else - t->gconf = NULL; - - return t; -} - EMConfigTargetSettings * em_config_target_new_settings (EMConfig *emp, const gchar *email_address, diff --git a/mail/em-config.h b/mail/em-config.h index a90ecf3262..7c23495677 100644 --- a/mail/em-config.h +++ b/mail/em-config.h @@ -24,7 +24,6 @@ #define EM_CONFIG_H #include <camel/camel.h> -#include <gconf/gconf-client.h> #include <libedataserver/e-account.h> #include "e-util/e-config.h" @@ -58,12 +57,10 @@ typedef struct _EMConfigPrivate EMConfigPrivate; /* Types of popup tagets */ enum _em_config_target_t { EM_CONFIG_TARGET_FOLDER, - EM_CONFIG_TARGET_PREFS, EM_CONFIG_TARGET_SETTINGS }; typedef struct _EMConfigTargetFolder EMConfigTargetFolder; -typedef struct _EMConfigTargetPrefs EMConfigTargetPrefs; typedef struct _EMConfigTargetSettings EMConfigTargetSettings; struct _EMConfigTargetFolder { @@ -72,13 +69,6 @@ struct _EMConfigTargetFolder { CamelFolder *folder; }; -struct _EMConfigTargetPrefs { - EConfigTarget target; - - /* preferences are global from gconf */ - GConfClient *gconf; -}; - struct _EMConfigTargetSettings { EConfigTarget target; @@ -108,9 +98,6 @@ EMConfig * em_config_new (gint type, EMConfigTargetFolder * em_config_target_new_folder (EMConfig *emp, CamelFolder *folder); -EMConfigTargetPrefs * - em_config_target_new_prefs (EMConfig *emp, - GConfClient *gconf); EMConfigTargetSettings * em_config_target_new_settings (EMConfig *emp, const gchar *email_address, |