← Back to branch summary

~ubuntu-branches/debian/sid/evolution/sid

« back to all changes in this revision

Viewing changes to addressbook/gui/component/addressbook-view.c

  • Committer: Bazaar Package Importer
  • Author(s): Yves-Alexis Perez
  • Date: 2009-12-15 08:55:42 UTC
  • mfrom: (47.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20091215085542-93ma0xjjz3xjj4tz
Tags: 2.28.2-1
* New upstream release.
* debian/patches:
  - 02_empty-line_signature dropped, included upstream.
  - 03_GNOME-Bug-599792-Anjal-composer-s-Send-button-doesn-t-work too.
  - 04_GNOME-Bug-596027-In-Anjal-although-invalid-mail-address-wa.patch too. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
addressbook/gui/component/addressbook-view.c
454
454
        AddressbookViewPrivate *priv = view->priv;
455
455
        ESource *source;
456
456
        const gchar *source_uri;
 
457
        const gchar *delete = NULL;
457
458
 
458
459
        source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->selector));
459
460
        if (source) {
460
461
                source_uri = e_source_peek_relative_uri (source);
 
462
                /*check for delete_status property here*/
 
463
                delete = e_source_get_property (source, "delete");
 
464
 
461
465
                if (source_uri && !strcmp("system", source_uri))
462
466
                        return 0;
 
467
                else if (delete && strcmp (delete,"no") == 0)
 
468
                        return 0;
463
469
                else
464
470
                        return 1;
465
471
        }
948
954
static EPopupItem abv_source_popups[] = {
949
955
        { E_POPUP_ITEM, (gchar *) "10.new", (gchar *) N_("_New Address Book"), new_addressbook_cb, NULL, (gchar *) "address-book-new", 0, 0 },
950
956
        { E_POPUP_ITEM, (gchar *) "20.saveasvcard", (gchar *) N_("Save As vCard..."), save_addressbook_cb, NULL, (gchar *) "document-save-as", 0, EAB_POPUP_SOURCE_PRIMARY },
951
 
        { E_POPUP_ITEM, (gchar *) "25.rename", (gchar *) N_("_Rename..."), rename_addressbook_cb, NULL, NULL, 0, EAB_POPUP_SOURCE_PRIMARY },
 
957
        { E_POPUP_ITEM, (gchar *) "25.rename", (gchar *) N_("_Rename..."), rename_addressbook_cb, NULL, NULL, 0, EAB_POPUP_SOURCE_PRIMARY|EAB_POPUP_SOURCE_DELETE },
952
958
 
953
959
        { E_POPUP_BAR,  (gchar *) "30.bar" },
954
 
        { 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 },
 
960
        { 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 },
955
961
 
956
962
        { E_POPUP_BAR,  (gchar *) "99.bar" },
957
963
        { E_POPUP_ITEM, (gchar *) "99.properties", (gchar *) N_("_Properties"), edit_addressbook_cb, NULL, (gchar *) "document-properties", 0, EAB_POPUP_SOURCE_PRIMARY },