evolution r35399 - in trunk: composer e-util mail

[mbarnes svn gnome org]

Author: mbarnes
Date: Tue Apr 22 14:57:43 2008
New Revision: 35399
URL: http://svn.gnome.org/viewvc/evolution?rev=35399&view=rev

Log:
2008-04-22  Matthew Barnes  <mbarnes redhat com>

	* composer/gconf-bridge.c:
	* composer/gconf-bridge.h:
	Move these files to e-util.

	* composer/Makefile.am:
	* composer/e-composer-private.h:
	* mail/em-composer-prefs.c:
	Adapt.

	* e-util/Makefile.am:
	Add gconf-bridge.[ch] from composer.



Added:
   trunk/e-util/gconf-bridge.c
      - copied unchanged from r35398, /trunk/composer/gconf-bridge.c
   trunk/e-util/gconf-bridge.h
      - copied unchanged from r35398, /trunk/composer/gconf-bridge.h
Removed:
   trunk/composer/gconf-bridge.c
   trunk/composer/gconf-bridge.h
Modified:
   trunk/composer/ChangeLog
   trunk/composer/Makefile.am
   trunk/composer/e-composer-private.h
   trunk/e-util/ChangeLog
   trunk/e-util/Makefile.am
   trunk/mail/ChangeLog
   trunk/mail/em-composer-prefs.c

Modified: trunk/composer/Makefile.am
==============================================================================
--- trunk/composer/Makefile.am	(original)
+++ trunk/composer/Makefile.am	Tue Apr 22 14:57:43 2008
@@ -47,9 +47,7 @@
 	e-composer-text-header.c		\
 	e-composer-text-header.h		\
 	e-msg-composer.c			\
-	e-msg-composer.h			\
-	gconf-bridge.c				\
-	gconf-bridge.h
+	e-msg-composer.h
 
 uidir = $(evolutionuidir)
 ui_DATA = evolution-composer.ui

Modified: trunk/composer/e-composer-private.h
==============================================================================
--- trunk/composer/e-composer-private.h	(original)
+++ trunk/composer/e-composer-private.h	Tue Apr 22 14:57:43 2008
@@ -24,7 +24,6 @@
 
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
-#include "gconf-bridge.h"
 
 #include <libedataserver/e-iconv.h>
 
@@ -32,6 +31,7 @@
 #include "e-composer-actions.h"
 #include "e-composer-autosave.h"
 #include "e-composer-header-table.h"
+#include "e-util/gconf-bridge.h"
 
 #define E_MSG_COMPOSER_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \

Modified: trunk/e-util/Makefile.am
==============================================================================
--- trunk/e-util/Makefile.am	(original)
+++ trunk/e-util/Makefile.am	Tue Apr 22 14:57:43 2008
@@ -115,6 +115,8 @@
 	e-util-labels.c				\
 	e-util-private.h			\
 	e-xml-utils.c				\
+	gconf-bridge.c				\
+	gconf-bridge.h				\
 	$(PLATFORM_SOURCES)
 
 MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h

Modified: trunk/mail/em-composer-prefs.c
==============================================================================
--- trunk/mail/em-composer-prefs.c	(original)
+++ trunk/mail/em-composer-prefs.c	Tue Apr 22 14:57:43 2008
@@ -32,10 +32,10 @@
 
 #include "e-util/e-signature.h"
 #include "e-util/e-signature-list.h"
+#include "e-util/gconf-bridge.h"
 
 #include "em-composer-prefs.h"
 #include "composer/e-msg-composer.h"
-#include "composer/gconf-bridge.h"
 
 #include <bonobo/bonobo-generic-factory.h>