[Xfce4-commits] <garcon:master> Remove the display menu test. Update translation files.
Jannis Pohlmann
jannis at xfce.org
Sat Aug 15 03:30:02 CEST 2009
Updating branch refs/heads/master
to cd7e46643ab15b012ba2d38712c1223c597b96bf (commit)
from 19d1f0957693663ba983fca32e91e8da38fcde63 (commit)
commit cd7e46643ab15b012ba2d38712c1223c597b96bf
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Sat Aug 15 03:28:17 2009 +0200
Remove the display menu test. Update translation files.
INSTALL | 17 ++-
docs/reference/garcon-sections.txt | 332 ++++++++++++++--------------
po/POTFILES.in | 30 ++--
po/ca.po | 37 ++--
po/cs.po | 37 ++--
po/da.po | 37 ++--
po/de.po | 17 +-
po/el.po | 34 +--
po/en_GB.po | 42 ++--
po/es.po | 37 ++--
po/eu.po | 37 ++--
po/fi.po | 37 ++--
po/fr.po | 39 ++--
po/garcon.pot | 15 +-
po/gl.po | 32 +--
po/hu.po | 36 ++--
po/id.po | 36 ++--
po/ja.po | 39 ++--
po/ku.po | 36 ++--
po/lv.po | 32 +--
po/nb_NO.po | 37 ++--
po/pl.po | 38 ++--
po/pt_BR.po | 37 ++--
po/pt_PT.po | 32 +--
po/sq.po | 36 ++--
po/sv.po | 40 ++--
po/tr.po | 36 ++--
po/uk.po | 36 ++--
po/ur.po | 32 +--
po/zh_CN.po | 37 ++--
tests/Makefile.am | 34 +---
tests/test-display-menu.c | 435 ------------------------------------
tests/test-menu-parser.c | 154 +++++++-------
tests/test-menu-spec.c | 58 +++---
34 files changed, 722 insertions(+), 1279 deletions(-)
diff --git a/INSTALL b/INSTALL
index 8b82ade..2550dab 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,7 +2,7 @@ Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -159,7 +159,7 @@ Particular systems
CC is not installed, it is recommended to use the following options in
order to use an ANSI C compiler:
- ./configure CC="cc -Ae"
+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
@@ -174,6 +174,16 @@ and if that doesn't work, try
./configure CC="cc -nodtk"
+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+ On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'. It is recommended to use the following options:
+
+ ./configure --prefix=/boot/common
+
Specifying the System Type
==========================
@@ -189,7 +199,8 @@ type, such as `sun4', or a canonical name which has the form:
where SYSTEM can have one of these forms:
- OS KERNEL-OS
+ OS
+ KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
diff --git a/docs/reference/garcon-sections.txt b/docs/reference/garcon-sections.txt
index c91d5e7..ea6687a 100644
--- a/docs/reference/garcon-sections.txt
+++ b/docs/reference/garcon-sections.txt
@@ -1,29 +1,4 @@
<SECTION>
-<FILE>garcon-menu</FILE>
-GarconMenuPrivate
-garcon_menu_new
-garcon_menu_new_for_file
-garcon_menu_new_applications
-garcon_menu_load
-garcon_menu_get_file
-garcon_menu_get_directory
-garcon_menu_get_menus
-garcon_menu_get_menu_with_name
-garcon_menu_get_parent
-garcon_menu_get_elements
-<TITLE>GarconMenu</TITLE>
-GarconMenu
-<SUBSECTION Standard>
-GARCON_MENU
-GARCON_IS_MENU
-GARCON_TYPE_MENU
-garcon_menu_get_type
-GARCON_MENU_CLASS
-GARCON_IS_MENU_CLASS
-GARCON_MENU_GET_CLASS
-</SECTION>
-
-<SECTION>
<FILE>garcon-menu-element</FILE>
GarconMenuElement
GarconMenuElementIface
@@ -42,81 +17,20 @@ GARCON_MENU_ELEMENT_GET_IFACE
</SECTION>
<SECTION>
-<FILE>garcon-menu-item</FILE>
-GarconMenuItemPrivate
-GarconMenuItemClass
-GarconMenuItem
-garcon_menu_item_new
-garcon_menu_item_get_desktop_id
-garcon_menu_item_set_desktop_id
-garcon_menu_item_get_filename
-garcon_menu_item_set_filename
-garcon_menu_item_get_command
-garcon_menu_item_set_command
-garcon_menu_item_get_try_exec
-garcon_menu_item_set_try_exec
-garcon_menu_item_get_name
-garcon_menu_item_set_name
-garcon_menu_item_get_generic_name
-garcon_menu_item_set_generic_name
-garcon_menu_item_get_comment
-garcon_menu_item_set_comment
-garcon_menu_item_get_icon_name
-garcon_menu_item_set_icon_name
-garcon_menu_item_get_path
-garcon_menu_item_set_path
-garcon_menu_item_requires_terminal
-garcon_menu_item_set_requires_terminal
-garcon_menu_item_get_no_display
-garcon_menu_item_set_no_display
-garcon_menu_item_supports_startup_notification
-garcon_menu_item_set_supports_startup_notification
-garcon_menu_item_get_categories
-garcon_menu_item_set_categories
-garcon_menu_item_has_category
-garcon_menu_item_get_show_in_environment
-garcon_menu_item_only_show_in_environment
-garcon_menu_item_ref
-garcon_menu_item_unref
-garcon_menu_item_get_allocated
-garcon_menu_item_increment_allocated
-garcon_menu_item_decrement_allocated
-<SUBSECTION Standard>
-GARCON_MENU_ITEM
-GARCON_IS_MENU_ITEM
-GARCON_TYPE_MENU_ITEM
-garcon_menu_item_get_type
-GARCON_MENU_ITEM_CLASS
-GARCON_IS_MENU_ITEM_CLASS
-GARCON_MENU_ITEM_GET_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>garcon-menu-directory</FILE>
-GarconMenuDirectoryPrivate
-GarconMenuDirectoryClass
-GarconMenuDirectory
-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
-garcon_menu_directory_set_icon
-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
+<FILE>garcon-menu-parser</FILE>
+GarconMenuParserPrivate
+garcon_menu_parser_new
+garcon_menu_parser_run
+<TITLE>GarconMenuParser</TITLE>
+GarconMenuParser
<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
+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>
@@ -139,34 +53,35 @@ GARCON_MENU_ITEM_CACHE_GET_CLASS
</SECTION>
<SECTION>
-<FILE>garcon-menu-parser</FILE>
-GarconMenuParserPrivate
-garcon_menu_parser_new
-garcon_menu_parser_run
-<TITLE>GarconMenuParser</TITLE>
-GarconMenuParser
+<FILE>garcon-menu-merger</FILE>
+GarconMenuMergerPrivate
+garcon_menu_merger_new
+garcon_menu_merger_run
+<TITLE>GarconMenuMerger</TITLE>
+GarconMenuMerger
<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_MERGER
+GARCON_IS_MENU_MERGER
+GARCON_TYPE_MENU_MERGER
+garcon_menu_merger_get_type
+GARCON_MENU_MERGER_CLASS
+GARCON_IS_MENU_MERGER_CLASS
+GARCON_MENU_MERGER_GET_CLASS
</SECTION>
<SECTION>
-<FILE>garcon-menu-tree-provider</FILE>
-GarconMenuTreeProviderIface
-GarconMenuTreeProvider
-garcon_menu_tree_provider_get_tree
-garcon_menu_tree_provider_get_file
+<FILE>garcon-menu-separator</FILE>
+GarconMenuSeparatorClass
+GarconMenuSeparator
+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>
@@ -214,18 +129,106 @@ GARCON_MENU_NODE_GET_CLASS
</SECTION>
<SECTION>
-<FILE>garcon-menu-separator</FILE>
-GarconMenuSeparatorClass
-GarconMenuSeparator
-garcon_menu_separator_get_default
+<FILE>garcon-menu-item</FILE>
+GarconMenuItemPrivate
+GarconMenuItemClass
+GarconMenuItem
+garcon_menu_item_new
+garcon_menu_item_get_desktop_id
+garcon_menu_item_set_desktop_id
+garcon_menu_item_get_filename
+garcon_menu_item_set_filename
+garcon_menu_item_get_command
+garcon_menu_item_set_command
+garcon_menu_item_get_try_exec
+garcon_menu_item_set_try_exec
+garcon_menu_item_get_name
+garcon_menu_item_set_name
+garcon_menu_item_get_generic_name
+garcon_menu_item_set_generic_name
+garcon_menu_item_get_comment
+garcon_menu_item_set_comment
+garcon_menu_item_get_icon_name
+garcon_menu_item_set_icon_name
+garcon_menu_item_get_path
+garcon_menu_item_set_path
+garcon_menu_item_requires_terminal
+garcon_menu_item_set_requires_terminal
+garcon_menu_item_get_no_display
+garcon_menu_item_set_no_display
+garcon_menu_item_supports_startup_notification
+garcon_menu_item_set_supports_startup_notification
+garcon_menu_item_get_categories
+garcon_menu_item_set_categories
+garcon_menu_item_has_category
+garcon_menu_item_get_show_in_environment
+garcon_menu_item_only_show_in_environment
+garcon_menu_item_ref
+garcon_menu_item_unref
+garcon_menu_item_get_allocated
+garcon_menu_item_increment_allocated
+garcon_menu_item_decrement_allocated
<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
+GARCON_MENU_ITEM
+GARCON_IS_MENU_ITEM
+GARCON_TYPE_MENU_ITEM
+garcon_menu_item_get_type
+GARCON_MENU_ITEM_CLASS
+GARCON_IS_MENU_ITEM_CLASS
+GARCON_MENU_ITEM_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>garcon-menu</FILE>
+GarconMenuPrivate
+garcon_menu_new
+garcon_menu_new_for_file
+garcon_menu_new_applications
+garcon_menu_load
+garcon_menu_get_file
+garcon_menu_get_directory
+garcon_menu_get_menus
+garcon_menu_get_menu_with_name
+garcon_menu_get_parent
+garcon_menu_get_elements
+<TITLE>GarconMenu</TITLE>
+GarconMenu
+<SUBSECTION Standard>
+GARCON_MENU
+GARCON_IS_MENU
+GARCON_TYPE_MENU
+garcon_menu_get_type
+GARCON_MENU_CLASS
+GARCON_IS_MENU_CLASS
+GARCON_MENU_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>garcon-menu-directory</FILE>
+GarconMenuDirectoryPrivate
+GarconMenuDirectoryClass
+GarconMenuDirectory
+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
+garcon_menu_directory_set_icon
+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>
@@ -250,20 +253,29 @@ GARCON_MENU_ITEM_POOL_GET_CLASS
</SECTION>
<SECTION>
-<FILE>garcon-menu-merger</FILE>
-GarconMenuMergerPrivate
-garcon_menu_merger_new
-garcon_menu_merger_run
-<TITLE>GarconMenuMerger</TITLE>
-GarconMenuMerger
+<FILE>garcon-menu-tree-provider</FILE>
+GarconMenuTreeProviderIface
+GarconMenuTreeProvider
+garcon_menu_tree_provider_get_tree
+garcon_menu_tree_provider_get_file
<SUBSECTION Standard>
-GARCON_MENU_MERGER
-GARCON_IS_MENU_MERGER
-GARCON_TYPE_MENU_MERGER
-garcon_menu_merger_get_type
-GARCON_MENU_MERGER_CLASS
-GARCON_IS_MENU_MERGER_CLASS
-GARCON_MENU_MERGER_GET_CLASS
+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>
+<FILE>garcon-config</FILE>
+GARCON_MAJOR_VERSION
+GARCON_MINOR_VERSION
+GARCON_MICRO_VERSION
+GARCON_CHECK_VERSION
+garcon_major_version
+garcon_minor_version
+garcon_micro_version
+garcon_check_version
</SECTION>
<SECTION>
@@ -274,9 +286,11 @@ g_file_get_uri_relative_to_file
</SECTION>
<SECTION>
-<FILE>garcon-environment</FILE>
-garcon_set_environment
-garcon_get_environment
+<FILE>garcon</FILE>
+GARCON_INSIDE_GARCON_H
+garcon_init
+garcon_shutdown
+garcon_config_lookup
</SECTION>
<SECTION>
@@ -296,22 +310,8 @@ garcon_menu_monitor_has_flags
</SECTION>
<SECTION>
-<FILE>garcon-config</FILE>
-GARCON_MAJOR_VERSION
-GARCON_MINOR_VERSION
-GARCON_MICRO_VERSION
-GARCON_CHECK_VERSION
-garcon_major_version
-garcon_minor_version
-garcon_micro_version
-garcon_check_version
-</SECTION>
-
-<SECTION>
-<FILE>garcon</FILE>
-GARCON_INSIDE_GARCON_H
-garcon_init
-garcon_shutdown
-garcon_config_lookup
+<FILE>garcon-environment</FILE>
+garcon_set_environment
+garcon_get_environment
</SECTION>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 844b306..70cfe0d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,18 +1,18 @@
-./garcon/garconmenutreeprovider.c
-./garcon/garconmenumerger.c
-./garcon/garconmenuitem-pool.c
./garcon/garcon.c
-./garcon/garconmnenu.c
-./garcon/garconmenuparser.c
-./garcon/garconmenuseparator.c
-./garcon/garconmenunode.c
-./garcon/garconmenuitem-cache.c
-./garcon/garconenvironment.c
-./garcon/garconmenuitem.c
-./garcon/garcongio.c
-./garcon/garconmenumonitor.c
-./garcon/garconmenudirectory.c
-./garcon/garconmenuelement.c
-./tests/test-display-menu.c
+./garcon/garcon-config.c
+./garcon/garcon-environment.c
+./garcon/garcon-gio.c
+./garcon/garcon-menu.c
+./garcon/garcon-menu-directory.c
+./garcon/garcon-menu-element.c
+./garcon/garcon-menu-item.c
+./garcon/garcon-menu-item-cache.c
+./garcon/garcon-menu-item-pool.c
+./garcon/garcon-menu-merger.c
+./garcon/garcon-menu-monitor.c
+./garcon/garcon-menu-node.c
+./garcon/garcon-menu-parser.c
+./garcon/garcon-menu-separator.c
+./garcon/garcon-menu-tree-provider.c
./tests/test-menu-parser.c
./tests/test-menu-spec.c
diff --git a/po/ca.po b/po/ca.po
index bb892cf..40f695c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libxfce 4menu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2009-01-11 11:59+0100\n"
"Last-Translator: Carles Muñoz Gorriz <carlesmu at internautas.org>\n"
"Language-Team: Catalan\n"
@@ -16,27 +16,24 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
-#, c-format
-msgid "Failed to locate the system menu"
-msgstr "No s'ha pogut trobar el menú del sistema"
+#: .././garcon/garcon-menu-parser.c:308
+#, fuzzy, c-format
+msgid "Could not load menu file data from %s: %s"
+msgstr "No s'ha pogut obrir l'element cau de «libxfce4menu» de «%s»: %s."
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "No s'ha pogut crear l'element cau de «libxfce4menu» a «%s»."
+msgid "Could not load menu file data from %s"
+msgstr ""
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
-msgstr "No s'ha pogut obrir l'element cau de «libxfce4menu» de «%s»: %s."
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "XfceMenu: Mostra el menú de prova"
+
+#~ msgid "_Show menu"
+#~ msgstr "_Mostra el menú"
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "XfceMenu: Mostra el menú de prova"
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "No s'ha pogut trobar el menú del sistema"
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "_Mostra el menú"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "No s'ha pogut crear l'element cau de «libxfce4menu» a «%s»."
diff --git a/po/cs.po b/po/cs.po
index dd53e2c..b78a990 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libxfce4menu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2009-01-06 12:34+0100\n"
"Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
"Language-Team: \n"
@@ -18,27 +18,24 @@ msgstr ""
"X-Poedit-Country: CZECH REPUBLIC\n"
"X-Poedit-SourceCharset: utf-8\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
-#, c-format
-msgid "Failed to locate the system menu"
-msgstr "NepodaÅ™ilo se nalézt hlavnà nabÃdku aplikacÃ"
+#: .././garcon/garcon-menu-parser.c:308
+#, fuzzy, c-format
+msgid "Could not load menu file data from %s: %s"
+msgstr "NepodaÅ™ilo se naÄtenà doÄasného záznamu položky libxfce4menu z %s: %s."
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "VytvoÅ™enà doÄasného záznamu položky libxfce4menu v %s se nezdaÅ™ilo."
+msgid "Could not load menu file data from %s"
+msgstr ""
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
-msgstr "NepodaÅ™ilo se naÄtenà doÄasného záznamu položky libxfce4menu z %s: %s."
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "XfceMenu: ZkouÅ¡ka zobrazenà nabÃdky"
+
+#~ msgid "_Show menu"
+#~ msgstr "_Zobrazit nabÃdku"
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "XfceMenu: ZkouÅ¡ka zobrazenà nabÃdky"
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "NepodaÅ™ilo se nalézt hlavnà nabÃdku aplikacÃ"
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "_Zobrazit nabÃdku"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "VytvoÅ™enà doÄasného záznamu položky libxfce4menu v %s se nezdaÅ™ilo."
diff --git a/po/da.po b/po/da.po
index 0f2d45d..7f72aa4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libxfce4menu 4.5.92\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2009-01-22 09:13+0100\n"
"Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
"Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
@@ -19,27 +19,24 @@ msgstr ""
"X-Poedit-Country: DENMARK\n"
"X-Poedit-SourceCharset: utf-8\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
-#, c-format
-msgid "Failed to locate the system menu"
-msgstr "Kunne ikke finde systemmenuen"
+#: .././garcon/garcon-menu-parser.c:308
+#, fuzzy, c-format
+msgid "Could not load menu file data from %s: %s"
+msgstr "Kunne ikke indlæse elementcachen for libxfce4menu i %s: %s."
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "Kunne ikke oprette elementcachen for libxfce4-menu i %s."
+msgid "Could not load menu file data from %s"
+msgstr ""
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
-msgstr "Kunne ikke indlæse elementcachen for libxfce4menu i %s: %s."
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "XfceMenu: Vis menuprøve"
+
+#~ msgid "_Show menu"
+#~ msgstr "_Vis menu"
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "XfceMenu: Vis menuprøve"
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Kunne ikke finde systemmenuen"
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "_Vis menu"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "Kunne ikke oprette elementcachen for libxfce4-menu i %s."
diff --git a/po/de.po b/po/de.po
index 10058f5..55a0641 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 4.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-04 23:40+0200\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2009-01-31 15:30+0100\n"
"Last-Translator: Enrico Tröger <enrico at xfce.org>\n"
"Language-Team: German <xfce-i18n-de at xfce.org>\n"
@@ -17,24 +17,21 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: .././libxfce4menu/xfce-menu-parser.c:307
+#: .././garcon/garcon-menu-parser.c:308
#, c-format
msgid "Could not load menu file data from %s: %s"
msgstr "Konnte das Menü nicht aus der Datei %s laden: %s"
-#: .././libxfce4menu/xfce-menu-parser.c:311
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
msgid "Could not load menu file data from %s"
msgstr "Konnte das Menü nicht aus der Datei %s laden"
-#: .././tests/test-display-menu.c:357
-msgid "XfceMenu: Display Menu Test"
-msgstr "XfceMenu: Menü-Anzeige-Test"
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "XfceMenu: Menü-Anzeige-Test"
-#. Create button
-#: .././tests/test-display-menu.c:366
-msgid "_Show menu"
-msgstr "_Menü anzeigen"
+#~ msgid "_Show menu"
+#~ msgstr "_Menü anzeigen"
#~ msgid "Failed to locate the system menu"
#~ msgstr "Konnte das Hauptmenü nicht finden"
diff --git a/po/el.po b/po/el.po
index ac46aff..ba3acc7 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2008-03-25 00:19+0200\n"
"Last-Translator: Evaggelos Balaskas <ebalaskas at ebalaskas.gr>\n"
"Language-Team: Greek <nls at tux.hellug.gr>\n"
@@ -16,29 +16,21 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
+#: .././garcon/garcon-menu-parser.c:308
#, fuzzy, c-format
-msgid "Failed to locate the system menu"
-msgstr "Αποτυχία στον εντοπισμό της Ïίζας του Î¼ÎµÎ½Î¿Ï ÎµÏ†Î±Ïμογών"
-
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
-#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr ""
-"Αποτυχία στη δημιουÏγία Ï€ÏοσωÏινής μνήμης αντικειμÎνου libxfce4menu στο %s"
-
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, fuzzy, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
+msgid "Could not load menu file data from %s: %s"
msgstr ""
"Αποτυχία στο άνοιγμα Ï€ÏοσωÏινής μνήμης αντικειμÎνου libxfce4menu στο %s: %s."
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
+#: .././garcon/garcon-menu-parser.c:313
+#, c-format
+msgid "Could not load menu file data from %s"
msgstr ""
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Αποτυχία στον εντοπισμό της Ïίζας του Î¼ÎµÎ½Î¿Ï ÎµÏ†Î±Ïμογών"
+
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr ""
+#~ "Αποτυχία στη δημιουÏγία Ï€ÏοσωÏινής μνήμης αντικειμÎνου libxfce4menu στο %s"
diff --git a/po/en_GB.po b/po/en_GB.po
index 818f101..69af9d2 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,42 +2,38 @@
# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# Jeff Bailes <thepizzaking at gmail.com>, 2009.
-#
-#
+#
+#
msgid ""
msgstr ""
"Project-Id-Version: libxfce4menu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2009-01-27 12:38+1100\n"
"Last-Translator: Jeff Bailes <thepizzaking at gmail.com>\n"
"Language-Team: English/GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
-#, c-format
-msgid "Failed to locate the system menu"
-msgstr "Failed to locate the application root menu"
+#: .././garcon/garcon-menu-parser.c:308
+#, fuzzy, c-format
+msgid "Could not load menu file data from %s: %s"
+msgstr "Failed to load the libxfce4menu item cache from %s: %s."
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "Failed to create the libxfce4menu item cache in %s."
+msgid "Could not load menu file data from %s"
+msgstr ""
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
-msgstr "Failed to load the libxfce4menu item cache from %s: %s."
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "XfceMenu: Display Menu Test"
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "XfceMenu: Display Menu Test"
+#~ msgid "_Show menu"
+#~ msgstr "_Show menu"
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "_Show menu"
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Failed to locate the application root menu"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "Failed to create the libxfce4menu item cache in %s."
diff --git a/po/es.po b/po/es.po
index 9887780..e7db24b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libxfce4menu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2009-01-11 13:45+0100\n"
"Last-Translator: Abel MartÃn <abel.martin.ruiz at gmail.com>\n"
"Language-Team: Spanish/ES <xfce-i18n at xfce.org>\n"
@@ -17,27 +17,24 @@ msgstr ""
"X-Poedit-Language: English\n"
"X-Poedit-Country: UNITED KINGDOM\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
-#, c-format
-msgid "Failed to locate the system menu"
-msgstr "Fallo al localizar el menú de sistema"
+#: .././garcon/garcon-menu-parser.c:308
+#, fuzzy, c-format
+msgid "Could not load menu file data from %s: %s"
+msgstr "Fallo al cargar la caché del elemento libxfce4menu en %s: %s."
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "Fallo al crear la caché del elemento libxfce4menu en %s."
+msgid "Could not load menu file data from %s"
+msgstr ""
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
-msgstr "Fallo al cargar la caché del elemento libxfce4menu en %s: %s."
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "XfceMenu: prueba de visualización de menú"
+
+#~ msgid "_Show menu"
+#~ msgstr "_Mostrar menú"
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "XfceMenu: prueba de visualización de menú"
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Fallo al localizar el menú de sistema"
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "_Mostrar menú"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "Fallo al crear la caché del elemento libxfce4menu en %s."
diff --git a/po/eu.po b/po/eu.po
index 20fffa6..6cd8007 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libxfce4menu-0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2008-11-27 00:40+0100\n"
"Last-Translator: Piarres Beobide <pi at beobide.net>\n"
"Language-Team: Euskara <debian-l10n-basque at lists.debian.org>\n"
@@ -16,27 +16,24 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
-#, c-format
-msgid "Failed to locate the system menu"
-msgstr "Huts sistemaren erro menua kokatzerakoan"
+#: .././garcon/garcon-menu-parser.c:308
+#, fuzzy, c-format
+msgid "Could not load menu file data from %s: %s"
+msgstr "Huts %s-en libxfce4menu elementu katxean irekitzean: %s."
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "Huts %s-en libxfce4menu elementu cachean sortzerakoan."
+msgid "Could not load menu file data from %s"
+msgstr ""
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
-msgstr "Huts %s-en libxfce4menu elementu katxean irekitzean: %s."
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "XfceMenu: Pantaila menu proba"
+
+#~ msgid "_Show menu"
+#~ msgstr "_Ikusi menua"
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "XfceMenu: Pantaila menu proba"
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Huts sistemaren erro menua kokatzerakoan"
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "_Ikusi menua"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "Huts %s-en libxfce4menu elementu cachean sortzerakoan."
diff --git a/po/fi.po b/po/fi.po
index c630c99..bc0a36e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 09:20+0200\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2009-01-25 09:23+0200\n"
"Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
"Language-Team: Finnish <fi at li.org>\n"
@@ -15,27 +15,24 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
-#, c-format
-msgid "Failed to locate the system menu"
-msgstr "Järjestelmävalikkoa ei löydy"
+#: .././garcon/garcon-menu-parser.c:308
+#, fuzzy, c-format
+msgid "Could not load menu file data from %s: %s"
+msgstr "libxfce4menun välimuistin avaaminen kohteesta %s epäonnistui: %s."
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "libxfce4menun kohdevälimuistin luominen kohteeseen %s epäonnistui."
+msgid "Could not load menu file data from %s"
+msgstr ""
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
-msgstr "libxfce4menun välimuistin avaaminen kohteesta %s epäonnistui: %s."
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "XfceMenu: Valikkotesti"
+
+#~ msgid "_Show menu"
+#~ msgstr "_Näytä valikko"
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "XfceMenu: Valikkotesti"
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Järjestelmävalikkoa ei löydy"
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "_Näytä valikko"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "libxfce4menun kohdevälimuistin luominen kohteeseen %s epäonnistui."
diff --git a/po/fr.po b/po/fr.po
index 87459eb..7015511 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2009-01-18 16:05+0100\n"
"Last-Translator: Jérôme Guelfucci <jeromeg at xfce.org>\n"
"Language-Team: French <i18n-xfce at xfce.org>\n"
@@ -15,28 +15,25 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
-#, c-format
-msgid "Failed to locate the system menu"
-msgstr "Impossible de localiser le menu système"
-
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
-#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "Impossible de créer le cache d'éléments de libxfce4menu dans %s."
+#: .././garcon/garcon-menu-parser.c:308
+#, fuzzy, c-format
+msgid "Could not load menu file data from %s: %s"
+msgstr ""
+"Impossible de charger le cache d'éléments de libxfce4menu depuis %s : %s."
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
+msgid "Could not load menu file data from %s"
msgstr ""
-"Impossible de charger le cache d'éléments de libxfce4menu depuis %s : %s."
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "Menu Xfce : test d'affichage du menu"
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "Menu Xfce : test d'affichage du menu"
+
+#~ msgid "_Show menu"
+#~ msgstr "_Afficher le menu"
+
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Impossible de localiser le menu système"
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "_Afficher le menu"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "Impossible de créer le cache d'éléments de libxfce4menu dans %s."
diff --git a/po/garcon.pot b/po/garcon.pot
index ef7825d..42ccf9e 100644
--- a/po/garcon.pot
+++ b/po/garcon.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-04 23:40+0200\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,21 +16,12 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: .././libxfce4menu/xfce-menu-parser.c:307
+#: .././garcon/garcon-menu-parser.c:308
#, c-format
msgid "Could not load menu file data from %s: %s"
msgstr ""
-#: .././libxfce4menu/xfce-menu-parser.c:311
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
msgid "Could not load menu file data from %s"
msgstr ""
-
-#: .././tests/test-display-menu.c:357
-msgid "XfceMenu: Display Menu Test"
-msgstr ""
-
-#. Create button
-#: .././tests/test-display-menu.c:366
-msgid "_Show menu"
-msgstr ""
diff --git a/po/gl.po b/po/gl.po
index d88e79a..2fa8f38 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2008-06-28 12:35+0100\n"
"Last-Translator: Leandro Regueiro <leandro DOT regueiro AT gmail DOT com>\n"
"Language-Team: Galician <proxecto at trasno.net>\n"
@@ -20,27 +20,19 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
+#: .././garcon/garcon-menu-parser.c:308
#, fuzzy, c-format
-msgid "Failed to locate the system menu"
-msgstr "Fallo ó localizar o menú raÃz de aplicacións"
-
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
-#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "Fallo ó crear a caché de elementos de libxfce4menu en %s."
-
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, fuzzy, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
+msgid "Could not load menu file data from %s: %s"
msgstr "Fallo ó abrir a caché de elementos de libxfce4menu en %s: %s."
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
+#: .././garcon/garcon-menu-parser.c:313
+#, c-format
+msgid "Could not load menu file data from %s"
msgstr ""
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Fallo ó localizar o menú raÃz de aplicacións"
+
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "Fallo ó crear a caché de elementos de libxfce4menu en %s."
diff --git a/po/hu.po b/po/hu.po
index 22e6f7e..381a4e3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libxfce4menu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: SZERVÃC Attila <sas at 321.hu>\n"
"Language-Team: Hungarian <debian-l10n-hungarian at lists.d.o>\n"
@@ -13,28 +13,24 @@ msgstr ""
"X-Poedit-Language: Hungarian\n"
"X-Poedit-Country: HUNGARY\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
-#, c-format
-msgid "Failed to locate the system menu"
-msgstr "Nem találtam a rendszer menüt"
+#: .././garcon/garcon-menu-parser.c:308
+#, fuzzy, c-format
+msgid "Could not load menu file data from %s: %s"
+msgstr "Nem tudtam betölteni a libxfce4menu elem gyorstárat innen: %s: %s."
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "Nem tudtam létrehozni a libxfce4menu elem gyorstárat itt: %s."
+msgid "Could not load menu file data from %s"
+msgstr ""
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
-msgstr "Nem tudtam betölteni a libxfce4menu elem gyorstárat innen: %s: %s."
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "XfceMenu: Kijelző Menü Teszt"
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "XfceMenu: Kijelző Menü Teszt"
+#~ msgid "_Show menu"
+#~ msgstr "_Menü mutatása"
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "_Menü mutatása"
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Nem találtam a rendszer menüt"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "Nem tudtam létrehozni a libxfce4menu elem gyorstárat itt: %s."
diff --git a/po/id.po b/po/id.po
index 5ce6235..7c9ecd5 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libxfce 4menu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2009-01-27 22:29+0700\n"
"Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
"Language-Team: Indonesian <id at li.org>\n"
@@ -15,28 +15,24 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
-#, c-format
-msgid "Failed to locate the system menu"
-msgstr "Gagal menentukan lokasi aplikasi menu sistem"
+#: .././garcon/garcon-menu-parser.c:308
+#, fuzzy, c-format
+msgid "Could not load menu file data from %s: %s"
+msgstr "Gagal memuat tembolok item libxfce4menu dari %s: %s."
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "Gagal membuat tembolok item libxfce4menu di %s."
+msgid "Could not load menu file data from %s"
+msgstr ""
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
-msgstr "Gagal memuat tembolok item libxfce4menu dari %s: %s."
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "XfceMenu: Tampilkan Tes Menu"
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "XfceMenu: Tampilkan Tes Menu"
+#~ msgid "_Show menu"
+#~ msgstr "_Tampilkan menu"
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "_Tampilkan menu"
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Gagal menentukan lokasi aplikasi menu sistem"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "Gagal membuat tembolok item libxfce4menu di %s."
diff --git a/po/ja.po b/po/ja.po
index 690e86b..d3a732d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4menu 0.1.0svn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2009-01-06 19:29+0900\n"
"Last-Translator: Masato Hashimoto <cabezon.hashimoto at gmail.com>\n"
"Language-Team: Japanese <translation-team-ja at lists.sourceforge.net>\n"
@@ -16,28 +16,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
-#, c-format
-msgid "Failed to locate the system menu"
-msgstr "システムメニューã®é…ç½®ã«å¤±æ•—ã—ã¾ã—ãŸ"
-
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
-#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "libxfce4menu アイテムã®ã‚ャッシュを %s ã«ä½œæˆã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
+#: .././garcon/garcon-menu-parser.c:308
+#, fuzzy, c-format
+msgid "Could not load menu file data from %s: %s"
+msgstr ""
+"%s ã‹ã‚‰ã® libxfce4menu アイテムã®ã‚ャッシュã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
+msgid "Could not load menu file data from %s"
msgstr ""
-"%s ã‹ã‚‰ã® libxfce4menu アイテムã®ã‚ャッシュã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "XfceMenu: メニュー表示テスト"
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "XfceMenu: メニュー表示テスト"
+
+#~ msgid "_Show menu"
+#~ msgstr "メニューを表示(_S)"
+
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "システムメニューã®é…ç½®ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "メニューを表示(_S)"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "libxfce4menu アイテムã®ã‚ャッシュを %s ã«ä½œæˆã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
diff --git a/po/ku.po b/po/ku.po
index 861bd1a..ecd72b9 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libxfce4menu-0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2008-11-01 18:31+0100\n"
"Last-Translator: Erdal Ronahi <erdal.ronahi at gmail.com>\n"
"Language-Team: Kurdish <ubuntu-l10n-kur at lists.ubuntu.com>\n"
@@ -16,27 +16,25 @@ msgstr ""
"X-Generator: Lokalize 0.2\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
+#: .././garcon/garcon-menu-parser.c:308
#, fuzzy, c-format
-msgid "Failed to locate the system menu"
-msgstr "Peeka bingehn a sepanan nehate dtin"
+msgid "Could not load menu file data from %s: %s"
+msgstr "Vekirina pbra hemanan libxfce4menu di %s de biserneket: %s"
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "Afirandina pbra hmann libxfce4menu li %s biserneket."
+msgid "Could not load menu file data from %s"
+msgstr ""
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, fuzzy, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
-msgstr "Vekirina pbra hemanan libxfce4menu di %s de biserneket: %s"
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "XfceMenu: Testa Pek Nan Bide"
+
+#~ msgid "_Show menu"
+#~ msgstr "Pek _nan bide"
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "XfceMenu: Testa Pek Nan Bide"
+#, fuzzy
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Peeka bingehn a sepanan nehate dtin"
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "Pek _nan bide"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "Afirandina pbra hmann libxfce4menu li %s biserneket."
diff --git a/po/lv.po b/po/lv.po
index 3075169..655b141 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce4menu 0.1.0svn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2007-10-28 14:46+0300\n"
"Last-Translator: Rihards Priedītis <rprieditis at inbox.lv>\n"
"Language-Team: Latvian <rprieditis at inbox.lv>\n"
@@ -15,27 +15,19 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
+#: .././garcon/garcon-menu-parser.c:308
#, fuzzy, c-format
-msgid "Failed to locate the system menu"
-msgstr "Netika atrasta lietotņu saknes izvēlne"
-
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
-#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "Nevarēja izveidot libxfce4menu vienuma kešatmiņu iekš %s."
-
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, fuzzy, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
+msgid "Could not load menu file data from %s: %s"
msgstr "Nevarēja atvērt libxfce4menu vienuma kešatmiņu iekš %s: %s."
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
+#: .././garcon/garcon-menu-parser.c:313
+#, c-format
+msgid "Could not load menu file data from %s"
msgstr ""
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Netika atrasta lietotņu saknes izvēlne"
+
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "Nevarēja izveidot libxfce4menu vienuma kešatmiņu iekš %s."
diff --git a/po/nb_NO.po b/po/nb_NO.po
index fc5af77..e16bed9 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libxfce 4menu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2008-10-15 22:32+0200\n"
"Last-Translator: Terje <ter at operamail.com>\n"
"Language-Team: Norwegian Bokmal\n"
@@ -17,27 +17,24 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
-#, c-format
-msgid "Failed to locate the system menu"
-msgstr "Klarte ikke å finne systemmenyen"
+#: .././garcon/garcon-menu-parser.c:308
+#, fuzzy, c-format
+msgid "Could not load menu file data from %s: %s"
+msgstr "Klarte ikke å laste libxfcemenu elementhurtiglager fra %s: %s."
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "Klarte ikke å opprette libxfce4menu programhurtiglager i %s."
+msgid "Could not load menu file data from %s"
+msgstr ""
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
-msgstr "Klarte ikke å laste libxfcemenu elementhurtiglager fra %s: %s."
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "XfceMenu: Vis menytest"
+
+#~ msgid "_Show menu"
+#~ msgstr "_Vis meny"
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "XfceMenu: Vis menytest"
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Klarte ikke å finne systemmenyen"
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "_Vis meny"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "Klarte ikke å opprette libxfce4menu programhurtiglager i %s."
diff --git a/po/pl.po b/po/pl.po
index f34c377..8674fa5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libxfce4menu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2009-01-29 13:18+0100\n"
"Last-Translator: Piotr Sokół <piotr.sokol at 10g.pl>\n"
"Language-Team: Polish\n"
@@ -15,28 +15,26 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
-#, c-format
-msgid "Failed to locate the system menu"
-msgstr "Nie udało się zlokalizować menu systemowego"
+#: .././garcon/garcon-menu-parser.c:308
+#, fuzzy, c-format
+msgid "Could not load menu file data from %s: %s"
+msgstr ""
+"Nie udało się wczytać pamięci podręcznej elementu libxfce4menu z %s: %s."
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "Nie udało się utworzyć pamięci podręcznej elementu libxfce4menu w %s."
+msgid "Could not load menu file data from %s"
+msgstr ""
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
-msgstr "Nie udało się wczytać pamięci podręcznej elementu libxfce4menu z %s: %s."
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "XfceMenu: test wyświetlania menu"
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "XfceMenu: test wyświetlania menu"
+#~ msgid "_Show menu"
+#~ msgstr "_Wyświetl menu"
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "_Wyświetl menu"
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Nie udało się zlokalizować menu systemowego"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr ""
+#~ "Nie udało się utworzyć pamięci podręcznej elementu libxfce4menu w %s."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ad45b36..3294c14 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libxfce 4menu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2009-01-15 08:53-0500\n"
"Last-Translator: Og Maciel <ogmaciel at gnome.org>\n"
"Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
@@ -18,27 +18,24 @@ msgstr ""
"X-Poedit-Language: Portuguese\n"
"X-Poedit-Country: BRAZIL\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
-#, c-format
-msgid "Failed to locate the system menu"
-msgstr "Falha ao localizar o menu do sistema"
+#: .././garcon/garcon-menu-parser.c:308
+#, fuzzy, c-format
+msgid "Could not load menu file data from %s: %s"
+msgstr "Falha ao carregar o cache do item libxfce4menu de %s: %s."
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "Falha ao criar o cache do item libxfce4menu em %s."
+msgid "Could not load menu file data from %s"
+msgstr ""
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
-msgstr "Falha ao carregar o cache do item libxfce4menu de %s: %s."
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "XfceMenu: Mostrar o menu de teste"
+
+#~ msgid "_Show menu"
+#~ msgstr "_Mostrar menu"
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "XfceMenu: Mostrar o menu de teste"
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Falha ao localizar o menu do sistema"
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "_Mostrar menu"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "Falha ao criar o cache do item libxfce4menu em %s."
diff --git a/po/pt_PT.po b/po/pt_PT.po
index e1960de..9930f1c 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libxfce 4menu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2008-03-18 14:17+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -16,27 +16,19 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
+#: .././garcon/garcon-menu-parser.c:308
#, fuzzy, c-format
-msgid "Failed to locate the system menu"
-msgstr "Falha ao localizar o menu principal de aplicações"
-
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
-#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "Falha ao criar o item libxfce4menu de cache em %s"
-
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, fuzzy, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
+msgid "Could not load menu file data from %s: %s"
msgstr "Falha ao abrir item libxfce4menu de cache em %s: %s."
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
+#: .././garcon/garcon-menu-parser.c:313
+#, c-format
+msgid "Could not load menu file data from %s"
msgstr ""
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Falha ao localizar o menu principal de aplicações"
+
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "Falha ao criar o item libxfce4menu de cache em %s"
diff --git a/po/sq.po b/po/sq.po
index 044cb26..49d78bb 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libxfce4menu-0.1.\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2008-11-04 22:23+0200\n"
"Last-Translator: Besnik Bleta <besnik at programeshqip.org>\n"
"Language-Team: Albanian <translation-team-sq at lists.sourceforge.net>\n"
@@ -14,27 +14,25 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
+#: .././garcon/garcon-menu-parser.c:308
#, fuzzy, c-format
-msgid "Failed to locate the system menu"
-msgstr "Dështoi në gjetjen e menusë rrënjë për zbatimin "
+msgid "Could not load menu file data from %s: %s"
+msgstr "Dështoi në hapjen e objektit të fshehtinës libxfce4menu te %s: %s."
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "Dështoi në krijimin e objektit të fshehtinës libxfce4menu te %s."
+msgid "Could not load menu file data from %s"
+msgstr ""
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, fuzzy, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
-msgstr "Dështoi në hapjen e objektit të fshehtinës libxfce4menu te %s: %s."
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "XfceMenu: Provë Menuje Ekrani"
+
+#~ msgid "_Show menu"
+#~ msgstr "_Shfaq menu"
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "XfceMenu: Provë Menuje Ekrani"
+#, fuzzy
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Dështoi në gjetjen e menusë rrënjë për zbatimin "
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "_Shfaq menu"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "Dështoi në krijimin e objektit të fshehtinës libxfce4menu te %s."
diff --git a/po/sv.po b/po/sv.po
index 91edbbf..7eaf3e1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libxfce4menu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2009-01-18 12:29+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -16,28 +16,26 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
-#, c-format
-msgid "Failed to locate the system menu"
-msgstr "Misslyckades med att hitta systemmenyn"
-
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
-#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "Misslyckades med att skapa mellanlagring för libxfce4menu-objekt i %s."
+#: .././garcon/garcon-menu-parser.c:308
+#, fuzzy, c-format
+msgid "Could not load menu file data from %s: %s"
+msgstr ""
+"Misslyckades med att läsa in mellanlagring för libxfce4menu-objekt i %s: %s."
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
+msgid "Could not load menu file data from %s"
msgstr ""
-"Misslyckades med att läsa in mellanlagring för libxfce4menu-objekt i %s: %s."
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "XfceMenu: Visa menytest"
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "XfceMenu: Visa menytest"
+
+#~ msgid "_Show menu"
+#~ msgstr "_Visa meny"
+
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Misslyckades med att hitta systemmenyn"
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "_Visa meny"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr ""
+#~ "Misslyckades med att skapa mellanlagring för libxfce4menu-objekt i %s."
diff --git a/po/tr.po b/po/tr.po
index 227797c..61539cf 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: Gökmen Görgen <gkmngrgn at gmail.com>\n"
"Language-Team: Turkish <turkce at pardus.org.tr>\n"
@@ -18,28 +18,24 @@ msgstr ""
"X-Poedit-Language: Turkish\n"
"X-Poedit-Country: TURKEY\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
-#, c-format
-msgid "Failed to locate the system menu"
-msgstr "Sistem menüsünün yeri belirlenemedi"
+#: .././garcon/garcon-menu-parser.c:308
+#, fuzzy, c-format
+msgid "Could not load menu file data from %s: %s"
+msgstr "libxfce4menu öğesi önbelleği, %s bölümünden çağrılamadı: %s."
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "libxfce4menu öğesi önbelleği oluşturulamadı: %s."
+msgid "Could not load menu file data from %s"
+msgstr ""
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
-msgstr "libxfce4menu öğesi önbelleği, %s bölümünden çağrılamadı: %s."
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "XfceMenu: Menü Sınamasını Görüntüle"
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "XfceMenu: Menü Sınamasını Görüntüle"
+#~ msgid "_Show menu"
+#~ msgstr "_Menüyü göster"
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "_Menüyü göster"
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Sistem menüsünün yeri belirlenemedi"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "libxfce4menu öğesi önbelleği oluşturulamadı: %s."
diff --git a/po/uk.po b/po/uk.po
index 6316093..8801a02 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libxfce4menu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2009-01-26 11:01+0200\n"
"Last-Translator: Dmitry Nikitin <luckas_fb at mail.ru>\n"
"Language-Team: Ukrainian <xfce4-dev at xfce.org>\n"
@@ -16,28 +16,24 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
-#, c-format
-msgid "Failed to locate the system menu"
-msgstr "Помилка при пошуку ÑиÑтемного меню"
+#: .././garcon/garcon-menu-parser.c:308
+#, fuzzy, c-format
+msgid "Could not load menu file data from %s: %s"
+msgstr "Ðе вдалоÑÑŒ завантажити елемент кешу libxfce4menu з %s: %s."
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "Помилка при Ñтворенні елементу кешу libxfce4menu в %s."
+msgid "Could not load menu file data from %s"
+msgstr ""
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
-msgstr "Ðе вдалоÑÑŒ завантажити елемент кешу libxfce4menu з %s: %s."
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "XfceMenu: Показати теÑÑ‚ меню"
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "XfceMenu: Показати теÑÑ‚ меню"
+#~ msgid "_Show menu"
+#~ msgstr "_Показати меню"
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "_Показати меню"
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Помилка при пошуку ÑиÑтемного меню"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "Помилка при Ñтворенні елементу кешу libxfce4menu в %s."
diff --git a/po/ur.po b/po/ur.po
index 7564d2f..7a567b4 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libxfce4menu-0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2007-10-28 19:40+0200\n"
"Last-Translator: Muhammad Ali Makki <makki.ma at gmai.com>\n"
"Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -18,27 +18,19 @@ msgstr ""
"X-Poedit-Country: PAKISTAN\n"
"X-Poedit-SourceCharset: utf-8\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
+#: .././garcon/garcon-menu-parser.c:308
#, fuzzy, c-format
-msgid "Failed to locate the system menu"
-msgstr "Ø§Ø·Ù„Ø§Ù‚ÛŒÛ Ú©Ø§ روٹ مینیو تلاش کرنے میں ناکامی"
-
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
-#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "libxfce4menu کا کیشے عنصر %s میں بنانے میں ناکامی."
-
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, fuzzy, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
+msgid "Could not load menu file data from %s: %s"
msgstr "libxfce4menu کا کیشے عنصر %s: %s میں کھولنے میں ناکامی."
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
+#: .././garcon/garcon-menu-parser.c:313
+#, c-format
+msgid "Could not load menu file data from %s"
msgstr ""
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr ""
+#, fuzzy
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "Ø§Ø·Ù„Ø§Ù‚ÛŒÛ Ú©Ø§ روٹ مینیو تلاش کرنے میں ناکامی"
+
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "libxfce4menu کا کیشے عنصر %s میں بنانے میں ناکامی."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e6353ee..da6fd6d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-06 01:23+0100\n"
+"POT-Creation-Date: 2009-08-15 03:27+0200\n"
"PO-Revision-Date: 2009-01-20 22:10-0800\n"
"Last-Translator: Chris K. Zhang <plutino at gmail.com>\n"
"Language-Team: Simplified Chinese <i18n-xfce at xfce.org>\n"
@@ -15,27 +15,24 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Let the caller know there was no suitable file
-#: ../libxfce4menu/xfce-menu.c:743
-#, c-format
-msgid "Failed to locate the system menu"
-msgstr "找ä¸åˆ°ç³»ç»Ÿèœå•"
+#: .././garcon/garcon-menu-parser.c:308
+#, fuzzy, c-format
+msgid "Could not load menu file data from %s: %s"
+msgstr "æ— æ³•ä»Ž %s è¯»å– libxfce4menu 项目缓å˜ï¼š%s。"
-#: ../libxfce4menu/xfce-menu-item-cache.c:198
+#: .././garcon/garcon-menu-parser.c:313
#, c-format
-msgid "Failed to create the libxfce4menu item cache in %s."
-msgstr "æ— æ³•åœ¨ %s 建立 libxfce4menu 缓å˜åŒº."
+msgid "Could not load menu file data from %s"
+msgstr ""
-#: ../libxfce4menu/xfce-menu-item-cache.c:208
-#, c-format
-msgid "Failed to load the libxfce4menu item cache from %s: %s."
-msgstr "æ— æ³•ä»Ž %s è¯»å– libxfce4menu 项目缓å˜ï¼š%s。"
+#~ msgid "XfceMenu: Display Menu Test"
+#~ msgstr "Xfce èœå•ï¼šæµ‹è¯•ç›®å½•æ˜¾ç¤º"
+
+#~ msgid "_Show menu"
+#~ msgstr "显示èœå•(_S)"
-#: ../tests/test-display-menu.c:353
-msgid "XfceMenu: Display Menu Test"
-msgstr "Xfce èœå•ï¼šæµ‹è¯•ç›®å½•æ˜¾ç¤º"
+#~ msgid "Failed to locate the system menu"
+#~ msgstr "找ä¸åˆ°ç³»ç»Ÿèœå•"
-#. Create button
-#: ../tests/test-display-menu.c:362
-msgid "_Show menu"
-msgstr "显示èœå•(_S)"
+#~ msgid "Failed to create the libxfce4menu item cache in %s."
+#~ msgstr "æ— æ³•åœ¨ %s 建立 libxfce4menu 缓å˜åŒº."
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d274410..d51c387 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,17 +19,15 @@
INCLUDES = \
-I$(top_srcdir) \
- -DG_LOG_DOMAIN=\"gdesktopmenu-tests\"
+ -DG_LOG_DOMAIN=\"garcon-tests\"
TESTS = \
test-menu-parser \
- test-menu-spec \
- test-display-menu
+ test-menu-spec
check_PROGRAMS = \
test-menu-parser \
- test-menu-spec \
- test-display-menu
+ test-menu-spec
test_menu_parser_SOURCES = \
test-menu-parser.c
@@ -39,12 +37,12 @@ test_menu_parser_CFLAGS = \
$(GLIB_CFLAGS)
test_menu_parser_DEPENDENCIES = \
- $(top_builddir)/gdesktopmenu/libgdesktopmenu-$(GDESKTOPMENU_VERSION_API).la
+ $(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la
test_menu_parser_LDADD = \
$(LIBXFCE4UTIL_LIBS) \
$(GLIB_LIBS) \
- $(top_builddir)/gdesktopmenu/libgdesktopmenu-$(GDESKTOPMENU_VERSION_API).la
+ $(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la
test_menu_spec_SOURCES = \
test-menu-spec.c
@@ -54,27 +52,9 @@ test_menu_spec_CFLAGS = \
$(GLIB_CFLAGS)
test_menu_spec_DEPENDENCIES = \
- $(top_builddir)/gdesktopmenu/libgdesktopmenu-$(GDESKTOPMENU_VERSION_API).la
+ $(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la
test_menu_spec_LDADD = \
$(LIBXFCE4UTIL_LIBS) \
$(GLIB_LIBS) \
- $(top_builddir)/gdesktopmenu/libgdesktopmenu-$(GDESKTOPMENU_VERSION_API).la
-
-test_display_menu_SOURCES = \
- test-display-menu.c
-
-test_display_menu_CFLAGS = \
- $(LIBXFCE4UTIL_CFLAGS) \
- $(GTK_CFLAGS) \
- $(GLIB_CFLAGS)
-
-test_display_menu_DEPENDENCIES = \
- $(top_builddir)/gdesktopmenu/libgdesktopmenu-$(GDESKTOPMENU_VERSION_API).la
-
-test_display_menu_LDADD = \
- $(LIBXFCE4UTIL_LIBS) \
- $(GTK_LIBS) \
- $(GLIB_LIBS) \
- $(top_builddir)/gdesktopmenu/libgdesktopmenu-$(GDESKTOPMENU_VERSION_API).la
-
+ $(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la
diff --git a/tests/test-display-menu.c b/tests/test-display-menu.c
deleted file mode 100644
index 230274f..0000000
--- a/tests/test-display-menu.c
+++ /dev/null
@@ -1,435 +0,0 @@
-/* $Id$ */
-/*-
- * vi:set et ai sts=2 sw=2 cindent:
- *
- * Copyright (c) 2007 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
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#include <gtk/gtk.h>
-
-#include <glib.h>
-#include <glib-object.h>
-#include <glib/gprintf.h>
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-
-#include <gdesktopmenu/gdesktopmenu.h>
-
-
-
-/* Default icon size */
-#define ICON_SIZE 22
-
-
-
-/* Root menu */
-static GDesktopMenu *root = NULL;
-
-
-
-/* Pseudo monitor handler */
-static guint pseudo_monitor_handler = 0;
-
-
-
-static gpointer
-monitor_file (GDesktopMenu *menu,
- const gchar *filename,
- gpointer user_data)
-{
-#if 0
- g_debug ("%s: monitoring file %s => %d",
- g_desktop_menu_element_get_name (G_DESKTOP_MENU_ELEMENT (menu)),
- filename, ++pseudo_monitor_handler);
-#endif
- return GUINT_TO_POINTER (pseudo_monitor_handler);
-}
-
-
-
-static gpointer
-monitor_directory (GDesktopMenu *menu,
- const gchar *filename,
- gpointer user_data)
-{
-#if 0
- g_debug ("%s: monitoring directory %s => %d",
- g_desktop_menu_element_get_name (G_DESKTOP_MENU_ELEMENT (menu)),
- filename, ++pseudo_monitor_handler);
-#endif
- return GUINT_TO_POINTER (pseudo_monitor_handler);
-}
-
-
-
-static void
-remove_monitor (GDesktopMenu *menu,
- gpointer monitor_handle)
-{
-#if 0
- g_debug ("%s: removing monitor %d",
- g_desktop_menu_element_get_name (G_DESKTOP_MENU_ELEMENT (menu)),
- GPOINTER_TO_UINT (monitor_handle));
-#endif
-}
-
-
-
-static void
-initialize_monitoring (void)
-{
- GDesktopMenuMonitorVTable vtable = {
- monitor_file,
- monitor_directory,
- remove_monitor,
- };
-
- /* Pass VTable to the menu library */
- g_desktop_menu_monitor_set_vtable (&vtable, NULL);
-}
-
-
-
-static void
-execute_item_command (GtkWidget *widget,
- GDesktopMenuItem *item)
-{
-#if 0
- GError *error = NULL;
-#endif
- const gchar *command;
- gboolean terminal;
- gboolean startup_notification;
-
- command = g_desktop_menu_item_get_command (item);
- terminal = g_desktop_menu_item_requires_terminal (item);
- startup_notification = g_desktop_menu_item_supports_startup_notification (item);
-
- if (G_UNLIKELY (command == NULL))
- return;
-
-#if 0
- if (!xfce_exec_on_screen (gdk_screen_get_default (), command, terminal,
- startup_notification, &error))
- {
- xfce_err (error->message);
- g_error_free (error);
- }
-#endif
-}
-
-
-
-static GdkPixbuf*
-create_item_icon (GDesktopMenuItem *item)
-{
- GdkPixbuf *icon = NULL;
- GtkIconTheme *icon_theme;
- const gchar *icon_name;
- const gchar *item_name;
- gchar *basename;
- gchar *extension;
- gchar *new_item_name;
- gchar new_icon_name[1024];
-
- /* Get current icon theme */
- icon_theme = gtk_icon_theme_get_default ();
-
- item_name = g_desktop_menu_element_get_name (G_DESKTOP_MENU_ELEMENT (item));
- icon_name = g_desktop_menu_element_get_icon_name (G_DESKTOP_MENU_ELEMENT (item));
-
- if (icon_name == NULL)
- return NULL;
-
- /* Check if we have an absolute filename */
- if (g_path_is_absolute (icon_name) && g_file_test (icon_name, G_FILE_TEST_EXISTS))
- icon = gdk_pixbuf_new_from_file_at_scale (icon_name, ICON_SIZE, ICON_SIZE, TRUE, NULL);
- else
- {
- /* Try to load the icon name directly using the icon theme */
- icon = gtk_icon_theme_load_icon (icon_theme, icon_name, ICON_SIZE, GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
-
- /* If that didn't work, try to remove the filename extension if there is one */
- if (icon == NULL)
- {
- /* Get basename (just to be sure) */
- basename = g_path_get_basename (icon_name);
-
- /* Determine position of the extension */
- extension = g_utf8_strrchr (basename, -1, '.');
-
- /* Make sure we found an extension */
- if (extension != NULL)
- {
- /* Remove extension */
- g_utf8_strncpy (new_icon_name, basename, g_utf8_strlen (basename, -1) - g_utf8_strlen (extension, -1));
-
- /* Try to load the pixbuf using the new icon name */
- icon = gtk_icon_theme_load_icon (icon_theme, new_icon_name, ICON_SIZE, GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
- }
-
- /* Free basename */
- g_free (basename);
-
- /* As a last fallback, we try to load the icon by lowercase item name */
- if (icon == NULL && item_name != NULL)
- {
- new_item_name = g_utf8_strdown (item_name, -1);
- icon = gtk_icon_theme_load_icon (icon_theme, new_item_name, ICON_SIZE, GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
- g_free (new_item_name);
- }
- }
- }
-
- /* Scale icon (if needed) */
- if (icon != NULL)
- {
- GdkPixbuf *old_icon = icon;
- icon = gdk_pixbuf_scale_simple (old_icon, ICON_SIZE, ICON_SIZE, GDK_INTERP_BILINEAR);
- g_object_unref (old_icon);
- }
-
- return icon;
-}
-
-
-
-static void
-create_item_widgets (GDesktopMenuItem *item,
- GtkWidget *parent_menu)
-{
- GtkWidget *gtk_item;
- GtkWidget *image;
- GdkPixbuf *icon;
-
- /* Try to load the icon */
- icon = create_item_icon (item);
-
- if (icon != NULL)
- image = gtk_image_new_from_pixbuf (icon);
- else
- image = gtk_image_new_from_icon_name ("applications-other", ICON_SIZE);
-
- gtk_item = gtk_image_menu_item_new_with_label (g_desktop_menu_element_get_name (G_DESKTOP_MENU_ELEMENT (item)));
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (gtk_item), image);
- gtk_menu_shell_append (GTK_MENU_SHELL (parent_menu), gtk_item);
- gtk_widget_show (gtk_item);
-
- /* Execute command if item is clicked */
- g_signal_connect (gtk_item, "activate", G_CALLBACK (execute_item_command), item);
-}
-
-
-
-static void
-create_menu_widgets (GtkWidget *gtk_menu,
- GDesktopMenu *menu)
-{
- GDesktopMenuDirectory *directory;
- GDesktopMenu *submenu;
- GtkIconTheme *icon_theme;
- GtkWidget *gtk_item;
- GtkWidget *gtk_submenu;
- GtkWidget *image;
- GdkPixbuf *icon;
- GList *iter;
- GList *items;
- const gchar *display_name;
- const gchar *icon_name;
-
- /* Get current icon theme */
- icon_theme = gtk_icon_theme_get_default ();
-
- /* Get submenus and items based on the menu layout */
- items = g_desktop_menu_get_elements (menu);
-
- /* Iterate over menu items */
- for (iter = items; iter != NULL; iter = g_list_next (iter))
- {
- if (!g_desktop_menu_element_get_visible (iter->data))
- continue;
-
- if (G_IS_DESKTOP_MENU_ITEM (iter->data))
- {
- /* Add menu item to the menu */
- create_item_widgets (G_DESKTOP_MENU_ITEM (iter->data), gtk_menu);
- }
- else if (G_IS_DESKTOP_MENU_SEPARATOR (iter->data))
- {
- /* Add separator to the menu */
- gtk_item = gtk_separator_menu_item_new ();
- gtk_menu_shell_append (GTK_MENU_SHELL (gtk_menu), gtk_item);
- gtk_widget_show (gtk_item);
- }
- else if (G_IS_DESKTOP_MENU (iter->data))
- {
- submenu = G_DESKTOP_MENU (iter->data);
- directory = g_desktop_menu_get_directory (submenu);
-
- /* Determine display name */
- display_name = g_desktop_menu_element_get_name (G_DESKTOP_MENU_ELEMENT (submenu));
-
- /* Determine icon name */
- icon_name = g_desktop_menu_element_get_icon_name (G_DESKTOP_MENU_ELEMENT (submenu));
- if (icon_name == NULL)
- icon_name = "applications-other";
-
- /* Load menu icon */
- icon = gtk_icon_theme_load_icon (icon_theme, icon_name, ICON_SIZE, GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
- if (G_UNLIKELY (icon == NULL))
- icon = gtk_icon_theme_load_icon (icon_theme, "applications-other", ICON_SIZE, GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
-
- /* Create image widget */
- image = gtk_image_new_from_pixbuf (icon);
-
- /* Create menu item */
- gtk_item = gtk_image_menu_item_new_with_label (display_name);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (gtk_item), image);
- gtk_menu_shell_append (GTK_MENU_SHELL (gtk_menu), gtk_item);
- gtk_widget_show (gtk_item);
-
- /* Create submenu */
- gtk_submenu = gtk_menu_new ();
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (gtk_item), gtk_submenu);
-
- /* Create widgets for submenu */
- create_menu_widgets (gtk_submenu, submenu);
-
- /* Destroy submenu if it is empty */
- if (G_UNLIKELY (gtk_container_get_children (GTK_CONTAINER (gtk_submenu)) == NULL))
- gtk_widget_destroy (gtk_item);
- }
- }
-
- /* Free menu item list */
- g_list_free (items);
-}
-
-
-
-static void
-show_menu (GtkButton *button,
- GtkWidget *menu)
-{
- /* Create menu widgets if not already done */
- if (g_list_length (gtk_container_get_children (GTK_CONTAINER (menu))) == 0)
- create_menu_widgets (menu, root);
-
- /* Display the menu */
- gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time ());
-}
-
-
-
-static void
-main_window_destroy (GtkWidget *window)
-{
- gtk_main_quit ();
-}
-
-
-
-static void
-create_main_window (void)
-{
- GtkWidget *window;
- GtkWidget *button;
- GtkWidget *menu;
-
- /* Create main window */
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title (GTK_WINDOW (window), _("GDesktopMenu: Display Menu Test"));
- gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
- gtk_container_set_border_width (GTK_CONTAINER (window), 12);
- gtk_widget_show (window);
-
- /* Exit main loop when when the window is closed */
- g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (main_window_destroy), NULL);
-
- /* Create button */
- button = gtk_button_new_with_mnemonic (_("_Show menu"));
- gtk_container_add (GTK_CONTAINER (window), button);
- gtk_widget_show (button);
-
- /* Create GTK+ root menu */
- menu = gtk_menu_new ();
-
- /* Display root menu when the button is clicked */
- g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (show_menu), menu);
-}
-
-
-
-int
-main (int argc,
- char **argv)
-{
- GError *error = NULL;
- gint exit_code = EXIT_SUCCESS;
-
- /* Initialize the menu library */
- g_desktop_menu_init ("XFCE");
-
- /* Set up menu monitoring */
- initialize_monitoring ();
-
- /* Initialize GTK+ */
- gtk_init (&argc, &argv);
-
- /* Try to load the menu */
- if (G_UNLIKELY (g_strv_length (argv) > 1))
- root = g_desktop_menu_new (argv[1]);
- else
- root = g_desktop_menu_new_applications ();
-
- /* Check if the menu was loaded */
- if (G_LIKELY (g_desktop_menu_load (root, NULL, &error)))
- {
- /* Create main window */
- create_main_window ();
-
- /* Enter main loop */
- gtk_main ();
-
- /* Destroy the root menu */
- g_object_unref (root);
- }
- else
- {
- gchar *uri;
-
- uri = g_file_get_uri (g_desktop_menu_get_file (root));
- g_error ("Could not load menu from %s: %s", uri, error->message);
- g_free (uri);
-
- exit_code = EXIT_FAILURE;
- }
-
- /* Shut down the menu library */
- g_desktop_menu_shutdown ();
-
- return exit_code;
-}
diff --git a/tests/test-menu-parser.c b/tests/test-menu-parser.c
index 0492370..2129766 100644
--- a/tests/test-menu-parser.c
+++ b/tests/test-menu-parser.c
@@ -28,7 +28,7 @@
#include <glib.h>
-#include <gdesktopmenu/gdesktopmenu.h>
+#include <garcon/garcon.h>
@@ -44,16 +44,16 @@ static gboolean print_node (GNode *node,
const gchar *
node_name (GNode *node)
{
- switch (g_desktop_menu_node_tree_get_node_type (node))
+ switch (garcon_menu_node_tree_get_node_type (node))
{
- case G_DESKTOP_MENU_NODE_TYPE_MENU: return "Menu"; break;
- case G_DESKTOP_MENU_NODE_TYPE_INCLUDE: return "Include"; break;
- case G_DESKTOP_MENU_NODE_TYPE_EXCLUDE: return "Exclude"; break;
- case G_DESKTOP_MENU_NODE_TYPE_OR: return "Or"; break;
- case G_DESKTOP_MENU_NODE_TYPE_AND: return "And"; break;
- case G_DESKTOP_MENU_NODE_TYPE_NOT: return "Not"; break;
- case G_DESKTOP_MENU_NODE_TYPE_MOVE: return "Move"; break;
- case G_DESKTOP_MENU_NODE_TYPE_LAYOUT: return "Layout"; break;
+ case GARCON_MENU_NODE_TYPE_MENU: return "Menu"; break;
+ case GARCON_MENU_NODE_TYPE_INCLUDE: return "Include"; break;
+ case GARCON_MENU_NODE_TYPE_EXCLUDE: return "Exclude"; break;
+ case GARCON_MENU_NODE_TYPE_OR: return "Or"; break;
+ case GARCON_MENU_NODE_TYPE_AND: return "And"; break;
+ case GARCON_MENU_NODE_TYPE_NOT: return "Not"; break;
+ case GARCON_MENU_NODE_TYPE_MOVE: return "Move"; break;
+ case GARCON_MENU_NODE_TYPE_LAYOUT: return "Layout"; break;
default: return NULL; break;
}
}
@@ -83,14 +83,14 @@ print_node (GNode *node,
#define INDENT {for (i = 0; i < depth; ++i) g_print (" ");}
- if (G_UNLIKELY (g_desktop_menu_node_tree_get_node_type (node) == G_DESKTOP_MENU_NODE_TYPE_MENU ||
- g_desktop_menu_node_tree_get_node_type (node) == G_DESKTOP_MENU_NODE_TYPE_INCLUDE ||
- g_desktop_menu_node_tree_get_node_type (node) == G_DESKTOP_MENU_NODE_TYPE_EXCLUDE ||
- g_desktop_menu_node_tree_get_node_type (node) == G_DESKTOP_MENU_NODE_TYPE_OR ||
- g_desktop_menu_node_tree_get_node_type (node) == G_DESKTOP_MENU_NODE_TYPE_AND ||
- g_desktop_menu_node_tree_get_node_type (node) == G_DESKTOP_MENU_NODE_TYPE_NOT ||
- g_desktop_menu_node_tree_get_node_type (node) == G_DESKTOP_MENU_NODE_TYPE_MOVE ||
- g_desktop_menu_node_tree_get_node_type (node) == G_DESKTOP_MENU_NODE_TYPE_LAYOUT))
+ if (G_UNLIKELY (garcon_menu_node_tree_get_node_type (node) == GARCON_MENU_NODE_TYPE_MENU ||
+ garcon_menu_node_tree_get_node_type (node) == GARCON_MENU_NODE_TYPE_INCLUDE ||
+ garcon_menu_node_tree_get_node_type (node) == GARCON_MENU_NODE_TYPE_EXCLUDE ||
+ garcon_menu_node_tree_get_node_type (node) == GARCON_MENU_NODE_TYPE_OR ||
+ garcon_menu_node_tree_get_node_type (node) == GARCON_MENU_NODE_TYPE_AND ||
+ garcon_menu_node_tree_get_node_type (node) == GARCON_MENU_NODE_TYPE_NOT ||
+ garcon_menu_node_tree_get_node_type (node) == GARCON_MENU_NODE_TYPE_MOVE ||
+ garcon_menu_node_tree_get_node_type (node) == GARCON_MENU_NODE_TYPE_LAYOUT))
{
INDENT; g_print ("<%s>\n", node_name (node));
print_child_nodes (node, depth);
@@ -98,88 +98,88 @@ print_node (GNode *node,
}
else
{
- switch (g_desktop_menu_node_tree_get_node_type (node))
+ switch (garcon_menu_node_tree_get_node_type (node))
{
- case G_DESKTOP_MENU_NODE_TYPE_NAME:
- INDENT; g_print ("<Name>%s</Name>\n", g_desktop_menu_node_tree_get_string (node));
+ case GARCON_MENU_NODE_TYPE_NAME:
+ INDENT; g_print ("<Name>%s</Name>\n", garcon_menu_node_tree_get_string (node));
break;
- case G_DESKTOP_MENU_NODE_TYPE_DIRECTORY:
- INDENT; g_print ("<Directory>%s</Directory>\n", g_desktop_menu_node_tree_get_string (node));
+ case GARCON_MENU_NODE_TYPE_DIRECTORY:
+ INDENT; g_print ("<Directory>%s</Directory>\n", garcon_menu_node_tree_get_string (node));
break;
- case G_DESKTOP_MENU_NODE_TYPE_DIRECTORY_DIR:
- INDENT; g_print ("<DirectoryDir>%s</DirectoryDir>\n", g_desktop_menu_node_tree_get_string (node));
+ case GARCON_MENU_NODE_TYPE_DIRECTORY_DIR:
+ INDENT; g_print ("<DirectoryDir>%s</DirectoryDir>\n", garcon_menu_node_tree_get_string (node));
break;
- case G_DESKTOP_MENU_NODE_TYPE_DEFAULT_DIRECTORY_DIRS:
+ case GARCON_MENU_NODE_TYPE_DEFAULT_DIRECTORY_DIRS:
INDENT; g_print ("<DefaultDirectoryDirs/>\n");
break;
- case G_DESKTOP_MENU_NODE_TYPE_APP_DIR:
- INDENT; g_print ("<AppDir>%s</AppDir>\n", g_desktop_menu_node_tree_get_string (node));
+ case GARCON_MENU_NODE_TYPE_APP_DIR:
+ INDENT; g_print ("<AppDir>%s</AppDir>\n", garcon_menu_node_tree_get_string (node));
break;
- case G_DESKTOP_MENU_NODE_TYPE_DEFAULT_APP_DIRS:
+ case GARCON_MENU_NODE_TYPE_DEFAULT_APP_DIRS:
INDENT; g_print ("<DefaultAppDirs/>\n");
break;
- case G_DESKTOP_MENU_NODE_TYPE_ONLY_UNALLOCATED:
+ case GARCON_MENU_NODE_TYPE_ONLY_UNALLOCATED:
INDENT; g_print ("<OnlyUnallocated/>\n");
break;
- case G_DESKTOP_MENU_NODE_TYPE_NOT_ONLY_UNALLOCATED:
+ case GARCON_MENU_NODE_TYPE_NOT_ONLY_UNALLOCATED:
INDENT; g_print ("<NotOnlyUnallocated/>\n");
break;
- case G_DESKTOP_MENU_NODE_TYPE_DELETED:
+ case GARCON_MENU_NODE_TYPE_DELETED:
INDENT; g_print ("<Deleted/>\n");
break;
- case G_DESKTOP_MENU_NODE_TYPE_NOT_DELETED:
+ case GARCON_MENU_NODE_TYPE_NOT_DELETED:
INDENT; g_print ("<NotDeleted/>\n");
break;
- case G_DESKTOP_MENU_NODE_TYPE_FILENAME:
- INDENT; g_print ("<Filename>%s</Filename>\n", g_desktop_menu_node_tree_get_string (node));
+ case GARCON_MENU_NODE_TYPE_FILENAME:
+ INDENT; g_print ("<Filename>%s</Filename>\n", garcon_menu_node_tree_get_string (node));
break;
- case G_DESKTOP_MENU_NODE_TYPE_CATEGORY:
- INDENT; g_print ("<Category>%s</Category>\n", g_desktop_menu_node_tree_get_string (node));
+ case GARCON_MENU_NODE_TYPE_CATEGORY:
+ INDENT; g_print ("<Category>%s</Category>\n", garcon_menu_node_tree_get_string (node));
break;
- case G_DESKTOP_MENU_NODE_TYPE_OLD:
- INDENT; g_print ("<Old>%s</Old>\n", g_desktop_menu_node_tree_get_string (node));
+ case GARCON_MENU_NODE_TYPE_OLD:
+ INDENT; g_print ("<Old>%s</Old>\n", garcon_menu_node_tree_get_string (node));
break;
- case G_DESKTOP_MENU_NODE_TYPE_NEW:
- INDENT; g_print ("<New>%s</New>\n", g_desktop_menu_node_tree_get_string (node));
+ case GARCON_MENU_NODE_TYPE_NEW:
+ INDENT; g_print ("<New>%s</New>\n", garcon_menu_node_tree_get_string (node));
break;
- case G_DESKTOP_MENU_NODE_TYPE_MENUNAME:
- INDENT; g_print ("<Menuname>%s</Menuname>\n", g_desktop_menu_node_tree_get_string (node));
+ case GARCON_MENU_NODE_TYPE_MENUNAME:
+ INDENT; g_print ("<Menuname>%s</Menuname>\n", garcon_menu_node_tree_get_string (node));
break;
- case G_DESKTOP_MENU_NODE_TYPE_SEPARATOR:
+ case GARCON_MENU_NODE_TYPE_SEPARATOR:
INDENT; g_print ("<Separator/>\n");
break;
- case G_DESKTOP_MENU_NODE_TYPE_MERGE:
+ case GARCON_MENU_NODE_TYPE_MERGE:
INDENT;
- switch (g_desktop_menu_node_tree_get_layout_merge_type (node))
+ switch (garcon_menu_node_tree_get_layout_merge_type (node))
{
- case G_DESKTOP_MENU_LAYOUT_MERGE_ALL:
+ case GARCON_MENU_LAYOUT_MERGE_ALL:
g_print ("<Merge type=\"all\"/>\n");
break;
- case G_DESKTOP_MENU_LAYOUT_MERGE_MENUS:
+ case GARCON_MENU_LAYOUT_MERGE_MENUS:
g_print ("<Merge type=\"menus\"/>\n");
break;
- case G_DESKTOP_MENU_LAYOUT_MERGE_FILES:
+ case GARCON_MENU_LAYOUT_MERGE_FILES:
g_print ("<Merge type=\"files\"/>\n");
break;
}
break;
- case G_DESKTOP_MENU_NODE_TYPE_MERGE_FILE:
+ case GARCON_MENU_NODE_TYPE_MERGE_FILE:
INDENT;
- switch (g_desktop_menu_node_tree_get_merge_file_type (node))
+ switch (garcon_menu_node_tree_get_merge_file_type (node))
{
- case G_DESKTOP_MENU_MERGE_FILE_PATH:
+ case GARCON_MENU_MERGE_FILE_PATH:
g_print ("<MergeFile type=\"path\">%s</MergeFile>\n",
- g_desktop_menu_node_tree_get_merge_file_filename (node));
+ garcon_menu_node_tree_get_merge_file_filename (node));
break;
- case G_DESKTOP_MENU_MERGE_FILE_PARENT:
+ case GARCON_MENU_MERGE_FILE_PARENT:
g_print ("<MergeFile type=\"parent\"/>\n");
break;
}
break;
- case G_DESKTOP_MENU_NODE_TYPE_MERGE_DIR:
- INDENT; g_print ("<MergeDir>%s</MergeDir>\n", g_desktop_menu_node_tree_get_string (node));
+ case GARCON_MENU_NODE_TYPE_MERGE_DIR:
+ INDENT; g_print ("<MergeDir>%s</MergeDir>\n", garcon_menu_node_tree_get_string (node));
break;
- case G_DESKTOP_MENU_NODE_TYPE_DEFAULT_MERGE_DIRS:
+ case GARCON_MENU_NODE_TYPE_DEFAULT_MERGE_DIRS:
INDENT; g_print ("<DefaultMergeDirs/>\n");
break;
default:
@@ -193,15 +193,15 @@ print_node (GNode *node,
void
-print_tree (GDesktopMenuTreeProvider *provider)
+print_tree (GarconMenuTreeProvider *provider)
{
GNode *tree;
- g_return_if_fail (G_IS_DESKTOP_MENU_TREE_PROVIDER (provider));
+ g_return_if_fail (GARCON_IS_MENU_TREE_PROVIDER (provider));
- tree = g_desktop_menu_tree_provider_get_tree (provider);
+ tree = garcon_menu_tree_provider_get_tree (provider);
print_node (tree, 0);
- g_desktop_menu_node_tree_free (tree);
+ garcon_menu_node_tree_free (tree);
}
@@ -220,18 +220,18 @@ int
main (int argc,
char **argv)
{
- GDesktopMenuParser *parser;
- GDesktopMenuMerger *merger;
- GError *error = NULL;
- GFile *file = NULL;
- gchar *filename;
- gint result = EXIT_SUCCESS;
- gint n;
+ GarconMenuParser *parser;
+ GarconMenuMerger *merger;
+ GError *error = NULL;
+ GFile *file = NULL;
+ gchar *filename;
+ gint result = EXIT_SUCCESS;
+ gint n;
if (!g_thread_supported ())
g_thread_init (NULL);
- g_desktop_menu_init ("XFCE");
+ garcon_init ("XFCE");
if (argc > 1)
file = g_file_new_for_path (argv[1]);
@@ -241,7 +241,7 @@ main (int argc,
for (n = 0; n < G_N_ELEMENTS (ROOT_SPECS) && file == NULL; ++n)
{
/* Search for the root menu file */
- filename = g_desktop_menu_config_lookup (ROOT_SPECS[n]);
+ filename = garcon_config_lookup (ROOT_SPECS[n]);
if (G_UNLIKELY (filename == NULL))
continue;
@@ -257,19 +257,19 @@ main (int argc,
}
}
- parser = g_desktop_menu_parser_new (file);
+ parser = garcon_menu_parser_new (file);
g_object_unref (file);
- if (G_LIKELY (g_desktop_menu_parser_run (parser, NULL, &error)))
+ if (G_LIKELY (garcon_menu_parser_run (parser, NULL, &error)))
{
- print_tree (G_DESKTOP_MENU_TREE_PROVIDER (parser));
+ print_tree (GARCON_MENU_TREE_PROVIDER (parser));
- merger = g_desktop_menu_merger_new (G_DESKTOP_MENU_TREE_PROVIDER (parser));
+ merger = garcon_menu_merger_new (GARCON_MENU_TREE_PROVIDER (parser));
- if (G_LIKELY (g_desktop_menu_merger_run (merger, NULL, &error)))
+ if (G_LIKELY (garcon_menu_merger_run (merger, NULL, &error)))
{
g_print ("\n\n");
- print_tree (G_DESKTOP_MENU_TREE_PROVIDER (merger));
+ print_tree (GARCON_MENU_TREE_PROVIDER (merger));
}
else
{
@@ -300,7 +300,7 @@ main (int argc,
g_object_unref (parser);
- g_desktop_menu_shutdown ();
+ garcon_shutdown ();
return result;
}
diff --git a/tests/test-menu-spec.c b/tests/test-menu-spec.c
index 911d2e6..bfc82e0 100644
--- a/tests/test-menu-spec.c
+++ b/tests/test-menu-spec.c
@@ -30,25 +30,25 @@
#include <glib/gprintf.h>
-#include <gdesktopmenu/gdesktopmenu.h>
+#include <garcon/garcon.h>
void
-print_menu (GDesktopMenu *menu,
- const gchar *path)
+print_menu (GarconMenu *menu,
+ const gchar *path)
{
- GDesktopMenuDirectory *directory;
- GList *menus;
- GList *items;
- GList *iter;
- gchar *name;
+ GarconMenuDirectory *directory;
+ GList *menus;
+ GList *items;
+ GList *iter;
+ gchar *name;
- if (!g_desktop_menu_element_get_visible (G_DESKTOP_MENU_ELEMENT (menu)))
+ if (!garcon_menu_element_get_visible (GARCON_MENU_ELEMENT (menu)))
return;
/* Determine menu name */
- directory = g_desktop_menu_get_directory (menu);
+ directory = garcon_menu_get_directory (menu);
if (G_UNLIKELY (path == NULL))
name = g_strdup ("");
@@ -56,35 +56,35 @@ print_menu (GDesktopMenu *menu,
{
name = g_strdup_printf ("%s%s/", path,
(directory == NULL
- ? g_desktop_menu_element_get_name (G_DESKTOP_MENU_ELEMENT (menu))
- : g_desktop_menu_directory_get_name (directory)));
+ ? garcon_menu_element_get_name (GARCON_MENU_ELEMENT (menu))
+ : garcon_menu_directory_get_name (directory)));
}
/* Fetch submenus */
- menus = g_desktop_menu_get_menus (menu);
+ menus = garcon_menu_get_menus (menu);
/* Print child menus */
for (iter = menus; iter != NULL; iter = g_list_next (iter))
{
/* Only display menus which are not hidden or excluded from this environment */
- if (G_LIKELY (g_desktop_menu_element_get_visible (iter->data)))
- print_menu (G_DESKTOP_MENU (iter->data), name);
+ if (G_LIKELY (garcon_menu_element_get_visible (iter->data)))
+ print_menu (GARCON_MENU (iter->data), name);
}
/* Free submenu list */
g_list_free (menus);
/* Fetch menu items */
- items = g_desktop_menu_get_elements (menu);
+ items = garcon_menu_get_elements (menu);
/* Print menu items */
for (iter = items; iter != NULL; iter = g_list_next (iter))
{
- if (G_IS_DESKTOP_MENU_ITEM (iter->data)
- && g_desktop_menu_element_get_visible (iter->data))
+ if (GARCON_IS_MENU_ITEM (iter->data)
+ && garcon_menu_element_get_visible (iter->data))
{
- g_printf ("%s\t%s\t%s\n", name, g_desktop_menu_item_get_desktop_id (iter->data),
- g_desktop_menu_item_get_filename (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));
}
}
@@ -101,23 +101,23 @@ int
main (int argc,
char **argv)
{
- GDesktopMenu *menu;
- GError *error = NULL;
+ GarconMenu *menu;
+ GError *error = NULL;
#ifdef HAVE_STDLIB_H
- int exit_code = EXIT_SUCCESS;
+ int exit_code = EXIT_SUCCESS;
#else
- int exit_code = 0;
+ int exit_code = 0;
#endif
g_set_prgname ("test-menu-spec");
/* Initialize menu library */
- g_desktop_menu_init (NULL);
+ garcon_init (NULL);
/* Try to get the root menu */
- menu = g_desktop_menu_new_applications ();
+ menu = garcon_menu_new_applications ();
- if (G_LIKELY (g_desktop_menu_load (menu, NULL, &error)))
+ if (G_LIKELY (garcon_menu_load (menu, NULL, &error)))
{
/* Print menu contents according to the test suite criteria */
print_menu (menu, NULL);
@@ -126,7 +126,7 @@ main (int argc,
{
gchar *uri;
- uri = g_file_get_uri (g_desktop_menu_get_file (menu));
+ uri = g_file_get_uri (garcon_menu_get_file (menu));
g_error ("Could not load menu from %s: %s", uri, error->message);
g_free (uri);
@@ -139,7 +139,7 @@ main (int argc,
}
/* Shut down the menu library */
- g_desktop_menu_shutdown ();
+ garcon_shutdown ();
return exit_code;
}
More information about the Xfce4-commits
mailing list