← Back to branch summary

~ubuntu-branches/ubuntu/maverick/evolution-data-server/maverick-proposed

« back to all changes in this revision

Viewing changes to addressbook/backends/file/e-book-backend-file.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-05-17 17:02:06 UTC
  • mfrom: (1.1.79 upstream) (1.6.12 experimental)
  • Revision ID: james.westby@ubuntu.com-20100517170206-4ufr52vwrhh26yh0
Tags: 2.30.1-1ubuntu1
https://launchpad.net/bugs/42199
https://launchpad.net/bugs/229669
https://launchpad.net/bugs/173703
https://launchpad.net/bugs/360344
https://launchpad.net/bugs/508494
* Merge from debian experimental. Remaining change:
  (LP: #42199, #229669, #173703, #360344, #508494)
  + debian/control:
    - add Vcs-Bzr tag
    - don't use libgnome
    - Use Breaks instead of Conflicts against evolution 2.25 and earlier.
  + debian/evolution-data-server.install,
    debian/patches/45_libcamel_providers_version.patch:
    - use the upstream versioning, not a Debian-specific one 
  + debian/libedata-book1.2-dev.install, debian/libebackend-1.2-dev.install,
    debian/libcamel1.2-dev.install, debian/libedataserverui1.2-dev.install:
    - install html documentation
  + debian/rules:
    - don't build documentation it's shipped with the tarball

Show diffs side-by-side

added added

removed removed

Lines of Context:
addressbook/backends/file/e-book-backend-file.c
556
556
        db = bf->priv->file_db;
557
557
        query = e_data_book_view_get_card_query (book_view);
558
558
 
559
 
        if ( ! strcmp (query, "(contains \"x-evolution-any-field\" \"\")")) {
 
559
        if ( !strcmp (query, "(contains \"x-evolution-any-field\" \"\")")) {
560
560
                e_data_book_view_notify_status_message (book_view, _("Loading..."));
561
561
                allcontacts = TRUE;
562
562
        } else {
899
899
}
900
900
 
901
901
static EBookBackendSyncStatus
 
902
e_book_backend_file_get_supported_auth_methods (EBookBackendSync *backend,
 
903
                                                EDataBook *book,
 
904
                                                guint32 opid,
 
905
                                                GList **methods_out)
 
906
{
 
907
        *methods_out = NULL;
 
908
        return GNOME_Evolution_Addressbook_Success;
 
909
}
 
910
 
 
911
static EBookBackendSyncStatus
902
912
e_book_backend_file_get_supported_fields (EBookBackendSync *backend,
903
913
                                          EDataBook *book,
904
914
                                          guint32 opid,
1178
1188
                        /* the database didn't exist, so we create the
1179
1189
                           directory then the .db */
1180
1190
                        db->close (db, 0);
1181
 
                        rv = g_mkdir_with_parents (dirname, 0777);
 
1191
                        rv = g_mkdir_with_parents (dirname, 0700);
1182
1192
                        if (rv == -1 && errno != EEXIST) {
1183
1193
                                g_warning ("failed to make directory %s: %s", dirname, g_strerror (errno));
1184
1194
                                g_free (dirname);
1375
1385
        g_assert (backend != NULL);
1376
1386
        g_assert (E_IS_BOOK_BACKEND_FILE (backend));
1377
1387
 
1378
 
        if (! e_book_backend_construct (E_BOOK_BACKEND (backend)))
 
1388
        if (!e_book_backend_construct (E_BOOK_BACKEND (backend)))
1379
1389
                return FALSE;
1380
1390
 
1381
1391
        return TRUE;
1391
1401
 
1392
1402
        backend = g_object_new (E_TYPE_BOOK_BACKEND_FILE, NULL);
1393
1403
 
1394
 
        if (! e_book_backend_file_construct (backend)) {
 
1404
        if (!e_book_backend_file_construct (backend)) {
1395
1405
                g_object_unref (backend);
1396
1406
 
1397
1407
                return NULL;
1499
1509
        backend_class = E_BOOK_BACKEND_CLASS (klass);
1500
1510
 
1501
1511
        /* Set the virtual methods. */
1502
 
        backend_class->load_source             = e_book_backend_file_load_source;
1503
 
        backend_class->get_static_capabilities = e_book_backend_file_get_static_capabilities;
1504
 
        backend_class->start_book_view         = e_book_backend_file_start_book_view;
1505
 
        backend_class->stop_book_view          = e_book_backend_file_stop_book_view;
1506
 
        backend_class->cancel_operation        = e_book_backend_file_cancel_operation;
1507
 
        backend_class->set_mode                = e_book_backend_file_set_mode;
1508
 
        backend_class->sync                    = e_book_backend_file_sync;
1509
 
        sync_class->remove_sync                = e_book_backend_file_remove;
1510
 
        sync_class->create_contact_sync        = e_book_backend_file_create_contact;
1511
 
        sync_class->remove_contacts_sync       = e_book_backend_file_remove_contacts;
1512
 
        sync_class->modify_contact_sync        = e_book_backend_file_modify_contact;
1513
 
        sync_class->get_contact_sync           = e_book_backend_file_get_contact;
1514
 
        sync_class->get_contact_list_sync      = e_book_backend_file_get_contact_list;
1515
 
        sync_class->get_changes_sync           = e_book_backend_file_get_changes;
1516
 
        sync_class->authenticate_user_sync     = e_book_backend_file_authenticate_user;
1517
 
        sync_class->get_supported_fields_sync  = e_book_backend_file_get_supported_fields;
1518
 
        sync_class->get_required_fields_sync   = e_book_backend_file_get_required_fields;
 
1512
        backend_class->load_source                      = e_book_backend_file_load_source;
 
1513
        backend_class->get_static_capabilities          = e_book_backend_file_get_static_capabilities;
 
1514
        backend_class->start_book_view                  = e_book_backend_file_start_book_view;
 
1515
        backend_class->stop_book_view                   = e_book_backend_file_stop_book_view;
 
1516
        backend_class->cancel_operation                 = e_book_backend_file_cancel_operation;
 
1517
        backend_class->set_mode                         = e_book_backend_file_set_mode;
 
1518
        backend_class->sync                             = e_book_backend_file_sync;
 
1519
        sync_class->remove_sync                         = e_book_backend_file_remove;
 
1520
        sync_class->create_contact_sync                 = e_book_backend_file_create_contact;
 
1521
        sync_class->remove_contacts_sync                = e_book_backend_file_remove_contacts;
 
1522
        sync_class->modify_contact_sync                 = e_book_backend_file_modify_contact;
 
1523
        sync_class->get_contact_sync                    = e_book_backend_file_get_contact;
 
1524
        sync_class->get_contact_list_sync               = e_book_backend_file_get_contact_list;
 
1525
        sync_class->get_changes_sync                    = e_book_backend_file_get_changes;
 
1526
        sync_class->authenticate_user_sync              = e_book_backend_file_authenticate_user;
 
1527
        sync_class->get_supported_auth_methods_sync     = e_book_backend_file_get_supported_auth_methods;
 
1528
        sync_class->get_supported_fields_sync           = e_book_backend_file_get_supported_fields;
 
1529
        sync_class->get_required_fields_sync            = e_book_backend_file_get_required_fields;
1519
1530
 
1520
1531
        object_class->dispose = e_book_backend_file_dispose;
1521
1532
        object_class->finalize = e_book_backend_file_finalize;