From 24c96e9aed0aee582ba279b1733bffe8b5f0a3fa Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 24 Jan 2005 19:23:04 +0000 Subject: [PATCH] 2005-01-24 Dan Williams Patch from Tom Parker * 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 | 5 +++++ configure.in | 6 +++--- panel-applet/Makefile.am | 1 + panel-applet/NMWirelessApplet.h | 2 ++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad7511afe8..19d3acd0df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-01-24 Dan Williams + + Patch from Tom Parker + * Fix up compile warnings & errors in the wireless applet + 2005-01-24 Dan Williams * panel-applet/NMWirelessApplet.c diff --git a/configure.in b/configure.in index 0386e5b1bc..9767b5f390 100644 --- a/configure.in +++ b/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) diff --git a/panel-applet/Makefile.am b/panel-applet/Makefile.am index 46f881bbe7..914abb20b6 100644 --- a/panel-applet/Makefile.am +++ b/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 = \ diff --git a/panel-applet/NMWirelessApplet.h b/panel-applet/NMWirelessApplet.h index 81263b13fb..b7c43f0090 100644 --- a/panel-applet/NMWirelessApplet.h +++ b/panel-applet/NMWirelessApplet.h @@ -100,7 +100,9 @@ typedef struct */ typedef struct { +#ifdef BUILD_NOTIFICATION_ICON EggTrayIcon parent; +#endif DBusConnection *connection; GConfClient *gconf_client;