* update for new mu_runtime init stuff
This commit is contained in:
@ -29,7 +29,7 @@ main (int argc, char *argv[])
|
|||||||
{
|
{
|
||||||
int rv;
|
int rv;
|
||||||
|
|
||||||
if (!mu_runtime_init_from_cmdline (&argc, &argv))
|
if (!mu_runtime_init_from_cmdline (&argc, &argv, "mu"))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
rv = mu_config_execute (mu_runtime_config());
|
rv = mu_config_execute (mu_runtime_config());
|
||||||
|
|||||||
@ -38,10 +38,10 @@ test_mu_runtime_init (void)
|
|||||||
|
|
||||||
tmpdir = test_mu_common_get_random_tmpdir();
|
tmpdir = test_mu_common_get_random_tmpdir();
|
||||||
g_assert (tmpdir);
|
g_assert (tmpdir);
|
||||||
g_assert (mu_runtime_init (tmpdir) == TRUE);
|
g_assert (mu_runtime_init (tmpdir, "test-mu-runtime") == TRUE);
|
||||||
mu_runtime_uninit ();
|
mu_runtime_uninit ();
|
||||||
|
|
||||||
g_assert (mu_runtime_init (tmpdir) == TRUE);
|
g_assert (mu_runtime_init (tmpdir, "test-mu-runtime") == TRUE);
|
||||||
mu_runtime_uninit ();
|
mu_runtime_uninit ();
|
||||||
|
|
||||||
g_free (tmpdir);
|
g_free (tmpdir);
|
||||||
@ -62,7 +62,7 @@ test_mu_runtime_data (void)
|
|||||||
bmfile = g_strdup_printf ("%s%c%s", homedir,
|
bmfile = g_strdup_printf ("%s%c%s", homedir,
|
||||||
G_DIR_SEPARATOR, "bookmarks");
|
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 (homedir, ==, mu_runtime_path (MU_RUNTIME_PATH_MUHOME));
|
||||||
g_assert_cmpstr (xdir, ==, mu_runtime_path (MU_RUNTIME_PATH_XAPIANDB));
|
g_assert_cmpstr (xdir, ==, mu_runtime_path (MU_RUNTIME_PATH_XAPIANDB));
|
||||||
|
|||||||
@ -369,7 +369,7 @@ main (int argc, char *argv[])
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
mu_runtime_init (mugdata.muhome);
|
mu_runtime_init (mugdata.muhome, "mug");
|
||||||
|
|
||||||
mugshell = mug_shell (&mugdata);
|
mugshell = mug_shell (&mugdata);
|
||||||
g_signal_connect (G_OBJECT (mugshell), "destroy",
|
g_signal_connect (G_OBJECT (mugshell), "destroy",
|
||||||
|
|||||||
@ -420,7 +420,7 @@ main (int argc, char *argv[])
|
|||||||
}
|
}
|
||||||
|
|
||||||
g_option_context_free (octx);
|
g_option_context_free (octx);
|
||||||
mu_runtime_init (mugdata.muhome);
|
mu_runtime_init (mugdata.muhome, "mug2");
|
||||||
|
|
||||||
mugshell = mug_shell (&mugdata);
|
mugshell = mug_shell (&mugdata);
|
||||||
g_signal_connect (G_OBJECT (mugshell), "destroy",
|
g_signal_connect (G_OBJECT (mugshell), "destroy",
|
||||||
|
|||||||
@ -97,7 +97,8 @@ main (int argc, char *argv[])
|
|||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!mu_runtime_init (opts->muhome /* NULL is okay */)) {
|
if (!mu_runtime_init (opts->muhome /* NULL is okay */,
|
||||||
|
"muile")) {
|
||||||
usage ();
|
usage ();
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user