From 670e6d167863d4c8d8dde107e7d8ac7a288e0b52 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 6 Aug 2008 15:44:47 +0000 Subject: ** Fix for bug #249844 2008-08-06 Milan Crha ** Fix for bug #249844 * addressbook/gui/component/addressbook-component.c: * calendar/gui/tasks-component.c: (impl__get_userCreatableItems): * calendar/gui/memos-component.c: (impl__get_userCreatableItems): * mail/mail-component.c: (impl__get_userCreatableItems): * shell/test/evolution-test-component.c: (impl__get_userCreatableItems): (impl__get_userCreatableItems): Do not let compiler claim. * mail/em-event.h: (struct _EMEventTargetCustomIcon): Declare 'folder_name' as const char * to let compiler happy; no copy of the pointer anyway. * calendar/gui/calendar-component.c: (impl__get_userCreatableItems): Use C_() macro instead of Q_() macro. Use fully qualified names for "New" submenu entries. svn path=/trunk/; revision=35916 --- shell/ChangeLog | 7 +++++++ shell/test/evolution-test-component.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 6f12b5bd4b..b4df3e0962 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2008-08-06 Milan Crha + + ** Fix for bug #249844 + + * test/evolution-test-component.c: (impl__get_userCreatableItems): + Do not let compiler claim. + 2008-08-04 Matthew Barnes ** Fixes bug #249844 diff --git a/shell/test/evolution-test-component.c b/shell/test/evolution-test-component.c index 1ce8006ea5..88a7b05bf9 100644 --- a/shell/test/evolution-test-component.c +++ b/shell/test/evolution-test-component.c @@ -105,7 +105,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, list->_buffer[0].id = CREATE_TEST_ID; list->_buffer[0].description = _("New Test"); - list->_buffer[0].menuDescription = C_("New", "_Test"); + list->_buffer[0].menuDescription = (char *) C_("New", "_Test"); list->_buffer[0].tooltip = _("Create a new test item"); list->_buffer[0].menuShortcut = 'i'; list->_buffer[0].iconName = ""; -- cgit v1.2.3