Skip to content
Permalink
Browse files

remove inline from desktop_menuspec_path_free (https://trac.macports.…

  • Loading branch information
Anders F. Björklund
Anders F. Björklund committed Oct 4, 2008
1 parent 0f84497 commit a17075d7564cd48e98a900b504153773085af3c5
Showing with 45 additions and 0 deletions.
  1. +3 −0 xfce/xfdesktop/Portfile
  2. +42 −0 xfce/xfdesktop/files/patch-remove-g_inline_func.diff
@@ -4,6 +4,7 @@ PortSystem 1.0

name xfdesktop
version 4.4.2
revision 1
categories xfce
platforms darwin
maintainers afb@macports.org
@@ -20,3 +21,5 @@ depends_lib port:libxfce4mcs port:libxml2 \
port:Thunar port:libxfcegui4

depends_build port:xfce4-panel port:xfce-mcs-manager

patchfiles patch-remove-g_inline_func.diff
@@ -0,0 +1,42 @@
Index: modules/menu/desktop-menuspec.h
===================================================================
--- modules/menu/desktop-menuspec.h (revision 27203)
+++ modules/menu/desktop-menuspec.h (revision 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__ */
Index: modules/menu/desktop-menu-dentry.c
===================================================================
--- modules/menu/desktop-menu-dentry.c (revision 27203)
+++ modules/menu/desktop-menu-dentry.c (revision 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;

0 comments on commit a17075d

Please sign in to comment.
You can’t perform that action at this time.