diff --git a/gnome b/gnome index 1376211..0fb9356 100644 --- a/gnome +++ b/gnome @@ -59,7 +59,23 @@ EOF fi fi - # FIXME: we need to add a launcher for gnome-panel (fallback mode) + # Add live installer to the top panel in fallback mode + if test -f /usr/share/gnome-panel/panel-default-layout.layout -a ! -f "${XDG_CONFIG_HOME}/gnome-panel/panel-default-layout.layout"; then + FIRST_TOPLEVEL=`grep --max-count=1 "\[Toplevel" /usr/share/gnome-panel/panel-default-layout.layout | sed "s:\[Toplevel *::g;s: *]::g"` + if test ! -z "${FIRST_TOPLEVEL}"; then + mkdir -p -m 0700 "${XDG_CONFIG_HOME}" + mkdir -p "${XDG_CONFIG_HOME}/gnome-panel" + cp /usr/share/gnome-panel/panel-default-layout.layout "${XDG_CONFIG_HOME}/gnome-panel/panel-default-layout.layout" + cat >> "${XDG_CONFIG_HOME}/gnome-panel/panel-default-layout.layout" << EOF +[Object live-installer-launcher] +object-iid=PanelInternalFactory::Launcher +toplevel-id=top-panel +pack-type=start +pack-index=-1 +@instance-config/location="file:///usr/share/applications/YaST2/live-installer.desktop" +EOF + fi + fi ## Other tweaks diff --git a/gnome-session.changes b/gnome-session.changes index b85cf83..ed8739e 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,11 +1,22 @@ +------------------------------------------------------------------- +Tue Oct 11 16:40:32 UTC 2011 - vuntz@opensuse.org + +- Update /usr/bin/gnome script to have an installer launcher on the + panel in fallback mode. We simply copy the panel default layout + for the live user, and append the definition of the launcher. + Fix bnc#702671. + ------------------------------------------------------------------- Mon Oct 10 12:19:53 UTC 2011 - dimstar@opensuse.org - Provide a gnome2-look-and-feel package that allows the user to switch to GNOME 2 look and feel (GNOME Fallback mode) during - login or as his prefered default session. This is meant to ease - the transition of some users constantly requiring the old look - and feel. + login or as his preferred default session: + + Simply copy the gnome.desktop X session definition to + gnome2-look-and-feel.desktop, and start the fallback mode from + there. + + This is meant to ease the transition of some users constantly + requiring the old look and feel. ------------------------------------------------------------------- Mon Sep 26 10:44:11 UTC 2011 - vuntz@opensuse.org diff --git a/gnome-session.spec b/gnome-session.spec index e6f4fcb..bd1c531 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -107,8 +107,8 @@ Group: System/GUI/GNOME Requires: %{name}-fallback-session %description -n gnome2-look-and-feel -This package contains definitions to provide you with a GNOME 3 session -that looks and feels like a GNOME 2 session in most parts. +This package contains the definition to choose in the display manager +a GNOME 3 session that looks and feels like GNOME 2. %package core License: GPLv2+