[PATCH] Minor cleanup - don't define an own gconf prefix.



---
 composer/e-composer-header-table.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index b9602e6..62bf258 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -31,6 +31,8 @@
 #include "e-composer-post-header.h"
 #include "e-composer-text-header.h"
 
+#include "e-composer-private.h"
+
 extern gboolean composer_lite;
 
 #define E_COMPOSER_HEADER_TABLE_GET_PRIVATE(obj) \
@@ -47,8 +49,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 +304,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 +372,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:
-- 
1.6.0.2


--=-C+TN/4KqtlzZ4ZkPOeap--



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]