build(flatpak): bump evolution-data-server and libpeas

build-aux/flatpak/ca.andyholmes.Valent.json

@@ -137,8 +137,8 @@
                 {
                     "type" : "git",
                     "url" : "https://gitlab.gnome.org/GNOME/evolution-data-server.git",
-                    "commit" : "8141944c16eecc772aeb2ac41ab98a74de5f90cd",
-                    "tag" : "3.50.2",
+                    "commit" : "175c44679ee95830adcbd095d2e77995fef3b114",
+                    "tag" : "3.50.4",
                     "x-checker-data" : {
                         "type" : "anitya",
                         "project-id" : 10935,
@@ -166,8 +166,8 @@
                 {
                     "type" : "git",
                     "url" : "https://gitlab.gnome.org/GNOME/libpeas.git",
-                    "commit" : "0733118ae8e7148a1de63616611c7b0fc092eced",
-                    "tag" : "2.0.0",
+                    "commit" : "63bc9ecb185865024f05c43f1084f50b2240844a",
+                    "tag" : "2.0.1",
                     "x-checker-data" : {
                         "type" : "anitya",
                         "project-id" : 6871,

src/libvalent/ui/valent-ui-manager.c

@@ -44,6 +44,7 @@ main_window_action (GSimpleAction *action,
   if (self->main_window == NULL)
     {
       ValentDeviceManager *devices = valent_device_manager_get_default ();
+      GApplication *application = valent_extension_get_object (VALENT_EXTENSION (self));
 
       self->main_window = g_object_new (VALENT_TYPE_WINDOW,
                                         "default-width",  600,
@@ -52,6 +53,10 @@ main_window_action (GSimpleAction *action,
                                         NULL);
       g_object_add_weak_pointer (G_OBJECT (self->main_window),
                                  (gpointer)&self->main_window);
+
+      gtk_widget_insert_action_group (GTK_WIDGET (self->main_window),
+                                      "app",
+                                      G_ACTION_GROUP (application));
     }
 
   gtk_window_present_with_time (self->main_window, GDK_CURRENT_TIME);
@@ -93,8 +98,8 @@ media_remote_action (GSimpleAction *action,
   if (self->media_remote == NULL)
     {
       self->media_remote = g_object_new (VALENT_TYPE_MEDIA_REMOTE,
-                                   "players", valent_media_get_default (),
-                                   NULL);
+                                         "players", valent_media_get_default (),
+                                         NULL);
       g_object_add_weak_pointer (G_OBJECT (self->media_remote),
                                  (gpointer)&self->media_remote);
     }
@@ -151,8 +156,6 @@ valent_ui_manager_startup (ValentApplicationPlugin *plugin)
 
   g_assert (VALENT_IS_UI_MANAGER (plugin));
 
-  valent_ui_init ();
-
   application = valent_extension_get_object (VALENT_EXTENSION (plugin));
   g_action_map_add_action_entries (G_ACTION_MAP (application),
                                    app_actions,
@@ -177,5 +180,6 @@ valent_ui_manager_class_init (ValentUIManagerClass *klass)
 static void
 valent_ui_manager_init (ValentUIManager *self)
 {
+  valent_ui_init ();
 }
 

src/libvalent/ui/valent-ui-utils-private.h

@@ -28,6 +28,5 @@ typedef enum {
 
 char * valent_media_time_to_string          (int64_t        msecs,
                                              TotemTimeFlag  flags);
-void   valent_ui_insert_application_actions (GtkWidget     *widget);
 
 G_END_DECLS

src/libvalent/ui/valent-ui-utils.c

@@ -111,23 +111,3 @@ valent_string_to_markup (const char *text)
 
   return g_steal_pointer (&result);
 }
-
-/*< private >
- * valent_ui_insert_application_actions:
- * @widget: a `GtkWidget`
- *
- * Insert the default `GApplication` as the action group `app` in @widget.
- */
-void
-valent_ui_insert_application_actions (GtkWidget *widget)
-{
-  GApplication *application = g_application_get_default ();
-
-  if G_UNLIKELY (application == NULL)
-    return;
-
-  /* NOTE: the application must be registered before listing its actions */
-  if (g_application_get_is_registered (application))
-    gtk_widget_insert_action_group (widget, "app", G_ACTION_GROUP (application));
-}
-

src/libvalent/ui/valent-window.c

@@ -436,7 +436,6 @@ valent_window_constructed (GObject *object)
 
   g_assert (self->manager != NULL);
 
-  valent_ui_insert_application_actions (GTK_WIDGET (self));
   gtk_list_box_bind_model (self->device_list,
                            G_LIST_MODEL (self->manager),
                            valent_window_create_row_func,

src/plugins/lan/valent-lan-channel-service.c

@@ -239,6 +239,7 @@ on_incoming_connection (ValentChannelService   *service,
                                                      certificate,
                                                      timeout,
                                                      &warning);
+  g_cancellable_disconnect (cancellable, cancellable_id);
 
   if (tls_stream == NULL)
     {
@@ -247,13 +248,9 @@ on_incoming_connection (ValentChannelService   *service,
       else if (!g_cancellable_is_cancelled (cancellable))
         g_warning ("%s(): timed out waiting for authentication", G_STRFUNC);
 
-      g_cancellable_disconnect (cancellable, cancellable_id);
-
       return TRUE;
     }
 
-  g_cancellable_disconnect (cancellable, cancellable_id);
-
   if (!valent_lan_channel_service_verify_channel (self, peer_identity, tls_stream))
     return TRUE;
 

tests/extra/cppcheck.cfg

@@ -6,4 +6,11 @@
 <!-- See: https://github.com/danmar/cppcheck/pull/5464 -->
 <def format="2">
   <define name="G_DEFINE_QUARK(QN, q_n)" value=""/>
+  <define name="G_FILE_ATTRIBUTE_TIME_CREATED_USEC" value="time::created-usec"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_MODIFIED" value="time::modified"/>
+  <define name="G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC" value="time::modified-usec"/>
+  <define name="G_GINT64_FORMAT" value=""/>
+  <define name="G_GOFFSET_FORMAT" value=""/>
+  <define name="G_GSIZE_FORMAT" value=""/>
+  <define name="G_GSSIZE_FORMAT" value=""/>
 </def>

tests/extra/cppcheck.supp

@@ -1,6 +1,9 @@
 # SPDX-License-Identifier: CC0-1.0
 # SPDX-FileCopyrightText: No rights reserved
 
+# src/libvalent/core/
+preprocessorErrorDirective:src/libvalent/core/valent-global.c:35
+
 # src/libvalent/device/
 memleak:src/libvalent/device/valent-channel.c:325
 
@@ -16,13 +19,17 @@ leakNoVarFunctionCall:src/libvalent/notifications/valent-notification.c:849
 leakNoVarFunctionCall:src/libvalent/notifications/valent-notification.c:868
 leakNoVarFunctionCall:src/libvalent/notifications/valent-notification.c:872
 
+# src/plugins/battery/
+memleak:src/plugins/battery/valent-battery-gadget.c
+
 # src/plugins/sms/
 memleak:src/plugins/sms/valent-sms-store.c:814
 memleak:src/plugins/sms/valent-sms-store.c:864
 leakNoVarFunctionCall:src/plugins/sms/valent-sms-conversation.c:568
 leakNoVarFunctionCall:src/plugins/sms/valent-sms-conversation.c:573
 
 # tests/plugins/connectivity_report/
+memleak:src/plugins/connectivity_report/valent-connectivity_report-gadget.c:206
 leakNoVarFunctionCall:src/plugins/connectivity_report/valent-connectivity_report-plugin.c:258
 leakNoVarFunctionCall:src/plugins/connectivity_report/valent-connectivity_report-plugin.c:260
 leakNoVarFunctionCall:src/plugins/connectivity_report/valent-connectivity_report-plugin.c:262
@@ -49,5 +56,8 @@ leakNoVarFunctionCall:tests/plugins/gtk/test-gtk-notifications.c:117
 leakNoVarFunctionCall:tests/plugins/gtk/test-gtk-notifications.c:119
 
 # tests/plugins/lan/
-memleak:src/plugins/lan/valent-lan-channel-service.c:541
+memleak:src/plugins/lan/valent-lan-channel-service.c:538
+memleak:src/plugins/lan/valent-lan-channel-service.c:553
+memleak:src/plugins/lan/valent-lan-dnssd.c:86
+memleak:src/plugins/lan/valent-lan-dnssd.c:96