app: replace private accels functions by get_application_accels()

It's like gtk_application_get_action_muxer(). https://bugzilla.gnome.org/show_bug.cgi?id=764879
GNOME · Apr 22, 2016 · 554de0b · 554de0b
1 parent 3b988ce
commit 554de0b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 35 deletions.
diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
@@ -29,7 +29,6 @@
 #endif
 
 #include "gtkapplicationprivate.h"
-#include "gtkapplicationaccelsprivate.h"
 #include "gtkclipboardprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkmain.h"
@@ -1264,28 +1263,10 @@ gtk_application_get_parent_muxer_for_window (GtkWindow *window)
   return application->priv->muxer;
 }
 
-gboolean
-gtk_application_activate_accel (GtkApplication  *application,
-                                GActionGroup    *action_group,
-                                guint            key,
-                                GdkModifierType  modifier)
-{
-  return gtk_application_accels_activate (application->priv->accels,
-                                          action_group,
-                                          key,
-                                          modifier);
-}
-
-void
-gtk_application_foreach_accel_keys (GtkApplication           *application,
-                                    GtkWindow                *window,
-                                    GtkWindowKeysForeachFunc  callback,
-                                    gpointer                  user_data)
+GtkApplicationAccels *
+gtk_application_get_application_accels (GtkApplication *application)
 {
-  gtk_application_accels_foreach_key (application->priv->accels,
-                                      window,
-                                      callback,
-                                      user_data);
+  return application->priv->accels;
 }
 
 /**

diff --git a/gtk/gtkapplicationprivate.h b/gtk/gtkapplicationprivate.h
@@ -25,6 +25,7 @@
 #include "gtkwindowprivate.h"
 
 #include "gtkactionmuxer.h"
+#include "gtkapplicationaccelsprivate.h"
 
 G_BEGIN_DECLS
 
@@ -37,20 +38,12 @@ void                    gtk_application_handle_window_map               (GtkAppl
                                                                          GtkWindow                *window);
 GtkActionMuxer *        gtk_application_get_parent_muxer_for_window     (GtkWindow                *window);
 
-gboolean                gtk_application_activate_accel                  (GtkApplication           *application,
-                                                                         GActionGroup             *action_group,
-                                                                         guint                     key,
-                                                                         GdkModifierType           modifier);
-
-void                    gtk_application_foreach_accel_keys              (GtkApplication           *application,
-                                                                         GtkWindow                *window,
-                                                                         GtkWindowKeysForeachFunc  callback,
-                                                                         gpointer                  user_data);
 GtkActionMuxer *        gtk_application_get_action_muxer                (GtkApplication           *application);
 void                    gtk_application_insert_action_group             (GtkApplication           *application,
                                                                          const gchar              *name,
                                                                          GActionGroup             *action_group);
 
+GtkApplicationAccels *  gtk_application_get_application_accels          (GtkApplication           *application);
 
 #define GTK_TYPE_APPLICATION_IMPL                           (gtk_application_impl_get_type ())
 #define GTK_APPLICATION_IMPL_CLASS(class)                   (G_TYPE_CHECK_CLASS_CAST ((class),                     \

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
@@ -11611,7 +11611,12 @@ _gtk_window_keys_foreach (GtkWindow                *window,
     }
 
   if (window->priv->application)
-    gtk_application_foreach_accel_keys (window->priv->application, window, func, func_data);
+    {
+      GtkApplicationAccels *app_accels;
+
+      app_accels = gtk_application_get_application_accels (window->priv->application);
+      gtk_application_accels_foreach_key (app_accels, window, func, func_data);
+    }
 }
 
 static void
@@ -11777,6 +11782,7 @@ gtk_window_activate_key (GtkWindow   *window,
                 {
                   GtkWidget *focused_widget;
                   GtkActionMuxer *muxer;
+                  GtkApplicationAccels *app_accels;
 
                   focused_widget = gtk_window_get_focus (window);
 
@@ -11788,9 +11794,10 @@ gtk_window_activate_key (GtkWindow   *window,
                   if (muxer == NULL)
                     return FALSE;
 
-                  return gtk_application_activate_accel (window->priv->application,
-                                                         G_ACTION_GROUP (muxer),
-                                                         found_entry->keyval, found_entry->modifiers);
+                  app_accels = gtk_application_get_application_accels (window->priv->application);
+                  return gtk_application_accels_activate (app_accels,
+                                                          G_ACTION_GROUP (muxer),
+                                                          found_entry->keyval, found_entry->modifiers);
                 }
             }
         }