Updating branch refs/heads/master to 2dd014607c864df164e01c0754d32a704c52bf38 (commit) from bd9c268f41e6539b9fa8760823de43080658f103 (commit)
commit 2dd014607c864df164e01c0754d32a704c52bf38 Author: Jannis Pohlmann <jan...@xfce.org> Date: Tue Sep 1 22:46:12 2009 +0200 Make test applications compile and run again. tests/test-menu-parser.c | 6 +++--- tests/test-menu-spec.c | 9 +++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/test-menu-parser.c b/tests/test-menu-parser.c index 601cd9c..39908fb 100644 --- a/tests/test-menu-parser.c +++ b/tests/test-menu-parser.c @@ -228,10 +228,12 @@ main (int argc, gint result = EXIT_SUCCESS; gint n; + g_type_init (); + if (!g_thread_supported ()) g_thread_init (NULL); - garcon_init ("XFCE"); + garcon_set_environment ("XFCE"); if (argc > 1) file = g_file_new_for_path (argv[1]); @@ -300,7 +302,5 @@ main (int argc, g_object_unref (parser); - garcon_shutdown (); - return result; } diff --git a/tests/test-menu-spec.c b/tests/test-menu-spec.c index 408130b..c85b535 100644 --- a/tests/test-menu-spec.c +++ b/tests/test-menu-spec.c @@ -84,7 +84,7 @@ print_menu (GarconMenu *menu, && garcon_menu_element_get_visible (iter->data)) { g_printf ("%s\t%s\t%s\n", name, garcon_menu_item_get_desktop_id (iter->data), - garcon_menu_item_get_filename (iter->data)); + garcon_menu_item_get_path (iter->data)); } } @@ -111,8 +111,8 @@ main (int argc, g_set_prgname ("test-menu-spec"); - /* Initialize menu library */ - garcon_init (NULL); + /* Initialize the type system */ + g_type_init (); /* Try to get the root menu */ menu = garcon_menu_new_applications (); @@ -138,8 +138,5 @@ main (int argc, #endif } - /* Shut down the menu library */ - garcon_shutdown (); - return exit_code; } _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits