[Audacity-cvs] audacity-src/src AudacityApp.cpp,1.246,1.247

[Richard Ash]

Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30438/src

Modified Files:
        AudacityApp.cpp 
Log Message:
A more elegant solution taken from Micheal Schwent (Fedora package)


Index: AudacityApp.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AudacityApp.cpp,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- AudacityApp.cpp     18 Sep 2009 17:53:41 -0000      1.246
+++ AudacityApp.cpp     18 Sep 2009 20:25:18 -0000      1.247
@@ -330,15 +330,12 @@
 
 #include <dlfcn.h>
 /* There is a conflict between the type names used in Glib >= 2.21 and those in
- * wxGTK. This is an exceptionally hackish solution to the name conflict, but
- * is comparable to that used by wxGTK upstream:
- *   http://trac.wxwidgets.org/ticket/10883
- * What we are doing is renaming Glib's GSocket to something else so we can
- * use the name for our (well, wxGTK's) element
+ * wxGTK (http://trac.wxwidgets.org/ticket/10883)
+ * Happily we can avoid the hack, as we only need some of the headers, not
+ * the full GTK headers
  */
-#define GSocket GlibGSocket
-#include <gtk/gtk.h>
-#undef GSocket
+#include <glib/gtypes.h>
+#include <glib-object.h>
 
 typedef struct _GnomeProgram GnomeProgram;
 typedef struct _GnomeModuleInfo GnomeModuleInfo;


------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs