aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMichael Monreal <mmonreal@svn.gnome.org>2007-11-10 17:37:27 +0800
committerMichael Monreal <mmonreal@src.gnome.org>2007-11-10 17:37:27 +0800
commitcfb0a3c19afa083d7abdd48e5900589c304a462f (patch)
tree2fa48539c3365651c71fcac97cbd2dcfce2c370b /calendar
parent0ed655c83ba6701df82572b5e41400e498ba6579 (diff)
downloadgsoc2013-evolution-cfb0a3c19afa083d7abdd48e5900589c304a462f.tar.gz
gsoc2013-evolution-cfb0a3c19afa083d7abdd48e5900589c304a462f.tar.zst
gsoc2013-evolution-cfb0a3c19afa083d7abdd48e5900589c304a462f.zip
** Fix for bug #209425
2007-11-10 Michael Monreal <mmonreal@svn.gnome.org> ** Fix for bug #209425 * data/icons/Makefile.am: * data/icons/hicolor_actions_16x16_go-today.svg: * data/icons/hicolor_actions_22x22_go-today.svg: Don't use gtk-home for the go-today action. Add new icons to the build. svn path=/trunk/; revision=34518
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/calendar-commands.c16
-rw-r--r--calendar/gui/e-calendar-view.c2
3 files changed, 18 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e0adf45964..62342f187d 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-10 Michael Monreal <mmonreal@svn.gnome.org>
+
+ ** Fix for bug #209425
+
+ * gui/calendar-commands.c:
+ * gui/e-calendar-view.c:
+ Don't use gtk-home for the go-today action.
+
2007-11-05 Milan Crha <mcrha@redhat.com>
** Fix for bug #491345
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index b16a6991f4..7c6576bf2a 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -598,13 +598,14 @@ static EPixmap pixmaps [] = {
E_PIXMAP ("/commands/CalendarPrint", "document-print", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/DeleteAllOccurrences", "edit-delete", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/DeleteOccurrence", "edit-delete", E_ICON_SIZE_MENU),
- E_PIXMAP ("/commands/CalendarGoto", "go-jump", E_ICON_SIZE_MENU),
- E_PIXMAP ("/commands/CalendarNext", "go-next", E_ICON_SIZE_MENU),
- E_PIXMAP ("/commands/CalendarPrintPreview", "document-print-preview", E_ICON_SIZE_MENU),
- E_PIXMAP ("/commands/Copy", "edit-copy", E_ICON_SIZE_MENU),
- E_PIXMAP ("/commands/Cut", "edit-cut", E_ICON_SIZE_MENU),
- E_PIXMAP ("/commands/Delete", "edit-delete", E_ICON_SIZE_MENU),
- E_PIXMAP ("/commands/Paste", "edit-paste", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/CalendarGoto", "go-jump", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/CalendarNext", "go-next", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/CalendarPrintPreview", "document-print-preview", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/Copy", "edit-copy", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/Cut", "edit-cut", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/Delete", "edit-delete", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/Paste", "edit-paste", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/CalendarToday", "go-today", E_ICON_SIZE_MENU),
E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR),
@@ -616,6 +617,7 @@ static EPixmap pixmaps [] = {
E_PIXMAP ("/Toolbar/WeekView", "view-calendar-week", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP ("/Toolbar/MonthView", "view-calendar-month", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP ("/Toolbar/ListView", "view-calendar-list", E_ICON_SIZE_LARGE_TOOLBAR),
+ E_PIXMAP ("/Toolbar/Today", "go-today", E_ICON_SIZE_LARGE_TOOLBAR),
E_PIXMAP_END
};
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index fae8a2cb8e..7f84d6e540 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1666,7 +1666,7 @@ static EPopupItem ecv_main_items [] = {
/* FIXME: hook in this somehow */
{ E_POPUP_SUBMENU, "60.view", N_("_Current View") },
- { E_POPUP_ITEM, "61.today", N_("Select T_oday"), on_goto_today, NULL, GTK_STOCK_HOME },
+ { E_POPUP_ITEM, "61.today", N_("Select T_oday"), on_goto_today, NULL, "go-today" },
{ E_POPUP_ITEM, "62.todate", N_("_Select Date..."), on_goto_date, NULL, GTK_STOCK_JUMP_TO },
};