Attachment 260947 Details for Bug 457787

[patch] proposed patch for mono-winforms

bnc457787.diff (text/plain), 3.56 KB, created by Andres Aragoneses on 2008-12-18 17:28:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andres Aragoneses

Created: 2008-12-18 17:28:22 UTC

Size: 3.56 KB

patch

obsolete

>Index: Managed.Windows.Forms/System.Windows.Forms/ChangeLog
>===================================================================
>--- Managed.Windows.Forms/System.Windows.Forms/ChangeLog	(revision 121537)
>+++ Managed.Windows.Forms/System.Windows.Forms/ChangeLog	(working copy)
>@@ -1,3 +1,10 @@
>+2008-12-18  AndrÃ©s G. Aragoneses  <aaragoneses@novell.com>
>+
>+	* X11DesktopColors.cs: Avoid gtk+ accessibility conflicts in more
>+	recent versions (see http://bugzilla.gnome.org/show_bug.cgi?id=563943).
>+	Function refactored to have a more readable GtkInit() as well.
>+	Fixes BNC#457787 .
>+
> 2008-12-15  Brad Taylor  <brad@getcoded.net>
> 
> 	* ToolStripItem.cs: Add a UIA specific event for listening for when a
>Index: Managed.Windows.Forms/System.Windows.Forms/X11DesktopColors.cs
>===================================================================
>--- Managed.Windows.Forms/System.Windows.Forms/X11DesktopColors.cs	(revision 121537)
>+++ Managed.Windows.Forms/System.Windows.Forms/X11DesktopColors.cs	(working copy)
>@@ -149,23 +149,11 @@
> 
> 		static void GtkInit ()
> 		{
>-#if NET_2_0
>-			// NOTE: SetEnvironmentVariable not available in 1.x
>-			// Prevent ATK bridge initalization, as it causes
>-			// conflicts with the UIA<->ATK bridge.
>-			// A better solution would probably be to get these
>-			// values out-of-process.  See details/discussion here:
>-			// https://bugzilla.novell.com/show_bug.cgi?id=375987
>-			string gtk_modules_env_var = "GTK_MODULES";
>-			string gtk_modules_env_var_content = Environment.GetEnvironmentVariable (gtk_modules_env_var);
>-			Environment.SetEnvironmentVariable (gtk_modules_env_var, string.Empty);
>-#endif
>+			AvoidAccessibilityConflicts (false);
> 
> 			gtk_init_check (IntPtr.Zero, IntPtr.Zero);
> 
>-#if NET_2_0
>-			Environment.SetEnvironmentVariable (gtk_modules_env_var, gtk_modules_env_var_content);
>-#endif
>+			AvoidAccessibilityConflicts (true);
> 		}
> 		#endregion	// Constructors
> 
>@@ -194,6 +182,40 @@
> 			// Do nothing; all is done in our static ctor
> 		}
> 
>+		
>+		static string gtk_modules_env_var_content = null;
>+		static string atk_bridge_env_var_content = null;
>+		
>+		// Prevent ATK bridge initalization, as it causes
>+		// conflicts with the UIA<->ATK bridge.
>+		static void AvoidAccessibilityConflicts (bool restore) {
>+// NOTE: SetEnvironmentVariable not available in 1.x
>+#if NET_2_0
>+
>+			string gtk_modules_env_var_name = "GTK_MODULES";
>+			string atk_bridge_env_var_name = "NO_AT_BRIDGE";
>+			
>+			if (!restore) {
>+				// Solution for gtk+ < 2.14:
>+				// (A better solution would probably be to get these
>+				//  values out-of-process.  See details/discussion here:
>+				//  https://bugzilla.novell.com/show_bug.cgi?id=375987 )
>+				gtk_modules_env_var_content =  Environment.GetEnvironmentVariable (gtk_modules_env_var_name);
>+				Environment.SetEnvironmentVariable (gtk_modules_env_var_name, string.Empty);
>+				
>+				// Solution for gtk+ >= 2.14 [requires atk-bridge version > 1.25.2 (r1136, Gnome 2.24.2)]
>+				// see https://bugzilla.novell.com/show_bug.cgi?id=457787
>+				atk_bridge_env_var_content =  Environment.GetEnvironmentVariable (atk_bridge_env_var_name);
>+				Environment.SetEnvironmentVariable (atk_bridge_env_var_name, "0");
>+			} else {
>+				Environment.SetEnvironmentVariable (gtk_modules_env_var_name, gtk_modules_env_var_content);
>+				gtk_modules_env_var_content = null;
>+				Environment.SetEnvironmentVariable (atk_bridge_env_var_name, atk_bridge_env_var_content);
>+				atk_bridge_env_var_content = null;
>+			}
>+#endif
>+		}
>+		
> 		private static Color ColorFromGdkColor (GdkColorStruct gtkcolor) {
> 			return Color.FromArgb (255, 
> 				(gtkcolor.red >> 8)  & 0xff,

Actions: View | Diff

Attachments on bug 457787: 259053 | 259476 | 260947 | 261428 | 261430