Hi,
In gnome-session, gnome-session-05-trusted-extensions.diff
touches a piece of code added by gnome-session-03-gnome-about.diff
and also touches the context of another piece of code also added
by gnome-session-03-gnome-about.diff. In the indiana built,
we don't want gnome-session-03-gnome-about.diff, but we do need
gnome-session-05-trusted-extensions.diff be cause other patches (>05)
depend on it. So I made the following changes:
1) I moved show_gnome_about closer to the beginning of the file where
it's in a safe distance from the trusted changes
2) deleted this piece from 05:
- if (! show_about)
- gtk_timeout_add (4000, show_gnome_about, NULL);
+ if (! trusted_session)
+ if (! show_about)
+ gtk_timeout_add (4000, show_gnome_about, NULL);
The about changes code added by 03.
And added the following in 03:
#ifndef HAVE_XTSOL
if (! show_about)
gtk_timeout_add (4000, show_gnome_about, NULL);
#else
if (! trusted_session)
if (! show_about)
gtk_timeout_add (4000, show_gnome_about, NULL);
#endif
Patch of patches is attached this time because it shows my changes
best.
Laca
-------------- next part --------------
A non-text attachment was scrubbed...
Name: gnome-about.diff
Type: text/x-patch
Size: 3340 bytes
Desc: not available
URL:
<http://mail.opensolaris.org/pipermail/jds-review/attachments/20071022/bcc74e87/attachment.bin>
