Sophie

Sophie

distrib > Mageia > 6 > armv5tl > media > core-updates-src > by-pkgid > b6a1c42af15b66e643fc12e8cc838c39 > files > 2

libfm-1.2.5-3.1.mga6.src.rpm

--- libfm-1.2.3/src/gtk/fm-app-menu-view.c~	2014-02-19 00:59:19.000000000 +0100
+++ libfm-1.2.3/src/gtk/fm-app-menu-view.c	2015-09-16 16:38:29.146812500 +0200
@@ -170,7 +170,7 @@
 
         /* ensure that we're using lxmenu-data */
         oldenv = g_strdup(g_getenv("XDG_MENU_PREFIX"));
-        g_setenv("XDG_MENU_PREFIX", "lxde-", TRUE);
+        /*g_setenv("XDG_MENU_PREFIX", "lxde-", TRUE);*/
         menu_cache = menu_cache_lookup("applications.menu");
         if(oldenv)
         {
--- libfm-1.2.3/src/tools/libfm-pref-apps.c~	2013-12-05 16:05:58.000000000 +0100
+++ libfm-1.2.3/src/tools/libfm-pref-apps.c	2015-09-16 16:30:30.033802876 +0200
@@ -58,7 +58,7 @@
     gtk_window_set_icon_name(GTK_WINDOW(dlg), "preferences-desktop");
 
     /* make sure we're using menu from lxmenu-data */
-    g_setenv("XDG_MENU_PREFIX", "lxde-", TRUE);
+    /*g_setenv("XDG_MENU_PREFIX", "lxde-", TRUE);*/
 
     mt = fm_mime_type_from_name("x-scheme-handler/http");
     fm_app_chooser_combo_box_setup_for_mime_type(browser, mt);
--- libfm-1.2.3/src/modules/vfs-menu.c~	2015-09-16 16:54:42.270518007 +0200
+++ libfm-1.2.3/src/modules/vfs-menu.c	2015-09-16 16:56:52.561297674 +0200
@@ -1080,19 +1080,10 @@
 static MenuCache *_get_menu_cache(GError **error)
 {
     MenuCache *mc;
-    static gboolean environment_tested = FALSE;
-    static gboolean requires_prefix = FALSE;
-
-    /* do it in compatibility with lxpanel */
-    if(!environment_tested)
-    {
-        requires_prefix = (g_getenv("XDG_MENU_PREFIX") == NULL);
-        environment_tested = TRUE;
-    }
 #if MENU_CACHE_CHECK_VERSION(0, 5, 0)
-    mc = menu_cache_lookup_sync(requires_prefix ? "lxde-applications.menu+hidden" : "applications.menu+hidden");
+    mc = menu_cache_lookup_sync("applications.menu+hidden");
 #else
-    mc = menu_cache_lookup_sync(requires_prefix ? "lxde-applications.menu" : "applications.menu");
+    mc = menu_cache_lookup_sync("applications.menu");
 #endif
     /* FIXME: may be it is reasonable to set XDG_MENU_PREFIX ? */