[Xfce4-commits] <garcon:master> Fix build errors (unitialized variable and out-of-date test program).

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 26e60006e9c8df360d56cbd06880c668febd04e1 (commit)
       from 365d8213100bd6420ba0747d4caf136a56203ad7 (commit)

commit 26e60006e9c8df360d56cbd06880c668febd04e1
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Tue Sep 7 22:00:55 2010 +0200

    Fix build errors (unitialized variable and out-of-date test program).

 garcon/garcon-menu.c     |    2 +-
 tests/test-menu-parser.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/garcon/garcon-menu.c b/garcon/garcon-menu.c
index 85c8ffc..d560686 100644
--- a/garcon/garcon-menu.c
+++ b/garcon/garcon-menu.c
@@ -2232,7 +2232,7 @@ garcon_menu_directory_file_changed (GarconMenu       *menu,
                                     GFileMonitorEvent event_type,
                                     GFileMonitor     *monitor)
 {
-  GarconMenuDirectory *old_directory;
+  GarconMenuDirectory *old_directory = NULL;
 
   g_return_if_fail (GARCON_IS_MENU (menu));
 
diff --git a/tests/test-menu-parser.c b/tests/test-menu-parser.c
index 334e0fc..792dc4b 100644
--- a/tests/test-menu-parser.c
+++ b/tests/test-menu-parser.c
@@ -268,7 +268,7 @@ main (int    argc,
 
       merger = garcon_menu_merger_new (GARCON_MENU_TREE_PROVIDER (parser));
 
-      if (G_LIKELY (garcon_menu_merger_run (merger, NULL, &error)))
+      if (G_LIKELY (garcon_menu_merger_run (merger, NULL, NULL, NULL, &error)))
         {
           g_print ("\n\n");
           print_tree (GARCON_MENU_TREE_PROVIDER (merger));