--- trunk/src/plugins/contrib/codesnippets/codesnippets.cpp	2009-09-13 14:09:50.000000000 +0200
+++ trunk/src/plugins/contrib/codesnippets/codesnippets.cpp	2009-09-13 15:01:25.257461690 +0200
@@ -52,8 +52,12 @@
 #include "memorymappedfile.h"
 
 #if defined(__WXGTK__)
-    #include "wx/gtk/win_gtk.h"
+    // hack to avoid name-conflict between wxWidgets GSocket and the one defined
+    // in newer glib-headers
+    #define GSocket GLibSocket
     #include <gdk/gdkx.h>
+    #undef GSocket
+    #include "wx/gtk/win_gtk.h"
 #endif
 
 // The plugin needs a flag ON to enable some code for the plugin
--- trunk/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp	2008-01-14 19:27:34.000000000 +0100
+++ trunk/src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp	2009-09-13 15:07:38.585926264 +0200
@@ -49,8 +49,12 @@
 #include "menuidentifiers.h"
 #include "editsnippetframe.h"
 #if defined(__WXGTK__)
-    #include "wx/gtk/win_gtk.h"
+    // hack to avoid name-conflict between wxWidgets GSocket and the one defined
+    // in newer glib-headers
+    #define GSocket GLibSocket
     #include <gdk/gdkx.h>
+    #undef GSocket
+    #include "wx/gtk/win_gtk.h"
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(CodeSnippetsTreeCtrl, wxTreeCtrl)