← Back to branch summary

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

« back to all changes in this revision

Viewing changes to camel/camel-imapx-folder.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/camel-imapx-folder.c
66
66
        gboolean filter_junk;
67
67
        gboolean filter_junk_inbox;
68
68
 
69
 
        d("opening imap folder '%s'\n", folder_dir);
 
69
        d ("opening imap folder '%s'\n", folder_dir);
70
70
 
71
71
        service = CAMEL_SERVICE (store);
72
 
        settings = camel_service_get_settings (service);
 
72
 
 
73
        settings = camel_service_ref_settings (service);
73
74
 
74
75
        g_object_get (
75
76
                settings,
79
80
                "filter-junk-inbox", &filter_junk_inbox,
80
81
                NULL);
81
82
 
 
83
        g_object_unref (settings);
 
84
 
82
85
        short_name = strrchr (folder_name, '/');
83
86
        if (short_name)
84
87
                short_name++;
161
164
        g_return_if_fail (folder != NULL);
162
165
        g_return_if_fail (CAMEL_IS_IMAPX_FOLDER (folder));
163
166
 
164
 
        if ((folder->apply_filters ? 1 : 0) == (apply_filters ? 1 : 0))
 
167
        if (folder->apply_filters == apply_filters)
165
168
                return;
166
169
 
167
170
        folder->apply_filters = apply_filters;