[folks] Don't emit "group invalidated" warnings when disconnecting



commit 1f88a87439ede4b78e834593027a797901de1c8d
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Thu Jul 22 11:41:13 2010 +0100

    Don't emit "group invalidated" warnings when disconnecting

 backends/telepathy/tpf-persona.vala |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/backends/telepathy/tpf-persona.vala b/backends/telepathy/tpf-persona.vala
index f3ac648..7c1ebe0 100644
--- a/backends/telepathy/tpf-persona.vala
+++ b/backends/telepathy/tpf-persona.vala
@@ -228,8 +228,15 @@ public class Tpf.Persona : Folks.Persona,
       ((Tpf.PersonaStore) this.store).group_removed.connect (
           (s, group, error) =>
             {
-              if (error != null)
-                warning ("group invalidated: %s", error.message);
+              /* FIXME: Can't use
+               * !(error is TelepathyGLib.DBusError.OBJECT_REMOVED) because the
+               * GIR bindings don't annotate errors */
+              if (error != null &&
+                  (error.domain != TelepathyGLib.dbus_errors_quark () ||
+                   error.code != TelepathyGLib.DBusError.OBJECT_REMOVED))
+                {
+                  warning ("Group invalidated: %s", error.message);
+                }
 
               this._change_group (group, false);
             });



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]