From eab7f8ea1593d3de85e983090c51e5f20a8d1961 Mon Sep 17 00:00:00 2001
From: Septias <scoreplayer2000@gmail.com>
Date: Mon, 12 Dec 2022 22:21:42 +0100
Subject: [PATCH] modernise some stuff

---
 CHANGELOG.md                        | 5 +----
 deltachat-ffi/src/lib.rs            | 3 +--
 deltachat-jsonrpc/src/api/events.rs | 2 --
 src/events.rs                       | 4 ++--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db495e48c..44dbab3a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,10 +5,9 @@
 ### Changes
 - Don't use deprecated `chrono` functions #3798
 - Document accounts manager #3837
-
 - If a classical-email-user sends an email to a group and adds new recipients,
   add the new recipients as group members #3781
-
+- `DC_EVENT_WEBXDC_UPDATE_STATE_CHANGED` is emitted when update state changes #3320
 ### API-Changes
 
 ### Fixes
@@ -285,8 +284,6 @@
   this affects `dc_get_chat_contacts()`, `dc_get_contacts()` and `dc_get_blocked_contacts()` #3562
 - add `internet_access` flag to `dc_msg_get_webxdc_info()` #3516
 - `DC_EVENT_WEBXDC_INSTANCE_DELETED` is emitted when a message containing a webxdc gets deleted #3592
-- `DC_EVENT_WEBXDC_BUSY_UPDATING` is emitted when a new update has to be sent by an webxdc #3320
-- `DC_EVENT_WEBXDC_UP_TO_DATE` is emitted when a webxdc has sent all updates #3320
 
 ### Fixes
 - do not emit notifications for blocked chats #3557
diff --git a/deltachat-ffi/src/lib.rs b/deltachat-ffi/src/lib.rs
index 91b8c9453..6cd2ea202 100644
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -3307,11 +3307,10 @@ pub unsafe extern "C" fn dc_is_webxdc_updating(
     msg_id: u32,
 ) -> libc::c_int {
     if context.is_null() {
-        eprintln!("ignoring careless call to dc_get_blocked_contacts()");
+        eprintln!("ignoring careless call to dc_is_webxdc_updating()");
         return 0;
     }
     let ctx = &*context;
-
     block_on(async move {
         webxdc::get_busy_webxdc_instances(ctx)
             .await
diff --git a/deltachat-jsonrpc/src/api/events.rs b/deltachat-jsonrpc/src/api/events.rs
index 2ebe8846d..e2ffd5939 100644
--- a/deltachat-jsonrpc/src/api/events.rs
+++ b/deltachat-jsonrpc/src/api/events.rs
@@ -281,8 +281,6 @@ pub enum JSONRPCEventType {
     WebxdcInstanceDeleted {
         msg_id: u32,
     },
-    WebxdcBusyUpdating,
-    WebxdcUpToDate,
     WebxdcUpdateStateChanged,
 }
 
diff --git a/src/events.rs b/src/events.rs
index 26344dc7c..2b3c4e996 100644
--- a/src/events.rs
+++ b/src/events.rs
@@ -314,12 +314,12 @@ pub enum EventType {
         status_update_serial: StatusUpdateSerial,
     },
 
-    /// Inform that a message containing a webxdc instance has been deleted
+    /// Informs that a message containing a webxdc instance has been deleted
     WebxdcInstanceDeleted {
         msg_id: MsgId,
     },
 
-    /// Inform that the webxdc changed its update sending state
+    /// Informs that the webxdc changed its update sending state
     WebxdcUpdateStateChanged {
         msg_id: MsgId,
         is_sending: bool,