--- /dev/null
+commit e5780aa96ee901a4b6747a8d3c1472e956fee305
+Author: Mike Massonnet <mmassonnet@xfce.org>
+Date: Sun Feb 7 14:39:55 2010 +0100
+
+ Allow slashes in the application name (bug #3995).
+
+diff --git a/settings/xfae-model.c b/settings/xfae-model.c
+index e7a4b85..dcc6098 100644
+--- a/settings/xfae-model.c
++++ b/settings/xfae-model.c
+@@ -629,6 +629,7 @@ xfae_model_add (XfaeModel *model,
+ file = (n == 0)
+ ? g_strdup_printf ("%s.desktop", name)
+ : g_strdup_printf ("%s-%u.desktop", name, n);
++ file = g_strdelimit (file, G_DIR_SEPARATOR_S, '-'); /* not a copy */
+
+ g_snprintf (relpath, 4096, "%s%s", dir, file);
+ if (!g_file_test (relpath, G_FILE_TEST_IS_REGULAR))
--- /dev/null
+commit 76b1fea1a36401d8f9de1617e2f7e41348a63292
+Author: Brian J. Tarricone <brian@tarricone.org>
+Date: Sun Oct 18 17:24:44 2009 -0700
+
+ fix crash when properties are freed in failure handler (bug 5797)
+
+diff --git a/xfce4-session/xfsm-startup.c b/xfce4-session/xfsm-startup.c
+index caa34f2..ddf6ad4 100644
+--- a/xfce4-session/xfsm-startup.c
++++ b/xfce4-session/xfsm-startup.c
+@@ -690,6 +690,9 @@ xfsm_startup_child_watch (GPid pid,
+ xfsm_verbose ("Client Id = %s, PID %d exited with status %d\n",
+ cwdata->properties->client_id, (gint)pid, status);
+
++ cwdata->properties->child_watch_id = 0;
++ cwdata->properties->pid = -1;
++
+ starting_properties = xfsm_manager_get_queue (cwdata->manager, XFSM_MANAGER_QUEUE_STARTING_PROPS);
+ if (g_queue_find (starting_properties, cwdata->properties) != NULL)
+ {
+@@ -698,8 +701,9 @@ xfsm_startup_child_watch (GPid pid,
+ xfsm_startup_handle_failed_startup (cwdata->properties, cwdata->manager);
+ }
+
+- cwdata->properties->child_watch_id = 0;
+- cwdata->properties->pid = -1;
++ /* NOTE: cwdata->properties could have been freed by
++ * xfsm_startup_handle_failed_startup() above, so don't try to access
++ * any of its members here. */
+
+ g_spawn_close_pid (pid);
+ }
DEPENDS = "libwnck libxfcegui4 libxfce4util dbus iceauth xfce-utils"
SECTION = "x11"
-PR = "r3"
+PR = "r4"
inherit xfce46
RDEPENDS_${PN} = "iceauth xfce-utils xinit dbus-x11 libxres"
-SRC_URI += "file://0001-no_tips_on_startup.patch;patch=1"
+SRC_URI += "file://0001-no_tips_on_startup.patch;patch=1 \
+ file://fix_properties_crash.patch;patch=1 \
+ file://allow_slashes.patch;patch=1"
FILES_${PN} += "${libdir}/xfce4/splash/engines/*.so"
FILES_${PN} += "${datadir}/xfce4/tips/*"