summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2007-04-18 17:05:38 +0000
committerFlorian Boor <florian.boor@kernelconcepts.de>2007-04-18 17:05:38 +0000
commit5e755a1c503c090de21133f80753eefd8fae3591 (patch)
tree6737fe6fb7d446a9435873b9b3ca863188146731
parent5cb77b347b812d6d06254af8a7a419de2567b46d (diff)
parenta03f3f0f71404215ea3c49aa33ae8faf5f75383a (diff)
merge of '5a4285ad6b3d7c5a06194b0dd1ae8e7c57cdeaaf'
and 'f9ad1bcbdfe9f172658de8e1aecfb3a9520bb25f'
-rw-r--r--packages/gpephone/gpe-session-scripts-phone/standard-apps.patch23
-rw-r--r--packages/gpephone/gpe-session-scripts-phone_0.67.bb5
2 files changed, 26 insertions, 2 deletions
diff --git a/packages/gpephone/gpe-session-scripts-phone/standard-apps.patch b/packages/gpephone/gpe-session-scripts-phone/standard-apps.patch
new file mode 100644
index 0000000000..3be47c03b2
--- /dev/null
+++ b/packages/gpephone/gpe-session-scripts-phone/standard-apps.patch
@@ -0,0 +1,23 @@
+--- gpe-session-scripts/X11/Xsession.d/98standard-apps~ 2007-04-18 18:54:59.000000000 +0200
++++ gpe-session-scripts/X11/Xsession.d/98standard-apps 2007-04-18 18:54:59.000000000 +0200
+@@ -7,20 +7,3 @@
+ else
+ time_set_already=no
+ fi
+-
+-# No action if .mbdock exists
+-if [ ! -f $HOME/.matchbox/mbdock.session ]; then
+- mkdir -p $HOME/.matchbox
+- cp /etc/gpe/gpe.mbdock $HOME/.matchbox/mbdock.session
+-
+- if [ "$time_set_already" = "no" ]; then
+- gpe-conf time user_only &
+- fi
+-
+- gpe-question --icon !gtk-dialog-info --question "<b>Welcome to GPE!</b>
+-
+-I have added some standard programs to the panel at the bottom of the screen.
+-
+-To remove these, or add more, tap and hold on an empty area of the panel." --buttons !gtk-ok &
+-fi
+-
diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
index 5af3ff683a..1e67d2a290 100644
--- a/packages/gpephone/gpe-session-scripts-phone_0.67.bb
+++ b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
@@ -11,9 +11,10 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \
file://matchbox-session \
file://matchbox-session.vm \
file://phonesession \
- file://disable-composite.xsettings"
+ file://disable-composite.xsettings \
+ file://standard-apps.patch;patch=1"
-PR = "r4"
+PR = "r5"
S = "${WORKDIR}/gpe-session-scripts-${PV}"