Ubuntu's AppIndicator support for gopenvpn

configure.ac

@@ -21,7 +21,7 @@ AC_PREREQ([2.59])
 AC_INIT([gopenvpn], [0.8], [[email protected]])
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([foreign -Wall -Werror])
-AM_GNU_GETTEXT_VERSION([0.18.1])
+AM_GNU_GETTEXT_VERSION([0.18.3])
 AM_GNU_GETTEXT([external])
 
 AC_PROG_CC
@@ -47,6 +47,17 @@ AC_CHECK_FUNCS([socket strrchr])
 
 # Checks for needed packages (pkg-config)
 PKG_PROG_PKG_CONFIG
+PKG_CHECK_MODULES(LIBSECRET, [libsecret-1 >= 0.15],
+    [AC_DEFINE([HAVE_LIBSECRET], [1], [Use libsecret])],
+    [PKG_CHECK_MODULES([GNOME_KEYRING], [gnome-keyring-1],
+        [AC_DEFINE([HAVE_GNOME_KEYRING], [1], [Use gnome-keyring])
+    ])
+])
+AC_SUBST(LIBSECRET_CFLAGS)
+AC_SUBST(LIBSECRET_LIBS)
+AC_SUBST(GNOME_KEYRING_CFLAGS)
+AC_SUBST(GNOME_KEYRING_LIBS)
+
 PKG_CHECK_MODULES(GTK, gtk+-2.0)
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
@@ -55,16 +66,23 @@ PKG_CHECK_MODULES(GLADE, libglade-2.0)
 AC_SUBST(GLADE_CFLAGS)
 AC_SUBST(GLADE_LIBS)
 
-PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1)
-AC_SUBST(GNOME_KEYRING_CFLAGS)
-AC_SUBST(GNOME_KEYRING_LIBS)
-
 PKG_CHECK_MODULES(X11, x11)
 AC_SUBST(X11_CFLAGS)
 AC_SUBST(X11_LIBS)
 
 PKG_CHECK_MODULES(POLKIT, polkit-gobject-1 >= 0.96)
 
+# Check for AppIndicator
+APPINDICATOR_LIBS=
+
+PKG_CHECK_MODULES(APPINDICATOR, appindicator-0.1,
+     [AC_DEFINE([USE_APPINDICATOR],[1],[Use AppIndicator1-0.1])],
+     [AC_MSG_WARN(AppIndicator 1-0.1 not present")])
+
+AM_CONDITIONAL(APPINDICATOR, test -n "$APPINDICATOR_LIBS")
+AC_SUBST(APPINDICATOR_CFLAGS)
+AC_SUBST(APPINDICATOR_LIBS)
+
 # Check for PolicyKit pkexec - can be overridden by --with-pkexec
 AC_ARG_WITH([pkexec],
         AC_HELP_STRING([--with-pkexec=/path/to/pkexec], [Full path to PolicyKit pkexec]))

debian/control

@@ -2,7 +2,9 @@ Source: gopenvpn
 Section: net
 Priority: extra
 Maintainer: Sam Burney <[email protected]>
-Build-Depends: debhelper (>= 7), libglib2.0-dev, libgtk2.0-dev, libglade2-dev, libgnome-keyring-dev, build-essential, autogen, automake, autoconf, intltool, libpolkit-gobject-1-dev
+Build-Depends: debhelper (>= 7), libglib2.0-dev, libgtk2.0-dev, libglade2-dev,
+ libsecret-1-dev | libgnome-keyring-dev,
+ build-essential, autogen, automake, autoconf, intltool, libpolkit-gobject-1-dev
 Standards-Version: 3.8.0
 Homepage: http://gopenvpn.sourceforge.net/
 

debian/gopenvpn.substvars

@@ -1,2 +1,3 @@
-shlibs:Depends=libatk1.0-0 (>= 1.29.3), libc6 (>= 2.3.6-6~), libc6 (>= 2.4), libcairo2 (>= 1.2.4), libfontconfig1 (>= 2.8.0), libfreetype6 (>= 2.2.1), libglade2-0 (>= 1:2.6.1), libglib2.0-0 (>= 2.23.5), libgnome-keyring0 (>= 2.20.3), libgtk2.0-0 (>= 2.10.0), libpango1.0-0 (>= 1.14.0), libx11-6 (>= 0), libxml2 (>= 2.6.27)
+shlibs:Depends=libatk1.0-0 (>= 1.12.4), libc6 (>= 2.3.6-6~), libc6 (>= 2.27), libcairo2 (>= 1.2.4), libfontconfig1 (>= 2.12.6), libfreetype6 (>= 2.2.1), libgdk-pixbuf2.0-0 (>= 2.22.0), libglade2-0 (>= 1:2.6.4-2~), libglib2.0-0 (>= 2.24.0), libgtk2.0-0 (>= 2.10.0), libpango-1.0-0 (>= 1.14.0), libpangocairo-1.0-0 (>= 1.14.0), libpangoft2-1.0-0 (>= 1.14.0), libsecret-1-0 (>= 0.7), libx11-6, libxml2 (>= 2.6.27)
 misc:Depends=
+misc:Pre-Depends=

pixmaps/Makefile.am

@@ -2,5 +2,9 @@ pixmapsdir   = $(datadir)/gopenvpn
 pixmaps_DATA = gopenvpn-open.png 	\
 	   gopenvpn-connecting.png 	\
 	   gopenvpn-blink.png 		\
-	   gopenvpn-closed.png
+	   gopenvpn-closed.png		\
+	   gopenvpn-active.svg		\
+	   gopenvpn-inactive.svg	\
+	   gopenvpn-processing.svg	\
+	   gopenvpn-processing-2.svg
 EXTRA_DIST   = $(pixmaps_DATA)