Merge pull request #19 from endlessm/rebase-2.3.3

Rebase 2.3.3
endlessm · Aug 31, 2023 · 0f5d518 · 0f5d518
2 parents 71d4e4b + 99c8a72
commit 0f5d518
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/data/metainfo/org.learningequality.Kolibri.metainfo.xml.in.in b/data/metainfo/org.learningequality.Kolibri.metainfo.xml.in.in
@@ -22,13 +22,24 @@
     </screenshot>
   </screenshots>
   <releases>
+    <release version="2.3.3" date="2023-08-30" type="stable">
+      <description>
+        <p>Changes included in this release:</p>
+        <ul>
+          <li>
+            An issue was resolved which caused Kolibri to crash when starting
+            for the first time on some systems.
+          </li>
+        </ul>
+      </description>
+    </release>
     <release version="2.3.2" date="2023-08-25" type="stable">
       <description>
         <p>Changes included in this release:</p>
         <ul>
           <li>
-            An issue which caused Kolibri to hang when using automatic login
-            was resolved.
+            An issue was resolved which caused Kolibri to hang when using
+            automatic login.
           </li>
         </ul>
       </description>

diff --git a/meson.build b/meson.build
@@ -1,6 +1,6 @@
 project('kolibri-gnome', ['c'],
     meson_version: '>= 0.56.0',
-    version: '2.3.2'
+    version: '2.3.3'
 )
 
 package_string = '@0@-@1@'.format(meson.project_name(), meson.project_version())

diff --git a/src/kolibri_gnome/kolibri_daemon_manager.py b/src/kolibri_gnome/kolibri_daemon_manager.py
@@ -155,10 +155,9 @@ def __kolibri_api_call_async(
         soup_session = Soup.Session.new()
         soup_message = Soup.Message.new(method, url)
         if request_body is not None:
-            soup_message.set_request(
+            soup_message.set_request_body_from_bytes(
                 "application/json",
-                Soup.MemoryUse.COPY,
-                self.__request_body_object_to_bytes(request_body),
+                GLib.Bytes(self.__request_body_object_to_bytes(request_body)),
             )
         soup_session.send_async(
             soup_message,
@@ -182,9 +181,7 @@ def __kolibri_api_get_async_on_soup_send(
         if soup_message.get_status() >= Soup.Status.BAD_REQUEST:
             # FIXME: It would be better to raise an exception, and
             # handle it in the other side to set SESSION_STATUS_ERROR.
-            logger.warning(
-                f"Error calling Kolibri API, code: {soup_message.status_code}"
-            )
+            logger.warning(f"Error calling Kolibri API: {soup_message.get_status()}")
             result_cb(None)
             return
 
@@ -218,7 +215,6 @@ def __dbus_proxy_on_init(self, source: GLib.Object, result: Gio.AsyncResult):
                 "Error initializing Kolibri daemon proxy: {error}".format(error=error)
             )
             self.props.has_error = True
-            self.__on_dbus_proxy_changed()
         else:
             self.__dbus_proxy_on_notify_g_name_owner(self.__dbus_proxy)