GNOME.org
 

[alacarte/vala+gdesktopmenu] update to match library rename

commit f6dfc84a7e143b25c0145c3c1f3a7426773f17c6
Author: Travis Watkins <amaranth ubuntu com>
Date:   Sun May 10 18:39:52 2009 -0500

    update to match library rename
---
 configure.ac                                  |    2 +-
 src/Makefile.am                               |    2 +-
 src/mainwindow.vala                           |   51 ++++----
 vapi/Makefile.am                              |    2 +-
 vapi/{libxfce4menu-0.1.vapi => garcon-1.vapi} |  170 +++++++++++++------------
 5 files changed, 116 insertions(+), 111 deletions(-)

diff --git a/configure.ac b/configure.ac
index 26e1f1e..c2a5908 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_SUBST(LDFLAGS)
 GLIB_REQUIRED=2.12.0
 GTK_REQUIRED=2.10.0
 
-PKG_CHECK_MODULES(ALACARTE, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gmodule-2.0 libxfce4menu-0.1)
+PKG_CHECK_MODULES(ALACARTE, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gmodule-2.0 garcon-1)
 AC_SUBST(ALACARTE_CFLAGS)
 AC_SUBST(ALACARTE_LIBS)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 71ce775..fcaa6c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@ alacarte_SOURCES = \
 	$(NULL)
 
 alacarte.vala.stamp: $(alacarte_VALASOURCES)
-	$(VALAC) -C --pkg gtk+-2.0 --pkg glib-2.0 --pkg gmodule-2.0 --vapidir=$(srcdir)/../vapi --pkg libxfce4menu-0.1 $^
+	$(VALAC) -C --pkg gtk+-2.0 --pkg glib-2.0 --pkg gmodule-2.0 --vapidir=$(srcdir)/../vapi --pkg garcon-1 $^
 	touch $@
 
 alacarte_LDADD = \
diff --git a/src/mainwindow.vala b/src/mainwindow.vala
index f6a834c..3b67777 100644
--- a/src/mainwindow.vala
+++ b/src/mainwindow.vala
@@ -22,16 +22,16 @@
 using GLib;
 using Gtk;
 using Gdk;
