Commit 2d042c28 authored by Philip Withnall's avatar Philip Withnall Committed by Travis Reitter

Bug 652472 — Handle failure in getting the logger service better

If we fail to get the logger from the bus, get_object() may return NULL. If
we check for this, we don't then try and connect a signal to a NULL object
instance and emit criticals.

Closes: bgo#652472
parent 89a97595
......@@ -7,6 +7,7 @@ Bugs fixed:
* Bug 652463 — Tidy up CLEANFILES
* Bug 652434 — Add ability to run any tests through gdb
* Bug 648071 — Add support for presence status from Telepathy
* Bug 652472 — Handle failure in getting the logger service better
API changes:
* Swf.Persona retains and exposes its libsocialweb Contact
......
......@@ -74,6 +74,13 @@ internal class Logger : GLib.Object
"/org/freedesktop/Telepathy/Logger",
"org.freedesktop.Telepathy.Logger.DRAFT") as LoggerIface;
/* Failure? */
if (this._logger == null)
{
this.invalidated ();
return retval;
}
this._logger.destroy.connect (() =>
{
/* We've lost the connection to the logger service, so invalidate
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment