[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.1-54-ga151e23

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, master has been updated
       via  a151e23c9192f7cb34fdd3da80ac8cfc1a667b17 (commit)
       via  abd3bb22686205afb49ec4921f6453744099ca4c (commit)
      from  8bd9716ddf6483d435bee18a9dc82400f52eab53 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a151e23c9192f7cb34fdd3da80ac8cfc1a667b17
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Aug 13 08:13:26 2013 +0000

    Update klepatra with fixes for portable
    
        * packages/packages.current: Update kleopatra.

diff --git a/packages/packages.current b/packages/packages.current
index 89a025e..5e6d7fa 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -498,8 +498,8 @@ chk  c48227c5f3b475c7792abc36c415479d3233468c
 #
 server http://files.kolab.org/local/gpg4win
 
-file kleopatra-20130809-bin.tar.bz2
-chk  7b85d169ec5d16f7331b15a9b9cdbdef8db3c8cb
+file kleopatra-20130813-bin.tar.bz2
+chk  65dbd603e62a16b19b7f3f969363095393dbb062
 
-file kleopatra-20130809-src.tar.bz2
-chk  a11939d96106d6b05855f92d2a86cc1fc41b6e1b
+file kleopatra-20130813-src.tar.bz2
+chk  02fa3f03eaca7c32179b7388030efd8ea2f089b5

commit abd3bb22686205afb49ec4921f6453744099ca4c
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Aug 12 15:20:23 2013 +0000

    Write out a kde.conf in portable (full mode)
    
        Adds a new file to control kleopatras home directories.
    
        * src/mkportable.c (write_kde_conf): New. Configures kleopatra
        to use home/kleopatra as home directory.

diff --git a/src/mkportable.c b/src/mkportable.c
index d30d4d5..2bf11aa 100644
--- a/src/mkportable.c
+++ b/src/mkportable.c
@@ -629,6 +629,51 @@ make_home_dir (void)
   return 0;
 }
 
+/* Write the kde.conf file which tells kleopatra where to put its data.  */
+static int
+write_kde_conf (void)
+{
+  char *name;
+  FILE *fp;
+
+  if (install_type != iFULL)
+    {
+      return 0;
+    }
+
+  name = make_targetname ("bin/kde.conf");
+  fp = fopen (name, "wb");
+  if (!fp)
+    {
+      err ("failed to create '%s': %s\n", name, strerror (errno));
+      free (name);
+      return 1;
+    }
+
+  fprintf (fp,
+           "[KDE]\n"
+           "KDEHOME=home/kleopatra\n"
+           "[XDG]\n"
+           "XDG_DATA_HOME=home/kleopatra\n"
+           "XDG_CONFIG_HOME=home/kleopatra\n");
+
+   if (fflush (fp) == EOF)
+    {
+      err ("error writing to '%s': %s\n", name, strerror (errno));
+      fclose (fp);
+      free (name);
+      return 1;
+    }
+  if (fclose (fp) == EOF)
+    {
+      err ("error closing '%s': %s\n", name, strerror (errno));
+      free (name);
+      return 1;
+    }
+
+  free (name);
+  return 0;
+}
 
 
 /* Write the gpgconf.ctl file which is used by GnuPG to put itself
@@ -794,6 +839,9 @@ main (int argc, char **argv)
   if (write_ctl_file ())
     return 1;
 
+  if (write_kde_conf ())
+    return 1;
+
   inf ("ready");
 
   return 0;

-----------------------------------------------------------------------

Summary of changes:
 packages/packages.current |    8 +++---
 src/mkportable.c          |   48 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org