-using Xfce;
+using Garcon;
 using Config;
 
 
 public class MainWindow
 {
 	private Builder builder;
-	private Xfce.Menu applications;
+	private Garcon.Menu applications;
 
-	private Gdk.Pixbuf? get_icon (Xfce.MenuElement item)
+	private Gdk.Pixbuf? get_icon (Garcon.MenuElement item)
 	{
 		Gdk.Pixbuf pixbuf = null;
 
@@ -39,9 +39,9 @@ public class MainWindow
 
 		if (icon_name == null)
 		{
-			if (item is Xfce.Menu)
+			if (item is Garcon.Menu)
 				icon_name = "gnome-fs-directory";
-			else if (item is Xfce.MenuItem)
+			else if (item is Garcon.MenuItem)
 				icon_name = "application-default-icon";
 		}
 
@@ -78,7 +78,7 @@ public class MainWindow
 	private void update_icons (Gtk.TreeIter iter)
 	{
 		Gtk.TreeIter child_iter;
-		unowned Xfce.Menu menu;
+		unowned Garcon.Menu menu;
 
 		var tree_store = builder.get_object ("menu_tree_store") as Gtk.TreeStore;
 		tree_store.get (iter, 2, out menu, -1);
@@ -94,19 +94,19 @@ public class MainWindow
 		}
 	}
 
-	private void show_menus (Gtk.TreeIter? parent, List<Xfce.MenuElement>? items)
+	private void show_menus (Gtk.TreeIter? parent, List<Garcon.MenuElement>? items)
 	{
 		Gtk.TreeIter iter;
 		var tree_store = builder.get_object ("menu_tree_store") as Gtk.TreeStore;
 
-		foreach (Xfce.MenuElement item in items)
+		foreach (Garcon.MenuElement item in items)
 		{
 			if (!item.get_show_in_environment ())
 				continue;
 			if (item.get_no_display ())
 				continue;
 
-			if (item is Xfce.Menu)
+			if (item is Garcon.Menu)
 			{
 				var name = GLib.Markup.escape_text (item.get_name ());
 				if (!item.get_visible ())
@@ -117,19 +117,19 @@ public class MainWindow
 				tree_store.set (iter, 1, name, -1);
 				tree_store.set (iter, 2, item);
 
-				show_menus (iter, (item as Xfce.Menu).get_elements ());
+				show_menus (iter, (item as Garcon.Menu).get_elements ());
 			}
 		}
 	}
 
-	private void show_items (Xfce.Menu parent)
+	private void show_items (Garcon.Menu parent)
 	{
 		Gtk.TreeIter iter;
 		var list_store = builder.get_object ("item_tree_store") as Gtk.ListStore;
 		list_store.clear ();
 
-		unowned List<Xfce.MenuElement> items = parent.get_elements ();
-		foreach (Xfce.MenuElement item in items)
+		unowned List<Garcon.MenuElement> items = parent.get_elements ();
+		foreach (Garcon.MenuElement item in items)
 		{
 			if (!item.get_show_in_environment ())
 				continue;
@@ -191,9 +191,9 @@ public class MainWindow
 
 
 		//start adding the menus here
-		applications = new Xfce.Menu.applications ();
+		applications = new Garcon.Menu.applications ();
 		applications.load (null);
-		unowned List<Xfce.MenuElement> items = applications.get_elements ();
+		unowned List<Garcon.MenuElement> items = applications.get_elements ();
 
 		Gtk.TreeIter iter;
 		var tree_store = builder.get_object ("menu_tree_store") as Gtk.TreeStore;
@@ -240,11 +240,6 @@ public class MainWindow
 		{
 			builder = new Builder ();
 			builder.add_from_file (Config.pkgdatadir + "/alacarte.ui");
-			builder.connect_signals_full (connect_signals);
-			var window = builder.get_object ("main_window") as Gtk.Window;
-			window.show_all ();
-			fill_trees ();
-			Gtk.main ();
 		}
 		catch (Error e)
 		{
@@ -253,6 +248,12 @@ public class MainWindow
 										 "Failed to load UI\n%s", e.message);
 			msg.run ();
 		}
+
+		builder.connect_signals_full (connect_signals);
+		var window = builder.get_object ("main_window") as Gtk.Window;
+		window.show_all ();
+		fill_trees ();
+		Gtk.main ();
 	}
 
 	private void toggle_cell_data_toggle_func (Gtk.CellLayout cell_layout,
@@ -260,9 +261,9 @@ public class MainWindow
 												Gtk.TreeModel tree_model,
 												Gtk.TreeIter iter)
 	{
-		unowned Xfce.MenuElement item;
+		unowned Garcon.MenuElement item;
 		tree_model.get (iter, 3, out item, -1);
-		if (item is Xfce.MenuSeparator)
+		if (item is Garcon.MenuSeparator)
 			cell.visible = false;
 		else
 			cell.visible = true;
@@ -333,7 +334,7 @@ public class MainWindow
 	{
 		Gtk.TreeIter iter;
 		weak Gtk.TreeModel model;
-		unowned Xfce.Menu menu;
+		unowned Garcon.Menu menu;
 
 		var selection = tree_view.get_selection ();
 		selection.get_selected (out model, out iter);
@@ -387,12 +388,12 @@ public class MainWindow
 
 static int main (string[] args)
 {
-	libxfce4menu_init ("GNOME");
+	Garcon.init ("GNOME");
 	Gtk.init (ref args);
 
 	var main_window = new MainWindow ();
 	main_window.run ();
-	libxfce4menu_shutdown ();
+	Garcon.shutdown ();
 
 	return 0;
 }
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 7844f13..9ebe221 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -1,5 +1,5 @@
 NULL = 
 
 EXTRA_DIST = \
-	libxfce4menu-0.1.vapi \
+	garcon-1.vapi \
 	$(NULL)
diff --git a/vapi/libxfce4menu-0.1.vapi b/vapi/garcon-1.vapi
similarity index 55%
rename from vapi/libxfce4menu-0.1.vapi
rename to vapi/garcon-1.vapi
index b98f8dc..f410ef7 100644
--- a/vapi/libxfce4menu-0.1.vapi
+++ b/vapi/garcon-1.vapi
@@ -1,27 +1,29 @@
-/* libxfce4menu-0.1.vapi generated by vapigen, do not modify. */
+/* garcon-1.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "Xfce", lower_case_cprefix = "xfce_")]
-namespace Xfce {
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class Menu : GLib.Object, Xfce.MenuElement {
+[CCode (cprefix = "Garcon", lower_case_cprefix = "garcon_")]
+namespace Garcon {
+	[CCode (cheader_filename = "garcon/garcon.h")]
+	public class Menu : GLib.Object, Garcon.MenuElement {
 		[CCode (has_construct_function = false)]
 		public Menu.applications ();
 		[CCode (has_construct_function = false)]
 		public Menu.for_file (GLib.File file);
-		public unowned Xfce.MenuDirectory get_directory ();
+		public unowned Garcon.MenuDirectory get_directory ();
 		public unowned GLib.List get_elements ();
 		public unowned GLib.File get_file ();
-		public unowned Xfce.Menu get_menu_with_name (string name);
+		public unowned Garcon.Menu get_menu_with_name (string name);
 		public unowned GLib.List get_menus ();
-		public unowned Xfce.Menu get_parent ();
+		public unowned Garcon.Menu get_parent ();
 		public bool load (GLib.Cancellable? cancellable) throws GLib.Error;
 		[CCode (has_construct_function = false)]
 		public Menu (string filename);
+		[NoAccessorMethod]
+		public Garcon.MenuDirectory directory { owned get; set; }
 		public GLib.File file { get; construct; }
 	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cheader_filename = "garcon/garcon.h")]
 	public class MenuDirectory : GLib.Object {
-		public bool equal (Xfce.MenuDirectory other);
+		public bool equal (Garcon.MenuDirectory other);
 		public unowned string get_comment ();
 		public unowned GLib.File get_file ();
 		public bool get_hidden ();
@@ -31,17 +33,17 @@ namespace Xfce {
 		public bool get_show_in_environment ();
 		public bool get_visible ();
 		public void set_comment (string comment);
-		public void set_hidden (bool hidden);
 		public void set_icon (string icon);
 		public void set_name (string name);
 		public void set_no_display (bool no_display);
+		public string comment { get; set; }
 		public GLib.File file { get; construct; }
-		public bool hidden { get; set; }
+		public string icon { get; set; }
+		public string name { get; set; }
+		public bool no_display { get; set; }
 	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuItem : GLib.Object, Xfce.MenuElement {
-		public void decrement_allocated ();
-		public int get_allocated ();
+	[CCode (cheader_filename = "garcon/garcon.h")]
+	public class MenuItem : GLib.Object, Garcon.MenuElement {
 		public unowned GLib.List get_categories ();
 		public unowned string get_command ();
 		public unowned string get_desktop_id ();
@@ -50,7 +52,6 @@ namespace Xfce {
 		public unowned string get_path ();
 		public unowned string get_try_exec ();
 		public bool has_category (string category);
-		public void increment_allocated ();
 		[CCode (has_construct_function = false)]
 		public MenuItem (string filename);
 		public bool only_show_in_environment ();
@@ -60,7 +61,6 @@ namespace Xfce {
 		public void set_desktop_id (string desktop_id);
 		public void set_filename (string filename);
 		public void set_generic_name (string generic_name);
-		public void set_hidden (bool hidden);
 		public void set_icon_name (string icon_name);
 		public void set_name (string name);
 		public void set_no_display (bool no_display);
@@ -68,141 +68,149 @@ namespace Xfce {
 		public void set_requires_terminal (bool requires_terminal);
 		public void set_supports_startup_notification (bool supports_startup_notification);
 		public void set_try_exec (string try_exec);
-		public bool hidden { get; set; }
+		public string command { get; set; }
+		public string comment { get; set; }
+		public string desktop_id { get; set; }
+		public string filename { get; set; }
+		public string generic_name { get; set; }
+		public string icon_name { get; set; }
+		public string name { get; set; }
+		public bool no_display { get; set; }
+		public string path { get; set; }
 		[NoAccessorMethod]
 		public bool requires_terminal { get; set; }
 		[NoAccessorMethod]
 		public bool supports_startup_notification { get; set; }
+		public string try_exec { get; set; }
 	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cheader_filename = "garcon/garcon.h")]
 	public class MenuItemCache : GLib.Object {
 		public void @foreach (GLib.HFunc func);
-		public static unowned Xfce.MenuItemCache get_default ();
+		public static unowned Garcon.MenuItemCache get_default ();
 		public void invalidate ();
-		public unowned Xfce.MenuItem lookup (string filename, string desktop_id);
+		public unowned Garcon.MenuItem lookup (string filename, string desktop_id);
 	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cheader_filename = "garcon/garcon.h")]
 	public class MenuItemPool : GLib.Object {
 		public void apply_exclude_rule (GLib.Node node);
 		public void @foreach (GLib.HFunc func);
 		public bool get_empty ();
-		public void insert (Xfce.MenuItem item);
-		public unowned Xfce.MenuItem lookup (string desktop_id);
+		public void insert (Garcon.MenuItem item);
+		public unowned Garcon.MenuItem lookup (string desktop_id);
 		[CCode (has_construct_function = false)]
 		public MenuItemPool ();
 	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuMerger : GLib.Object, Xfce.MenuTreeProvider {
+	[CCode (cheader_filename = "garcon/garcon.h")]
+	public class MenuMerger : GLib.Object, Garcon.MenuTreeProvider {
 		[CCode (has_construct_function = false)]
-		public MenuMerger (Xfce.MenuTreeProvider provider);
+		public MenuMerger (Garcon.MenuTreeProvider provider);
 		public bool run (GLib.Cancellable cancellable) throws GLib.Error;
 		[NoAccessorMethod]
-		public Xfce.MenuTreeProvider tree_provider { owned get; construct; }
+		public Garcon.MenuTreeProvider tree_provider { owned get; construct; }
 	}
 	[Compact]
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cheader_filename = "garcon/garcon.h")]
 	public class MenuMonitor {
 		public void* add_directory (string directory);
 		public void* add_file (string filename);
-		public void* add_item (Xfce.MenuItem item);
-		public static Xfce.MenuMonitorFlags get_flags ();
-		public static bool has_flags (Xfce.MenuMonitorFlags flags);
+		public void* add_item (Garcon.MenuItem item);
+		public static Garcon.MenuMonitorFlags get_flags ();
+		public static bool has_flags (Garcon.MenuMonitorFlags flags);
 		public void remove_directory (string directory);
 		public void remove_file (string filename);
-		public void remove_item (Xfce.MenuItem item);
-		public static void set_flags (Xfce.MenuMonitorFlags flags);
-		public static void set_vtable (Xfce.MenuMonitorVTable vtable);
+		public void remove_item (Garcon.MenuItem item);
+		public static void set_flags (Garcon.MenuMonitorFlags flags);
+		public static void set_vtable (Garcon.MenuMonitorVTable vtable);
 	}
 	[Compact]
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cheader_filename = "garcon/garcon.h")]
 	public class MenuMonitorVTable {
 		public weak GLib.Callback monitor_directory;
 		public weak GLib.Callback monitor_file;
 		public weak GLib.Callback remove_monitor;
 	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cheader_filename = "garcon/garcon.h")]
 	public class MenuNode : GLib.Object {
-		public unowned Xfce.MenuNode copy ();
-		public static unowned Xfce.MenuNode create (Xfce.MenuNodeType node_type, ...);
+		public unowned Garcon.MenuNode copy ();
+		public static unowned Garcon.MenuNode create (Garcon.MenuNodeType node_type, ...);
 		public unowned string get_merge_file_filename ();
-		public Xfce.MenuMergeFileType get_merge_file_type ();
-		public Xfce.MenuNodeType get_node_type ();
+		public Garcon.MenuMergeFileType get_merge_file_type ();
+		public Garcon.MenuNodeType get_node_type ();
 		public unowned string get_string ();
 		[CCode (has_construct_function = false)]
-		public MenuNode (Xfce.MenuNodeType node_type);
+		public MenuNode (Garcon.MenuNodeType node_type);
 		public void set_merge_file_filename (string filename);
-		public void set_merge_file_type (Xfce.MenuMergeFileType type);
+		public void set_merge_file_type (Garcon.MenuMergeFileType type);
 		public void set_string (string value);
 		public static int tree_compare (GLib.Node tree, GLib.Node other_tree);
 		public static unowned GLib.Node tree_copy (GLib.Node tree);
 		public static void tree_free (GLib.Node tree);
 		public static void tree_free_data (GLib.Node tree);
-		public static bool tree_get_boolean_child (GLib.Node tree, Xfce.MenuNodeType type);
-		public static unowned GLib.Node tree_get_child_node (GLib.Node tree, Xfce.MenuNodeType type, bool reverse);
-		public static unowned GLib.List tree_get_child_nodes (GLib.Node tree, Xfce.MenuNodeType type, bool reverse);
-		public static Xfce.MenuLayoutMergeType tree_get_layout_merge_type (GLib.Node tree);
+		public static bool tree_get_boolean_child (GLib.Node tree, Garcon.MenuNodeType type);
+		public static unowned GLib.Node tree_get_child_node (GLib.Node tree, Garcon.MenuNodeType type, bool reverse);
+		public static unowned GLib.List tree_get_child_nodes (GLib.Node tree, Garcon.MenuNodeType type, bool reverse);
+		public static Garcon.MenuLayoutMergeType tree_get_layout_merge_type (GLib.Node tree);
 		public static unowned string tree_get_merge_file_filename (GLib.Node tree);
-		public static Xfce.MenuMergeFileType tree_get_merge_file_type (GLib.Node tree);
-		public static Xfce.MenuNodeType tree_get_node_type (GLib.Node tree);
+		public static Garcon.MenuMergeFileType tree_get_merge_file_type (GLib.Node tree);
+		public static Garcon.MenuNodeType tree_get_node_type (GLib.Node tree);
 		public static unowned string tree_get_string (GLib.Node tree);
-		public static unowned string tree_get_string_child (GLib.Node tree, Xfce.MenuNodeType type);
-		public static unowned GLib.List tree_get_string_children (GLib.Node tree, Xfce.MenuNodeType type, bool reverse);
-		public static bool tree_rule_matches (GLib.Node tree, Xfce.MenuItem item);
+		public static unowned string tree_get_string_child (GLib.Node tree, Garcon.MenuNodeType type);
+		public static unowned GLib.List tree_get_string_children (GLib.Node tree, Garcon.MenuNodeType type, bool reverse);
+		public static bool tree_rule_matches (GLib.Node tree, Garcon.MenuItem item);
 		public static void tree_set_merge_file_filename (GLib.Node tree, string filename);
 		public static void tree_set_string (GLib.Node tree, string value);
 		[NoAccessorMethod]
-		public Xfce.MenuNodeType node_type { get; set; }
+		public Garcon.MenuNodeType node_type { get; set; }
 	}
 	[Compact]
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cheader_filename = "garcon/garcon.h")]
 	public class MenuNodeData {
 	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuParser : GLib.Object, Xfce.MenuTreeProvider {
+	[CCode (cheader_filename = "garcon/garcon.h")]
+	public class MenuParser : GLib.Object, Garcon.MenuTreeProvider {
 		[CCode (has_construct_function = false)]
 		public MenuParser (GLib.File file);
 		public bool run (GLib.Cancellable cancellable) throws GLib.Error;
 		[NoAccessorMethod]
 		public GLib.File file { owned get; construct; }
 	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public class MenuSeparator : GLib.Object, Xfce.MenuElement {
-		public static unowned Xfce.MenuSeparator get_default ();
+	[CCode (cheader_filename = "garcon/garcon.h")]
+	public class MenuSeparator : GLib.Object, Garcon.MenuElement {
+		public static unowned Garcon.MenuSeparator get_default ();
 	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cheader_filename = "garcon/garcon.h")]
 	public interface MenuElement : GLib.Object {
 		public abstract unowned string get_comment ();
-		public abstract bool get_hidden ();
 		public abstract unowned string get_icon_name ();
 		public abstract unowned string get_name ();
 		public abstract bool get_no_display ();
 		public abstract bool get_show_in_environment ();
 		public abstract bool get_visible ();
 	}
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cheader_filename = "garcon/garcon.h")]
 	public interface MenuTreeProvider : GLib.Object {
 		public abstract unowned GLib.File get_file ();
 		public abstract unowned GLib.Node get_tree ();
 	}
-	[CCode (cprefix = "XFCE_MENU_LAYOUT_MERGE_", has_type_id = "0", cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cprefix = "GARCON_MENU_LAYOUT_MERGE_", has_type_id = "0", cheader_filename = "garcon/garcon.h")]
 	public enum MenuLayoutMergeType {
 		MENUS,
 		FILES,
 		ALL
 	}
-	[CCode (cprefix = "XFCE_MENU_MERGE_FILE_", has_type_id = "0", cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cprefix = "GARCON_MENU_MERGE_FILE_", has_type_id = "0", cheader_filename = "garcon/garcon.h")]
 	public enum MenuMergeFileType {
 		PATH,
 		PARENT
 	}
-	[CCode (cprefix = "XFCE_MENU_MONITOR_", has_type_id = "0", cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cprefix = "GARCON_MENU_MONITOR_", has_type_id = "0", cheader_filename = "garcon/garcon.h")]
 	public enum MenuMonitorFlags {
 		DIRECTORIES,
 		MENU_FILES,
 		DIRECTORY_FILES,
 		DESKTOP_FILES
 	}
-	[CCode (cprefix = "XFCE_MENU_NODE_TYPE_", has_type_id = "0", cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cprefix = "GARCON_MENU_NODE_TYPE_", has_type_id = "0", cheader_filename = "garcon/garcon.h")]
 	public enum MenuNodeType {
 		INVALID,
 		MENU,
@@ -236,24 +244,20 @@ namespace Xfce {
 		MERGE_DIR,
 		DEFAULT_MERGE_DIRS
 	}
-	[CCode (cname = "xfce_menu_config_lookup", cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cheader_filename = "garcon/garcon.h")]
 	public static unowned string config_lookup (string filename);
-	[CCode (cname = "g_file_get_uri_relative_to_file", cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cname = "g_file_get_uri_relative_to_file", cheader_filename = "garcon/garcon.h")]
 	public static unowned string g_file_get_uri_relative_to_file (string path, GLib.File file);
-	[CCode (cname = "g_file_new_for_unknown_input", cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cname = "g_file_new_for_unknown_input", cheader_filename = "garcon/garcon.h")]
 	public static unowned GLib.File g_file_new_for_unknown_input (string path, GLib.File parent);
-	[CCode (cname = "g_file_new_relative_to_file", cheader_filename = "libxfce4menu/libxfce4menu.h")]
+	[CCode (cname = "g_file_new_relative_to_file", cheader_filename = "garcon/garcon.h")]
 	public static unowned GLib.File g_file_new_relative_to_file (string path, GLib.File file);
-	[CCode (cname = "libxfce4menu_init", cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public static void libxfce4menu_init (string env);
-	[CCode (cname = "libxfce4menu_shutdown", cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public static void libxfce4menu_shutdown ();
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public static unowned string menu_get_environment ();
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public static void menu_init (string env);
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public static void menu_set_environment (string env);
-	[CCode (cheader_filename = "libxfce4menu/libxfce4menu.h")]
-	public static void menu_shutdown ();
+	[CCode (cheader_filename = "garcon/garcon.h")]
+	public static unowned string get_environment ();
+	[CCode (cheader_filename = "garcon/garcon.h")]
+	public static void init (string env);
+	[CCode (cheader_filename = "garcon/garcon.h")]
+	public static void set_environment (string env);
+	[CCode (cheader_filename = "garcon/garcon.h")]
+	public static void shutdown ();
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]