From c64a021af4747366f4d3f4ad86025589d73cd581 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 18 Jul 2020 18:28:51 -0400 Subject: NEWS: Updates --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 7783efccb0..452b14a9f2 100644 --- a/NEWS +++ b/NEWS @@ -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 -- cgit v1.2.1 From 75a30b1f98c6fcb3140f39356c21165aa55ca51c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 19 Jul 2020 12:52:31 -0400 Subject: windowhandle: Don't use an action muxer needlessly The api that is meant to be used here is gtk_widget_activate_action. --- gtk/gtkwindowhandle.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) 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 -- cgit v1.2.1