[Gaim-commits] CVS: gaim/src plugin.c,1.75,1.76

[Daniel A. <dat...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12585

Modified Files:
	plugin.c 
Log Message:
Prevent error popups from appearing when plugin DLLs can't be loaded by Windows LoadLibrary(). The messages still appear in the debug log.

Index: plugin.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/plugin.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -p -r1.75 -r1.76
--- plugin.c	5 Dec 2005 04:19:07 -0000	1.75
+++ plugin.c	22 Dec 2005 16:06:41 -0000	1.76
@@ -226,6 +226,10 @@ gaim_plugin_probe(const char *filename)
 
 	if (plugin->native_plugin) {
 		const char *error;
+#ifdef _WIN32
+		/* Suppress error popups for failing to load plugins */
+		UINT old_error_mode = SetErrorMode(SEM_FAILCRITICALERRORS);
+#endif
 		/*
 		 * We pass G_MODULE_BIND_LOCAL here to prevent symbols from
 		 * plugins being added to the global name space.
@@ -239,6 +243,11 @@ gaim_plugin_probe(const char *filename)
 		plugin->handle = g_module_open(filename, 0);
 #endif
 
+#ifdef _WIN32
+		/* Restore the original error mode */
+		SetErrorMode(old_error_mode);
+#endif
+
 		if (plugin->handle == NULL)
 		{
 			error = g_module_error();