diff options
| author | Bharath Acharya <abharath@novell.com> | 2009-11-27 15:56:07 +0800 |
|---|---|---|
| committer | Bharath Acharya <abharath@novell.com> | 2009-11-27 15:56:07 +0800 |
| commit | ff36af25e8e1db585e7afc1936eea8bb7ef54c96 (patch) | |
| tree | 0c354f2b99c15f30b6fffeddce2c8d1a421f2c92 | |
| parent | d780f0758a5c542e3b3db1ab48dead66d0cec68a (diff) | |
| download | gsoc2013-evolution-ff36af25e8e1db585e7afc1936eea8bb7ef54c96.tar gsoc2013-evolution-ff36af25e8e1db585e7afc1936eea8bb7ef54c96.tar.gz gsoc2013-evolution-ff36af25e8e1db585e7afc1936eea8bb7ef54c96.tar.bz2 gsoc2013-evolution-ff36af25e8e1db585e7afc1936eea8bb7ef54c96.tar.lz gsoc2013-evolution-ff36af25e8e1db585e7afc1936eea8bb7ef54c96.tar.xz gsoc2013-evolution-ff36af25e8e1db585e7afc1936eea8bb7ef54c96.tar.zst gsoc2013-evolution-ff36af25e8e1db585e7afc1936eea8bb7ef54c96.zip | |
BUGFIX #601644 - Disable rename for system folders
Use the delete property in ESource
| -rw-r--r-- | addressbook/gui/component/addressbook-view.c | 2 | ||||
| -rw-r--r-- | calendar/gui/calendar-component.c | 2 | ||||
| -rw-r--r-- | calendar/gui/memos-component.c | 2 | ||||
| -rw-r--r-- | calendar/gui/tasks-component.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 4eec3cd8e4..5f5ac6541d 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -954,7 +954,7 @@ primary_source_selection_changed_callback (ESourceSelector *selector, static EPopupItem abv_source_popups[] = { { E_POPUP_ITEM, (gchar *) "10.new", (gchar *) N_("_New Address Book"), new_addressbook_cb, NULL, (gchar *) "address-book-new", 0, 0 }, { E_POPUP_ITEM, (gchar *) "20.saveasvcard", (gchar *) N_("Save As vCard..."), save_addressbook_cb, NULL, (gchar *) "document-save-as", 0, EAB_POPUP_SOURCE_PRIMARY }, - { E_POPUP_ITEM, (gchar *) "25.rename", (gchar *) N_("_Rename..."), rename_addressbook_cb, NULL, NULL, 0, EAB_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, (gchar *) "25.rename", (gchar *) N_("_Rename..."), rename_addressbook_cb, NULL, NULL, 0, EAB_POPUP_SOURCE_PRIMARY|EAB_POPUP_SOURCE_DELETE }, { E_POPUP_BAR, (gchar *) "30.bar" }, { E_POPUP_ITEM, (gchar *) "30.delete", (gchar *) N_("_Delete"), delete_addressbook_cb, NULL, (gchar *) "edit-delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY|EAB_POPUP_SOURCE_DELETE }, diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index ec35fa8a0c..ad819e80cd 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -628,7 +628,7 @@ mark_offline_cb (EPopup *ep, EPopupItem *pitem, gpointer data) static EPopupItem ecc_source_popups[] = { { E_POPUP_ITEM, (gchar *) "10.new", (gchar *) N_("_New Calendar"), new_calendar_cb, NULL, (gchar *) "x-office-calendar", 0, 0 }, { E_POPUP_ITEM, (gchar *) "15.copy", (gchar *) N_("_Copy..."), copy_calendar_cb, NULL, (gchar *) "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, - { E_POPUP_ITEM, (gchar *) "18.rename", (gchar *) N_("_Rename..."), rename_calendar_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, (gchar *) "18.rename", (gchar *) N_("_Rename..."), rename_calendar_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE }, { E_POPUP_BAR, (gchar *) "20.bar" }, { E_POPUP_ITEM, (gchar *) "20.delete", (gchar *) N_("_Delete"), delete_calendar_cb, NULL, (gchar *) "edit-delete", 0,E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE }, diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c index 01a8a12c41..37f890a6e2 100644 --- a/calendar/gui/memos-component.c +++ b/calendar/gui/memos-component.c @@ -479,7 +479,7 @@ mark_offline_cb (EPopup *ep, EPopupItem *pitem, gpointer data) static EPopupItem emc_source_popups[] = { { E_POPUP_ITEM, (gchar *) "10.new", (gchar *) N_("_New Memo List"), new_memo_list_cb, NULL, (gchar *) "stock_notes", 0, 0 }, { E_POPUP_ITEM, (gchar *) "15.copy", (gchar *) N_("_Copy..."), copy_memo_list_cb, NULL, (gchar *) "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, - { E_POPUP_ITEM, (gchar *) "18.rename", (gchar *) N_("_Rename..."), rename_memo_list_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, (gchar *) "18.rename", (gchar *) N_("_Rename..."), rename_memo_list_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE }, { E_POPUP_BAR, (gchar *) "20.bar" }, { E_POPUP_ITEM, (gchar *) "20.delete", (gchar *) N_("_Delete"), delete_memo_list_cb, NULL, (gchar *) "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE }, diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index 1f8145882b..9fb8af8a12 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -472,7 +472,7 @@ mark_offline_cb (EPopup *ep, EPopupItem *pitem, gpointer data) static EPopupItem etc_source_popups[] = { { E_POPUP_ITEM, (gchar *) "10.new", (gchar *) N_("_New Task List"), new_task_list_cb, NULL, (gchar *) "stock_todo", 0, 0 }, { E_POPUP_ITEM, (gchar *) "15.copy", (gchar *) N_("_Copy..."), copy_task_list_cb, NULL, (gchar *) "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, - { E_POPUP_ITEM, (gchar *) "18.rename", (gchar *) N_("_Rename..."), rename_task_list_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, (gchar *) "18.rename", (gchar *) N_("_Rename..."), rename_task_list_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE }, { E_POPUP_BAR, (gchar *) "20.bar" }, { E_POPUP_ITEM, (gchar *) "20.delete", (gchar *) N_("_Delete"), delete_task_list_cb, NULL, (gchar *) "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE }, |