diff options
| author | Milan Crha <mcrha@redhat.com> | 2008-08-06 23:44:47 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@src.gnome.org> | 2008-08-06 23:44:47 +0800 |
| commit | 670e6d167863d4c8d8dde107e7d8ac7a288e0b52 (patch) | |
| tree | 01aa1c20effb5b36fa39c1ba37a63cec9aa84822 /mail | |
| parent | 6bf36561f19fede5232329407dbdbd1dec82f33c (diff) | |
| download | gsoc2013-evolution-670e6d167863d4c8d8dde107e7d8ac7a288e0b52.tar gsoc2013-evolution-670e6d167863d4c8d8dde107e7d8ac7a288e0b52.tar.gz gsoc2013-evolution-670e6d167863d4c8d8dde107e7d8ac7a288e0b52.tar.bz2 gsoc2013-evolution-670e6d167863d4c8d8dde107e7d8ac7a288e0b52.tar.lz gsoc2013-evolution-670e6d167863d4c8d8dde107e7d8ac7a288e0b52.tar.xz gsoc2013-evolution-670e6d167863d4c8d8dde107e7d8ac7a288e0b52.tar.zst gsoc2013-evolution-670e6d167863d4c8d8dde107e7d8ac7a288e0b52.zip | |
** Fix for bug #249844
2008-08-06 Milan Crha <mcrha@redhat.com>
** 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
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/em-event.h | 2 | ||||
| -rw-r--r-- | mail/mail-component.c | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index dbe8443ec3..6e0039d345 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2008-08-06 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #249844 + + * em-event.h: (struct _EMEventTargetCustomIcon): Declare 'folder_name' + as const char * to let compiler happy; no copy of the pointer anyway. + * mail-component.c: (impl__get_userCreatableItems): + Do not let compiler claim. + 2008-08-05 Srinivasa Ragavan <sragavan@novell.com> * mail/message-list.c: Fix a performance issue, where we can just go diff --git a/mail/em-event.h b/mail/em-event.h index 8725868e2f..6b35547084 100644 --- a/mail/em-event.h +++ b/mail/em-event.h @@ -117,7 +117,7 @@ struct _EMEventTargetCustomIcon { EEventTarget target; GtkCellRenderer *renderer; - char *folder_name; + const char *folder_name; }; typedef struct _EEventItem EMEventItem; diff --git a/mail/mail-component.c b/mail/mail-component.c index 43bf5485e5..f18ccb08d0 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -914,7 +914,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_Environment list->_buffer[0].id = "message"; list->_buffer[0].description = _("New Mail Message"); - list->_buffer[0].menuDescription = C_("New", "_Mail Message"); + list->_buffer[0].menuDescription = (char *) C_("New", "_Mail Message"); list->_buffer[0].tooltip = _("Compose a new mail message"); list->_buffer[0].menuShortcut = 'm'; list->_buffer[0].iconName = "mail-message-new"; @@ -922,7 +922,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_Environment list->_buffer[1].id = "folder"; list->_buffer[1].description = _("New Mail Folder"); - list->_buffer[1].menuDescription = C_("New", "Mail _Folder"); + list->_buffer[1].menuDescription = (char *) C_("New", "Mail _Folder"); list->_buffer[1].tooltip = _("Create a new mail folder"); list->_buffer[1].menuShortcut = '\0'; list->_buffer[1].iconName = "folder-new"; |