[libdazzle] action-muxer: avoid interfering with win or app prefixes



commit 80066a206cd79d6572e6329f50baf13628af3b36
Author: Christian Hergert <chergert redhat com>
Date:   Mon Jul 3 03:34:59 2017 -0700

    action-muxer: avoid interfering with win or app prefixes

 src/util/dzl-gtk.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/src/util/dzl-gtk.c b/src/util/dzl-gtk.c
index 2bc128b..1ecf1bf 100644
--- a/src/util/dzl-gtk.c
+++ b/src/util/dzl-gtk.c
@@ -404,7 +404,12 @@ dzl_gtk_widget_mux_action_groups (GtkWidget   *widget,
   if (old_prefixes != NULL)
     {
       for (guint i = 0; old_prefixes [i]; i++)
-        gtk_widget_insert_action_group (widget, old_prefixes [i], NULL);
+        {
+          if (g_str_equal (old_prefixes [i], "win") || g_str_equal (old_prefixes [i], "app"))
+            continue;
+
+          gtk_widget_insert_action_group (widget, old_prefixes [i], NULL);
+        }
     }
 
   /*
@@ -422,6 +427,9 @@ dzl_gtk_widget_mux_action_groups (GtkWidget   *widget,
             {
               GActionGroup *group = gtk_widget_get_action_group (from_widget, prefixes [i]);
 
+              if (g_str_equal (prefixes [i], "win") || g_str_equal (prefixes [i], "app"))
+                continue;
+
               if G_UNLIKELY (group == NULL)
                 continue;
 


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