From 7fef745d176c2e10223f58ba24dc17570033d67b Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Sat, 23 Jul 2011 17:58:40 +0300 Subject: [PATCH] * update for new mu_runtime init stuff --- src/mu.cc | 2 +- src/tests/test-mu-runtime.c | 6 +++--- toys/mug/mug.cc | 2 +- toys/mug2/mug.cc | 2 +- toys/muile/muile.cc | 3 ++- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/mu.cc b/src/mu.cc index 7bc02199..4cfb6520 100644 --- a/src/mu.cc +++ b/src/mu.cc @@ -29,7 +29,7 @@ main (int argc, char *argv[]) { int rv; - if (!mu_runtime_init_from_cmdline (&argc, &argv)) + if (!mu_runtime_init_from_cmdline (&argc, &argv, "mu")) return 1; rv = mu_config_execute (mu_runtime_config()); diff --git a/src/tests/test-mu-runtime.c b/src/tests/test-mu-runtime.c index f47bd7a3..60fee22e 100644 --- a/src/tests/test-mu-runtime.c +++ b/src/tests/test-mu-runtime.c @@ -38,10 +38,10 @@ test_mu_runtime_init (void) tmpdir = test_mu_common_get_random_tmpdir(); g_assert (tmpdir); - g_assert (mu_runtime_init (tmpdir) == TRUE); + g_assert (mu_runtime_init (tmpdir, "test-mu-runtime") == TRUE); mu_runtime_uninit (); - g_assert (mu_runtime_init (tmpdir) == TRUE); + g_assert (mu_runtime_init (tmpdir, "test-mu-runtime") == TRUE); mu_runtime_uninit (); g_free (tmpdir); @@ -62,7 +62,7 @@ test_mu_runtime_data (void) bmfile = g_strdup_printf ("%s%c%s", homedir, G_DIR_SEPARATOR, "bookmarks"); - g_assert (mu_runtime_init (homedir) == TRUE); + g_assert (mu_runtime_init (homedir, "test-mu-runtime") == TRUE); g_assert_cmpstr (homedir, ==, mu_runtime_path (MU_RUNTIME_PATH_MUHOME)); g_assert_cmpstr (xdir, ==, mu_runtime_path (MU_RUNTIME_PATH_XAPIANDB)); diff --git a/toys/mug/mug.cc b/toys/mug/mug.cc index 2495b4f6..f85bce4c 100644 --- a/toys/mug/mug.cc +++ b/toys/mug/mug.cc @@ -369,7 +369,7 @@ main (int argc, char *argv[]) return 1; } - mu_runtime_init (mugdata.muhome); + mu_runtime_init (mugdata.muhome, "mug"); mugshell = mug_shell (&mugdata); g_signal_connect (G_OBJECT (mugshell), "destroy", diff --git a/toys/mug2/mug.cc b/toys/mug2/mug.cc index 4c8bde3a..07e29be0 100644 --- a/toys/mug2/mug.cc +++ b/toys/mug2/mug.cc @@ -420,7 +420,7 @@ main (int argc, char *argv[]) } g_option_context_free (octx); - mu_runtime_init (mugdata.muhome); + mu_runtime_init (mugdata.muhome, "mug2"); mugshell = mug_shell (&mugdata); g_signal_connect (G_OBJECT (mugshell), "destroy", diff --git a/toys/muile/muile.cc b/toys/muile/muile.cc index f9bd33d3..4ca2f308 100644 --- a/toys/muile/muile.cc +++ b/toys/muile/muile.cc @@ -97,7 +97,8 @@ main (int argc, char *argv[]) goto error; } - if (!mu_runtime_init (opts->muhome /* NULL is okay */)) { + if (!mu_runtime_init (opts->muhome /* NULL is okay */, + "muile")) { usage (); goto error; }