lxde-base/menu-cache/files/menu-cache-1.1.0-fno-common.diff

   1 diff --git a/menu-cache-gen/menu-tags.h b/menu-cache-gen/menu-tags.h
   2 index f3fd7d3..f71c0bc 100644
   3 --- a/menu-cache-gen/menu-tags.h
   4 +++ b/menu-cache-gen/menu-tags.h
   5 @@ -22,38 +22,17 @@
   6  #include <libfm/fm-extra.h>
   7  #include <menu-cache.h>
   8
   9 -FmXmlFileTag menuTag_Menu;
  10 -FmXmlFileTag menuTag_AppDir;
  11 -FmXmlFileTag menuTag_DefaultAppDirs;
  12 -FmXmlFileTag menuTag_DirectoryDir;
  13 -FmXmlFileTag menuTag_DefaultDirectoryDirs;
  14 -FmXmlFileTag menuTag_Include;
  15 -FmXmlFileTag menuTag_Exclude;
  16 -FmXmlFileTag menuTag_Filename;
  17 -FmXmlFileTag menuTag_Or;
  18 -FmXmlFileTag menuTag_And;
  19 -FmXmlFileTag menuTag_Not;
  20 -FmXmlFileTag menuTag_Category;
  21 -FmXmlFileTag menuTag_MergeFile;
  22 -FmXmlFileTag menuTag_MergeDir;
  23 -FmXmlFileTag menuTag_DefaultMergeDirs;
  24 -FmXmlFileTag menuTag_Directory;
  25 -FmXmlFileTag menuTag_Name;
  26 -FmXmlFileTag menuTag_Deleted;
  27 -FmXmlFileTag menuTag_NotDeleted;
  28 -FmXmlFileTag menuTag_OnlyUnallocated;
  29 -FmXmlFileTag menuTag_NotOnlyUnallocated;
  30 -FmXmlFileTag menuTag_All;
  31 -FmXmlFileTag menuTag_LegacyDir;
  32 -FmXmlFileTag menuTag_KDELegacyDirs;
  33 -FmXmlFileTag menuTag_Move;
  34 -FmXmlFileTag menuTag_Old;
  35 -FmXmlFileTag menuTag_New;
  36 -FmXmlFileTag menuTag_Layout;
  37 -FmXmlFileTag menuTag_DefaultLayout;
  38 -FmXmlFileTag menuTag_Menuname;
  39 -FmXmlFileTag menuTag_Separator;
  40 -FmXmlFileTag menuTag_Merge;
  41 +extern FmXmlFileTag menuTag_AppDir;
  42 +extern FmXmlFileTag menuTag_DirectoryDir;
  43 +extern FmXmlFileTag menuTag_Include;
  44 +extern FmXmlFileTag menuTag_Exclude;
  45 +extern FmXmlFileTag menuTag_Filename;
  46 +extern FmXmlFileTag menuTag_Or;
  47 +extern FmXmlFileTag menuTag_And;
  48 +extern FmXmlFileTag menuTag_Not;
  49 +extern FmXmlFileTag menuTag_Category;
  50 +extern FmXmlFileTag menuTag_All;
  51 +extern FmXmlFileTag menuTag_LegacyDir;
  52
  53  typedef enum {
  54      MERGE_NONE, /* starting value */
  55 @@ -152,19 +131,19 @@ typedef struct {
  56  } MenuRule;
  57
  58  /* requested language(s) */
  59 -char **languages;
  60 +extern char **languages;
  61
  62  /* list of menu files to monitor */
  63 -GSList *MenuFiles;
  64 +extern GSList *MenuFiles;
  65
  66  /* list of menu dirs to monitor */
  67 -GSList *MenuDirs;
  68 +extern GSList *MenuDirs;
  69
  70  /* list of available app dirs */
  71 -GSList *AppDirs;
  72 +extern GSList *AppDirs;
  73
  74  /* list of available dir dirs */
  75 -GSList *DirDirs;
  76 +extern GSList *DirDirs;
  77
  78  /* parse and merge menu files */
  79  MenuMenu *get_merged_menu(const char *file, FmXmlFile **xmlfile, GError **error);
  80 @@ -177,7 +156,7 @@ gboolean save_menu_cache(MenuMenu *layout, const char *menuname, const char *fil
  81  void _free_layout_items(GList *data);
  82
  83  /* verbosity level */
  84 -gint verbose;
  85 +extern gint verbose;
  86
  87  #define DBG if (verbose) g_debug
  88  #define VDBG if (verbose > 1) g_debug