Images are now in $(datadir)/evolution/images

instead of $(datadir)/images/evolution.

svn path=/trunk/; revision=19294
This commit is contained in:
Ettore Perazzoli
2003-01-08 22:36:12 +00:00
parent 89862745a8
commit 86033606aa
7 changed files with 45 additions and 30 deletions

View File

@ -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.

View File

@ -1,6 +1,6 @@
SUBDIRS = . ename
imagesdir = $(datadir)/images/evolution
imagesdir = $(datadir)/evolution/images
eutilincludedir = $(includedir)/evolution/e-util
econdincludedir = $(includedir)/evolution/e-conduit

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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 | \