evolution r35916 - in trunk: addressbook addressbook/gui/component calendar calendar/gui mail shell shell/test

[mcrha svn gnome org]

Author: mcrha
Date: Wed Aug  6 15:44:47 2008
New Revision: 35916
URL: http://svn.gnome.org/viewvc/evolution?rev=35916&view=rev

Log:
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.



Modified:
   trunk/addressbook/ChangeLog
   trunk/addressbook/gui/component/addressbook-component.c
   trunk/calendar/ChangeLog
   trunk/calendar/gui/calendar-component.c
   trunk/calendar/gui/memos-component.c
   trunk/calendar/gui/tasks-component.c
   trunk/mail/ChangeLog
   trunk/mail/em-event.h
   trunk/mail/mail-component.c
   trunk/shell/ChangeLog
   trunk/shell/test/evolution-test-component.c

Modified: trunk/addressbook/gui/component/addressbook-component.c
==============================================================================
--- trunk/addressbook/gui/component/addressbook-component.c	(original)
+++ trunk/addressbook/gui/component/addressbook-component.c	Wed Aug  6 15:44:47 2008
@@ -226,7 +226,7 @@
 
 	list->_buffer[0].id = "contact";
 	list->_buffer[0].description = _("New Contact");
-	list->_buffer[0].menuDescription = C_("New", "_Contact");
+	list->_buffer[0].menuDescription = (char *) C_("New", "_Contact");
 	list->_buffer[0].tooltip = _("Create a new contact");
 	list->_buffer[0].menuShortcut = 'c';
 	list->_buffer[0].iconName = "contact-new";
@@ -234,7 +234,7 @@
 
 	list->_buffer[1].id = "contact_list";
 	list->_buffer[1].description = _("New Contact List");
-	list->_buffer[1].menuDescription = C_("New", "Contact _List");
+	list->_buffer[1].menuDescription = (char *) C_("New", "Contact _List");
 	list->_buffer[1].tooltip = _("Create a new contact list");
 	list->_buffer[1].menuShortcut = 'l';
 	list->_buffer[1].iconName = "stock_contact-list";
@@ -242,7 +242,7 @@
 
 	list->_buffer[2].id = "address_book";
 	list->_buffer[2].description = _("New Address Book");
-	list->_buffer[2].menuDescription = C_("New", "Address _Book");
+	list->_buffer[2].menuDescription = (char *) C_("New", "Address _Book");
 	list->_buffer[2].tooltip = _("Create a new address book");
 	list->_buffer[2].menuShortcut = '\0';
 	list->_buffer[2].iconName = "address-book-new";

Modified: trunk/calendar/gui/calendar-component.c
==============================================================================
--- trunk/calendar/gui/calendar-component.c	(original)
+++ trunk/calendar/gui/calendar-component.c	Wed Aug  6 15:44:47 2008
@@ -1594,7 +1594,7 @@
 
 	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 @@
 
 	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 @@
 
 	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 @@
 
 	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";

Modified: trunk/calendar/gui/memos-component.c
==============================================================================
--- trunk/calendar/gui/memos-component.c	(original)
+++ trunk/calendar/gui/memos-component.c	Wed Aug  6 15:44:47 2008
@@ -1258,7 +1258,7 @@
 
 	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 @@
 
 	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 @@
 
 	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";

Modified: trunk/calendar/gui/tasks-component.c
==============================================================================
--- trunk/calendar/gui/tasks-component.c	(original)
+++ trunk/calendar/gui/tasks-component.c	Wed Aug  6 15:44:47 2008
@@ -1323,7 +1323,7 @@
 
 	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 @@
 
 	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 @@
 
 	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";

Modified: trunk/mail/em-event.h
==============================================================================
--- trunk/mail/em-event.h	(original)
+++ trunk/mail/em-event.h	Wed Aug  6 15:44:47 2008
@@ -117,7 +117,7 @@
 	EEventTarget target;
 
 	GtkCellRenderer *renderer;
-	char 		*folder_name;
+	const char 	*folder_name;
 };
 
 typedef struct _EEventItem EMEventItem;

Modified: trunk/mail/mail-component.c
==============================================================================
--- trunk/mail/mail-component.c	(original)
+++ trunk/mail/mail-component.c	Wed Aug  6 15:44:47 2008
@@ -914,7 +914,7 @@
 
 	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 @@
 
 	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";

Modified: trunk/shell/test/evolution-test-component.c
==============================================================================
--- trunk/shell/test/evolution-test-component.c	(original)
+++ trunk/shell/test/evolution-test-component.c	Wed Aug  6 15:44:47 2008
@@ -105,7 +105,7 @@
 
 	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 = "";