Periodic merge of branch 'maint'

- Replace deprecated g_dirname
This commit is contained in:
Geert Janssens 2014-04-17 18:08:18 +02:00
commit 096e71cb6a

View File

@ -281,7 +281,7 @@ static void
teardown (Fixture *fixture, gconstpointer pData) teardown (Fixture *fixture, gconstpointer pData)
{ {
gchar *lockfile = g_strdup_printf ("%s/test-dbi.xml.LCK", gchar *lockfile = g_strdup_printf ("%s/test-dbi.xml.LCK",
g_dirname (DBI_TEST_XML_FILENAME)); g_path_get_dirname (DBI_TEST_XML_FILENAME));
gchar *msg = g_strdup_printf ("[xml_session_end()] Error on g_unlink(%s): 2: No such file or directory", lockfile); gchar *msg = g_strdup_printf ("[xml_session_end()] Error on g_unlink(%s): 2: No such file or directory", lockfile);
gchar *logdomain = "gnc.backend"; gchar *logdomain = "gnc.backend";
guint loglevel = G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL; guint loglevel = G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL;