diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-07-19 19:14:04 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-07-19 19:14:04 +0000 |
| commit | b5e20a3e37d192b289407e57cc9df8017384789c (patch) | |
| tree | 744ed8ac6073fc6aa6fe8ddb47ae1c4a9a30fb69 | |
| parent | 9b64635925980e641312b3d9386ac9107cef5922 (diff) | |
| parent | 75a30b1f98c6fcb3140f39356c21165aa55ca51c (diff) | |
| download | gtk+-b5e20a3e37d192b289407e57cc9df8017384789c.tar.gz | |
Merge branch 'matthiasc/for-master' into 'master'
Matthiasc/for master
See merge request GNOME/gtk!2265
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | gtk/gtkwindowhandle.c | 15 |
2 files changed, 7 insertions, 10 deletions
@@ -1,7 +1,7 @@ Overview of Changes in GTK 3.99.0 ================================= -* Add GtkEditableLabel +* Add GtkEditableLabel, a label that can be edited * Add GtkBookmarkList, a list model for bookmarks diff --git a/gtk/gtkwindowhandle.c b/gtk/gtkwindowhandle.c index 437a13c7c6..ebc1394ed0 100644 --- a/gtk/gtkwindowhandle.c +++ b/gtk/gtkwindowhandle.c @@ -268,7 +268,6 @@ perform_titlebar_action (GtkWindowHandle *self, GtkSettings *settings; gchar *action = NULL; gboolean retval = TRUE; - GtkActionMuxer *context; settings = gtk_widget_get_settings (GTK_WIDGET (self)); switch (button) @@ -287,23 +286,21 @@ perform_titlebar_action (GtkWindowHandle *self, break; } - context = _gtk_widget_get_action_muxer (GTK_WIDGET (self), TRUE); - if (action == NULL) retval = FALSE; else if (g_str_equal (action, "none")) retval = FALSE; /* treat all maximization variants the same */ else if (g_str_has_prefix (action, "toggle-maximize")) - g_action_group_activate_action (G_ACTION_GROUP (context), - "window.toggle-maximized", - NULL); + gtk_widget_activate_action (GTK_WIDGET (self), + "window.toggle-maximized", + NULL); else if (g_str_equal (action, "lower")) lower_window (self); else if (g_str_equal (action, "minimize")) - g_action_group_activate_action (G_ACTION_GROUP (context), - "window.minimize", - NULL); + gtk_widget_activate_action (GTK_WIDGET (self), + "window.minimize", + NULL); else if (g_str_equal (action, "menu")) do_popup (self, event); else |