diff options
| -rw-r--r-- | composer/ChangeLog | 10 | ||||
| -rw-r--r-- | composer/Makefile.am | 4 | ||||
| -rw-r--r-- | composer/e-composer-private.h | 2 | ||||
| -rw-r--r-- | e-util/ChangeLog | 5 | ||||
| -rw-r--r-- | e-util/Makefile.am | 2 | ||||
| -rw-r--r-- | e-util/gconf-bridge.c (renamed from composer/gconf-bridge.c) | 0 | ||||
| -rw-r--r-- | e-util/gconf-bridge.h (renamed from composer/gconf-bridge.h) | 0 | ||||
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/em-composer-prefs.c | 2 |
9 files changed, 25 insertions, 5 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index bd6c1a3037..9d0dfb7e5b 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,13 @@ +2008-04-22 Matthew Barnes <mbarnes@redhat.com> + + * gconf-bridge.c: + * gconf-bridge.h: + Move these files to e-util. + + * Makefile.am: + * e-composer-private.h: + Adapt. + 2008-04-17 Milan Crha <mcrha@redhat.com> ** Part of fix for bug #526739 diff --git a/composer/Makefile.am b/composer/Makefile.am index 562687a1d4..5b777f5525 100644 --- a/composer/Makefile.am +++ b/composer/Makefile.am @@ -47,9 +47,7 @@ libcomposer_la_SOURCES = \ 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 diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h index 5cea10af89..5381dac80d 100644 --- a/composer/e-composer-private.h +++ b/composer/e-composer-private.h @@ -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 \ diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 73220b574c..023c708dcc 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,8 @@ +2008-04-22 Matthew Barnes <mbarnes@redhat.com> + + * Makefile.am: + Add gconf-bridge.[ch] from composer. + 2008-04-18 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #528817 diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 3677d841d4..3d4c495b8a 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -115,6 +115,8 @@ libeutil_la_SOURCES = \ 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 diff --git a/composer/gconf-bridge.c b/e-util/gconf-bridge.c index 49754cfe96..49754cfe96 100644 --- a/composer/gconf-bridge.c +++ b/e-util/gconf-bridge.c diff --git a/composer/gconf-bridge.h b/e-util/gconf-bridge.h index aa7bfaefb8..aa7bfaefb8 100644 --- a/composer/gconf-bridge.h +++ b/e-util/gconf-bridge.h diff --git a/mail/ChangeLog b/mail/ChangeLog index c90b054d0b..19d902e9ee 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2008-04-22 Matthew Barnes <mbarnes@redhat.com> + + * em-composer-prefs.c: + gconf-bridge.h moved to e-util. + 2008-04-21 Milan Crha <mcrha@redhat.com> ** Fix for bug #323402 diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c index 230d32526c..118bfb6a3c 100644 --- a/mail/em-composer-prefs.c +++ b/mail/em-composer-prefs.c @@ -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> |