nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'wip/misc-warning-fixes' into 'master'

Browse source 
Misc build warning fixes

See merge request GNOME/geary!81
This commit is contained in:
Michael Gratton 2019-01-10 12:17:30 +00:00
commit fdf1eba646
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/engine/imap/api/imap-client-service.vala
View file

@ -296,20 +296,29 @@ internal class Geary.Imap.ClientService : Geary.ClientService {
// Nothing to do here
} catch (GLib.Error err) {
Geary.ErrorContext context = new Geary.ErrorContext(err);
debug("[%s] Error adding new session to the pool: %s",
debug("[%s] Error creating new session for the pool: %s",
this.account.id, context.format_full_error());
notify_connection_failed(new ErrorContext(err));
notify_connection_failed(context);
}
if (new_session != null) {
notify_connected();
yield this.sessions_mutex.execute_locked(() => {
this.all_sessions.add(new_session);
});
this.free_queue.send(new_session);
} else {
if (new_session == null) {
// An error was thrown, so close the pool
this.close_pool.begin();
} else {
try {
yield this.sessions_mutex.execute_locked(() => {
this.all_sessions.add(new_session);
});
this.free_queue.send(new_session);
notify_connected();
} catch (GLib.Error err) {
Geary.ErrorContext context = new Geary.ErrorContext(err);
debug("[%s] Error adding new session to the pool: %s",
this.account.id, context.format_full_error());
notify_connection_failed(context);
new_session.disconnect_async.begin(null);
this.close_pool.begin();
}
}
}

1
src/engine/meson.build
View file

@ -365,7 +365,6 @@ geary_engine_lib = static_library('geary-engine',
# GNOME/vala#358
geary_engine_internal_header_fixup = custom_target(
'geary_engine_internal_header_fixup',
source: geary_engine_sources,
output: [
'geary-engine-internal.h',
'geary-engine-internal.vapi',