aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-11-03 08:42:21 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-11-03 08:42:21 +0800
commit18fedea069a759788ccce9207ba8dcc3543ef944 (patch)
treead97078b314c73a5784a989a8a621c00091adcc9
parente735e8fa8965d907fe91467482e0fb5d00364bc2 (diff)
downloadgsoc2013-evolution-18fedea069a759788ccce9207ba8dcc3543ef944.tar
gsoc2013-evolution-18fedea069a759788ccce9207ba8dcc3543ef944.tar.gz
gsoc2013-evolution-18fedea069a759788ccce9207ba8dcc3543ef944.tar.bz2
gsoc2013-evolution-18fedea069a759788ccce9207ba8dcc3543ef944.tar.lz
gsoc2013-evolution-18fedea069a759788ccce9207ba8dcc3543ef944.tar.xz
gsoc2013-evolution-18fedea069a759788ccce9207ba8dcc3543ef944.tar.zst
gsoc2013-evolution-18fedea069a759788ccce9207ba8dcc3543ef944.zip
Fix for #14281 (missing icons in the druids).
svn path=/trunk/; revision=14576
-rw-r--r--art/ChangeLog6
-rw-r--r--art/Makefile.am15
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/glade/evolution-startup-wizard.glade2
4 files changed, 26 insertions, 2 deletions
diff --git a/art/ChangeLog b/art/ChangeLog
index 7d856a7992..0c088bbbe6 100644
--- a/art/ChangeLog
+++ b/art/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-01 Ettore Perazzoli <ettore@ximian.com>
+
+ * Makefile.am (gladedir): New.
+ (glade_DATA): Pixmap files required to be installed by the glade
+ files.
+
2001-10-31 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am: Install `evolution.png', not `evolution-icon.png'.
diff --git a/art/Makefile.am b/art/Makefile.am
index ccb77e5d83..74918f4f59 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -169,7 +169,20 @@ buttons_DATA = \
send-24.png \
weekview.xpm \
workweekview.xpm \
- yearview.xpm
+ yearview.xpm
+
+gladedir = $(datadir)/evolution/glade
+glade_DATA = \
+ evolution.png \
+ import.png \
+ mail-config-druid-account-name.png \
+ mail-config-druid-identity.png \
+ mail-config-druid.png \
+ mail-config-druid-receive.png \
+ mail-config-druid-send.png \
+ meeting_widget.png \
+ thankyou.png \
+ timezone-48.png
conduitsdir = $(datadir)/images/evolution/conduits
conduits_DATA = \
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 29f9520002..7e00ebb555 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-01 Ettore Perazzoli <ettore@ximian.com>
+
+ * glade/evolution-startup-wizard.glade: `timezone-48.png', not
+ `timezone.png'.
+
2001-11-01 Anna Marie Dirks <anna@ximian.com>
* glade/evolution-startup-wizard.glade: Changed the welcome
diff --git a/shell/glade/evolution-startup-wizard.glade b/shell/glade/evolution-startup-wizard.glade
index 5722be4f8e..f82643f76b 100644
--- a/shell/glade/evolution-startup-wizard.glade
+++ b/shell/glade/evolution-startup-wizard.glade
@@ -6,7 +6,7 @@
<program_name>evolution-startup-wizard</program_name>
<directory></directory>
<source_directory>src</source_directory>
- <pixmaps_directory>../../art/</pixmaps_directory>
+ <pixmaps_directory>/opt/gnome/share/images/evolution</pixmaps_directory>
<language>C</language>
<gnome_support>True</gnome_support>
<gettext_support>True</gettext_support>