Merge lp:~bregma/ginn/fix-699925 into lp:ginn

[Stephen M. Webb]

Adds $HOME/.ginn to the config (wishes) file search path and eliminates $(prefix)/share/ginn from the same path.

Also installs the default wishes.xml to $(sysconfdir)/ginn so it can be made a conffile.

This should resolve the complaints about things not working as expected.

[Mohamed IKBEL Boulabiar (boulabiar)]

Thanks Stephen for this patch.

review: Approve

[Gustavo Luiz Duarte (gustavold)]

Thanks Stephen!
It works great here.

review: Approve

=== modified file 'etc/Makefile.am'
--- etc/Makefile.am	2010-12-10 14:15:40 +0000
+++ etc/Makefile.am	2011-02-04 16:11:55 +0000
@@ -1,4 +1,10 @@
 # etc/Makefile.am - ginn configuration build recipe
 
+pkgconfdir = ${sysconfdir}/ginn
+
+# install as a template
 dist_pkgdata_DATA = wishes.xml
 
+# install as a conffile
+pkgconf_DATA = wishes.xml
+

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-12-10 14:15:40 +0000
+++ src/Makefile.am	2011-02-04 16:11:55 +0000
@@ -3,7 +3,7 @@
 
 ginn_SOURCES = ginn.c config.h config.c xt.c bamf.c
 ginn_CFLAGS = \
-	-DGINN_CONFIG_DIR=\"$(pkgdatadir)\" \
+	-DGINN_CONFIG_DIR=\"$(sysconfdir)/ginn\" \
 	$(GEIS_CFLAGS) $(XTST_CFLAGS) $(X11_CFLAGS) $(XML2_CFLAGS) $(BAMF_CFLAGS)
 ginn_LDFLAGS = $(GEIS_LIBS) $(XTST_LIBS) $(X11_LIBS) $(XML2_LIBS) $(BAMF_LIBS)
 

=== modified file 'src/ginn.c'
--- src/ginn.c	2011-01-26 16:25:33 +0000
+++ src/ginn.c	2011-02-04 16:11:55 +0000
@@ -284,7 +284,7 @@
     "etc",
     "../etc",
     ".",
-    "/etc/ginn",
+    "$HOME/.ginn",
     GINN_CONFIG_DIR
   };
   static const int num_paths = sizeof(search_paths) / sizeof(const char *);
@@ -293,11 +293,35 @@
   for (i=0; i < num_paths; ++i)
   {
     struct stat sbuf;
-    char *file_name = calloc(strlen(search_paths[i])
-                             + strlen(default_file_name)
-                             + 1,
-                             sizeof(char));
-    strcpy(file_name, search_paths[i]);
+    char *file_name = NULL;
+
+    if (strstr(search_paths[i], "$HOME"))
+    {
+      char *home_dir = getenv("HOME");
+      if (!home_dir)
+      {
+	continue;
+      }
+      else
+      {
+	char *cdr = index(search_paths[i], '/');
+	size_t file_name_length = strlen(home_dir)
+	                        + strlen(cdr)
+	                        + strlen(default_file_name)
+	                        + 1;
+	file_name = calloc(file_name_length, sizeof(char));
+	strcpy(file_name, home_dir);
+	strcat(file_name, cdr);
+      }
+    }
+    else
+    {
+      size_t file_name_length = strlen(search_paths[i])
+                              + strlen(default_file_name)
+                              + 1;
+      file_name = calloc(file_name_length, sizeof(char));
+      strcpy(file_name, search_paths[i]);
+    }
     strcat(file_name, default_file_name);
     int sres = stat(file_name, &sbuf);
     if (sres == 0)