Merge branch 'matthiasc/for-master' into 'master'

Matthiasc/for master

Closes #3047, #3034, #3038, and #3036

See merge request GNOME/gtk!2416

6 files changed, 20 insertions, 12 deletions

diff --git a/demos/print-editor/print-editor.c b/demos/print-editor/print-editor.c
index 338274a7eb..892fc152a2 100644
--- a/demos/print-editor/print-editor.c
+++ b/demos/print-editor/print-editor.c
@@ -608,6 +608,7 @@ activate_about (GSimpleAction *action,
     "The GTK Team",
     NULL
   };
+  GtkWidget *dialog;
 
   os_name = g_get_os_info (G_OS_INFO_KEY_NAME);
   os_version = g_get_os_info (G_OS_INFO_KEY_VERSION_ID);
@@ -642,7 +643,8 @@ activate_about (GSimpleAction *action,
                              gtk_get_minor_version (),
                              gtk_get_micro_version ());
 
-  gtk_show_about_dialog (GTK_WINDOW (main_window),
+  dialog = g_object_new (GTK_TYPE_ABOUT_DIALOG,
+                         "transient-for", main_window,
                          "program-name", "GTK Print Editor",
                          "version", version,
                          "copyright", "© 2006-2020 Red Hat, Inc",
@@ -654,9 +656,11 @@ activate_about (GSimpleAction *action,
                          "title", "About GTK Print Editor",
                          "system-information", sysinfo->str,
                          NULL);
-  gtk_about_dialog_add_credit_section (GTK_ABOUT_DIALOG (g_object_get_data (G_OBJECT (main_window), "gtk-about-dialog")),
+  gtk_about_dialog_add_credit_section (GTK_ABOUT_DIALOG (dialog),
                                        _("Maintained by"), maintainers);
 
+  gtk_window_present (GTK_WINDOW (dialog));
+
   g_string_free (sysinfo, TRUE);
   g_free (version);
 }
diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c
index 4265cf5322..612ba462eb 100644
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -263,6 +263,7 @@ activate_about (GSimpleAction *action,
   char *os_name;
   char *os_version;
   GString *s;
+  GtkWidget *dialog;
 
   s = g_string_new ("");
 
@@ -289,7 +290,8 @@ activate_about (GSimpleAction *action,
                              gtk_get_minor_version (),
                              gtk_get_micro_version ());
 
-  gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
+  dialog = g_object_new (GTK_TYPE_ABOUT_DIALOG,
+                         "transient-for", gtk_application_get_active_window (app),
                          "program-name", "GTK Widget Factory",
                          "version", version,
                          "copyright", "© 1997—2020 The GTK Team",
@@ -302,9 +304,11 @@ activate_about (GSimpleAction *action,
                          "system-information", s->str,
                          NULL);
 
-  gtk_about_dialog_add_credit_section (GTK_ABOUT_DIALOG (g_object_get_data (G_OBJECT (gtk_application_get_active_window (app)), "gtk-about-dialog")),
+  gtk_about_dialog_add_credit_section (GTK_ABOUT_DIALOG (dialog),
                                        _("Maintained by"), maintainers);
 
+  gtk_window_present (GTK_WINDOW (dialog));
+
   g_string_free (s, TRUE);
   g_free (version);
   g_free (os_name);
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 414d6dc63e..269ae28829 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -2859,15 +2859,14 @@ gdk_x11_display_get_primary_monitor (GdkDisplay *display)
   GdkX11Display *self = GDK_X11_DISPLAY (display);
   GdkMonitor *monitor;
 
-  if (0 <= self->primary_monitor)
-    return NULL;
-
   monitor = g_list_model_get_item (G_LIST_MODEL (self->monitors), self->primary_monitor);
   if (monitor == NULL)
-    return NULL;
+    monitor = g_list_model_get_item (G_LIST_MODEL (self->monitors), 0);
 
   /* because g_list_model_get_item() returns a ref */
-  g_object_unref (monitor);
+  if (monitor)
+    g_object_unref (monitor);
+
   return monitor;
 }
 
diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index 66887e2b66..d7dfd985f7 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -2319,9 +2319,7 @@ gtk_show_about_dialog (GtkWindow   *parent,
 
     }
 
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   gtk_window_present (GTK_WINDOW (dialog));
-  G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 /**
diff --git a/gtk/gtkbookmarksmanager.c b/gtk/gtkbookmarksmanager.c
index 4fce669113..ed1ea063b3 100644
--- a/gtk/gtkbookmarksmanager.c
+++ b/gtk/gtkbookmarksmanager.c
@@ -238,10 +238,10 @@ bookmarks_file_changed (GFileMonitor      *monitor,
     case G_FILE_MONITOR_EVENT_CHANGED:
     case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
     case G_FILE_MONITOR_EVENT_CREATED:
-    case G_FILE_MONITOR_EVENT_DELETED:
       g_file_load_contents_async (file, NULL, read_bookmarks_finish, manager);
       break;
 
+    case G_FILE_MONITOR_EVENT_DELETED:
     case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
     case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
     case G_FILE_MONITOR_EVENT_UNMOUNTED:
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 9a4f010fc9..1e9f566346 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -5395,9 +5395,12 @@ gtk_label_update_actions (GtkLabel *self)
       link = gtk_label_get_focus_link (self, NULL);
     }
 
+  gtk_widget_action_set_enabled (widget, "clipboard.cut", FALSE);
   gtk_widget_action_set_enabled (widget, "clipboard.copy", has_selection);
+  gtk_widget_action_set_enabled (widget, "clipboard.paste", FALSE);
   gtk_widget_action_set_enabled (widget, "selection.select-all",
                                  gtk_label_get_selectable (self));
+  gtk_widget_action_set_enabled (widget, "selection.delete", FALSE);
   gtk_widget_action_set_enabled (widget, "link.open", !has_selection && link);
   gtk_widget_action_set_enabled (widget, "link.copy", !has_selection && link);
 }