diff options
| author |   Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-03-23 13:17:25 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-28 15:54:51 +0100 |
| commit | e0c5bcb73f3663990ccb489a75cbc59927fc9e13 (patch) | |
| tree | 825682d152c112f8831a10c347cb875db14c7068 /meta/recipes-sato/matchbox-desktop | |
| parent | 54387be24d6a157574496f1b20b21c7fc2a51d3e (diff) | |
| download | openembedded-core-contrib-e0c5bcb73f3663990ccb489a75cbc59927fc9e13.tar.gz | |
matchbox-desktop: Do not close desktop on alt-F4
There are cases where user can close the desktop with a
well timed alt-F4: prevent this from happening
[YOCTO #2063]
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/matchbox-desktop')
| -rw-r--r-- | meta/recipes-sato/matchbox-desktop/files/0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch | 60 | ||||
| -rw-r--r-- | meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb | 4 |
2 files changed, 63 insertions, 1 deletions
diff --git a/meta/recipes-sato/matchbox-desktop/files/0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch b/meta/recipes-sato/matchbox-desktop/files/0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch new file mode 100644 index 00000000000..46397dc8a28 --- /dev/null +++ b/meta/recipes-sato/matchbox-desktop/files/0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch @@ -0,0 +1,60 @@ +From 5fe37ef38500f858a22ecdf9bf69bf06e213bf68 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Tue, 22 Mar 2016 12:41:35 +0200 +Subject: [PATCH] Do nothing on delete-event when not STANDALONE + +This prevents an opportunistic alt-F4 from closing the desktop. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Signed-off-by: Ross Burton <ross.burton@intel.com> + + +Upstream-Status: Backport +--- + src/desktop.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/desktop.c b/src/desktop.c +index d4fc2fb..94b4ddf 100644 +--- a/src/desktop.c ++++ b/src/desktop.c +@@ -122,6 +122,15 @@ load_items (TakuMenu *menu) + + } + ++#ifndef STANDALONE ++static gboolean ++delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer user_data) ++{ ++ /* prevent default handler from destroying the window */ ++ return TRUE; ++} ++#endif ++ + static void + workarea_changed (int x, int y, int w, int h) + { +@@ -144,11 +153,11 @@ create_desktop (void) + gtk_icon_size_register ("taku-icon", 64, 64); + + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); +- g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL); + gtk_widget_set_name (window, "TakuWindow"); + gtk_window_set_title (GTK_WINDOW (window), _("Desktop")); + + #ifndef STANDALONE ++ g_signal_connect (window, "delete-event", G_CALLBACK (delete_event_cb), NULL); + gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DESKTOP); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (window), TRUE); + +@@ -156,6 +165,7 @@ create_desktop (void) + screen_w = gdk_screen_get_width (screen); + screen_h = gdk_screen_get_height (screen); + #else ++ g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL); + screen_w = 640; + screen_h = 480; + #endif +-- +2.7.0 + diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb index 318d2e08094..dbe8c11451c 100644 --- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb +++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_git.bb @@ -13,7 +13,9 @@ SECTION = "x11/wm" SRCREV = "71e3e6e04271e9d5a14f1c231ef100c7f320134d" PV = "2.0+git${SRCPV}" -SRC_URI = "git://git.yoctoproject.org/${BPN}-2" +SRC_URI = "git://git.yoctoproject.org/${BPN}-2 \ + file://0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch \ + " EXTRA_OECONF = "--enable-startup-notification --with-dbus" |