X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkapplicationwindow.c;h=271054b109cfa90d98391023e10b7c70b3fabaf8;hb=fd51c8f5e9d6fb68c8e81b9b1e2ab80931f963f0;hp=fefb7d2444ab7f8455efb86fb276598c62e8a935;hpb=792c719478b73af686d5295a6644c658285f89ec;p=~andy%2Fgtk
diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c
index fefb7d244..271054b10 100644
--- a/gtk/gtkapplicationwindow.c
+++ b/gtk/gtkapplicationwindow.c
@@ -12,9 +12,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*
* Author: Ryan Lortie
*/
@@ -23,59 +21,492 @@
#include "gtkapplicationwindow.h"
-#include "gtkseparatormenuitem.h"
-#include "gtkcheckmenuitem.h"
+#include "gtkapplicationprivate.h"
+#include "gtkwidgetprivate.h"
+#include "gtkwindowprivate.h"
+#include "gtkaccelgroup.h"
+#include "gtkaccelmap.h"
#include "gtkmenubar.h"
-#include "gactionmuxer.h"
#include "gtkintl.h"
+#include "gtksettings.h"
+
+#include
+#ifdef GDK_WINDOWING_X11
+#include
+#endif
+
+#ifdef HAVE_GIO_UNIX
+#include
+#endif
/**
* SECTION:gtkapplicationwindow
* @title: GtkApplicationWindow
* @short_description: GtkWindow subclass with GtkApplication support
*
- * GtkApplicationWindow is a #GtkWindow subclass that offers some extra
- * functionality for better integration with #GtkApplication features.
- * It implements the #GActionGroup and #GActionMap interfaces, to let
- * you add window-specific actions that will be exported by the associated
- * #GtkApplication, together with its application-wide actions.
- * Window-specific actions are prefixed with the "win." prefix and
- * application-wide actions are prefixed with the "app." prefix.
- * Actions must be addressed with the prefixed name when referring
- * to them from a #GMenuModel.
+ * GtkApplicationWindow is a #GtkWindow subclass that offers some
+ * extra functionality for better integration with #GtkApplication
+ * features. Notably, it can handle both the application menu as well
+ * as the menubar. See gtk_application_set_app_menu() and
+ * gtk_application_set_menubar().
+ *
+ * This class implements the #GActionGroup and #GActionMap interfaces,
+ * to let you add window-specific actions that will be exported by the
+ * associated #GtkApplication, together with its application-wide
+ * actions. Window-specific actions are prefixed with the "win."
+ * prefix and application-wide actions are prefixed with the "app."
+ * prefix. Actions must be addressed with the prefixed name when
+ * referring to them from a #GMenuModel.
+ *
+ * Note that widgets that are placed inside a GtkApplicationWindow
+ * can also activate these actions, if they implement the
+ * GtkActionable interface.
+ *
+ * As with #GtkApplication, the GDK lock will be acquired when
+ * processing actions arriving from other processes and should therefore
+ * be held when activating actions locally (if GDK threads are enabled).
+ *
+ * The settings #GtkSettings:gtk-shell-shows-app-menu and
+ * #GtkSettings:gtk-shell-shows-menubar tell GTK+ whether the
+ * desktop environment is showing the application menu and menubar
+ * models outside the application as part of the desktop shell.
+ * For instance, on OS X, both menus will be displayed remotely;
+ * on Windows neither will be. gnome-shell (starting with version 3.4)
+ * will display the application menu, but not the menubar.
+ *
+ * If the desktop environment does not display the menubar, then
+ * #GtkApplicationWindow will automatically show a #GtkMenuBar for it.
+ * (see the #GtkApplication docs for some screenshots of how this
+ * looks on different platforms).
+ * This behaviour can be overridden with the #GtkApplicationWindow:show-menubar
+ * property. If the desktop environment does not display the application
+ * menu, then it will automatically be included in the menubar.
+ *
+ * A GtkApplicationWindow with a menubar
+ * "
+ * " "
+ * "");
+ * gtk_application_set_menubar (G_APPLICATION (app),
+ * G_MENU_MODEL (gtk_builder_get_object (builder, "menubar")));
+ * g_object_unref (builder);
+ *
+ * ...
+ *
+ * window = gtk_application_window_new (app);
+ * ]]>
+ *
+ *
+ *
+ * Handling fallback yourself
+ *
+ *
+ * FIXME: MISSING XINCLUDE CONTENT
+ *
+ *
+ *
*
- * If the desktop environment does not display the application menu
- * as part of the desktop shell, then #GApplicationWindow will
- * automatically show the menu as part of a menubar. This behaviour
- * can be overridden with the #GtkApplicationWindow:show-app-menu
- * property.
+ * The XML format understood by #GtkBuilder for #GMenuModel consists
+ * of a toplevel menu element, which contains
+ * one or more item elements. Each
+ * item element contains
+ * attribute and link
+ * elements with a mandatory name attribute.
+ * link elements have the same content
+ * model as menu.
+ *
+ * Attribute values can be translated using gettext, like other #GtkBuilder
+ * content. attribute elements can be marked for
+ * translation with a translatable="yes" attribute.
+ * It is also possible to specify message context and translator comments,
+ * using the context and comments attributes. To make use of this, the
+ * #GtkBuilder must have been given the gettext domain to use.
*/
+typedef GSimpleActionGroupClass GtkApplicationWindowActionsClass;
+typedef struct
+{
+ GSimpleActionGroup parent_instance;
+ GtkWindow *window;
+} GtkApplicationWindowActions;
+
+static GType gtk_application_window_actions_get_type (void);
+static void gtk_application_window_actions_iface_init (GRemoteActionGroupInterface *iface);
+G_DEFINE_TYPE_WITH_CODE (GtkApplicationWindowActions, gtk_application_window_actions, G_TYPE_SIMPLE_ACTION_GROUP,
+ G_IMPLEMENT_INTERFACE (G_TYPE_REMOTE_ACTION_GROUP, gtk_application_window_actions_iface_init))
+
+static void
+gtk_application_window_actions_activate_action_full (GRemoteActionGroup *remote,
+ const gchar *action_name,
+ GVariant *parameter,
+ GVariant *platform_data)
+{
+ GtkApplicationWindowActions *actions = (GtkApplicationWindowActions *) remote;
+ GApplication *application;
+ GApplicationClass *class;
+
+ application = G_APPLICATION (gtk_window_get_application (actions->window));
+ class = G_APPLICATION_GET_CLASS (application);
+
+ class->before_emit (application, platform_data);
+ g_action_group_activate_action (G_ACTION_GROUP (actions), action_name, parameter);
+ class->after_emit (application, platform_data);
+}
+
+static void
+gtk_application_window_actions_change_action_state_full (GRemoteActionGroup *remote,
+ const gchar *action_name,
+ GVariant *value,
+ GVariant *platform_data)
+{
+ GtkApplicationWindowActions *actions = (GtkApplicationWindowActions *) remote;
+ GApplication *application;
+ GApplicationClass *class;
+
+ application = G_APPLICATION (gtk_window_get_application (actions->window));
+ class = G_APPLICATION_GET_CLASS (application);
+
+ class->before_emit (application, platform_data);
+ g_action_group_change_action_state (G_ACTION_GROUP (actions), action_name, value);
+ class->after_emit (application, platform_data);
+}
+
+static void
+gtk_application_window_actions_init (GtkApplicationWindowActions *actions)
+{
+}
+
+static void
+gtk_application_window_actions_iface_init (GRemoteActionGroupInterface *iface)
+{
+ iface->activate_action_full = gtk_application_window_actions_activate_action_full;
+ iface->change_action_state_full = gtk_application_window_actions_change_action_state_full;
+}
+
+static void
+gtk_application_window_actions_class_init (GtkApplicationWindowActionsClass *class)
+{
+}
+
+static GSimpleActionGroup *
+gtk_application_window_actions_new (GtkApplicationWindow *window)
+{
+ GtkApplicationWindowActions *actions;
+
+ actions = g_object_new (gtk_application_window_actions_get_type (), NULL);
+ actions->window = GTK_WINDOW (window);
+
+ return G_SIMPLE_ACTION_GROUP (actions);
+}
+
+/* Now onto GtkApplicationWindow... */
+
struct _GtkApplicationWindowPrivate
{
GSimpleActionGroup *actions;
- GtkMenuBar *menubar;
+ GtkWidget *menubar;
+ GtkAccelGroup *accels;
+ GSList *accel_closures;
+
+ GMenu *app_menu_section;
+ GMenu *menubar_section;
+ gboolean show_menubar;
+
+ GDBusConnection *session;
+ gchar *object_path;
+ guint export_id;
- guint initialized_app_menu : 1;
- guint default_show_app_menu : 1;
- guint did_override_show_app_menu : 1;
- guint override_show_app_menu : 1;
+ guint id;
};
static void
-recalculate_app_menu_state (GtkApplicationWindow *window);
+gtk_application_window_update_menubar (GtkApplicationWindow *window)
+{
+ gboolean should_have_menubar;
+ gboolean have_menubar;
+
+ have_menubar = window->priv->menubar != NULL;
+
+ should_have_menubar = window->priv->show_menubar &&
+ (g_menu_model_get_n_items (G_MENU_MODEL (window->priv->app_menu_section)) ||
+ g_menu_model_get_n_items (G_MENU_MODEL (window->priv->menubar_section)));
+
+ if (have_menubar && !should_have_menubar)
+ {
+ gtk_widget_unparent (window->priv->menubar);
+ window->priv->menubar = NULL;
+
+ gtk_widget_queue_resize (GTK_WIDGET (window));
+ }
+
+ if (!have_menubar && should_have_menubar)
+ {
+ GMenu *combined;
+
+ combined = g_menu_new ();
+ g_menu_append_section (combined, NULL, G_MENU_MODEL (window->priv->app_menu_section));
+ g_menu_append_section (combined, NULL, G_MENU_MODEL (window->priv->menubar_section));
+
+ window->priv->menubar = gtk_menu_bar_new_from_model (G_MENU_MODEL (combined));
+ gtk_widget_set_parent (window->priv->menubar, GTK_WIDGET (window));
+ gtk_widget_show_all (window->priv->menubar);
+ g_object_unref (combined);
+
+ gtk_widget_queue_resize (GTK_WIDGET (window));
+ }
+}
+
+static gchar *
+gtk_application_window_get_app_desktop_name (void)
+{
+ gchar *retval = NULL;
+
+#ifdef HAVE_GIO_UNIX
+ GDesktopAppInfo *app_info;
+ const gchar *app_name = NULL;
+ gchar *desktop_file;
+
+ desktop_file = g_strconcat (g_get_prgname (), ".desktop", NULL);
+ app_info = g_desktop_app_info_new (desktop_file);
+ g_free (desktop_file);
+
+ if (app_info != NULL)
+ app_name = g_app_info_get_name (G_APP_INFO (app_info));
+
+ if (app_name != NULL)
+ retval = g_strdup (app_name);
+
+ g_clear_object (&app_info);
+#endif /* HAVE_GIO_UNIX */
+
+ return retval;
+}
static void
-on_shell_shows_app_menu_changed (GtkSettings *settings,
- GParamSpec *pspec,
- gpointer user_data)
+gtk_application_window_update_shell_shows_app_menu (GtkApplicationWindow *window,
+ GtkSettings *settings)
{
- GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (user_data);
- gboolean val;
+ gboolean shown_by_shell;
- g_object_get (settings, "gtk-shell-shows-app-menu", &val, NULL);
- window->priv->default_show_app_menu = !val;
- recalculate_app_menu_state (window);
+ g_object_get (settings, "gtk-shell-shows-app-menu", &shown_by_shell, NULL);
+
+ if (shown_by_shell)
+ {
+ /* the shell shows it, so don't show it locally */
+ if (g_menu_model_get_n_items (G_MENU_MODEL (window->priv->app_menu_section)) != 0)
+ g_menu_remove (window->priv->app_menu_section, 0);
+ }
+ else
+ {
+ /* the shell does not show it, so make sure we show it */
+ if (g_menu_model_get_n_items (G_MENU_MODEL (window->priv->app_menu_section)) == 0)
+ {
+ GMenuModel *app_menu;
+
+ app_menu = gtk_application_get_app_menu (gtk_window_get_application (GTK_WINDOW (window)));
+
+ if (app_menu != NULL)
+ {
+ const gchar *app_name;
+ gchar *name;
+
+ app_name = g_get_application_name ();
+ if (app_name != g_get_prgname ())
+ {
+ /* the app has set its application name, use it */
+ name = g_strdup (app_name);
+ }
+ else
+ {
+ /* get the name from .desktop file */
+ name = gtk_application_window_get_app_desktop_name ();
+ if (name == NULL)
+ name = g_strdup (_("Application"));
+ }
+
+ g_menu_append_submenu (window->priv->app_menu_section, name, app_menu);
+ g_free (name);
+ }
+ }
+ }
+}
+
+static void
+gtk_application_window_update_shell_shows_menubar (GtkApplicationWindow *window,
+ GtkSettings *settings)
+{
+ gboolean shown_by_shell;
+
+ g_object_get (settings, "gtk-shell-shows-menubar", &shown_by_shell, NULL);
+
+ if (shown_by_shell)
+ {
+ /* the shell shows it, so don't show it locally */
+ if (g_menu_model_get_n_items (G_MENU_MODEL (window->priv->menubar_section)) != 0)
+ g_menu_remove (window->priv->menubar_section, 0);
+ }
+ else
+ {
+ /* the shell does not show it, so make sure we show it */
+ if (g_menu_model_get_n_items (G_MENU_MODEL (window->priv->menubar_section)) == 0)
+ {
+ GMenuModel *menubar;
+
+ menubar = gtk_application_get_menubar (gtk_window_get_application (GTK_WINDOW (window)));
+
+ if (menubar != NULL)
+ g_menu_append_section (window->priv->menubar_section, NULL, menubar);
+ }
+ }
+}
+
+typedef struct {
+ GClosure closure;
+ gchar *action_name;
+ GVariant *parameter;
+} AccelClosure;
+
+static void
+accel_activate (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
+{
+ AccelClosure *aclosure = (AccelClosure*)closure;
+ GActionGroup *actions;
+
+ actions = G_ACTION_GROUP (closure->data);
+ if (g_action_group_get_action_enabled (actions, aclosure->action_name))
+ {
+ g_action_group_activate_action (actions, aclosure->action_name, aclosure->parameter);
+
+ /* we handled the accelerator */
+ g_value_set_boolean (return_value, TRUE);
+ }
+}
+
+static void
+free_accel_closures (GtkApplicationWindow *window)
+{
+ GSList *l;
+
+ for (l = window->priv->accel_closures; l; l = l->next)
+ {
+ AccelClosure *closure = l->data;
+
+ gtk_accel_group_disconnect (window->priv->accels, &closure->closure);
+
+ g_object_unref (closure->closure.data);
+ if (closure->parameter)
+ g_variant_unref (closure->parameter);
+ g_free (closure->action_name);
+ g_closure_invalidate (&closure->closure);
+ g_closure_unref (&closure->closure);
+ }
+ g_slist_free (window->priv->accel_closures);
+ window->priv->accel_closures = NULL;
+}
+
+/* Hack. We iterate over the accel map instead of the actions,
+ * in order to pull the parameters out of accel map entries
+ */
+static void
+add_accel_closure (gpointer data,
+ const gchar *accel_path,
+ guint accel_key,
+ GdkModifierType accel_mods,
+ gboolean changed)
+{
+ GtkApplicationWindow *window = data;
+ GActionGroup *actions;
+ const gchar *path;
+ const gchar *p;
+ gchar *action_name;
+ GVariant *parameter;
+ AccelClosure *closure;
+
+ if (accel_key == 0)
+ return;
+
+ if (!g_str_has_prefix (accel_path, "/"))
+ return;
+
+ path = accel_path + strlen ("/");
+ p = strchr (path, '/');
+ if (p)
+ {
+ action_name = g_strndup (path, p - path);
+ parameter = g_variant_parse (NULL, p + 1, NULL, NULL, NULL);
+ if (!parameter)
+ g_warning ("Failed to parse parameter from '%s'\n", accel_path);
+ }
+ else
+ {
+ action_name = g_strdup (path);
+ parameter = NULL;
+ }
+
+ actions = G_ACTION_GROUP (_gtk_widget_get_action_muxer (GTK_WIDGET (window)));
+ if (g_action_group_has_action (actions, action_name))
+ {
+ closure = (AccelClosure*) g_closure_new_object (sizeof (AccelClosure), g_object_ref (actions));
+ g_closure_set_marshal (&closure->closure, accel_activate);
+
+ closure->action_name = g_strdup (action_name);
+ closure->parameter = parameter ? g_variant_ref_sink (parameter) : NULL;
+
+ window->priv->accel_closures = g_slist_prepend (window->priv->accel_closures, g_closure_ref (&closure->closure));
+ g_closure_sink (&closure->closure);
+
+ gtk_accel_group_connect_by_path (window->priv->accels, accel_path, &closure->closure);
+ }
+ else if (parameter)
+ {
+ g_variant_unref (parameter);
+ }
+
+ g_free (action_name);
+}
+
+static void
+gtk_application_window_update_accels (GtkApplicationWindow *window)
+{
+ free_accel_closures (window);
+
+ gtk_accel_map_foreach (window, add_accel_closure);
+}
+
+static void
+gtk_application_window_shell_shows_app_menu_changed (GObject *object,
+ GParamSpec *pspec,
+ gpointer user_data)
+{
+ GtkApplicationWindow *window = user_data;
+
+ gtk_application_window_update_shell_shows_app_menu (window, GTK_SETTINGS (object));
+ gtk_application_window_update_menubar (window);
+}
+
+static void
+gtk_application_window_shell_shows_menubar_changed (GObject *object,
+ GParamSpec *pspec,
+ gpointer user_data)
+{
+ GtkApplicationWindow *window = user_data;
+
+ gtk_application_window_update_shell_shows_menubar (window, GTK_SETTINGS (object));
+ gtk_application_window_update_menubar (window);
}
static gchar **
@@ -122,7 +553,7 @@ gtk_application_window_change_action_state (GActionGroup *group,
}
static GAction *
-gtk_application_window_lookup_action (GActionMap *action_map,
+gtk_application_window_lookup_action (GActionMap *action_map,
const gchar *action_name)
{
GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (action_map);
@@ -171,7 +602,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkApplicationWindow, gtk_application_window, GTK_TYPE_
enum {
PROP_0,
- PROP_SHOW_APP_MENU,
+ PROP_SHOW_MENUBAR,
N_PROPS
};
static GParamSpec *gtk_application_window_properties[N_PROPS];
@@ -190,7 +621,7 @@ gtk_application_window_real_get_preferred_height (GtkWidget *widget,
{
gint menubar_min_height, menubar_nat_height;
- gtk_widget_get_preferred_height (GTK_WIDGET (window->priv->menubar), &menubar_min_height, &menubar_nat_height);
+ gtk_widget_get_preferred_height (window->priv->menubar, &menubar_min_height, &menubar_nat_height);
*minimum_height += menubar_min_height;
*natural_height += menubar_nat_height;
}
@@ -211,7 +642,7 @@ gtk_application_window_real_get_preferred_height_for_width (GtkWidget *widget,
{
gint menubar_min_height, menubar_nat_height;
- gtk_widget_get_preferred_height_for_width (GTK_WIDGET (window->priv->menubar), width, &menubar_min_height, &menubar_nat_height);
+ gtk_widget_get_preferred_height_for_width (window->priv->menubar, width, &menubar_min_height, &menubar_nat_height);
*minimum_height += menubar_min_height;
*natural_height += menubar_nat_height;
}
@@ -231,7 +662,7 @@ gtk_application_window_real_get_preferred_width (GtkWidget *widget,
{
gint menubar_min_width, menubar_nat_width;
- gtk_widget_get_preferred_width (GTK_WIDGET (window->priv->menubar), &menubar_min_width, &menubar_nat_width);
+ gtk_widget_get_preferred_width (window->priv->menubar, &menubar_min_width, &menubar_nat_width);
*minimum_width = MAX (*minimum_width, menubar_min_width);
*natural_width = MAX (*natural_width, menubar_nat_width);
}
@@ -244,15 +675,21 @@ gtk_application_window_real_get_preferred_width_for_height (GtkWidget *widget,
gint *natural_width)
{
GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (widget);
+ gint menubar_height;
+
+ if (window->priv->menubar != NULL)
+ gtk_widget_get_preferred_height (window->priv->menubar, &menubar_height, NULL);
+ else
+ menubar_height = 0;
GTK_WIDGET_CLASS (gtk_application_window_parent_class)
- ->get_preferred_width_for_height (widget, height, minimum_width, natural_width);
+ ->get_preferred_width_for_height (widget, height - menubar_height, minimum_width, natural_width);
if (window->priv->menubar != NULL)
{
gint menubar_min_width, menubar_nat_width;
- gtk_widget_get_preferred_width_for_height (GTK_WIDGET (window->priv->menubar), height, &menubar_min_width, &menubar_nat_width);
+ gtk_widget_get_preferred_width_for_height (window->priv->menubar, menubar_height, &menubar_min_width, &menubar_nat_width);
*minimum_width = MAX (*minimum_width, menubar_min_width);
*natural_width = MAX (*natural_width, menubar_nat_width);
}
@@ -267,13 +704,15 @@ gtk_application_window_real_size_allocate (GtkWidget *widget,
if (window->priv->menubar != NULL)
{
GtkAllocation menubar_allocation = *allocation;
- gint menubar_min_height, menubar_nat_height;
+ gint menubar_height;
GtkWidget *child;
- gtk_widget_get_preferred_height_for_width (GTK_WIDGET (window->priv->menubar), allocation->width, &menubar_min_height, &menubar_nat_height);
+ _gtk_window_set_allocation (GTK_WINDOW (widget), allocation);
+
+ gtk_widget_get_preferred_height_for_width (window->priv->menubar, allocation->width, &menubar_height, NULL);
- menubar_allocation.height = menubar_min_height;
- gtk_widget_size_allocate (GTK_WIDGET (window->priv->menubar), &menubar_allocation);
+ menubar_allocation.height = menubar_height;
+ gtk_widget_size_allocate (window->priv->menubar, &menubar_allocation);
child = gtk_bin_get_child (GTK_BIN (window));
if (child != NULL && gtk_widget_get_visible (child))
@@ -281,17 +720,14 @@ gtk_application_window_real_size_allocate (GtkWidget *widget,
GtkAllocation child_allocation = *allocation;
gint border_width;
- child_allocation.height = MAX (1, child_allocation.height - menubar_min_height);
-
border_width = gtk_container_get_border_width (GTK_CONTAINER (window));
child_allocation.x += border_width;
- child_allocation.y += border_width + menubar_min_height;
- child_allocation.width -= border_width * 2;
- child_allocation.height -= border_width * 2 - menubar_min_height;
+ child_allocation.y += border_width + menubar_height;
+ child_allocation.width = MAX (1, child_allocation.width - border_width * 2);
+ child_allocation.height = MAX (1, child_allocation.height - border_width * 2 - menubar_height);
+
gtk_widget_size_allocate (child, &child_allocation);
}
-
- gtk_widget_set_allocation (widget, allocation);
}
else
GTK_WIDGET_CLASS (gtk_application_window_parent_class)
@@ -302,19 +738,109 @@ static void
gtk_application_window_real_realize (GtkWidget *widget)
{
GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (widget);
+ GtkApplication *application;
+ GtkSettings *settings;
- if (!window->priv->initialized_app_menu)
- {
- window->priv->initialized_app_menu = TRUE;
- g_signal_connect (gtk_widget_get_settings ((GtkWidget*)window),
- "notify::gtk-shell-shows-app-menu",
- G_CALLBACK (on_shell_shows_app_menu_changed),
- window);
- on_shell_shows_app_menu_changed (gtk_widget_get_settings ((GtkWidget*)window), NULL, window);
- }
+ application = gtk_window_get_application (GTK_WINDOW (window));
+ settings = gtk_widget_get_settings (widget);
+
+ g_signal_connect (settings, "notify::gtk-shell-shows-app-menu",
+ G_CALLBACK (gtk_application_window_shell_shows_app_menu_changed), window);
+ g_signal_connect (settings, "notify::gtk-shell-shows-menubar",
+ G_CALLBACK (gtk_application_window_shell_shows_menubar_changed), window);
+
+ gtk_application_window_update_shell_shows_app_menu (window, settings);
+ gtk_application_window_update_shell_shows_menubar (window, settings);
+ gtk_application_window_update_menubar (window);
+ gtk_application_window_update_accels (window);
GTK_WIDGET_CLASS (gtk_application_window_parent_class)
->realize (widget);
+
+#ifdef GDK_WINDOWING_X11
+ {
+ GdkWindow *gdkwindow;
+
+ gdkwindow = gtk_widget_get_window (GTK_WIDGET (window));
+
+ if (GDK_IS_X11_WINDOW (gdkwindow) && window->priv->session)
+ {
+ gdk_x11_window_set_utf8_property (gdkwindow, "_GTK_APPLICATION_ID",
+ g_application_get_application_id (G_APPLICATION (application)));
+
+ gdk_x11_window_set_utf8_property (gdkwindow, "_GTK_UNIQUE_BUS_NAME",
+ g_dbus_connection_get_unique_name (window->priv->session));
+
+ gdk_x11_window_set_utf8_property (gdkwindow, "_GTK_APPLICATION_OBJECT_PATH",
+ g_application_get_dbus_object_path (G_APPLICATION (application)));
+
+ gdk_x11_window_set_utf8_property (gdkwindow, "_GTK_WINDOW_OBJECT_PATH",
+ window->priv->object_path);
+
+ gdk_x11_window_set_utf8_property (gdkwindow, "_GTK_APP_MENU_OBJECT_PATH",
+ gtk_application_get_app_menu_object_path (application));
+
+ gdk_x11_window_set_utf8_property (gdkwindow, "_GTK_MENUBAR_OBJECT_PATH",
+ gtk_application_get_menubar_object_path (application));
+ }
+ }
+#endif
+}
+
+static void
+gtk_application_window_real_unrealize (GtkWidget *widget)
+{
+ GtkSettings *settings;
+
+ settings = gtk_widget_get_settings (widget);
+
+ g_signal_handlers_disconnect_by_func (settings, gtk_application_window_shell_shows_app_menu_changed, widget);
+ g_signal_handlers_disconnect_by_func (settings, gtk_application_window_shell_shows_menubar_changed, widget);
+
+ GTK_WIDGET_CLASS (gtk_application_window_parent_class)
+ ->unrealize (widget);
+}
+
+gboolean
+gtk_application_window_publish (GtkApplicationWindow *window,
+ GDBusConnection *session,
+ const gchar *object_path,
+ guint object_id)
+{
+ g_assert (window->priv->session == NULL);
+ g_assert (window->priv->export_id == 0);
+ g_assert (window->priv->object_path == NULL);
+ g_assert (window->priv->id == 0);
+
+ window->priv->export_id = g_dbus_connection_export_action_group (session, object_path,
+ G_ACTION_GROUP (window->priv->actions),
+ NULL);
+
+ if (window->priv->export_id == 0)
+ return FALSE;
+
+ window->priv->session = session;
+ window->priv->object_path = g_strdup (object_path);
+ window->priv->id = object_id;
+
+ return TRUE;
+}
+
+void
+gtk_application_window_unpublish (GtkApplicationWindow *window)
+{
+ g_assert (window->priv->session != NULL);
+ g_assert (window->priv->export_id != 0);
+ g_assert (window->priv->object_path != NULL);
+ g_assert (window->priv->id != 0);
+
+ g_dbus_connection_unexport_action_group (window->priv->session, window->priv->export_id);
+ window->priv->session = NULL;
+ window->priv->export_id = 0;
+ window->priv->id = 0;
+
+ g_free (window->priv->object_path);
+ window->priv->object_path = NULL;
}
static void
@@ -322,9 +848,9 @@ gtk_application_window_real_map (GtkWidget *widget)
{
GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (widget);
- /* XXX could elimate this by tweaking gtk_window_map */
+ /* XXX could eliminate this by tweaking gtk_window_map */
if (window->priv->menubar)
- gtk_widget_map (GTK_WIDGET (window->priv->menubar));
+ gtk_widget_map (window->priv->menubar);
GTK_WIDGET_CLASS (gtk_application_window_parent_class)
->map (widget);
@@ -339,23 +865,24 @@ gtk_application_window_real_forall_internal (GtkContainer *container,
GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (container);
if (window->priv->menubar)
- callback (GTK_WIDGET (window->priv->menubar), user_data);
+ callback (window->priv->menubar, user_data);
GTK_CONTAINER_CLASS (gtk_application_window_parent_class)
->forall (container, include_internal, callback, user_data);
}
-
static void
-gtk_application_window_get_property (GObject *object, guint prop_id,
- GValue *value, GParamSpec *pspec)
+gtk_application_window_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (object);
switch (prop_id)
{
- case PROP_SHOW_APP_MENU:
- g_value_set_boolean (value, window->priv->override_show_app_menu);
+ case PROP_SHOW_MENUBAR:
+ g_value_set_boolean (value, window->priv->show_menubar);
break;
default:
@@ -364,15 +891,17 @@ gtk_application_window_get_property (GObject *object, guint prop_id,
}
static void
-gtk_application_window_set_property (GObject *object, guint prop_id,
- const GValue *value, GParamSpec *pspec)
+gtk_application_window_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (object);
switch (prop_id)
{
- case PROP_SHOW_APP_MENU:
- gtk_application_window_set_show_app_menu (window, g_value_get_boolean (value));
+ case PROP_SHOW_MENUBAR:
+ gtk_application_window_set_show_menubar (window, g_value_get_boolean (value));
break;
default:
@@ -385,8 +914,18 @@ gtk_application_window_dispose (GObject *object)
{
GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (object);
- g_clear_object (&window->priv->menubar);
+ if (window->priv->menubar)
+ {
+ gtk_widget_unparent (window->priv->menubar);
+ window->priv->menubar = NULL;
+ }
+
+ free_accel_closures (window);
+
+ g_clear_object (&window->priv->app_menu_section);
+ g_clear_object (&window->priv->menubar_section);
g_clear_object (&window->priv->actions);
+ g_clear_object (&window->priv->accels);
G_OBJECT_CLASS (gtk_application_window_parent_class)
->dispose (object);
@@ -397,7 +936,13 @@ gtk_application_window_init (GtkApplicationWindow *window)
{
window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window, GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindowPrivate);
- window->priv->actions = g_simple_action_group_new ();
+ window->priv->actions = gtk_application_window_actions_new (window);
+ window->priv->app_menu_section = g_menu_new ();
+ window->priv->menubar_section = g_menu_new ();
+ window->priv->accels = gtk_accel_group_new ();
+ gtk_window_add_accel_group (GTK_WINDOW (window), window->priv->accels);
+
+ gtk_widget_insert_action_group (GTK_WIDGET (window), "win", G_ACTION_GROUP (window->priv->actions));
/* window->priv->actions is the one and only ref on the group, so when
* we dispose, the action group will die, disconnecting all signals.
@@ -426,21 +971,43 @@ gtk_application_window_class_init (GtkApplicationWindowClass *class)
widget_class->get_preferred_width_for_height = gtk_application_window_real_get_preferred_width_for_height;
widget_class->size_allocate = gtk_application_window_real_size_allocate;
widget_class->realize = gtk_application_window_real_realize;
+ widget_class->unrealize = gtk_application_window_real_unrealize;
widget_class->map = gtk_application_window_real_map;
object_class->get_property = gtk_application_window_get_property;
object_class->set_property = gtk_application_window_set_property;
object_class->dispose = gtk_application_window_dispose;
- gtk_application_window_properties[PROP_SHOW_APP_MENU] =
- g_param_spec_boolean ("show-app-menu",
- P_("Show application menu"),
- P_("TRUE if the application menu should be included "
- "in the menubar at the top of the window"),
- FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);
+ /**
+ * GtkApplicationWindow:show-menubar:
+ *
+ * If this property is %TRUE, the window will display a menubar
+ * that includes the app menu and menubar, unless these are
+ * shown by the desktop shell. See gtk_application_set_app_menu()
+ * and gtk_application_set_menubar().
+ *
+ * If %FALSE, the window will not display a menubar, regardless
+ * of whether the desktop shell is showing the menus or not.
+ */
+ gtk_application_window_properties[PROP_SHOW_MENUBAR] =
+ g_param_spec_boolean ("show-menubar",
+ P_("Show a menubar"),
+ P_("TRUE if the window should show a "
+ "menubar at the top of the window"),
+ TRUE, G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);
g_object_class_install_properties (object_class, N_PROPS, gtk_application_window_properties);
g_type_class_add_private (class, sizeof (GtkApplicationWindowPrivate));
}
+/**
+ * gtk_application_window_new:
+ * @application: a #GtkApplication
+ *
+ * Creates a new #GtkApplicationWindow.
+ *
+ * Returns: a newly created #GtkApplicationWindow
+ *
+ * Since: 3.4
+ */
GtkWidget *
gtk_application_window_new (GtkApplication *application)
{
@@ -451,460 +1018,73 @@ gtk_application_window_new (GtkApplication *application)
NULL);
}
+/**
+ * gtk_application_window_get_show_menubar:
+ * @window: a #GtkApplicationWindow
+ *
+ * Returns whether the window will display a menubar for the app menu
+ * and menubar as needed.
+ *
+ * Returns: %TRUE if @window will display a menubar when needed
+ *
+ * Since: 3.4
+ */
gboolean
-gtk_application_window_get_show_app_menu (GtkApplicationWindow *window)
+gtk_application_window_get_show_menubar (GtkApplicationWindow *window)
{
- return window->priv->override_show_app_menu;
-}
-
-static void
-recalculate_app_menu_state (GtkApplicationWindow *window)
-{
- if ((window->priv->did_override_show_app_menu
- && window->priv->override_show_app_menu)
- || window->priv->default_show_app_menu)
- {
- GtkWidget *menubar;
- GtkWidget *item;
-
- item = gtk_menu_item_new_with_label ("Application");
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), gtk_application_window_get_app_menu (window));
-
- menubar = gtk_menu_bar_new ();
- window->priv->menubar = g_object_ref_sink (menubar);
- gtk_menu_shell_append (GTK_MENU_SHELL (menubar), item);
- gtk_widget_set_parent (menubar, GTK_WIDGET (window));
- gtk_widget_show_all (menubar);
- }
- else
- {
- gtk_widget_unparent (GTK_WIDGET (window->priv->menubar));
- g_object_unref (window->priv->menubar);
- }
+ return window->priv->show_menubar;
}
+/**
+ * gtk_application_window_set_show_menubar:
+ * @window: a #GtkApplicationWindow
+ * @show_menubar: whether to show a menubar when needed
+ *
+ * Sets whether the window will display a menubar for the app menu
+ * and menubar as needed.
+ *
+ * Since: 3.4
+ */
void
-gtk_application_window_set_show_app_menu (GtkApplicationWindow *window,
- gboolean show_app_menu)
-{
- show_app_menu = !!show_app_menu;
- window->priv->did_override_show_app_menu = TRUE;
- if (window->priv->override_show_app_menu != show_app_menu)
- {
- window->priv->override_show_app_menu = show_app_menu;
- recalculate_app_menu_state (window);
- g_object_notify_by_pspec (G_OBJECT (window), gtk_application_window_properties[PROP_SHOW_APP_MENU]);
- }
-}
-
-/* GtkMenu construction {{{1 */
-
-typedef struct {
- GActionGroup *group;
- gchar *name;
- gchar *target;
- gulong enabled_changed_id;
- gulong state_changed_id;
- gulong activate_handler;
-} ActionData;
-
-static void
-action_data_free (gpointer data)
-{
- ActionData *a = data;
-
- if (a->enabled_changed_id)
- g_signal_handler_disconnect (a->group, a->enabled_changed_id);
-
- if (a->state_changed_id)
- g_signal_handler_disconnect (a->group, a->state_changed_id);
-
- g_object_unref (a->group);
- g_free (a->name);
- g_free (a->target);
-
- g_free (a);
-}
-
-static void
-enabled_changed (GActionGroup *group,
- const gchar *action_name,
- gboolean enabled,
- GtkWidget *widget)
-{
- gtk_widget_set_sensitive (widget, enabled);
-}
-
-static void
-item_activated (GtkWidget *w,
- gpointer data)
-{
- ActionData *a;
- GVariant *parameter;
-
- a = g_object_get_data (G_OBJECT (w), "action");
- if (a->target)
- parameter = g_variant_ref_sink (g_variant_new_string (a->target));
- else
- parameter = NULL;
- g_action_group_activate_action (a->group, a->name, parameter);
- if (parameter)
- g_variant_unref (parameter);
-}
-
-static void
-toggle_state_changed (GActionGroup *group,
- const gchar *name,
- GVariant *state,
- GtkCheckMenuItem *w)
-{
- ActionData *a;
-
- a = g_object_get_data (G_OBJECT (w), "action");
- g_signal_handler_block (w, a->activate_handler);
- gtk_check_menu_item_set_active (w, g_variant_get_boolean (state));
- g_signal_handler_unblock (w, a->activate_handler);
-}
-
-static void
-radio_state_changed (GActionGroup *group,
- const gchar *name,
- GVariant *state,
- GtkCheckMenuItem *w)
-{
- ActionData *a;
- gboolean b;
-
- a = g_object_get_data (G_OBJECT (w), "action");
- g_signal_handler_block (w, a->activate_handler);
- b = g_strcmp0 (a->target, g_variant_get_string (state, NULL)) == 0;
- gtk_check_menu_item_set_active (w, b);
- g_signal_handler_unblock (w, a->activate_handler);
-}
-
-static GtkWidget *
-create_menuitem_from_model (GMenuModel *model,
- gint item,
- GActionGroup *group)
-{
- GtkWidget *w;
- gchar *label;
- gchar *action;
- gchar *target;
- gchar *s;
- ActionData *a;
- const GVariantType *type;
- GVariant *v;
-
- label = NULL;
- g_menu_model_get_item_attribute (model, item, G_MENU_ATTRIBUTE_LABEL, "s", &label);
-
- action = NULL;
- g_menu_model_get_item_attribute (model, item, G_MENU_ATTRIBUTE_ACTION, "s", &action);
-
- if (action != NULL)
- type = g_action_group_get_action_state_type (group, action);
- else
- type = NULL;
-
- if (type == NULL)
- w = gtk_menu_item_new_with_mnemonic (label);
- else if (g_variant_type_equal (type, G_VARIANT_TYPE_BOOLEAN))
- w = gtk_check_menu_item_new_with_label (label);
- else if (g_variant_type_equal (type, G_VARIANT_TYPE_STRING))
- {
- w = gtk_check_menu_item_new_with_label (label);
- gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (w), TRUE);
- }
- else
- g_assert_not_reached ();
-
- if (action != NULL)
- {
- a = g_new0 (ActionData, 1);
- a->group = g_object_ref (group);
- a->name = g_strdup (action);
- g_object_set_data_full (G_OBJECT (w), "action", a, action_data_free);
-
- if (!g_action_group_get_action_enabled (group, action))
- gtk_widget_set_sensitive (w, FALSE);
-
- s = g_strconcat ("action-enabled-changed::", action, NULL);
- a->enabled_changed_id = g_signal_connect (group, s,
- G_CALLBACK (enabled_changed), w);
- g_free (s);
- a->activate_handler = g_signal_connect (w, "activate",
- G_CALLBACK (item_activated), NULL);
-
- if (type == NULL)
- {
- /* all set */
- }
- else if (g_variant_type_equal (type, G_VARIANT_TYPE_BOOLEAN))
- {
- s = g_strconcat ("action-state-changed::", action, NULL);
- a->state_changed_id = g_signal_connect (group, s,
- G_CALLBACK (toggle_state_changed), w);
- g_free (s);
- v = g_action_group_get_action_state (group, action);
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w),
- g_variant_get_boolean (v));
- g_variant_unref (v);
- }
- else if (g_variant_type_equal (type, G_VARIANT_TYPE_STRING))
- {
- s = g_strconcat ("action-state-changed::", action, NULL);
- a->state_changed_id = g_signal_connect (group, s,
- G_CALLBACK (radio_state_changed), w);
- g_free (s);
- g_menu_model_get_item_attribute (model, item, G_MENU_ATTRIBUTE_TARGET, "s", &target);
- a->target = g_strdup (target);
- v = g_action_group_get_action_state (group, action);
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (w),
- g_strcmp0 (g_variant_get_string (v, NULL), target) == 0);
- g_variant_unref (v);
- g_free (target);
- }
- else
- g_assert_not_reached ();
- }
-
- g_free (label);
- g_free (action);
-
- return w;
-}
-
-static void populate_menu_from_model (GtkMenuShell *menu,
- GMenuModel *model,
- GActionGroup *group);
-
-static void
-append_items_from_model (GtkMenuShell *menu,
- GMenuModel *model,
- GActionGroup *group,
- gboolean *need_separator,
- const gchar *heading)
+gtk_application_window_set_show_menubar (GtkApplicationWindow *window,
+ gboolean show_menubar)
{
- gint n;
- gint i;
- GtkWidget *w;
- GtkWidget *menuitem;
- GtkWidget *submenu;
- GMenuModel *m;
- gchar *label;
+ g_return_if_fail (GTK_IS_APPLICATION_WINDOW (window));
- n = g_menu_model_get_n_items (model);
+ show_menubar = !!show_menubar;
- if (*need_separator && n > 0)
+ if (window->priv->show_menubar != show_menubar)
{
- w = gtk_separator_menu_item_new ();
- gtk_widget_show (w);
- gtk_menu_shell_append (menu, w);
- *need_separator = FALSE;
- }
+ window->priv->show_menubar = show_menubar;
- if (heading != NULL)
- {
- w = gtk_menu_item_new_with_label (heading);
- gtk_widget_show (w);
- gtk_widget_set_sensitive (w, FALSE);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), w);
- }
-
- for (i = 0; i < n; i++)
- {
- if ((m = g_menu_model_get_item_link (model, i, G_MENU_LINK_SECTION)))
- {
- label = NULL;
- g_menu_model_get_item_attribute (model, i, G_MENU_ATTRIBUTE_LABEL, "s", &label);
- append_items_from_model (menu, m, group, need_separator, label);
- g_object_unref (m);
- g_free (label);
- continue;
- }
-
- if (*need_separator)
- {
- w = gtk_separator_menu_item_new ();
- gtk_widget_show (w);
- gtk_menu_shell_append (menu, w);
- *need_separator = FALSE;
- }
-
- menuitem = create_menuitem_from_model (model, i, group);
-
- if ((m = g_menu_model_get_item_link (model, i, G_MENU_LINK_SUBMENU)))
- {
- submenu = gtk_menu_new ();
- populate_menu_from_model (GTK_MENU_SHELL (submenu), m, group);
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
- g_object_unref (m);
- }
-
- gtk_widget_show (menuitem);
- gtk_menu_shell_append (menu, menuitem);
+ gtk_application_window_update_menubar (window);
- *need_separator = TRUE;
+ g_object_notify_by_pspec (G_OBJECT (window), gtk_application_window_properties[PROP_SHOW_MENUBAR]);
}
}
-static void
-populate_menu_from_model (GtkMenuShell *menu,
- GMenuModel *model,
- GActionGroup *group)
+GtkAccelGroup *
+gtk_application_window_get_accel_group (GtkApplicationWindow *window)
{
- gboolean need_separator;
-
- need_separator = FALSE;
- append_items_from_model (menu, model, group, &need_separator, NULL);
-}
-
-typedef struct {
- GtkApplication *application;
- GtkMenuShell *menu;
- guint update_idle;
- GHashTable *connected;
-} ItemsChangedData;
-
-static void
-free_items_changed_data (gpointer data)
-{
- ItemsChangedData *d = data;
-
- g_object_unref (d->application);
-
- if (d->update_idle != 0)
- g_source_remove (d->update_idle);
-
- g_hash_table_unref (d->connected);
-
- g_free (d);
-}
-
-static gboolean
-repopulate_menu (gpointer data)
-{
- ItemsChangedData *d = data;
- GList *children, *l;
- GtkWidget *child;
- GMenuModel *model;
-
- /* remove current children */
- children = gtk_container_get_children (GTK_CONTAINER (d->menu));
- for (l = children; l; l = l->next)
- {
- child = l->data;
- gtk_container_remove (GTK_CONTAINER (d->menu), child);
- }
- g_list_free (children);
-
- /* repopulate */
- model = g_application_get_menu (G_APPLICATION (d->application));
- populate_menu_from_model (d->menu, model, G_ACTION_GROUP (d->application));
-
- d->update_idle = 0;
-
- return FALSE;
-}
-
-static void
-connect_to_items_changed (GMenuModel *model,
- GCallback callback,
- gpointer data)
-{
- ItemsChangedData *d = data;
- gint i;
- GMenuModel *m;
- GMenuLinkIter *iter;
-
- if (!g_hash_table_lookup (d->connected, model))
- {
- g_signal_connect (model, "items-changed", callback, data);
- g_hash_table_insert (d->connected, model, model);
- }
-
- for (i = 0; i < g_menu_model_get_n_items (model); i++)
- {
- iter = g_menu_model_iterate_item_links (model, i);
- while (g_menu_link_iter_next (iter))
- {
- m = g_menu_link_iter_get_value (iter);
- connect_to_items_changed (m, callback, data);
- g_object_unref (m);
- }
- g_object_unref (iter);
- }
-}
-
-static void
-items_changed (GMenuModel *model,
- gint position,
- gint removed,
- gint added,
- gpointer data)
-{
- ItemsChangedData *d = data;
-
- if (d->update_idle == 0)
- d->update_idle = gdk_threads_add_idle (repopulate_menu, data);
- connect_to_items_changed (model, G_CALLBACK (items_changed), data);
+ return window->priv->accels;
}
/**
- * gtk_application_window_get_app_menu:
+ * gtk_application_window_get_id:
* @window: a #GtkApplicationWindow
*
- * Populates a menu widget from a menu model that is
- * associated with @window. See g_application_set_menu().
- * The menu items will be connected to actions of @window or
- * its associated #GtkApplication, as indicated by the menu model.
- * The menus contents will be updated automatically in response
- * to menu model changes.
- *
- * It is the callers responsibility to add the menu at a
- * suitable place in the widget hierarchy.
+ * Returns the unique ID of the window. If the window has not yet been added to
+ * a #GtkApplication, returns 0.
*
- * This function returns %NULL if @window has no associated
- * menu model.
+ * Returns: the unique ID for @window, or 0 if the window
+ * has not yet been added to a #GtkApplication
*
- * Returns: A #GtkMenu that has been populated from the
- * #GMenuModel that is associated with @window, or %NULL
+ * Since: 3.6
*/
-GtkWidget *
-gtk_application_window_get_app_menu (GtkApplicationWindow *window)
+guint
+gtk_application_window_get_id (GtkApplicationWindow *window)
{
- GtkApplication *application;
- GtkWidget *menu;
- GMenuModel *model;
- ItemsChangedData *data;
- GActionMuxer *muxer;
-
- application = gtk_window_get_application (GTK_WINDOW (window));
-
- model = g_application_get_menu (G_APPLICATION (application));
-
- if (!model)
- return NULL;
-
- menu = gtk_menu_new ();
-
- muxer = g_action_muxer_new ();
- g_action_muxer_insert (muxer, "app", G_ACTION_GROUP (application));
- g_action_muxer_insert (muxer, "win", G_ACTION_GROUP (window));
- populate_menu_from_model (GTK_MENU_SHELL (menu), model, G_ACTION_GROUP (muxer));
- g_object_unref (muxer);
-
- data = g_new (ItemsChangedData, 1);
- data->application = g_object_ref (application);
- data->menu = GTK_MENU_SHELL (menu);
- data->update_idle = 0;
- data->connected = g_hash_table_new (NULL, NULL);
-
- g_object_set_data_full (G_OBJECT (menu), "gtk-application-menu-data",
- data, free_items_changed_data);
-
- connect_to_items_changed (model, G_CALLBACK (items_changed), data);
+ g_return_val_if_fail (GTK_IS_APPLICATION_WINDOW (window), 0);
- return menu;
+ return window->priv->id;
}