← Back to branch summary

~ubuntu-branches/ubuntu/saucy/evolution-data-server/saucy

« back to all changes in this revision

Viewing changes to calendar/libedata-cal/e-cal-backend-sexp.c

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-10-08 12:58:16 UTC
  • mfrom: (181.1.7 quantal)
  • Revision ID: package-import@ubuntu.com-20121008125816-i3n76e8c0m64e7xp
Tags: 3.6.0-0ubuntu2
https://launchpad.net/bugs/1038047
https://launchpad.net/bugs/1038047
* Fix LP: #1038047 part 1 - Don't abort in e_source_registry_new* when a
  problem occurs connecting to the Dbus service
  - add debian/patches/dont-abort-in-e_source_registry_new.patch
  - update debian/patches/series
* Fix LP: #1038047 part 2 - libedataserver depends on
  evolution-data-server-common to ensure that the GSettings schemas are
  present
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
calendar/libedata-cal/e-cal-backend-sexp.c
362
362
 
363
363
        if (!tzid || !tzid[0])
364
364
                return NULL;
365
 
        else if (!strcmp (tzid, "UTC"))
 
365
        else if (!strcmp (tzid, "UTC"))
366
366
                return icaltimezone_get_utc_timezone ();
367
367
 
368
368
        return e_cal_backend_internal_get_timezone (ctx->backend, tzid);
1356
1356
 
1357
1357
                propname = argv[0]->value.string;
1358
1358
 
1359
 
                any_field = !strcmp(propname, "x-evolution-any-field");
 
1359
                any_field = !strcmp (propname, "x-evolution-any-field");
1360
1360
                for (i = 0; i < G_N_ELEMENTS (prop_info_table); i++) {
1361
1361
                        if (any_field
1362
1362
                            || !strcmp (prop_info_table[i].query_prop, propname)) {
1372
1372
                                        if (prop && compare (prop, argv[1]->value.string)) {
1373
1373
                                                truth = TRUE;
1374
1374
                                        }
1375
 
                                        if ((!prop) && compare("", argv[1]->value.string)) {
 
1375
                                        if ((!prop) && compare ("", argv[1]->value.string)) {
1376
1376
                                                truth = TRUE;
1377
1377
                                        }
1378
1378
                                        g_free (prop);
1389
1389
                                        if (prop && compare (prop, argv[1]->value.string)) {
1390
1390
                                                truth = TRUE;
1391
1391
                                        }
1392
 
                                        if ((!prop) && compare("", argv[1]->value.string)) {
 
1392
                                        if ((!prop) && compare ("", argv[1]->value.string)) {
1393
1393
                                                truth = TRUE;
1394
1394
                                        }
1395
1395
                                }