[evolution] Don't stomp on GConf's identifier namespace.

[Matthew Barnes <mbarnes src gnome org>]

commit 5f2fd41ef4b791ece98ed932b94b73360bc60e0a
Author: Jan Holesovsky <kendy suse cz>
Date:   Tue Jan 19 10:01:30 2010 -0500

    Don't stomp on GConf's identifier namespace.

 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 b9602e6..f62dc37 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: