[Xfce4-commits] <garcon:master> Fix printing the path of items in the test suite application.
Jannis Pohlmann
noreply at xfce.org
Sun Jun 26 21:40:02 CEST 2011
Updating branch refs/heads/master
to e75fc6a382ada4dcc4c55bb54f4db9149f0be7e2 (commit)
from 3634884a49a513e27a32b6a91e9558052a1a735d (commit)
commit e75fc6a382ada4dcc4c55bb54f4db9149f0be7e2
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Sun Jun 26 21:39:19 2011 +0200
Fix printing the path of items in the test suite application.
docs/reference/garcon-sections.txt | 346 ++++++++++++++++++------------------
tests/test-menu-spec.c | 12 +-
2 files changed, 181 insertions(+), 177 deletions(-)
diff --git a/docs/reference/garcon-sections.txt b/docs/reference/garcon-sections.txt
index 8b6532e..ee5b7db 100644
--- a/docs/reference/garcon-sections.txt
+++ b/docs/reference/garcon-sections.txt
@@ -1,14 +1,49 @@
<SECTION>
+<FILE>garcon-menu-element</FILE>
+<TITLE>GarconMenuElement</TITLE>
+GarconMenuElementIface
+garcon_menu_element_get_name
+garcon_menu_element_get_comment
+garcon_menu_element_get_icon_name
+garcon_menu_element_get_visible
+garcon_menu_element_get_show_in_environment
+garcon_menu_element_get_no_display
+garcon_menu_element_equal
+<SUBSECTION Standard>
+GARCON_MENU_ELEMENT
+GARCON_IS_MENU_ELEMENT
+GARCON_TYPE_MENU_ELEMENT
+garcon_menu_element_get_type
+GARCON_MENU_ELEMENT_GET_IFACE
+</SECTION>
+
+<SECTION>
+<FILE>garcon-menu-parser</FILE>
+<TITLE>GarconMenuParser</TITLE>
+garcon_menu_parser_new
+garcon_menu_parser_run
+GarconMenuParserClass
+GarconMenuParserPrivate
+<SUBSECTION Standard>
+GARCON_MENU_PARSER
+GARCON_IS_MENU_PARSER
+GARCON_TYPE_MENU_PARSER
+garcon_menu_parser_get_type
+GARCON_MENU_PARSER_CLASS
+GARCON_IS_MENU_PARSER_CLASS
+GARCON_MENU_PARSER_GET_CLASS
+</SECTION>
+
+<SECTION>
<FILE>garcon-menu-item-cache</FILE>
<TITLE>GarconMenuItemCache</TITLE>
-GarconMenuItemCachePrivate
GarconMenuItemCacheClass
-GarconMenuItemCache
garcon_menu_item_cache_get_default
garcon_menu_item_cache_lookup
garcon_menu_item_cache_foreach
garcon_menu_item_cache_invalidate
garcon_menu_item_cache_invalidate_file
+GarconMenuItemCachePrivate
<SUBSECTION Standard>
GARCON_MENU_ITEM_CACHE
GARCON_IS_MENU_ITEM_CACHE
@@ -22,11 +57,10 @@ GARCON_MENU_ITEM_CACHE_GET_CLASS
<SECTION>
<FILE>garcon-menu-merger</FILE>
<TITLE>GarconMenuMerger</TITLE>
-GarconMenuMergerPrivate
-GarconMenuMergerClass
-GarconMenuMerger
garcon_menu_merger_new
garcon_menu_merger_run
+GarconMenuMergerClass
+GarconMenuMergerPrivate
<SUBSECTION Standard>
GARCON_MENU_MERGER
GARCON_IS_MENU_MERGER
@@ -38,97 +72,70 @@ GARCON_MENU_MERGER_GET_CLASS
</SECTION>
<SECTION>
-<FILE>garcon-menu-item-pool</FILE>
-GarconMenuItemPoolPrivate
-GarconMenuItemPoolClass
-GarconMenuItemPool
-garcon_menu_item_pool_new
-garcon_menu_item_pool_insert
-garcon_menu_item_pool_lookup
-garcon_menu_item_pool_lookup_file
-garcon_menu_item_pool_foreach
-garcon_menu_item_pool_apply_exclude_rule
-garcon_menu_item_pool_get_empty
-garcon_menu_item_pool_clear
-<SUBSECTION Standard>
-GARCON_MENU_ITEM_POOL
-GARCON_IS_MENU_ITEM_POOL
-GARCON_TYPE_MENU_ITEM_POOL
-garcon_menu_item_pool_get_type
-GARCON_MENU_ITEM_POOL_CLASS
-GARCON_IS_MENU_ITEM_POOL_CLASS
-GARCON_MENU_ITEM_POOL_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>garcon-menu-directory</FILE>
-<TITLE>GarconMenuDirectory</TITLE>
-GarconMenuDirectoryPrivate
-GarconMenuDirectoryClass
-GarconMenuDirectory
-garcon_menu_directory_new
-garcon_menu_directory_get_file
-garcon_menu_directory_get_name
-garcon_menu_directory_set_name
-garcon_menu_directory_get_comment
-garcon_menu_directory_set_comment
-garcon_menu_directory_get_icon_name
-garcon_menu_directory_set_icon_name
-garcon_menu_directory_get_no_display
-garcon_menu_directory_set_no_display
-garcon_menu_directory_get_hidden
-garcon_menu_directory_get_show_in_environment
-garcon_menu_directory_get_visible
-garcon_menu_directory_equal
-<SUBSECTION Standard>
-GARCON_MENU_DIRECTORY
-GARCON_IS_MENU_DIRECTORY
-GARCON_TYPE_MENU_DIRECTORY
-garcon_menu_directory_get_type
-GARCON_MENU_DIRECTORY_CLASS
-GARCON_IS_MENU_DIRECTORY_CLASS
-GARCON_MENU_DIRECTORY_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>garcon-menu-tree-provider</FILE>
-<TITLE>GarconMenuTreeProvider</TITLE>
-GarconMenuTreeProviderIface
-GarconMenuTreeProvider
-garcon_menu_tree_provider_get_tree
-garcon_menu_tree_provider_get_file
+<FILE>garcon-menu-separator</FILE>
+<TITLE>GarconMenuSeparator</TITLE>
+GarconMenuSeparatorClass
+garcon_menu_separator_get_default
<SUBSECTION Standard>
-GARCON_MENU_TREE_PROVIDER
-GARCON_IS_MENU_TREE_PROVIDER
-GARCON_TYPE_MENU_TREE_PROVIDER
-garcon_menu_tree_provider_get_type
-GARCON_MENU_TREE_PROVIDER_GET_IFACE
+GARCON_MENU_SEPARATOR
+GARCON_IS_MENU_SEPARATOR
+GARCON_TYPE_MENU_SEPARATOR
+garcon_menu_separator_get_type
+GARCON_MENU_SEPARATOR_CLASS
+GARCON_IS_MENU_SEPARATOR_CLASS
+GARCON_MENU_SEPARATOR_GET_CLASS
</SECTION>
<SECTION>
-<FILE>garcon-menu-parser</FILE>
-<TITLE>GarconMenuParser</TITLE>
-GarconMenuParserPrivate
-GarconMenuParserClass
-GarconMenuParser
-garcon_menu_parser_new
-garcon_menu_parser_run
+<FILE>garcon-menu-node</FILE>
+GarconMenuNodeType
+GarconMenuLayoutMergeType
+GarconMenuMergeFileType
+garcon_menu_node_get_type
+garcon_menu_node_new
+garcon_menu_node_get_node_type
+garcon_menu_node_create
+garcon_menu_node_copy
+garcon_menu_node_get_string
+garcon_menu_node_set_string
+garcon_menu_node_get_merge_file_type
+garcon_menu_node_set_merge_file_type
+garcon_menu_node_get_merge_file_filename
+garcon_menu_node_set_merge_file_filename
+garcon_menu_node_tree_get_child_node
+garcon_menu_node_tree_get_child_nodes
+garcon_menu_node_tree_get_string_children
+garcon_menu_node_tree_get_boolean_child
+garcon_menu_node_tree_get_string_child
+garcon_menu_node_tree_rule_matches
+garcon_menu_node_tree_get_node_type
+garcon_menu_node_tree_get_string
+garcon_menu_node_tree_set_string
+garcon_menu_node_tree_get_layout_merge_type
+garcon_menu_node_tree_get_merge_file_type
+garcon_menu_node_tree_get_merge_file_filename
+garcon_menu_node_tree_set_merge_file_filename
+garcon_menu_node_tree_compare
+garcon_menu_node_tree_copy
+garcon_menu_node_tree_free
+garcon_menu_node_tree_free_data
+GarconMenuNodeClass
+GarconMenuNodeData
+GarconMenuNode
<SUBSECTION Standard>
-GARCON_MENU_PARSER
-GARCON_IS_MENU_PARSER
-GARCON_TYPE_MENU_PARSER
-garcon_menu_parser_get_type
-GARCON_MENU_PARSER_CLASS
-GARCON_IS_MENU_PARSER_CLASS
-GARCON_MENU_PARSER_GET_CLASS
+GARCON_MENU_NODE
+GARCON_IS_MENU_NODE
+GARCON_TYPE_MENU_NODE
+garcon_menu_node_type_get_type
+GARCON_MENU_NODE_CLASS
+GARCON_IS_MENU_NODE_CLASS
+GARCON_MENU_NODE_GET_CLASS
</SECTION>
<SECTION>
<FILE>garcon-menu-item</FILE>
<TITLE>GarconMenuItem</TITLE>
-GarconMenuItemPrivate
GarconMenuItemClass
-GarconMenuItem
garcon_menu_item_new
garcon_menu_item_new_for_path
garcon_menu_item_new_for_uri
@@ -170,6 +177,7 @@ garcon_menu_item_unref
garcon_menu_item_get_allocated
garcon_menu_item_increment_allocated
garcon_menu_item_decrement_allocated
+GarconMenuItemPrivate
<SUBSECTION Standard>
GARCON_MENU_ITEM
GARCON_IS_MENU_ITEM
@@ -181,31 +189,8 @@ GARCON_MENU_ITEM_GET_CLASS
</SECTION>
<SECTION>
-<FILE>garcon-menu-element</FILE>
-<TITLE>GarconMenuElement</TITLE>
-GarconMenuElement
-GarconMenuElementIface
-garcon_menu_element_get_name
-garcon_menu_element_get_comment
-garcon_menu_element_get_icon_name
-garcon_menu_element_get_visible
-garcon_menu_element_get_show_in_environment
-garcon_menu_element_get_no_display
-garcon_menu_element_equal
-<SUBSECTION Standard>
-GARCON_MENU_ELEMENT
-GARCON_IS_MENU_ELEMENT
-GARCON_TYPE_MENU_ELEMENT
-garcon_menu_element_get_type
-GARCON_MENU_ELEMENT_GET_IFACE
-</SECTION>
-
-<SECTION>
<FILE>garcon-menu</FILE>
<TITLE>GarconMenu</TITLE>
-GarconMenuPrivate
-GarconMenuClass
-GarconMenu
garcon_menu_new
garcon_menu_new_for_path
garcon_menu_new_applications
@@ -219,6 +204,8 @@ garcon_menu_get_parent
garcon_menu_get_item_pool
garcon_menu_get_items
garcon_menu_get_elements
+GarconMenuClass
+GarconMenuPrivate
<SUBSECTION Standard>
GARCON_MENU
GARCON_IS_MENU
@@ -230,81 +217,69 @@ GARCON_MENU_GET_CLASS
</SECTION>
<SECTION>
-<FILE>garcon-menu-node</FILE>
-GarconMenuNodeType
-GarconMenuLayoutMergeType
-GarconMenuMergeFileType
-GarconMenuNodeData
-GarconMenuNodeClass
-GarconMenuNode
-garcon_menu_node_get_type
-garcon_menu_node_new
-garcon_menu_node_get_node_type
-garcon_menu_node_create
-garcon_menu_node_copy
-garcon_menu_node_get_string
-garcon_menu_node_set_string
-garcon_menu_node_get_merge_file_type
-garcon_menu_node_set_merge_file_type
-garcon_menu_node_get_merge_file_filename
-garcon_menu_node_set_merge_file_filename
-garcon_menu_node_tree_get_child_node
-garcon_menu_node_tree_get_child_nodes
-garcon_menu_node_tree_get_string_children
-garcon_menu_node_tree_get_boolean_child
-garcon_menu_node_tree_get_string_child
-garcon_menu_node_tree_rule_matches
-garcon_menu_node_tree_get_node_type
-garcon_menu_node_tree_get_string
-garcon_menu_node_tree_set_string
-garcon_menu_node_tree_get_layout_merge_type
-garcon_menu_node_tree_get_merge_file_type
-garcon_menu_node_tree_get_merge_file_filename
-garcon_menu_node_tree_set_merge_file_filename
-garcon_menu_node_tree_compare
-garcon_menu_node_tree_copy
-garcon_menu_node_tree_free
-garcon_menu_node_tree_free_data
+<FILE>garcon-menu-directory</FILE>
+<TITLE>GarconMenuDirectory</TITLE>
+GarconMenuDirectoryClass
+garcon_menu_directory_new
+garcon_menu_directory_get_file
+garcon_menu_directory_get_name
+garcon_menu_directory_set_name
+garcon_menu_directory_get_comment
+garcon_menu_directory_set_comment
+garcon_menu_directory_get_icon_name
+garcon_menu_directory_set_icon_name
+garcon_menu_directory_get_no_display
+garcon_menu_directory_set_no_display
+garcon_menu_directory_get_hidden
+garcon_menu_directory_get_show_in_environment
+garcon_menu_directory_get_visible
+garcon_menu_directory_equal
+GarconMenuDirectoryPrivate
<SUBSECTION Standard>
-GARCON_MENU_NODE
-GARCON_IS_MENU_NODE
-GARCON_TYPE_MENU_NODE
-garcon_menu_node_type_get_type
-GARCON_MENU_NODE_CLASS
-GARCON_IS_MENU_NODE_CLASS
-GARCON_MENU_NODE_GET_CLASS
+GARCON_MENU_DIRECTORY
+GARCON_IS_MENU_DIRECTORY
+GARCON_TYPE_MENU_DIRECTORY
+garcon_menu_directory_get_type
+GARCON_MENU_DIRECTORY_CLASS
+GARCON_IS_MENU_DIRECTORY_CLASS
+GARCON_MENU_DIRECTORY_GET_CLASS
</SECTION>
<SECTION>
-<FILE>garcon-menu-separator</FILE>
-<TITLE>GarconMenuSeparator</TITLE>
-GarconMenuSeparatorClass
-GarconMenuSeparator
-garcon_menu_separator_get_default
+<FILE>garcon-menu-item-pool</FILE>
+garcon_menu_item_pool_new
+garcon_menu_item_pool_insert
+garcon_menu_item_pool_lookup
+garcon_menu_item_pool_lookup_file
+garcon_menu_item_pool_foreach
+garcon_menu_item_pool_apply_exclude_rule
+garcon_menu_item_pool_get_empty
+garcon_menu_item_pool_clear
+GarconMenuItemPoolClass
+GarconMenuItemPoolPrivate
+GarconMenuItemPool
<SUBSECTION Standard>
-GARCON_MENU_SEPARATOR
-GARCON_IS_MENU_SEPARATOR
-GARCON_TYPE_MENU_SEPARATOR
-garcon_menu_separator_get_type
-GARCON_MENU_SEPARATOR_CLASS
-GARCON_IS_MENU_SEPARATOR_CLASS
-GARCON_MENU_SEPARATOR_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>garcon-environment</FILE>
-garcon_set_environment
-garcon_get_environment
-</SECTION>
-
-<SECTION>
-<FILE>garcon-marshal</FILE>
-garcon_marshal_VOID__OBJECT_OBJECT
+GARCON_MENU_ITEM_POOL
+GARCON_IS_MENU_ITEM_POOL
+GARCON_TYPE_MENU_ITEM_POOL
+garcon_menu_item_pool_get_type
+GARCON_MENU_ITEM_POOL_CLASS
+GARCON_IS_MENU_ITEM_POOL_CLASS
+GARCON_MENU_ITEM_POOL_GET_CLASS
</SECTION>
<SECTION>
-<FILE>garcon</FILE>
-GARCON_INSIDE_GARCON_H
+<FILE>garcon-menu-tree-provider</FILE>
+<TITLE>GarconMenuTreeProvider</TITLE>
+garcon_menu_tree_provider_get_tree
+garcon_menu_tree_provider_get_file
+GarconMenuTreeProviderIface
+<SUBSECTION Standard>
+GARCON_MENU_TREE_PROVIDER
+GARCON_IS_MENU_TREE_PROVIDER
+GARCON_TYPE_MENU_TREE_PROVIDER
+garcon_menu_tree_provider_get_type
+GARCON_MENU_TREE_PROVIDER_GET_IFACE
</SECTION>
<SECTION>
@@ -321,3 +296,24 @@ garcon_config_lookup
garcon_config_build_paths
</SECTION>
+<SECTION>
+<FILE>garcon-private</FILE>
+GARCON_DEFAULT_MENU_PREFIX
+</SECTION>
+
+<SECTION>
+<FILE>garcon</FILE>
+GARCON_INSIDE_GARCON_H
+</SECTION>
+
+<SECTION>
+<FILE>garcon-marshal</FILE>
+garcon_marshal_VOID__OBJECT_OBJECT
+</SECTION>
+
+<SECTION>
+<FILE>garcon-environment</FILE>
+garcon_set_environment
+garcon_get_environment
+</SECTION>
+
diff --git a/tests/test-menu-spec.c b/tests/test-menu-spec.c
index 328aaa0..fa5dab2 100644
--- a/tests/test-menu-spec.c
+++ b/tests/test-menu-spec.c
@@ -2,7 +2,7 @@
/*-
* vi:set et ai sts=2 sw=2 cindent:
*
- * Copyright (c) 2007 Jannis Pohlmann <jannis at xfce.org>
+ * Copyright (c) 2007-2011 Jannis Pohlmann <jannis at xfce.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -39,10 +39,12 @@ print_menu (GarconMenu *menu,
const gchar *path)
{
GarconMenuDirectory *directory;
+ GFile *file;
GList *menus;
GList *items;
GList *iter;
gchar *name;
+ gchar *file_path;
if (!garcon_menu_element_get_visible (GARCON_MENU_ELEMENT (menu)))
return;
@@ -83,8 +85,14 @@ print_menu (GarconMenu *menu,
if (GARCON_IS_MENU_ITEM (iter->data)
&& garcon_menu_element_get_visible (iter->data))
{
+ file = garcon_menu_item_get_file (iter->data);
+ file_path = g_file_get_path (file);
+
g_printf ("%s\t%s\t%s\n", name, garcon_menu_item_get_desktop_id (iter->data),
- garcon_menu_item_get_path (iter->data));
+ file_path);
+
+ g_free (file_path);
+ g_object_unref (file);
}
}
More information about the Xfce4-commits
mailing list