Merge lp:~ricardo.teixas/ubuntu/raring/xfce4-session/fix-for-1104435 into lp:ubuntu/raring/xfce4-session

[Ricardo F. Teixeira]

Fix random crashes.
Bug url: https://bugzilla.xfce.org/show_bug.cgi?id=9709

[Moritz Naumann (mnaumann)]

Thanks for the patch. Is there a chance to have a raring binary package based on it so reviewing can be easier for those affected?

[Ricardo F. Teixeira (ricardo.teixas)]

Sure. I already created a package recipe. Once the binary packages are built you can
test them using the following PPA: https://launchpad.net/~ricardo.teixas/+archive/xfce4-session

[Moritz Naumann (mnaumann)]

Works well for me, thanks.

review: Approve

[Piotr Maliński (riklaunim)]

Fixes the XFCE crash, nice :)

[Ivica Jovic (ivicajovic)]

This is great. It's working for me.

[Coya DeBrojara (coyadebrojara)]

Thanks for the excellent work. Everything works fine and no errors appear. :-)

[Thomas Karcher (thkarcher)]

Worked for me!

review: Approve (user experience)

[Michael Skolnik (michaelskolnik)]

Works for me!

[Piotr Maliński (riklaunim)]

approving as it keeps working.

review: Approve

[Kaio Donadelli (xhikofff)]

Works fine for me!

review: Approve

[schollsky (schollsky)]

No random crashes here since applying the patch. Thx!

[Coya DeBrojara (coyadebrojara)]

Therefore, an error occurring, as described herein: https://bugs.launchpad.net/ubuntu/+source/xfce4-session/+bug/1104435, after use of the solution described here: https://bugs.launchpad.net/ubuntu/+source/xfce4-session/+bug/1104435/comments/19, I can say that after several days use ubuntu, the problem never occurred, meaning that the patch removes the error.

review: Approve

[Robert Sander (gurubert)]

The patch fixes the crash for me.

review: Approve

[Dave Gilbert (ubuntu-treblig)]

One thing this fix doesn't say is that it's just a packaging of a fix from upstream
from:
 http://git.xfce.org/xfce/xfce4-session/commit/?id=ab391138cacc62ab184a338e237c4430356b41f9

so, it's a 'fixed upstream'; but I'm a little confused since the comment from Nick Schermer in that bug (who wrote the fix) is that he pushed two fixes in, I don't see the other one linked from the upstream bug report.

[Dimitri John Ledkov (xnox)]

Uploaded into saucy.
For upload into raring, somebody needs to update the bug description as per:
https://wiki.ubuntu.com/StableReleaseUpdates#SRU_Bug_Template

review: Approve

[Ricardo F. Teixeira (ricardo.teixas)]

Hi Dave,

if you look at the description you will see that I attached the URL for the upstream bug. If you look carefully again you'll see that I mention Nick Shermer as the origin author for this bugfix:

«Origin/Author: Nick Schermer <email address hidden>».

I only saw one commit message mentioning the bug #9709 [1] however if you think that the other one is needed please let me know. Nevertheless, I must say that I've been using this package - with the Nick patch - for more than 3 weeks and it solved my problem.

[1] http://git.xfce.org/xfce/xfce4-session/commit/?id=ab391138cacc62ab184a338e237c4430356b41f9

Hope that it helps.

[Martin Pitt (pitti)]

Uploaded to raring-proposed queue, for SRU team review. Thanks!

review: Approve

[robert (ekstraadresse3)]

It seems to be working, but when I try the Log-Out option and then cancels it, Firefox does not work anymore. I cant view recent webpages from the address field anymore. Also, none of the different options of the browser are possible to access.

[Ricardo F. Teixeira (ricardo.teixas)]

I acknowledge the same problem as Robert. However even with version 4.10.0-2ubuntu1 this behaviour is still present.

[Dimitri John Ledkov (xnox)]

Please open new bug reports to track and fix newly discovered bugs. This merge proposal has been merged and is considered complete. Only limited amount of people see updates on completed merge proposals.

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-09 23:05:01 +0000
+++ debian/changelog	2013-04-30 23:38:27 +0000
@@ -1,3 +1,9 @@
+xfce4-session (4.10.0-2ubuntu2) raring; urgency=low
+
+  * debian/patches/xfsm-startup-random-crash.patch: added. Fix random crashes. lp: #1104435
+
+ -- Ricardo F. Teixeira <[e-mail]>  Wed, 01 May 2013 00:33:42 +0100
+
 xfce4-session (4.10.0-2ubuntu1) raring; urgency=low
 
   * Merge from Debian experimental, remaining Ubuntu changes:

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-11-09 23:05:01 +0000
+++ debian/patches/series	2013-04-30 23:38:27 +0000
@@ -1,3 +1,4 @@
 0001-Handle-multiple-interactive-session-save-bug-5379.patch
 xubuntu_ignore-gdm-lang.patch
 xubuntu_set-xdg-current-desktop.patch
+xfsm-startup-random-crash.patch

=== added file 'debian/patches/xfsm-startup-random-crash.patch'
--- debian/patches/xfsm-startup-random-crash.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/xfsm-startup-random-crash.patch	2013-04-30 23:38:27 +0000
@@ -0,0 +1,21 @@
+## Description: Fix random crashes.
+## Origin/Author: Nick Schermer <[e-mail]>
+## Bug: https://bugzilla.xfce.org/show_bug.cgi?id=9709
+Index: xfce4-session/xfce4-session/xfsm-startup.c
+===================================================================
+--- xfce4-session.orig/xfce4-session/xfsm-startup.c	2013-05-01 00:30:39.772188000 +0100
++++ xfce4-session/xfce4-session/xfsm-startup.c	2013-05-01 00:33:38.164142830 +0100
+@@ -918,9 +918,10 @@
+   child_watch_data = g_new (XfsmStartupData, 1);
+   child_watch_data->manager = g_object_ref (manager);
+   child_watch_data->properties = properties;
+-  g_child_watch_add_full (G_PRIORITY_LOW, properties->pid,
+-                          xfsm_startup_child_watch, child_watch_data,
+-                          (GDestroyNotify) xfsm_startup_data_free);
++  child_watch_data->properties->child_watch_id = 
++    g_child_watch_add_full (G_PRIORITY_LOW, properties->pid,
++                            xfsm_startup_child_watch, child_watch_data,
++                            (GDestroyNotify) xfsm_startup_data_free);
+ 
+   /* set a timeout -- client must register in a a certain amount of time
+    * or it's assumed to be broken/have issues. */