[Wine-patches] [eterwine] eterbug #7021

[Alexander Morozov]

----------- следующая часть -----------
From 6aff9d0f130cc9bb25f57ec4620625cdf85b1f96 Mon Sep 17 00:00:00 2001
From: Vitaly Lipatov <lav на etersoft.ru>
Date: Fri, 16 Oct 2009 15:46:44 +0400
Subject: [eterwine 1/4] config: export config variable

---
 etersoft/init/config |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/etersoft/init/config b/etersoft/init/config
index 08a9106..73822b1 100644
--- a/etersoft/init/config
+++ b/etersoft/init/config
@@ -27,7 +27,7 @@ UMASK=0002
 #WINEADDUSERTOCOMPNAME=yes
 
 # Hold wine environment (drivers and wineserver) in the memory (in secs)
-WINEHOLDSERVER=1800
+export WINEHOLDSERVER=1800
 
 # Allow root to use wine
 #ONECLICKDESKTOP=1
-- 
1.7.4.2

----------- следующая часть -----------
From 67a787af04cf89483bb60d861ec6ffd6ef6836ad Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov на etersoft.ru>
Date: Tue, 10 Aug 2010 14:09:30 +0400
Subject: [eterwine 2/4] Fix for option which is not working without export (eterbug #4327).

---
 etersoft/init/config |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/etersoft/init/config b/etersoft/init/config
index 73822b1..908b3a2 100644
--- a/etersoft/init/config
+++ b/etersoft/init/config
@@ -36,7 +36,7 @@ export WINEHOLDSERVER=1800
 #WINECOPYSKEL=1
 
 # Disable automount (assign drive letters) removable devices (eterbug #4327)
-#WINEAUTOMOUNT=no
+#export WINEAUTOMOUNT=no
 
 # Disable WINE на Etersoft splash
 #WINEDISABLEETERSPLASH=yes
-- 
1.7.4.2

----------- следующая часть -----------
From ac49587df57bbbcd26df981e5709bd089425a216 Mon Sep 17 00:00:00 2001
From: Vitaly Lipatov <lav на etersoft.ru>
Date: Tue, 10 Aug 2010 13:46:15 +0400
Subject: [eterwine 3/4] config: add export for all exported vars

---
 etersoft/init/config |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/etersoft/init/config b/etersoft/init/config
index 908b3a2..f46da7a 100644
--- a/etersoft/init/config
+++ b/etersoft/init/config
@@ -11,20 +11,20 @@ UMASK=0002
 #WINEADMIN=/own/admin/dir
 
 # Disable FileFlushBuffers (see eterbug #2852)
-#WINEDISABLEFLUSH=yes
+#export WINEDISABLEFLUSH=yes
 
 # WINE на Etersoft only
 # Force window manage related behaviour
 # 0 - autodetected (see winediag)
 # 1 - kwin (KDE)
 # 2 - metacity (GNOME)
-#WINEUSEDWM=2
+#export WINEUSEDWM=2
 
 # Disable window info cache
-#WINEDISABLEMCACHE=1
+#export WINEDISABLEMCACHE=1
 
 # Add $USER as ComputerName component (see eterbug #2620)
-#WINEADDUSERTOCOMPNAME=yes
+#export WINEADDUSERTOCOMPNAME=yes
 
 # Hold wine environment (drivers and wineserver) in the memory (in secs)
 export WINEHOLDSERVER=1800
@@ -43,5 +43,5 @@ export WINEHOLDSERVER=1800
 
 # Disable annoying fixmes
 if [ -z "$WINEDEBUG" ] ; then
-	WINEDEBUG=fixme-mshtml
+	export WINEDEBUG=fixme-mshtml
 fi
-- 
1.7.4.2

----------- следующая часть -----------
From 8b09de768590b3e2c4a68c867e13cfb81d4c2302 Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov на etersoft.ru>
Date: Wed, 6 Apr 2011 22:02:22 +0400
Subject: [eterwine 4/4] Disable file type associations export by default (eterbug #7021).

---
 etersoft/init/config                       |    3 +++
 programs/winemenubuilder/winemenubuilder.c |   15 ++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/etersoft/init/config b/etersoft/init/config
index f46da7a..94172b9 100644
--- a/etersoft/init/config
+++ b/etersoft/init/config
@@ -38,6 +38,9 @@ export WINEHOLDSERVER=1800
 # Disable automount (assign drive letters) removable devices (eterbug #4327)
 #export WINEAUTOMOUNT=no
 
+# Disable file type associations export from wine
+export WINEDISABLEASSOC=yes
+
 # Disable WINE на Etersoft splash
 #WINEDISABLEETERSPLASH=yes
 
diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index 9aae73f..2505ea4 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -3338,6 +3338,18 @@ static BOOL init_xdg(void)
     return FALSE;
 }
 
+static BOOL associations_enabled(void)
+{
+    static int enabled = -1;
+
+    if (enabled < 0)
+    {
+        char *assoc = getenv("WINEDISABLEASSOC");
+        enabled = (!assoc || strcmp(assoc, "yes"));
+    }
+    return enabled;
+}
+
 /***********************************************************************
  *
  *           wWinMain
@@ -3373,7 +3385,8 @@ int PASCAL wWinMain (HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sh
 	    break;
         if( !strcmpW( token, dash_aW ) )
         {
-            RefreshFileTypeAssociations();
+            if (associations_enabled())
+                RefreshFileTypeAssociations();
             continue;
         }
         if( !strcmpW( token, dash_rW ) )
-- 
1.7.4.2