Attachment 259053 Details for Bug 457787

[patch] proposed patch

bug457787.diff (text/plain), 4.03 KB, created by Andres Aragoneses on 2008-12-09 22:03:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andres Aragoneses

Created: 2008-12-09 22:03:54 UTC

Size: 4.03 KB

patch

obsolete

>Index: bridge-glue/bridge-glue.mdp
>===================================================================
>--- bridge-glue/bridge-glue.mdp	(revision 121166)
>+++ bridge-glue/bridge-glue.mdp	(working copy)
>@@ -22,6 +22,7 @@
>     <Package file="glib-2.0" name="glib-2.0" IsProject="False" />
>     <Package file="gobject-2.0" name="gobject-2.0" IsProject="False" />
>     <Package file="atk" name="atk" IsProject="False" />
>+    <Package file="/usr/lib/pkgconfig/gtk+-2.0.pc" name="GTK+" IsProject="False" />
>   </Packages>
>   <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" IsAutotoolsProject="True" RelativeConfigureInPath="..">
>     <BuildFilesVar />
>Index: bridge-glue/main.c
>===================================================================
>--- bridge-glue/main.c	(revision 121166)
>+++ bridge-glue/main.c	(working copy)
>@@ -139,3 +139,33 @@
> 
> 	return rc;
> }
>+
>+// Reset gtk-modules setting from gtk settings
>+// (see http://bugzilla.gnome.org/show_bug.cgi?id=563876 and
>+//      https://bugzilla.mozilla.org/show_bug.cgi?id=460926
>+void drop_gtk_modules_conf (gchar* display_name)
>+{
>+	GdkDisplay* display = NULL;
>+	
>+	if (!display_name) {
>+		g_warning ("Error: no display specified\n");
>+		return;
>+	}
>+	
>+
>+	display = gdk_display_open(display_name);
>+	if (!display) {
>+		g_warning ("Error: cannot open display: %s\n", display_name);
>+		return;
>+	}
>+	
>+	GtkSettings* settings =
>+	  gtk_settings_get_for_screen (gdk_display_get_default_screen (display));
>+	gchar* gtk_modules_setting = NULL;
>+	g_object_get(settings, "gtk-modules", &gtk_modules_setting, NULL);
>+	if (gtk_modules_setting != NULL) {
>+		g_object_set(settings, "gtk-modules", "", NULL);
>+		g_free (gtk_modules_setting);
>+	}
>+}
>+
>Index: bridge-glue/Makefile.am
>===================================================================
>--- bridge-glue/Makefile.am	(revision 121166)
>+++ bridge-glue/Makefile.am	(working copy)
>@@ -9,6 +9,6 @@
> 	main.c \
> 	main.h
> 
>-INCLUDES = $(ATK_CFLAGS) $(GOBJECT_20_CFLAGS) $(GMODULE_20_CFLAGS) $(GLIB_CFLAGS)
>+INCLUDES = $(ATK_CFLAGS) $(GOBJECT_20_CFLAGS) $(GMODULE_20_CFLAGS) $(GLIB_CFLAGS) $(GTK20_CFLAGS)
> 
> EXTRA = Changelog
>Index: bridge-glue/main.h
>===================================================================
>--- bridge-glue/main.h	(revision 121166)
>+++ bridge-glue/main.h	(working copy)
>@@ -32,9 +32,16 @@
> #include <atk/atkutil.h>
> #include <string.h>
> 
>+// for drop_gtk_modules_conf()
>+#include <gtk/gtk.h>
>+
> void
> override_global_event_listener ();
> 
> void
> register_window_signals (GObject *dummy_window);
>+
>+void
>+drop_gtk_modules_conf (gchar* display_name);
>+
> #endif
>Index: UiaAtkBridge/Monitor.cs
>===================================================================
>--- UiaAtkBridge/Monitor.cs	(revision 121162)
>+++ UiaAtkBridge/Monitor.cs	(working copy)
>@@ -64,7 +64,9 @@
> 		internal Monitor ()
> 		{
> 			GLib.GType.Init();
>+
> 			
>+			
> 			Atk.Util.GetRootHandler = ReturnTopLevel;
> 			
> 			Atk.Util.GetToolkitNameHandler = GetAssemblyName;
>@@ -248,11 +250,25 @@
> 		{
> 			gnome_accessibility_module_shutdown ();
> 		}
>+
>+		private void DropGtkModulesConf ()
>+		{
>+			string display_name = Environment.GetEnvironmentVariable ("DISPLAY");
>+			if (String.IsNullOrEmpty (display_name))
>+				throw new Exception ("The env var DISPLAY should be set");
>+
>+			drop_gtk_modules_conf (display_name);
>+		}
> 		
> 		[DllImport("libbridge-glue.so")]
> 		static extern void override_global_event_listener ();
>+
>+		[DllImport("libbridge-glue.so")]
>+		static extern void drop_gtk_modules_conf (string display_name);
>+		
> 		[DllImport("libgobject-2.0-0.dll")]
> 		static extern void g_signal_new (IntPtr signal_name, IntPtr itype, int signal_flags, uint class_offset, IntPtr accumulator, IntPtr accu_data, IntPtr c_marshaller, IntPtr return_type, uint n_params);
>+
> 	}
> 	
> 	/// <summary>
>Index: configure.ac
>===================================================================
>--- configure.ac	(revision 121162)
>+++ configure.ac	(working copy)
>@@ -108,6 +108,9 @@
> AC_SUBST(GLIB_CFLAGS)
> AC_SUBST(GLIB_LIBS)
> 
>+AC_SUBST(GTK20_CFLAGS)
>+AC_SUBST(GTK20_LIBS)
>+
> TOPDIR=$PWD
> AC_SUBST(TOPDIR)
>

Actions: View | Diff

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