← Back to branch summary

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

« back to all changes in this revision

Viewing changes to camel/providers/nntp/camel-nntp-settings.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:
camel/providers/nntp/camel-nntp-settings.c
290
290
{
291
291
        g_return_if_fail (CAMEL_IS_NNTP_SETTINGS (settings));
292
292
 
293
 
        if ((settings->priv->filter_all ? 1 : 0) == (filter_all ? 1 : 0))
 
293
        if (settings->priv->filter_all == filter_all)
294
294
                return;
295
295
 
296
296
        settings->priv->filter_all = filter_all;
339
339
{
340
340
        g_return_if_fail (CAMEL_IS_NNTP_SETTINGS (settings));
341
341
 
342
 
        if ((settings->priv->folder_hierarchy_relative ? 1 : 0) == (folder_hierarchy_relative ? 1 : 0))
 
342
        if (settings->priv->folder_hierarchy_relative == folder_hierarchy_relative)
343
343
                return;
344
344
 
345
345
        settings->priv->folder_hierarchy_relative = folder_hierarchy_relative;
382
382
{
383
383
        g_return_if_fail (CAMEL_IS_NNTP_SETTINGS (settings));
384
384
 
385
 
        if ((settings->priv->short_folder_names ? 1 : 0) == (short_folder_names ? 1 : 0))
 
385
        if (settings->priv->short_folder_names == short_folder_names)
386
386
                return;
387
387
 
388
388
        settings->priv->short_folder_names = short_folder_names;