[Opensync-commits] r5875 - trunk/opensync/group

[<svn...@op...>]

Author: henrik
Date: Tue Oct 20 23:19:45 2009
New Revision: 5875
URL: http://www.opensync.org/changeset/5875

Log:
Make osync_bool osync_group_env_setup_config_dir work even if user has neither the new XDG_CONFIG_HOME/opensync/0.40 directory nor the old /home/Henrik//.opensync.  Fixes #1172

Modified:
   trunk/opensync/group/opensync_group_env.c

Modified: trunk/opensync/group/opensync_group_env.c
==============================================================================
--- trunk/opensync/group/opensync_group_env.c	Tue Oct 20 22:31:05 2009	(r5874)
+++ trunk/opensync/group/opensync_group_env.c	Tue Oct 20 23:19:45 2009	(r5875)
@@ -271,8 +271,12 @@
 		homedir = g_get_home_dir();
 
 	osync22dir = osync_strdup_printf("%s%c.opensync", homedir, G_DIR_SEPARATOR);
-	if (!osync_glob_copy(osync22dir, "group*", groupsdir, error))
-		goto destroy;
+	if (g_file_test(osync22dir, G_FILE_TEST_IS_DIR)) {
+		if (!osync_glob_copy(osync22dir, "group*", groupsdir, error))
+			goto destroy;
+	} else {
+		osync_trace(TRACE_INTERNAL, "No old configdir %s to copy\n", osync22dir);
+	}
 
 	osync_trace(TRACE_INTERNAL, "Created groups configdir %s\n", groupsdir);
 	ret = TRUE;