[GNUnet-SVN] r2830 - in gnunet-gtk: . src/core

[durner]

Author: durner
Date: 2006-05-15 14:26:37 -0700 (Mon, 15 May 2006)
New Revision: 2830

Modified:
   gnunet-gtk/configure.ac
   gnunet-gtk/src/core/Makefile.am
   gnunet-gtk/src/core/main.c
Log:
fix MinGW

Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac     2006-05-15 09:13:18 UTC (rev 2829)
+++ gnunet-gtk/configure.ac     2006-05-15 21:26:37 UTC (rev 2830)
@@ -133,6 +133,8 @@
 ;;
 esac
 
+AM_CONDITIONAL(MINGW,   test "$build_target" = "mingw")
+
 # some other checks for standard libs
 AC_CHECK_LIB(nsl, gethostbyname)
 AC_CHECK_LIB(socket, socket)

Modified: gnunet-gtk/src/core/Makefile.am
===================================================================
--- gnunet-gtk/src/core/Makefile.am     2006-05-15 09:13:18 UTC (rev 2829)
+++ gnunet-gtk/src/core/Makefile.am     2006-05-15 21:26:37 UTC (rev 2830)
@@ -6,8 +6,12 @@
 
 bin_PROGRAMS = gnunet-gtk
 
+if !MINGW
+EGGTRAY = eggtrayicon.c eggtrayicon.h
+endif
+
 gnunet_gtk_SOURCES = \
- eggtrayicon.c eggtrayicon.h \
+ $(EGGTRAY) \
   main.c
 
 gnunet_gtk_LDADD = \

Modified: gnunet-gtk/src/core/main.c
===================================================================
--- gnunet-gtk/src/core/main.c  2006-05-15 09:13:18 UTC (rev 2829)
+++ gnunet-gtk/src/core/main.c  2006-05-15 21:26:37 UTC (rev 2830)
@@ -136,7 +136,9 @@
     = glade_xml_get_widget(getMainXML(),
                           "mainWindow");
   gtk_window_maximize(GTK_WINDOW(root));
+#ifndef WINDOWS
   initTrayIcon();
+#endif
   gtk_widget_show(root);
   setCustomLogProc(&customLog);
   /* start the event loop */