Merge branch 'master' of git://git.openpandora.org/openpandora.oe
authorDavid-John Willis <John.Willis@Distant-earth.com>
Thu, 8 Apr 2010 07:09:17 +0000 (08:09 +0100)
committerDavid-John Willis <John.Willis@Distant-earth.com>
Thu, 8 Apr 2010 07:09:17 +0000 (08:09 +0100)
Conflicts:
recipes/pandora-system/pandora-scripts.bb

recipes/branding/pandora-xfce-defaults/xfce4-conf.zip
recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
recipes/pandora-system/pandora-scripts.bb
recipes/pandora-system/pandora-scripts/startmmenu [new file with mode: 0755]
recipes/pandora-system/pandora-skel.bb

index 307cc33..616f5a6 100644 (file)
Binary files a/recipes/branding/pandora-xfce-defaults/xfce4-conf.zip and b/recipes/branding/pandora-xfce-defaults/xfce4-conf.zip differ
index 3af9e0c..a7bfb5d 100755 (executable)
@@ -147,7 +147,7 @@ fi
 
 # Select the default interface and setup SLiM to pass that as a sesion to ~./.xinitrc
 
-selection=$(cat /etc/pandora/conf/gui.conf | awk -F\; '{print $1 "\n" $2 }' | zenity --title="Select the Default GUI" --list --multiple --column "name" --column "description" --text "select defaultgui" )
+selection=$(cat /etc/pandora/conf/gui.conf | awk -F\; '{print $1 "\n" $2 }' | zenity --width=500 --height=300 --title="Select the Default GUI" --list --multiple --column "name" --column "description" --text "select defaultgui" )
 echo $selection
 
 gui=$(grep $selection /etc/pandora/conf/gui.conf | awk -F\; '{print $3}')
index fcc8b19..5809944 100644 (file)
@@ -58,7 +58,7 @@ do_install() {
 
           install -d ${D}${bindir}/
           install -m 0755 ${WORKDIR}/startnetbooklauncher ${D}${bindir}/
-          install -m 0755 ${WORKDIR}/startmmenu ${D}${bindir}/          
+          install -m 0755 ${WORKDIR}/startmmenu ${D}${bindir}/
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes/pandora-system/pandora-scripts/startmmenu b/recipes/pandora-system/pandora-scripts/startmmenu
new file mode 100755 (executable)
index 0000000..8b0a639
--- /dev/null
@@ -0,0 +1,3 @@
+#!/bin/sh
+xfwm&
+mmwrapper -f/usr/bin/mmenu
\ No newline at end of file
index 6aa5dc2..b1c0d38 100644 (file)
@@ -16,7 +16,7 @@ SRC_URI = " \
   file://xsettings.xml \
   file://pndXmodmap \
   file://asoundrc \
-  file://op_btenabled \
+#  file://op_btenabled \
 "
 
 # xsettings.xml is a hack until I can figure out why XDG configs are not setting the icon theme for Xfce/GTK+
@@ -29,7 +29,7 @@ do_install() {
   install -m 0644 ${WORKDIR}/pam_environment ${D}${sysconfdir}/skel/.pam_environment
   install -m 0644 ${WORKDIR}/pndXmodmap ${D}${sysconfdir}/skel/.pndXmodmap
   install -m 0644 ${WORKDIR}/asoundrc ${D}${sysconfdir}/skel/.asoundrc
-  install -m 0644 ${WORKDIR}/op_btenabled ${D}${sysconfdir}/skel/.op_btenabled
+#  install -m 0644 ${WORKDIR}/op_btenabled ${D}${sysconfdir}/skel/.op_btenabled
   
   install -d ${D}${sysconfdir}/skel/Applications/Settings/xfce4/xfconf/xfce-perchannel-xml
   install -m 0644 ${WORKDIR}/xsettings.xml ${D}${sysconfdir}/skel/Applications/Settings/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml