diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-01-19 23:01:30 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-01-19 23:02:26 +0800 |
| commit | 5f2fd41ef4b791ece98ed932b94b73360bc60e0a (patch) | |
| tree | c9f9d9883b14ae5a789278d222f2520beceebbbe | |
| parent | 159ddc6a661b8a77567417fa9b11f0746a72d3fb (diff) | |
| download | gsoc2013-evolution-5f2fd41ef4b791ece98ed932b94b73360bc60e0a.tar gsoc2013-evolution-5f2fd41ef4b791ece98ed932b94b73360bc60e0a.tar.gz gsoc2013-evolution-5f2fd41ef4b791ece98ed932b94b73360bc60e0a.tar.bz2 gsoc2013-evolution-5f2fd41ef4b791ece98ed932b94b73360bc60e0a.tar.lz gsoc2013-evolution-5f2fd41ef4b791ece98ed932b94b73360bc60e0a.tar.xz gsoc2013-evolution-5f2fd41ef4b791ece98ed932b94b73360bc60e0a.tar.zst gsoc2013-evolution-5f2fd41ef4b791ece98ed932b94b73360bc60e0a.zip | |
Don't stomp on GConf's identifier namespace.
| -rw-r--r-- | composer/e-composer-header-table.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c index b9602e64fc..f62dc376fd 100644 --- a/composer/e-composer-header-table.c +++ b/composer/e-composer-header-table.c @@ -26,6 +26,7 @@ #include "e-util/gconf-bridge.h" #include "widgets/misc/e-signature-combo-box.h" +#include "e-composer-private.h" #include "e-composer-from-header.h" #include "e-composer-name-header.h" #include "e-composer-post-header.h" @@ -47,8 +48,6 @@ extern gboolean composer_lite; "carbon copy of the message without appearing " \ "in the recipient list of the message") -#define GCONF_KEY_PREFIX "/apps/evolution/mail/composer" - enum { PROP_0, PROP_ACCOUNT, @@ -304,19 +303,19 @@ composer_header_table_setup_mail_headers (EComposerHeaderTable *table) switch (ii) { case E_COMPOSER_HEADER_BCC: - key = GCONF_KEY_PREFIX "/show_mail_bcc"; + key = COMPOSER_GCONF_PREFIX "/show_mail_bcc"; break; case E_COMPOSER_HEADER_CC: - key = GCONF_KEY_PREFIX "/show_mail_cc"; + key = COMPOSER_GCONF_PREFIX "/show_mail_cc"; break; case E_COMPOSER_HEADER_FROM: - key = GCONF_KEY_PREFIX "/show_mail_from"; + key = COMPOSER_GCONF_PREFIX "/show_mail_from"; break; case E_COMPOSER_HEADER_REPLY_TO: - key = GCONF_KEY_PREFIX "/show_mail_reply_to"; + key = COMPOSER_GCONF_PREFIX "/show_mail_reply_to"; break; default: @@ -372,11 +371,11 @@ composer_header_table_setup_post_headers (EComposerHeaderTable *table) switch (ii) { case E_COMPOSER_HEADER_FROM: - key = GCONF_KEY_PREFIX "/show_post_from"; + key = COMPOSER_GCONF_PREFIX "/show_post_from"; break; case E_COMPOSER_HEADER_REPLY_TO: - key = GCONF_KEY_PREFIX "/show_post_reply_to"; + key = COMPOSER_GCONF_PREFIX "/show_post_reply_to"; break; default: |