diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2016-08-17 22:31:25 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2016-08-22 19:43:26 +0300 |
commit | 60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch) | |
tree | ecb49581a9e41a37943c22cd9ef3f63451b20ee7 /yocto-poky/meta/recipes-sato/matchbox-desktop/files/0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch | |
parent | e18c61205e0234b03697129c20cc69c9b3940efc (diff) | |
download | openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.xz |
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to
hold all of the layers that we import with git-subtree.
Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'yocto-poky/meta/recipes-sato/matchbox-desktop/files/0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch')
-rw-r--r-- | yocto-poky/meta/recipes-sato/matchbox-desktop/files/0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/yocto-poky/meta/recipes-sato/matchbox-desktop/files/0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch b/yocto-poky/meta/recipes-sato/matchbox-desktop/files/0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch deleted file mode 100644 index 46397dc8a..000000000 --- a/yocto-poky/meta/recipes-sato/matchbox-desktop/files/0001-Do-nothing-on-delete-event-when-not-STANDALONE.patch +++ /dev/null @@ -1,60 +0,0 @@ -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 - |