aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorVeerapuram Varadhan <vvaradan@src.gnome.org>2006-03-06 23:59:00 +0800
committerVeerapuram Varadhan <vvaradan@src.gnome.org>2006-03-06 23:59:00 +0800
commite2858021bfc1c70f9dbd70b6f5fea5b7882c0738 (patch)
tree2e4b6bcf9d75f1c2dcd688bf3934ee5e2f980a22 /calendar
parent3e791ca690cd1f0c75a918715ecc196b665e25ea (diff)
downloadgsoc2013-evolution-e2858021bfc1c70f9dbd70b6f5fea5b7882c0738.tar.gz
gsoc2013-evolution-e2858021bfc1c70f9dbd70b6f5fea5b7882c0738.tar.zst
gsoc2013-evolution-e2858021bfc1c70f9dbd70b6f5fea5b7882c0738.zip
**Fixes #321832 Pickup the right-icon for f/b. Define EVOLUTION_ICONSDIR
**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. svn path=/trunk/; revision=31667
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/dialogs/Makefile.am1
-rw-r--r--calendar/gui/dialogs/event-editor.c2
3 files changed, 8 insertions, 1 deletions
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
};