← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libedataserver/e-source-smime.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:
libedataserver/e-source-smime.c
359
359
 
360
360
        g_mutex_lock (extension->priv->property_lock);
361
361
 
362
 
        if (g_strcmp0 (extension->priv->encryption_certificate, encryption_certificate) == 0) {
 
362
        if (g_strcmp0 (
 
363
                extension->priv->encryption_certificate,
 
364
                encryption_certificate) == 0) {
363
365
                g_mutex_unlock (extension->priv->property_lock);
364
366
                return;
365
367
        }
408
410
{
409
411
        g_return_if_fail (E_IS_SOURCE_SMIME (extension));
410
412
 
411
 
        if ((extension->priv->encrypt_by_default ? 1 : 0) == (encrypt_by_default ? 1 : 0))
 
413
        if (extension->priv->encrypt_by_default == encrypt_by_default)
412
414
                return;
413
415
 
414
416
        extension->priv->encrypt_by_default = encrypt_by_default;
449
451
{
450
452
        g_return_if_fail (E_IS_SOURCE_SMIME (extension));
451
453
 
452
 
        if ((extension->priv->encrypt_to_self ? 1 : 0) == (encrypt_to_self ? 1 : 0))
 
454
        if (extension->priv->encrypt_to_self == encrypt_to_self)
453
455
                return;
454
456
 
455
457
        extension->priv->encrypt_to_self = encrypt_to_self;
664
666
{
665
667
        g_return_if_fail (E_IS_SOURCE_SMIME (extension));
666
668
 
667
 
        if ((extension->priv->sign_by_default ? 1 : 0) == (sign_by_default ? 1 : 0))
 
669
        if (extension->priv->sign_by_default == sign_by_default)
668
670
                return;
669
671
 
670
672
        extension->priv->sign_by_default = sign_by_default;