get rid of use of G_INLINE_FUNC, as it causes problems on some systems,

like amd64 (bug 4193)


(Old svn revision: 27204)

3 files changed, 3 insertions, 6 deletions

diff --git a/modules/menu/desktop-menu-cache.c b/modules/menu/desktop-menu-cache.c
index f48fd1c2..e7dcb95d 100644
--- a/modules/menu/desktop-menu-cache.c
+++ b/modules/menu/desktop-menu-cache.c
@@ -444,8 +444,6 @@ desktop_menu_cache_flush(const gchar *cache_file_suffix)
 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);
diff --git a/modules/menu/desktop-menu-dentry.c b/modules/menu/desktop-menu-dentry.c
index 27046562..0defd422 100644
--- a/modules/menu/desktop-menu-dentry.c
+++ b/modules/menu/desktop-menu-dentry.c
@@ -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 gchar **legacy_dirs = NULL;
 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 @@ _sanitise_dentry_cmd(gchar *cmd)
     return cmd;
 }
 
-G_INLINE_FUNC gint
+static inline gint
 _get_path_depth(const gchar *path)
 {
     gchar *p;
diff --git a/modules/menu/desktop-menuspec.h b/modules/menu/desktop-menuspec.h
index 1e068bb6..88e22e0e 100644
--- a/modules/menu/desktop-menuspec.h
+++ b/modules/menu/desktop-menuspec.h
@@ -82,6 +82,6 @@ G_CONST_RETURN gchar *desktop_menuspec_displayname_to_icon(const gchar *displayn
  * @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__ */