[gnome-builder] libide/gui: fix recursive action muxer typo



commit 56c1ab97617a8ec99ad995d14003f6df2ce84cf7
Author: Christian Hergert <chergert redhat com>
Date:   Fri Jul 29 11:21:21 2022 -0700

    libide/gui: fix recursive action muxer typo

 src/libide/core/ide-action-muxer.c | 3 +++
 src/libide/gui/ide-workspace.c     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/src/libide/core/ide-action-muxer.c b/src/libide/core/ide-action-muxer.c
index 743f92e24..c3a6ba3c7 100644
--- a/src/libide/core/ide-action-muxer.c
+++ b/src/libide/core/ide-action-muxer.c
@@ -202,6 +202,7 @@ ide_action_muxer_action_group_action_added_cb (GActionGroup        *action_group
   g_assert (pag != NULL);
   g_assert (pag->backptr != NULL);
   g_assert (IDE_IS_ACTION_MUXER (pag->backptr));
+  g_assert ((gpointer)pag->backptr != (gpointer)action_group);
 
   full_name = g_strconcat (pag->prefix, action_name, NULL);
   g_action_group_action_added (G_ACTION_GROUP (pag->backptr), full_name);
@@ -219,6 +220,7 @@ ide_action_muxer_action_group_action_removed_cb (GActionGroup        *action_gro
   g_assert (pag != NULL);
   g_assert (pag->backptr != NULL);
   g_assert (IDE_IS_ACTION_MUXER (pag->backptr));
+  g_assert ((gpointer)pag->backptr != (gpointer)action_group);
 
   full_name = g_strconcat (pag->prefix, action_name, NULL);
   g_action_group_action_removed (G_ACTION_GROUP (pag->backptr), full_name);
@@ -271,6 +273,7 @@ ide_action_muxer_insert_action_group (IdeActionMuxer *self,
   g_return_if_fail (self->n_recurse == 0);
   g_return_if_fail (prefix != NULL);
   g_return_if_fail (!action_group || G_IS_ACTION_GROUP (action_group));
+  g_return_if_fail ((gpointer)action_group != (gpointer)self);
 
   /* Protect against recursion via signal emission. We don't want anything to
    * mess with our GArray while we are actively processing actions. To do so is
diff --git a/src/libide/gui/ide-workspace.c b/src/libide/gui/ide-workspace.c
index 3b2af115a..b8053ef82 100644
--- a/src/libide/gui/ide-workspace.c
+++ b/src/libide/gui/ide-workspace.c
@@ -176,7 +176,7 @@ ide_workspace_addin_added_cb (IdeExtensionSetAdapter *set,
       IdeActionMuxer *muxer = ide_action_mixin_get_action_muxer (self);
       ide_action_muxer_insert_action_group (muxer,
                                             peas_plugin_info_get_module_name (plugin_info),
-                                            G_ACTION_GROUP (muxer));
+                                            action_group);
     }
 
   if ((page = ide_workspace_get_focus_page (self)))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]