2005-01-24 Dan Williams <dcbw@redhat.com>

Patch from Tom Parker <palfrey@tevp.net>
	* Fix up compile warnings & errors in the wireless applet


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@393 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

ChangeLog

@@ -1,3 +1,8 @@
+2005-01-24  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Tom Parker <palfrey@tevp.net>
+	* Fix up compile warnings & errors in the wireless applet
+
 2005-01-24  Dan Williams  <dcbw@redhat.com>
 
 	* panel-applet/NMWirelessApplet.c

configure.in

@@ -138,9 +138,9 @@ else
 fi
 AM_CONDITIONAL(WITH_GCRYPT, test x"$ac_gcrypt" != xno)
 
-#PKG_CHECK_MODULES(PANEL_APPLET, libpanelapplet-2.0)
-#AC_SUBST(PANEL_APPLET_CFLAGS)
-#AC_SUBST(PANEL_APPLET_LIBS)
+PKG_CHECK_MODULES(PANEL_APPLET, libpanelapplet-2.0)
+AC_SUBST(PANEL_APPLET_CFLAGS)
+AC_SUBST(PANEL_APPLET_LIBS)
 
 PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0)
 AC_SUBST(LIBGNOMEUI_CFLAFS)

panel-applet/Makefile.am

@@ -23,6 +23,7 @@ libnm_notification_applet_la_CPPFLAGS = 	\
 	-DGDK_DISABLE_DEPRECATED				\
 	-DGNOME_DISABLE_DEPRECATED			\
 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+	-DVERSION=\"$(VERSION)\" \
 	$(NULL)
 
 libnm_notification_applet_la_SOURCES =	\

panel-applet/NMWirelessApplet.h

@@ -100,7 +100,9 @@ typedef struct
  */
 typedef struct
 {
+#ifdef BUILD_NOTIFICATION_ICON
 	EggTrayIcon		 parent;
+#endif
 
 	DBusConnection		*connection;
 	GConfClient		*gconf_client;