** 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

4 files changed, 21 insertions, 10 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 172279d1a2..75c9143ca0 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,14 @@
+2008-08-06  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #249844
+
+	* gui/tasks-component.c: (impl__get_userCreatableItems):
+	* gui/memos-component.c: (impl__get_userCreatableItems):
+	Do not let compiler claim.
+	* gui/calendar-component.c: (impl__get_userCreatableItems):
+	Use C_() macro instead of Q_() macro.
+	Use fully qualified names for "New" submenu entries.
+
 2008-08-04  Paul Bolle  <pebolle@tiscali.nl>
 
 	** Fix for bug #544157
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index daa274129d..b30729c554 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -1594,7 +1594,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[0].id = CREATE_EVENT_ID;
 	list->_buffer[0].description = _("New appointment");
-	list->_buffer[0].menuDescription = _("_Appointment");
+	list->_buffer[0].menuDescription = (char *) C_("New", "_Appointment");
 	list->_buffer[0].tooltip = _("Create a new appointment");
 	list->_buffer[0].menuShortcut = 'a';
 	list->_buffer[0].iconName = "appointment-new";
@@ -1602,7 +1602,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[1].id = CREATE_MEETING_ID;
 	list->_buffer[1].description = _("New meeting");
-	list->_buffer[1].menuDescription = _("M_eeting");
+	list->_buffer[1].menuDescription = (char *) C_("New", "M_eeting");
 	list->_buffer[1].tooltip = _("Create a new meeting request");
 	list->_buffer[1].menuShortcut = 'e';
 	list->_buffer[1].iconName = "stock_new-meeting";
@@ -1610,7 +1610,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[2].id = CREATE_ALLDAY_EVENT_ID;
 	list->_buffer[2].description = _("New all day appointment");
-	list->_buffer[2].menuDescription = _("All Day A_ppointment");
+	list->_buffer[2].menuDescription = (char *) C_("New", "All Day A_ppointment");
 	list->_buffer[2].tooltip = _("Create a new all-day appointment");
 	list->_buffer[2].menuShortcut = '\0';
 	list->_buffer[2].iconName = "stock_new-24h-appointment";
@@ -1618,7 +1618,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[3].id = CREATE_CALENDAR_ID;
 	list->_buffer[3].description = _("New calendar");
-	list->_buffer[3].menuDescription = _("Cale_ndar");
+	list->_buffer[3].menuDescription = (char *) C_("New", "Cale_ndar");
 	list->_buffer[3].tooltip = _("Create a new calendar");
 	list->_buffer[3].menuShortcut = '\0';
 	list->_buffer[3].iconName = "x-office-calendar";
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index 89068a7f90..d0d17b0945 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -1258,7 +1258,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[0].id = CREATE_MEMO_ID;
 	list->_buffer[0].description = _("New memo");
-	list->_buffer[0].menuDescription = C_("New", "Mem_o");
+	list->_buffer[0].menuDescription = (char *) C_("New", "Mem_o");
 	list->_buffer[0].tooltip = _("Create a new memo");
 	list->_buffer[0].menuShortcut = 'o';
 	list->_buffer[0].iconName = "stock_insert-note";
@@ -1266,7 +1266,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[1].id = CREATE_SHARED_MEMO_ID;
 	list->_buffer[1].description = _("New shared memo");
-	list->_buffer[1].menuDescription = C_("New", "_Shared memo");
+	list->_buffer[1].menuDescription = (char *) C_("New", "_Shared memo");
 	list->_buffer[1].tooltip = _("Create a shared new memo");
 	list->_buffer[1].menuShortcut = 'h';
 	list->_buffer[1].iconName = "stock_insert-note";
@@ -1274,7 +1274,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[2].id = CREATE_MEMO_LIST_ID;
 	list->_buffer[2].description = _("New memo list");
-	list->_buffer[2].menuDescription = C_("New", "Memo li_st");
+	list->_buffer[2].menuDescription = (char *) C_("New", "Memo li_st");
 	list->_buffer[2].tooltip = _("Create a new memo list");
 	list->_buffer[2].menuShortcut = '\0';
 	list->_buffer[2].iconName = "stock_notes";
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index c8e8b58f49..b7f6cc6ea2 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -1323,7 +1323,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[0].id = CREATE_TASK_ID;
 	list->_buffer[0].description = _("New task");
-	list->_buffer[0].menuDescription = C_("New", "_Task");
+	list->_buffer[0].menuDescription = (char *) C_("New", "_Task");
 	list->_buffer[0].tooltip = _("Create a new task");
 	list->_buffer[0].menuShortcut = 't';
 	list->_buffer[0].iconName = "stock_task";
@@ -1331,7 +1331,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[1].id = CREATE_TASK_ASSIGNED_ID;
 	list->_buffer[1].description = _("New assigned task");
-	list->_buffer[1].menuDescription = C_("New", "Assigne_d Task");
+	list->_buffer[1].menuDescription = (char *) C_("New", "Assigne_d Task");
 	list->_buffer[1].tooltip = _("Create a new assigned task");
 	list->_buffer[1].menuShortcut = '\0';
 	list->_buffer[1].iconName = "stock_task";
@@ -1339,7 +1339,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	list->_buffer[2].id = CREATE_TASK_LIST_ID;
 	list->_buffer[2].description = _("New task list");
-	list->_buffer[2].menuDescription = C_("New", "Tas_k list");
+	list->_buffer[2].menuDescription = (char *) C_("New", "Tas_k list");
 	list->_buffer[2].tooltip = _("Create a new task list");
 	list->_buffer[2].menuShortcut = '\0';
 	list->_buffer[2].iconName = "stock_todo";