aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--art/ChangeLog4
-rw-r--r--art/Makefile.am3
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/dialogs/Makefile.am1
-rw-r--r--calendar/gui/dialogs/event-editor.c2
5 files changed, 14 insertions, 2 deletions
diff --git a/art/ChangeLog b/art/ChangeLog
index e11e991a48..bda022d17b 100644
--- a/art/ChangeLog
+++ b/art/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-06 Veerapuram Varadhan <vvaradhan@novell.com>
+
+ * Makefile.am (images_DATA): Add query-free-busy.png
+
2004-05-20 Rodney Dawes <dobey@ximian.com>
* Makefile.am (EXTRA_DIST): Add README and jump.xpm
diff --git a/art/Makefile.am b/art/Makefile.am
index 87bb7ded87..634ebf3d73 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -5,7 +5,8 @@ images_DATA = \
monkey-16.png \
offline.png \
online.png \
- world_map-960.png
+ world_map-960.png \
+ query-free-busy.png
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index bec1704aee..fc24a6bd1f 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-06 Veerapuram Varadhan <vvaradhan@novell.com>
+
+ **Fixes #321832
+ * gui/dialogs/event-editor.c: Pickup the right-icon for f/b.
+ * gui/dialgos/Makefile.am: Define EVOLUTION_ICONSDIR to pickup f/b icon.
+
2006-03-06 Simon Zheng <simon.zheng@sun.com>
Fixes bug #332140
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 71e7e1a61e..bd10669ab2 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES = \
-I$(top_srcdir)/widgets/misc \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
+ -DEVOLUTION_ICONSDIR=\""$(imagesdir)"\" \
-DPREFIX=\""$(prefix)"\" \
$(EVOLUTION_CALENDAR_CFLAGS)
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 0366cd5d7f..6123384650 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -391,7 +391,7 @@ static EPixmap pixmaps[] = {
E_PIXMAP ("/Toolbar/ViewTimeZone", "stock_timezone", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP ("/Toolbar/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP ("/commands/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/ActionFreeBusy", "stock_task-recurring", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/ActionFreeBusy", EVOLUTION_ICONSDIR"/query-free-busy.png", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP_END
};