Merge branch 'rel_0.6.3' into 'pureos/byzantium'

Document and release 0.6.3-1pureos1

See merge request !21

NEWS

+Overview of Changes in Chats 0.6.3. Tue, 26 March 2022
+====================================================
+* Fix calculating MMS max attachment size
+* Fix some compile time warnings
+* Fix parsing links with spaces in messages
+* Update Translations
+  - Turkish
+  - Italian
+
+
 Overview of Changes in Chats 0.6.2. Tue, 25 Feb 2022
 ====================================================
 * Update Translations

debian/changelog

+chatty (0.6.3-1pureos1) byzantium; urgency=medium
+
+  * Remove upstreamed patch
+
+ -- Evangelos Ribeiro Tzaras <evangelos.tzaras@puri.sm>  Thu, 31 Mar 2022 11:23:27 +0200
+
+chatty (0.6.3-1) unstable; urgency=medium
+
+  * New upstream version 0.6.3
+  * Patch out clock test which fails on some architectures
+
+ -- Evangelos Ribeiro Tzaras <devrtz-debian@fortysixandtwo.eu>  Tue, 29 Mar 2022 16:37:54 +0200
+
 chatty (0.6.2-1pureos1) byzantium; urgency=medium
 
   * Upload to byzantium

debian/patches/0003-Bump-test-timeout-to-5-minutes.patch

-From: Evangelos Ribeiro Tzaras <evangelos.tzaras@puri.sm>
-Date: Mon, 7 Mar 2022 09:29:18 +0100
-Subject: Bump test timeout to 5 minutes
-
-The history test can take quite a lot of time on spinning rust while
-it completes very fast in a tmpfs.
-
-Filed as https://source.puri.sm/Librem5/chatty/-/issues/684
----
- tests/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/meson.build b/tests/meson.build
-index cb287a1..ec9f419 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -37,5 +37,5 @@ foreach item: test_items
-     link_with: libchatty.get_static_lib(),
-     dependencies: chatty_deps,
-   )
--  test(item, t, env: env, timeout: 120)
-+  test(item, t, env: env, timeout: 300)
- endforeach

debian/patches/series

 0001-notification-Remove-glib-version-check-guard.patch
 0002-Disable-message-text-item-test-again.patch
-0003-Bump-test-timeout-to-5-minutes.patch

meson.build

 project(
   'chatty', 'c', 'cpp',
-  version: '0.6.2',
+  version: '0.6.3',
   meson_version: '>= 0.53.0',
 )
 

src/chatty-enums.h

