[Swfdec-commits] 2 commits - configure.ac src/swfmoz_config.c

[Benjamin Otte]

 configure.ac        |    2 +-
 src/swfmoz_config.c |   17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit b509c65c4828bb1795b0090bebd8f96ac868a479
Author: Benjamin Otte <otte at gnome.org>
Date:   Sun Dec 28 19:41:24 2008 +0100

    create the config directory if it doesn't exist yet

diff --git a/src/swfmoz_config.c b/src/swfmoz_config.c
index 10685e3..c197604 100644
--- a/src/swfmoz_config.c
+++ b/src/swfmoz_config.c
@@ -21,6 +21,8 @@
 #include "config.h"
 #endif
 
+#include <glib/gstdio.h>
+
 #include "swfmoz_config.h"
 
 G_DEFINE_TYPE (SwfmozConfig, swfmoz_config, G_TYPE_OBJECT)
@@ -40,13 +42,18 @@ swfmoz_config_save_file (SwfmozConfig *config)
 					  SWFMOZ_CONFIG_FILE, NULL);
 
   data = g_key_file_to_data (config->keyfile, &data_size, &error);
-  if (error) {
+  if (error)
     goto fail;
-  }
 
-  g_file_set_contents (keyfile_name, data, data_size, &error);
-  if (error) {
-    goto fail;
+  if (!g_file_set_contents (keyfile_name, data, data_size, &error)) {
+    /* try creating the config directory if it doesn't exist yet */
+    if (g_mkdir_with_parents (g_get_user_config_dir (), 0700) == 0) {
+      g_error_free (error);
+      if (!g_file_set_contents (keyfile_name, data, data_size, &error))
+	goto fail;
+    } else {
+      goto fail;
+    }
   }
 
   g_free (data);
commit 91e38e66bd1f046f00014ee4c5cc1836e60783ef
Author: Benjamin Otte <otte at gnome.org>
Date:   Sun Dec 28 19:33:19 2008 +0100

    use AC_CONFIG_MACRO_DIR instead of custom hack

diff --git a/configure.ac b/configure.ac
index b2cc44d..2ff0842 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ SWFDEC_MAJORMINOR=0.9
 AC_SUBST(SWFDEC_MAJORMINOR)
 
 AM_CONFIG_HEADER(config.h)
-AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
+AC_CONFIG_MACRO_DIR([m4])
 
 dnl decide on error flags
 dnl if we support them, we set them unconditionally