callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: replace private accels functions by get_application_accels()

Browse Source 
It's like gtk_application_get_action_muxer().

https://bugzilla.gnome.org/show_bug.cgi?id=764879
This commit is contained in:
Sébastien Wilmet 2016-04-20 17:24:46 +02:00
parent 3b988ce523
commit 554de0be2a
3 changed files with 16 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/gtkapplication.c
View File

@ -29,7 +29,6 @@
#endif #endif
#include "gtkapplicationprivate.h" #include "gtkapplicationprivate.h"
#include "gtkapplicationaccelsprivate.h"
#include "gtkclipboardprivate.h" #include "gtkclipboardprivate.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkmain.h" #include "gtkmain.h"
@ -1264,28 +1263,10 @@ gtk_application_get_parent_muxer_for_window (GtkWindow *window)
return application->priv->muxer; return application->priv->muxer;
} }
gboolean GtkApplicationAccels *
gtk_application_activate_accel (GtkApplication *application, gtk_application_get_application_accels (GtkApplication *application)
GActionGroup *action_group,
guint key,
GdkModifierType modifier)
{ {
return gtk_application_accels_activate (application->priv->accels, return application->priv->accels;
action_group,
key,
modifier);
}
void
gtk_application_foreach_accel_keys (GtkApplication *application,
GtkWindow *window,
GtkWindowKeysForeachFunc callback,
gpointer user_data)
{
gtk_application_accels_foreach_key (application->priv->accels,
window,
callback,
user_data);
} }
/** /**

11
gtk/gtkapplicationprivate.h
View File

@ -25,6 +25,7 @@
#include "gtkwindowprivate.h" #include "gtkwindowprivate.h"
#include "gtkactionmuxer.h" #include "gtkactionmuxer.h"
#include "gtkapplicationaccelsprivate.h"
G_BEGIN_DECLS G_BEGIN_DECLS
@ -37,20 +38,12 @@ void gtk_application_handle_window_map (GtkAppl
GtkWindow *window); GtkWindow *window);
GtkActionMuxer * gtk_application_get_parent_muxer_for_window (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); GtkActionMuxer * gtk_application_get_action_muxer (GtkApplication *application);
void gtk_application_insert_action_group (GtkApplication *application, void gtk_application_insert_action_group (GtkApplication *application,
const gchar *name, const gchar *name,
GActionGroup *action_group); GActionGroup *action_group);
GtkApplicationAccels * gtk_application_get_application_accels (GtkApplication *application);
#define GTK_TYPE_APPLICATION_IMPL (gtk_application_impl_get_type ()) #define GTK_TYPE_APPLICATION_IMPL (gtk_application_impl_get_type ())
#define GTK_APPLICATION_IMPL_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class), \ #define GTK_APPLICATION_IMPL_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class), \

11
gtk/gtkwindow.c
View File

@ -11611,7 +11611,12 @@ _gtk_window_keys_foreach (GtkWindow *window,
} }
if (window->priv->application) 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 static void
@ -11777,6 +11782,7 @@ gtk_window_activate_key (GtkWindow *window,
{ {
GtkWidget *focused_widget; GtkWidget *focused_widget;
GtkActionMuxer *muxer; GtkActionMuxer *muxer;
GtkApplicationAccels *app_accels;
focused_widget = gtk_window_get_focus (window); focused_widget = gtk_window_get_focus (window);
@ -11788,7 +11794,8 @@ gtk_window_activate_key (GtkWindow *window,
if (muxer == NULL) if (muxer == NULL)
return FALSE; return FALSE;
return gtk_application_activate_accel (window->priv->application, app_accels = gtk_application_get_application_accels (window->priv->application);
return gtk_application_accels_activate (app_accels,
G_ACTION_GROUP (muxer), G_ACTION_GROUP (muxer),
found_entry->keyval, found_entry->modifiers); found_entry->keyval, found_entry->modifiers);
} }