about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--src/event/server_events.c14
-rw-r--r--src/ui/console.c2
2 files changed, 15 insertions, 1 deletions
diff --git a/src/event/server_events.c b/src/event/server_events.c
index 0e84a3e3..4644cc8c 100644
--- a/src/event/server_events.c
+++ b/src/event/server_events.c
@@ -522,6 +522,13 @@ sv_ev_incoming_message(char *barejid, char *resource, char *message, char *pgp_m
         ProfWin *window = wins_new_chat(barejid);
         chatwin = (ProfChatWin*)window;
         new_win = TRUE;
+
+#ifdef HAVE_OMEMO
+        if (omemo_automatic_start(barejid)) {
+            omemo_start_session(barejid);
+            chatwin->is_omemo = TRUE;
+        }
+#endif
     }
 
 // OTR suported, PGP supported, OMEMO unsupported
@@ -658,6 +665,13 @@ sv_ev_incoming_carbon(char *barejid, char *resource, char *message, char *pgp_me
         ProfWin *window = wins_new_chat(barejid);
         chatwin = (ProfChatWin*)window;
         new_win = TRUE;
+
+#ifdef HAVE_OMEMO
+        if (omemo_automatic_start(barejid)) {
+            omemo_start_session(barejid);
+            chatwin->is_omemo = TRUE;
+        }
+#endif
     }
 
 #ifdef HAVE_LIBGPGME
diff --git a/src/ui/console.c b/src/ui/console.c
index 812a9184..f4ba7eba 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -412,7 +412,7 @@ cons_about(void)
         }
     }
 
-    win_println(console, THEME_DEFAULT, '-', "Copyright (C) 2012 - 2018 James Booth <%s>.", PACKAGE_BUGREPORT);
+    win_println(console, THEME_DEFAULT, '-', "Copyright (C) 2012 - 2019 James Booth <%s>.", PACKAGE_BUGREPORT);
     win_println(console, THEME_DEFAULT, '-', "License GPLv3+: GNU GPL version 3 or later <https://www.gnu.org/licenses/gpl.html>");
     win_println(console, THEME_DEFAULT, '-', "");
     win_println(console, THEME_DEFAULT, '-', "This is free software; you are free to change and redistribute it.");