Merge branch 'v1.1'

Conflicts:
	NEWS

diff --git a/NEWS b/NEWS
index 2218be0..606c1d1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ v1.1.3
 
 * Added tooltip explaining why a setting is not available.
 * Removed support of old AppIndicator library < 3.0.
+* Fixed compilation issue with gtk+3.14 due to deprecation
+  of GtkStatusIcon. (Closes: #763257).
 
 v1.1.2
 ------

diff --git a/configure.ac b/configure.ac
index 8c31356..31eae2d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -68,9 +68,10 @@ PKG_CHECK_MODULES(GTK,
 AM_CONDITIONAL(GTK, test -n "$GTK_LIBS")
 # ensure that only allowed headers are included
 GTK_CFLAGS+=" -DGTK_DISABLE_SINGLE_INCLUDES "
-# ensure that no gtk deprecated symbols are used
+# ensure that no gtk/dk deprecated symbols are used
 GTK_CFLAGS+=" -DGDK_DISABLE_DEPRECATED "
-GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED "
+# do not enable flag because GtkStatusIcon is deprecated
+#GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED "
 # ensure use of accessors
 GTK_CFLAGS+=" -DGSEAL_ENABLE "
 AC_SUBST(GTK_CFLAGS)

diff --git a/src/Makefile.am b/src/Makefile.am
index 1cf738f..2e4bb19 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,7 @@ SUBDIRS += server
 endif
 endif
 
-AM_CPPFLAGS =-Wall -Werror \
+AM_CPPFLAGS =-Wall \
        -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
        -DDATADIR=\""$(datadir)"\"\
        -DPSENSOR_DESKTOP_FILE=\""psensor.desktop"\"\