Merge lp:~gilir/ubiquity/lp-684802 into lp:ubiquity

[Julien Lavergne]

Currently, when using a LXDE or Lubuntu session in only-install mode, the panel doesn't wait the support for theming provided by lxsession.
This patch fixes this, by using the same way that gnome-settings-daemon. It also adds the possibility to load the background of the Lubuntu panel, if it's available, and if it can't find the Ubuntu default one.

[Sebastien Bacher (seb128)]

thank you for your bug report, the diff seems to have some issues though:

- there is a marker change in the changelog which seems buggy
- the pixbuf diff seems you load the lubuntu in any case and lack a }, did you forget some lines?

[Julien Lavergne (gilir)]

Branch updated properly.

[Didier Roche-Tolomelli (didrocks)]

Hey Julien, thanks for your update.
However, I don't understand this:
46 pixbuf = gdk_pixbuf_new_from_file("/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel.png", NULL);
47 if (pixbuf) {
48 + pixbuf = gdk_pixbuf_new_from_file("/usr/share/lxpanel/images/lubuntu-background.png", NULL);
49 + }
50 + if (pixbuf) {

I think the logic has to be changed. If you want to load the lubuntu one if there is no pixbuf, you should use if (!pixbuf) line 47,

Otherwise, if you want to override the default one with the lubuntu one, I would rather do:

pixbuf = gdk_pixbuf_new_from_file("/usr/share/lxpanel/images/lubuntu-background.png", NULL);
if (!pixbuf) {
    pixbuf = gdk_pixbuf_new_from_file("/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel.png", NULL);
    …

so that the "default" is the latest. the ode seems more logical this way to me

review: Needs Fixing

[Julien Lavergne (gilir)]

Thanks Didier for the comment.
Yes, the goal is to fallback to lubuntu icon if the standart one is not on the system. I updated my branch and the merge proposal.

[Luke Yelavich (themuso)]

Thanks for your work. Merging your changes. It will be uploaded when next the installer team upload ubiquity, which is usually fairly often.

review: Approve

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2011-02-19 21:56:03 +0000
+++ bin/ubiquity-dm	2011-03-01 01:01:09 +0000
@@ -379,10 +379,13 @@
                     preexec_fn=self.drop_privileges))
 
             if osextras.find_on_path('lxsession'):
-                extras.append(subprocess.Popen(
+                proc = subprocess.Popen(
                     ['lxsession','-s','Lubuntu', '-e', 'LXDE', '-a'],
                     stdin=null, stdout=logfile, stderr=logfile,
                     preexec_fn=self.drop_privileges))
+                #Wait until xsettings handler is launched, to have theme for the panel. 
+                proc.wait()
+                extras.append(proc)
 
             if os.path.exists('/usr/lib/ubiquity/panel') and "xfwm4" not in wm_cmd:
                 extras.append(subprocess.Popen(

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-28 19:59:04 +0000
+++ debian/changelog	2011-03-01 01:01:09 +0000
@@ -1,3 +1,13 @@
+ubiquity (2.5.20) UNRELEASED; urgency=low
+
+  * bin/ubiquity-dm:
+   - Wait lxsession before launching the panel, to have theming support.
+     (LP: #684802)
+  * src/panel/panel.c
+   - Load lxpanel background for the panel when it's available.
+
+ -- Julien Lavergne <[e-mail]>  Tue, 01 Mar 2011 01:26:01 +0100
+
 ubiquity (2.5.19) natty; urgency=low
 
   [ Colin Watson ]

=== modified file 'src/panel/panel.c'
--- src/panel/panel.c	2011-02-28 19:53:05 +0000
+++ src/panel/panel.c	2011-03-01 01:01:09 +0000
@@ -227,6 +227,9 @@
 	GdkPixbuf *pixbuf;
 	GtkPixmap *pixmap;
 	pixbuf = gdk_pixbuf_new_from_file("/usr/share/themes/Ambiance/gtk-2.0/apps/img/panel.png", NULL);
+	if (!pixbuf) {
+		pixbuf = gdk_pixbuf_new_from_file("/usr/share/lxpanel/images/lubuntu-background.png", NULL);
+	}
 	if (pixbuf) {
 		gdk_pixbuf_render_pixmap_and_mask(pixbuf, &pixmap, NULL, 0);
 		if (pixmap)