From: Matthias Hentges <oe@hentges.net>
Date: Tue, 6 Jun 2006 07:04:46 +0000 (+0000)
Subject: gpe-conf: gpe-conf sleep: s/ipaq-sleep.conf/.sleep.conf/ for user configuration to... 
X-Git-Tag: Release-2010-05/1~9453^2~1419^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09a6ae49e0fbfcda0f65c00f19c21de325967065;p=openembedded.git

gpe-conf: gpe-conf sleep: s/ipaq-sleep.conf/.sleep.conf/ for user configuration to sync it with the ipaq-sleep deamon. Previously ipaq-sleep would not pick up the configuration created by gpe-conf sleep for non-root users.
---

diff --git a/packages/gpe-conf/files/ipaq-sleep-configName.patch b/packages/gpe-conf/files/ipaq-sleep-configName.patch
new file mode 100644
index 0000000000..34f22094ad
--- /dev/null
+++ b/packages/gpe-conf/files/ipaq-sleep-configName.patch
@@ -0,0 +1,20 @@
+--- gpe-conf-0.1.30/sleep/main.c.orig	2006-06-05 12:23:34.458994776 +0200
++++ gpe-conf-0.1.30/sleep/main.c	2006-06-05 12:23:40.216119560 +0200
+@@ -23,7 +23,7 @@
+   g_spawn_command_line_sync (cmd, NULL, NULL, NULL, NULL);
+   if(save_ISconf(ISconf, ISconf->confName)) {
+     char homeConf[MAXPATHLEN];
+-    sprintf(homeConf, "%s/ipaq-sleep.conf", getenv("HOME"));
++    sprintf(homeConf, "%s/.sleep.conf", getenv("HOME"));
+     if(!save_ISconf(ISconf, homeConf))
+       strcpy(ISconf->confName, homeConf);
+   }
+@@ -42,7 +42,7 @@
+   char cname[MAXPATHLEN];
+   GtkWidget *GPE_Config_Sleep;
+ 
+-  sprintf(cname,"%s/ipaq-sleep.conf",g_get_home_dir());
++  sprintf(cname,"%s/.sleep.conf",g_get_home_dir());
+   ISconf = load_ISconf(cname);
+   if(ISconf == NULL) {
+     strcpy(cname, "/etc/ipaq-sleep.conf");
diff --git a/packages/gpe-conf/gpe-conf_0.1.30.bb b/packages/gpe-conf/gpe-conf_0.1.30.bb
index c0ee7e2ea0..5588420e45 100644
--- a/packages/gpe-conf/gpe-conf_0.1.30.bb
+++ b/packages/gpe-conf/gpe-conf_0.1.30.bb
@@ -3,11 +3,12 @@ LICENSE  = "GPL"
 SECTION  = "gpe"
 PRIORITY = "optional"
 MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
-PR="r1"
+PR="r2"
 
 inherit gpe
 
-SRC_URI += " file://fixsegfault.patch;patch=1;pnum=0"
+SRC_URI += " file://fixsegfault.patch;patch=1;pnum=0 \
+	     file://ipaq-sleep-configName.patch;patch=1"
 
 DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons"
 RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons"