2 trivial patches

--=-C+TN/4KqtlzZ4ZkPOeap
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit

Hi,

While trying to fix something more substantial, I stumbled upon these 2
trivial things, please have a look & potentially commit :-)

Thank you,
Kendy

--=-C+TN/4KqtlzZ4ZkPOeap
Content-Disposition: attachment; filename="0001-CVS-git-in-autogen.sh.patch"
Content-Type: text/x-patch; name="0001-CVS-git-in-autogen.sh.patch"; charset="UTF-8"
Content-Transfer-Encoding: 7bit

From ddf8c9169c9db75e12ad74a7eeb46cb968dd404e Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <[email protected]>
Date: Sat, 16 Jan 2010 19:57:00 +0100
Subject: [PATCH] CVS -> git in autogen.sh.

---
 autogen.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index f2fd1c3..f346c77 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,7 +19,7 @@ REQUIRED_INTLTOOL_VERSION=0.35.5
 }
 
 which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME CVS"
+    echo "You need to install gnome-common from the GNOME git"
     exit 1
 }
 USE_GNOME2_MACROS=1 . gnome-autogen.sh
-- 
1.6.0.2


--=-C+TN/4KqtlzZ4ZkPOeap
Content-Disposition: attachment; filename="0002-Minor-cleanup-don-t-define-an-own-gconf-prefix.patch"
Content-Type: text/x-patch; name="0002-Minor-cleanup-don-t-define-an-own-gconf-prefix.patch"; charset="UTF-8"
Content-Transfer-Encoding: 7bit

From 4672c754d47ea1e50abf8f627bae6ecb3f61383f Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <[email protected]>
Date: Mon, 18 Jan 2010 08:54:38 +0100
Subject: [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
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Evolution-patches mailing list
[email protected]
http://mail.gnome.org/mailman/listinfo/evolution-patches

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