From 5460bf4024999b78fb3837ffc14ca818a71dd4dc Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Fri, 15 Feb 2019 15:45:18 +0900
Subject: Use Changes enum properly

Don't use distinct items for each type of event; only for repeated/
combinable ones.
---
 lib/room.cpp | 3 ++-
 lib/room.h   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/room.cpp b/lib/room.cpp
index 580d04b8..23fb19db 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -2173,10 +2173,11 @@ Room::Changes Room::processStateEvent(const RoomEvent& e)
         }
         , [this] (const EncryptionEvent&) {
             emit encryption(); // It can only be done once, so emit it here.
-            return EncryptionOn;
+            return OtherChange;
         }
         , [this] (const RoomTombstoneEvent& evt) {
             emit upgraded(evt.serverMessage(), evt.successorRoomId());
+            return OtherChange;
         }
     );
 }
diff --git a/lib/room.h b/lib/room.h
index 246206d4..0569a0c0 100644
--- a/lib/room.h
+++ b/lib/room.h
@@ -128,7 +128,7 @@ namespace QMatrixClient
                 JoinStateChange = 0x20,
                 TagsChange = 0x40,
                 MembersChange = 0x80,
-                EncryptionOn = 0x100,
+                /*blank*/ = 0x100,
                 AccountDataChange = 0x200,
                 SummaryChange = 0x400,
                 ReadMarkerChange = 0x800,
-- 
cgit v1.2.3