aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/gui/component/addressbook-component.c6
-rw-r--r--calendar/ChangeLog11
-rw-r--r--calendar/gui/calendar-component.c8
-rw-r--r--calendar/gui/memos-component.c6
-rw-r--r--calendar/gui/tasks-component.c6
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/em-event.h2
-rw-r--r--mail/mail-component.c4
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/test/evolution-test-component.c2
11 files changed, 51 insertions, 17 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 87f96a9707..786901cdcc 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,12 @@
2008-08-06 Milan Crha <mcrha@redhat.com>
+ ** Fix for bug #249844
+
+ * gui/component/addressbook-component.c:
+ (impl__get_userCreatableItems): Do not let compiler claim.
+
+2008-08-06 Milan Crha <mcrha@redhat.com>
+
** Fix for bug #546263
* gui/widgets/e-minicard.c: (add_field), (add_email_field), (remodel):
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index cc109fb0a3..82f00f00c3 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -226,7 +226,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
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 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
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 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
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";
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";
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";
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 <mcrha@redhat.com>
+
+ ** Fix for bug #249844
+
+ * test/evolution-test-component.c: (impl__get_userCreatableItems):
+ Do not let compiler claim.
+
2008-08-04 Matthew Barnes <mbarnes@redhat.com>
** 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 = "";
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 04:38:52 +0800