libgnomedb r1759 - in trunk: . libgnomedb libgnomedb/binreloc

[vivien svn gnome org]

Author: vivien
Date: Mon Nov 10 15:24:38 2008
New Revision: 1759
URL: http://svn.gnome.org/viewvc/libgnomedb?rev=1759&view=rev

Log:
Released 3.99.6

2008-11-10  Vivien Malerba <malerba gnome-db org>

        * libgnomedb/gnome-db-dsn-assistant.c: follow Libgda's API changes
        * libgnomedb/binreloc/gnome-db-binreloc.c: ported code from Libgda
        correcting problems


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/libgnomedb/binreloc/gnome-db-binreloc.c
   trunk/libgnomedb/gnome-db-dsn-assistant.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Nov 10 15:24:38 2008
@@ -1,3 +1,10 @@
+libgnomedb 3.99.6, 2008-10-09
+
+ - Adaptations to Libgda's V4 API changes
+ - Translations:
+	- es (Jorge Gonzalez)
+	- hu (Gabor Kelemen)
+
 libgnomedb 3.99.5, 2008-10-09
 
  Adaptations to Libgda's V4 API changes, and:

Modified: trunk/libgnomedb/binreloc/gnome-db-binreloc.c
==============================================================================
--- trunk/libgnomedb/binreloc/gnome-db-binreloc.c	(original)
+++ trunk/libgnomedb/binreloc/gnome-db-binreloc.c	Mon Nov 10 15:24:38 2008
@@ -76,60 +76,89 @@
 	wchar_t path[MAX_PATH];
 	gchar* p;
 #endif
+
 	switch (where) {
 	default:
 	case GNOME_DB_NO_DIR:
 		break;
 	case GNOME_DB_BIN_DIR:
 		tmp = LIBGNOMEDBBIN;
+#ifndef G_OS_WIN32
 		if (! g_str_has_prefix (tmp, LIBGNOMEDBPREFIX) || (tmp [prefix_len] != G_DIR_SEPARATOR)) 
 			prefix = g_strdup (tmp);
 		else
 			prefix_dir_name = tmp + prefix_len + 1;
+#else
+		prefix_dir_name = "bin";
+#endif
 		break;
 	case GNOME_DB_SBIN_DIR:
 		tmp = LIBGNOMEDBSBIN;
+#ifndef G_OS_WIN32
 		if (! g_str_has_prefix (tmp, LIBGNOMEDBPREFIX) || (tmp [prefix_len] != G_DIR_SEPARATOR)) 
 			prefix = g_strdup (tmp);
 		else
 			prefix_dir_name = tmp + prefix_len + 1;
+#else
+		prefix_dir_name = "sbin";
+#endif
 		break;
 	case GNOME_DB_DATA_DIR:
 		tmp = LIBGNOMEDBDATA;
+#ifndef G_OS_WIN32
 		if (! g_str_has_prefix (tmp, LIBGNOMEDBPREFIX) || (tmp [prefix_len] != G_DIR_SEPARATOR)) 
 			prefix = g_strdup (tmp);
 		else
 			prefix_dir_name = tmp + prefix_len + 1;
+#else
+		prefix_dir_name = "share";
+#endif
 		break;
 	case GNOME_DB_LOCALE_DIR:
 		tmp = LIBGNOMEDBDATA;
+#ifndef G_OS_WIN32
 		if (! g_str_has_prefix (tmp, LIBGNOMEDBPREFIX) || (tmp [prefix_len] != G_DIR_SEPARATOR)) {
 			prefix = g_strdup (tmp);
 			prefix_dir_name = "locale";
 		}
 		else
 			prefix_dir_name = "share" G_DIR_SEPARATOR_S "locale";
+#else
+		prefix_dir_name = "share" G_DIR_SEPARATOR_S "locale";
+#endif
 		break;
 	case GNOME_DB_LIB_DIR:
 		tmp = LIBGNOMEDBLIB;
+#ifndef G_OS_WIN32
 		if (! g_str_has_prefix (tmp, LIBGNOMEDBPREFIX) || (tmp [prefix_len] != G_DIR_SEPARATOR)) 
 			prefix = g_strdup (tmp);
 		else 
 			prefix_dir_name = tmp + prefix_len + 1;
+#else
+		prefix_dir_name = "lib";
+#endif
 		break;
 	case GNOME_DB_LIBEXEC_DIR:
 		tmp = LIBGNOMEDBLIBEXEC;
+#ifndef G_OS_WIN32
 		if (! g_str_has_prefix (tmp, LIBGNOMEDBPREFIX) || (tmp [prefix_len] != G_DIR_SEPARATOR)) 
 			prefix = g_strdup (tmp);
 		else
 			prefix_dir_name = tmp + prefix_len + 1;
+#else
+		prefix_dir_name = "libexec";
+#endif
 		break;
 	case GNOME_DB_ETC_DIR:
 		tmp = LIBGNOMEDBSYSCONF;
+#ifndef G_OS_WIN32
 		if (! g_str_has_prefix (tmp, LIBGNOMEDBPREFIX) || (tmp [prefix_len] != G_DIR_SEPARATOR)) 
 			prefix = g_strdup (tmp);
 		else
 			prefix_dir_name = tmp + prefix_len + 1;
+#else
+		prefix_dir_name = "etc";
+#endif
 		break;
 	}
 
@@ -137,7 +166,6 @@
 	g_print ("%s ()\n", __FUNCTION__);
 #endif
 
-
 	if (!prefix) {
 		/* prefix part for each OS */
 #ifdef G_OS_WIN32
@@ -150,7 +178,7 @@
 		p = strrchr (prefix, G_DIR_SEPARATOR);
 		if (p && (g_ascii_strcasecmp (p + 1, "bin") == 0 ||
 			  g_ascii_strcasecmp (p + 1, "lib") == 0))
-			*p = '\0';	
+			*p = '\0';
 #elif HAVE_CARBON
 #define MAXLEN 500
 		ProcessSerialNumber myProcess;

Modified: trunk/libgnomedb/gnome-db-dsn-assistant.c
==============================================================================
--- trunk/libgnomedb/gnome-db-dsn-assistant.c	(original)
+++ trunk/libgnomedb/gnome-db-dsn-assistant.c	Mon Nov 10 15:24:38 2008
@@ -137,7 +137,7 @@
 			GSList *dsn_params;
 			GError *error = NULL;
 
-			allok = gda_perform_create_database (assistant->priv->create_db_op, &error);
+			allok = gda_perform_create_database (NULL, assistant->priv->create_db_op, &error);
 			if (!allok) {
 				gchar *str;
 				str = g_strdup_printf (_("Error creating database: %s"),