@@ -111,7 +111,7 @@ typedef enum
 {
   CHATTY_STATUS_UNKNOWN,
   CHATTY_STATUS_DRAFT,
-  CHATTY_STATUS_RECIEVED,
+  CHATTY_STATUS_RECEIVED,
   CHATTY_STATUS_SENDING,
   CHATTY_STATUS_SENT,
   CHATTY_STATUS_DELIVERED,

src/chatty-history.c

@@ -103,7 +103,7 @@
 /* Shouldn't be modified, new values should be appended */
 #define MESSAGE_STATUS_UNKNOWN          0
 #define MESSAGE_STATUS_DRAFT            1
-#define MESSAGE_STATUS_RECIEVED         2
+#define MESSAGE_STATUS_RECEIVED         2
 #define MESSAGE_STATUS_SENT             3
 #define MESSAGE_STATUS_DELIVERED        4
 #define MESSAGE_STATUS_READ             5
@@ -317,8 +317,8 @@ static int
 history_msg_status_to_value (ChattyMsgStatus status)
 {
   switch (status) {
-  case CHATTY_STATUS_RECIEVED:
-    return MESSAGE_STATUS_RECIEVED;
+  case CHATTY_STATUS_RECEIVED:
+    return MESSAGE_STATUS_RECEIVED;
 
   case CHATTY_STATUS_DRAFT:
     return MESSAGE_STATUS_DRAFT;
@@ -356,8 +356,8 @@ history_msg_status_from_value (int value)
     return CHATTY_STATUS_UNKNOWN;
   if (value == MESSAGE_STATUS_DRAFT)
     return CHATTY_STATUS_DRAFT;
-  if (value == MESSAGE_STATUS_RECIEVED)
-    return CHATTY_STATUS_RECIEVED;
+  if (value == MESSAGE_STATUS_RECEIVED)
+    return CHATTY_STATUS_RECEIVED;
   if (value == MESSAGE_STATUS_SENT)
     return CHATTY_STATUS_SENT;
   if (value == MESSAGE_STATUS_DELIVERED)

src/chatty-media.c

@@ -202,7 +202,7 @@ chatty_media_scale_image_to_size_sync (ChattyFileInfo *input_file,
     }
     new_size = g_file_info_get_size (file_info);
     if (new_size <= desired_size) {
-      g_debug ("Resized at quality %s to size %lu", *quality, new_size);
+      g_debug ("Resized at quality %s to size %" G_GSIZE_FORMAT, *quality, new_size);
       break;
     }
   }

src/matrix/matrix-api.c

@@ -551,7 +551,7 @@ handle_one_time_keys (MatrixApi  *self,
 
   /* If we don't have enough onetime keys add some */
   if (count < limit) {
-    CHATTY_TRACE_MSG ("generating %lu onetime keys", limit - count);
+    CHATTY_TRACE_MSG ("generating %" G_GSIZE_FORMAT " onetime keys", limit - count);
     matrix_enc_create_one_time_keys (self->matrix_enc, limit - count);
 
     if (!self->key)

src/mm/chatty-mm-account.c

@@ -701,7 +701,7 @@ mm_account_messaging_list_cb (GObject      *object,
 }
 
 static void
-mm_account_sms_recieved_cb (ChattyMmAccount  *self,
+mm_account_sms_received_cb (ChattyMmAccount  *self,
                             char             *arg_path,
                             gboolean          arg_received,
                             MMModemMessaging *mm_messaging)
@@ -805,7 +805,7 @@ mm_object_added_cb (ChattyMmAccount *self,
 
   g_signal_connect_swapped (mm_object_peek_modem_messaging (MM_OBJECT (object)),
                             "added",
-                            G_CALLBACK (mm_account_sms_recieved_cb), self);
+                            G_CALLBACK (mm_account_sms_received_cb), self);
   CHATTY_TRACE_MSG ("List messages from modem %p", object);
 
   data = g_new0 (MessagingData, 1);

src/mm/chatty-mmsd.c

@@ -76,7 +76,7 @@ struct _ChattyMmsd {
   char             *default_modem_number;
   GPtrArray        *mms_arr;
   GHashTable       *mms_hash_table;
-  int               max_attach_size;
+  gsize             max_attach_size;
   int               max_num_attach;
   char             *carrier_mmsc;
   char             *mms_apn;
@@ -482,7 +482,8 @@ chatty_mmsd_send_mms_create_attachments (ChattyMmsd    *self,
     g_debug ("Total Number of attachments %d", total_files_count);
     other_attachments_size = attachments_size-image_attachments_size;
     if (other_attachments_size > self->max_attach_size) {
-      g_warning ("Size of attachments that can't be resized %ld greater then maximum attachment size %d",
+      g_warning ("Size of attachments that can't be resized %" G_GSIZE_FORMAT
+                 " greater then maximum attachment size %" G_GSIZE_FORMAT,
                  other_attachments_size, self->max_attach_size);
       return NULL;
     }
@@ -796,7 +797,7 @@ chatty_mmsd_receive_message (ChattyMmsd *self,
     mms_status = CHATTY_STATUS_DELIVERED;
   } else if (g_strcmp0 (status, "received") == 0) {
     direction = CHATTY_DIRECTION_IN;
-    mms_status = CHATTY_STATUS_RECIEVED;
+    mms_status = CHATTY_STATUS_RECEIVED;
   } else if (g_strcmp0 (status, "downloaded") == 0) {
     /* This is an internal mmsd-tng state, and shouldn't be shown */
     return NULL;
@@ -807,12 +808,12 @@ chatty_mmsd_receive_message (ChattyMmsd *self,
      * it like a "received" message.
      */
     direction = CHATTY_DIRECTION_IN;
-    mms_status = CHATTY_STATUS_RECIEVED;
+    mms_status = CHATTY_STATUS_RECEIVED;
   } else if (g_strcmp0 (status, "expired") == 0) {
     g_autoptr(GDateTime) expire_time = NULL;
     g_autofree char *expire_date = NULL;
     direction = CHATTY_DIRECTION_IN;
-    mms_status = CHATTY_STATUS_RECIEVED;
+    mms_status = CHATTY_STATUS_RECEIVED;
 
     g_variant_dict_lookup (&dict, "Expire", "s", &expire_date);
 
@@ -1013,6 +1014,7 @@ chatty_mmsd_receive_message (ChattyMmsd *self,
     filename = g_strdup (filenode);
     g_strdelimit (filename, "<>", ' ');
     g_strstrip (filename);
+    g_strdelimit (filename, " ", '_');
     filename = g_path_get_basename (filename);
     new = g_file_get_child (savepath, filename);
     out = g_file_create (new, G_FILE_CREATE_PRIVATE, NULL, &error);
@@ -1356,18 +1358,19 @@ chatty_mmsd_get_mmsd_service_settings_cb (GObject      *service,
   } else {
     g_autoptr(GVariant) all_settings = NULL;
     GVariantDict dict;
-    int max_attach_total_size, max_attachments;
+    int max_attach_total_size;
+    int max_attachments;
     gboolean autocreatesmil;
 
     g_variant_get (ret, "(@a{?*})", &all_settings);
     g_variant_dict_init (&dict, all_settings);
 
     if (g_variant_dict_lookup (&dict, "TotalMaxAttachmentSize", "i", &max_attach_total_size))
-      self->max_attach_size = max_attach_total_size;
+      self->max_attach_size = (gsize) max_attach_total_size;
     else
       self->max_attach_size = DEFAULT_MAXIMUM_ATTACHMENT_SIZE;
 
-    g_debug ("TotalMaxAttachmentSize is set to %d", self->max_attach_size);
+    g_debug ("TotalMaxAttachmentSize is set to %" G_GSIZE_FORMAT, self->max_attach_size);
 
     if (g_variant_dict_lookup (&dict, "MaxAttachments", "i", &max_attachments))
       self->max_num_attach = max_attachments;

tests/meson.build

@@ -37,5 +37,5 @@ foreach item: test_items
     link_with: libchatty.get_static_lib(),
     dependencies: chatty_deps,
   )
-  test(item, t, env: env, timeout: 120)
+  test(item, t, env: env, timeout: 300)
 endforeach