Author: kelnos
Date: 2008-07-03 18:14:27 +0000 (Thu, 03 Jul 2008)
New Revision: 27204
Modified:
xfdesktop/branches/xfce_4_4/modules/menu/desktop-menu-cache.c
xfdesktop/branches/xfce_4_4/modules/menu/desktop-menu-dentry.c
xfdesktop/branches/xfce_4_4/modules/menu/desktop-menuspec.h
Log:
get rid of use of G_INLINE_FUNC, as it causes problems on some systems,
like amd64 (bug 4193)
Modified: xfdesktop/branches/xfce_4_4/modules/menu/desktop-menu-cache.c
===================================================================
--- xfdesktop/branches/xfce_4_4/modules/menu/desktop-menu-cache.c
2008-07-03 17:46:41 UTC (rev 27203)
+++ xfdesktop/branches/xfce_4_4/modules/menu/desktop-menu-cache.c
2008-07-03 18:14:27 UTC (rev 27204)
@@ -444,8 +444,6 @@
void
desktop_menu_cache_cleanup()
{
- GList *l;
-
if(menu_tree) {
g_node_traverse(menu_tree, G_IN_ORDER, G_TRAVERSE_ALL, -1,
(GNodeTraverseFunc)dmc_free_tree_data, NULL);
Modified: xfdesktop/branches/xfce_4_4/modules/menu/desktop-menu-dentry.c
===================================================================
--- xfdesktop/branches/xfce_4_4/modules/menu/desktop-menu-dentry.c
2008-07-03 17:46:41 UTC (rev 27203)
+++ xfdesktop/branches/xfce_4_4/modules/menu/desktop-menu-dentry.c
2008-07-03 18:14:27 UTC (rev 27204)
@@ -59,7 +59,6 @@
#define CATEGORIES_FILE "xfce-registered-categories.xml"
static void menu_dentry_legacy_init();
-G_INLINE_FUNC gboolean menu_dentry_legacy_need_update(XfceDesktopMenu
*desktop_menu);
static void menu_dentry_legacy_add_all(XfceDesktopMenu *desktop_menu,
MenuPathType pathtype);
@@ -87,7 +86,7 @@
static GHashTable *dir_to_cat = NULL;
/* we don't want most command-line parameters if they're given. */
-G_INLINE_FUNC gchar *
+static inline gchar *
_sanitise_dentry_cmd(gchar *cmd)
{
gchar *p;
@@ -101,7 +100,7 @@
return cmd;
}
-G_INLINE_FUNC gint
+static inline gint
_get_path_depth(const gchar *path)
{
gchar *p;
Modified: xfdesktop/branches/xfce_4_4/modules/menu/desktop-menuspec.h
===================================================================
--- xfdesktop/branches/xfce_4_4/modules/menu/desktop-menuspec.h 2008-07-03
17:46:41 UTC (rev 27203)
+++ xfdesktop/branches/xfce_4_4/modules/menu/desktop-menuspec.h 2008-07-03
18:14:27 UTC (rev 27204)
@@ -82,6 +82,6 @@
* @param paths A GPtrArray obtained from either menuspec_get_path_simple() or
* menuspec_get_path_multilevel().
*/
-G_INLINE_FUNC void desktop_menuspec_path_free(GPtrArray *paths);
+void desktop_menuspec_path_free(GPtrArray *paths);
#endif /* ifdef __MENUSPEC_H__ */
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
