aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e-util/ChangeLog5
-rw-r--r--e-util/Makefile.am2
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/Makefile.am54
-rw-r--r--widgets/misc/ChangeLog5
-rw-r--r--widgets/misc/Makefile.am2
-rw-r--r--widgets/misc/e-multi-config-dialog.c2
7 files changed, 45 insertions, 30 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 19bce6bd1f..ffca5638f1 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-08 Ettore Perazzoli <ettore@ximian.com>
+
+ * Makefile.am: Images are now in $(datadir)/evolution/images
+ instead of $(datadir)/images/evolution.
+
2003-01-07 Dan Winship <danw@ximian.com>
* e-config-listener.c (e_config_listener_remove_value): New.
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 89fea7550d..90b3423c60 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = . ename
-imagesdir = $(datadir)/images/evolution
+imagesdir = $(datadir)/evolution/images
eutilincludedir = $(includedir)/evolution/e-util
econdincludedir = $(includedir)/evolution/e-conduit
diff --git a/mail/ChangeLog b/mail/ChangeLog
index f95ce717e6..f650c14948 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-08 Ettore Perazzoli <ettore@ximian.com>
+
+ * Makefile.am: Images are now in $(datadir)/evolution/images
+ instead of $(datadir)/images/evolution.
+
2003-01-08 Jeffrey Stedfast <fejj@ximian.com>
* folder-browser-ui.c (folder_browser_ui_add_global): Call
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 0360bf5447..4c89094492 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -6,32 +6,32 @@ libexec_PROGRAMS = \
importerdir = $(privlibdir)/evolution-mail-importers
-INCLUDES = \
- -I$(top_srcdir)/widgets \
- -I$(top_srcdir)/widgets/e-text \
- -I$(top_srcdir)/widgets/misc \
- -I$(top_srcdir)/camel \
- -I$(top_srcdir) \
- -I$(top_srcdir)/composer \
- -I$(top_builddir)/composer \
- -I$(top_builddir)/shell \
- -I$(top_srcdir)/shell \
- -I$(top_srcdir)/shell/importer \
- -I$(top_builddir)/shell/importer \
- -I$(top_srcdir)/addressbook/backend \
- -I$(top_builddir)/addressbook/backend \
+INCLUDES = \
+ -I$(top_srcdir)/widgets \
+ -I$(top_srcdir)/widgets/e-text \
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_srcdir)/camel \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/composer \
+ -I$(top_builddir)/composer \
+ -I$(top_builddir)/shell \
+ -I$(top_srcdir)/shell \
+ -I$(top_srcdir)/shell/importer \
+ -I$(top_builddir)/shell/importer \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
$(EVOLUTION_MAIL_CFLAGS) \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
- -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
- -DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" \
- -DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\" \
- -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
- -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
- -DMAIL_IMPORTERSDIR=\""$(importerdir)"\" \
- -DG_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
+ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
+ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
+ -DEVOLUTION_IMAGES=\""$(datadir)/evolution/images"\" \
+ -DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\" \
+ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
+ -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
+ -DMAIL_IMPORTERSDIR=\""$(importerdir)"\" \
+ -DG_DISABLE_DEPRECATED \
+ -DGTK_DISABLE_DEPRECATED \
-DG_LOG_DOMAIN=\"evolution-mail\"
EVOLUTION_MAIL_CORBA_GENERATED = \
@@ -178,8 +178,8 @@ glade_DATA = mail-config.glade local-config.glade subscribe-dialog.glade message
etspecdir = $(datadir)/evolution/etspec/
etspec_DATA = mail-accounts.etspec message-list.etspec subscribe-dialog.etspec
-iconsdir = $(datadir)/images/evolution
-buttonsdir = $(datadir)/images/evolution/buttons
+iconsdir = $(datadir)/evolution/images
+buttonsdir = $(datadir)/evolution/images/buttons
idl_DATA = Mailer.idl
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 633bf06add..a1baeefc9e 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-08 Ettore Perazzoli <ettore@ximian.com>
+
+ * Makefile.am: Images are now in $(datadir)/evolution/images
+ instead of $(datadir)/images/evolution.
+
2002-12-10 Not Zed <NotZed@Ximian.com>
* e-multi-config-dialog.c (impl_response): Removed the
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 9ea28e8f38..66aa442a3f 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -4,7 +4,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets/shortcut-bar \
- -DMAP_DIR=\""$(datadir)/images/evolution"\" \
+ -DMAP_DIR=\""$(datadir)/evolution/images"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DG_LOG_DOMAIN=__FILE__ \
$(GNOME_FULL_CFLAGS)
diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c
index c13aca4a49..3f3562c220 100644
--- a/widgets/misc/e-multi-config-dialog.c
+++ b/widgets/misc/e-multi-config-dialog.c
@@ -294,7 +294,7 @@ class_init (EMultiConfigDialogClass *class)
dialog_class = GTK_DIALOG_CLASS (class);
dialog_class->response = impl_response;
- parent_class = g_type_class_ref(PARENT_TYPE);
+ parent_class = g_type_class_ref (PARENT_TYPE);
}
#define RGB_COLOR(color) (((color).red & 0xff00) << 8 | \