Merge branch 'v1.1'

Conflicts:
	NEWS

diff --combined NEWS
index 2218be0,5154de6..606c1d1
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,9 -2,10 +2,11 @@@ Psensor NEW
  ============
  
  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 --combined configure.ac
index 8c31356,37fc249..31eae2d
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -2,7 -2,7 +2,7 @@@
  # Process this file with autoconf to produce a configure script.
  
  AC_PREREQ([2.69])
 -AC_INIT([psensor], [1.1.2],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
 +AC_INIT([psensor], [1.1.0.x],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
  
  AM_INIT_AUTOMAKE([-Wall gnu])
  
@@@ -40,11 -40,9 +40,11 @@@ PTHREAD_LIBS=-pthrea
  AC_SUBST(PTHREAD_LIBS)
  
  # Checks sensors, required by psensor and psensor-server
 -AC_CHECK_LIB(sensors, sensors_init)
 +AC_CHECK_LIB(sensors, sensors_init,
 +             [SENSORS_LIBS=-lsensors
 +            AC_DEFINE([HAVE_LIBSENSORS],[1],[Use libsensors])])
  AC_CHECK_HEADERS([sensors/sensors.h sensors/error.h])
 -SENSORS_LIBS=-lsensors
 +AM_CONDITIONAL(SENSORS, test -n "$SENSORS_LIBS")
  AC_SUBST(SENSORS_LIBS)
  
  ############### psensor 
@@@ -68,9 -66,10 +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)
@@@ -106,9 -105,26 +107,9 @@@ AC_SUBST(LIBNOTIFY_LIBS
  
  # Checks AppIndicator 
  APPINDICATOR_LIBS=
 -
  PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1,
       [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])],
       [AC_MSG_WARN(AppIndicator 3-0.1 not present")])
 -
 -if test "$APPINDICATOR_LIBS" == ""; then
 -   PKG_CHECK_MODULES(APPINDICATOR, 
 -     appindicator-0.1 <= 0.2.9 , 
 -     [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator 0.2.9])
 -      AC_DEFINE([HAVE_APPINDICATOR_029],[1],[Use AppIndicator 0.2.9])
 -     ],
 -     [AC_MSG_WARN(AppIndicator 0.2.9 not present")])
 -fi
 -
 -if test "$APPINDICATOR_LIBS" == ""; then
 -   PKG_CHECK_MODULES(APPINDICATOR, 
 -     appindicator-0.1 > 0.2.9, 
 -     [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator > 0.2.9])], 
 -     [AC_MSG_WARN("AppIndicator > 0.2.9 not present")])
 -fi
  AM_CONDITIONAL(APPINDICATOR, test -n "$APPINDICATOR_LIBS")
  AC_SUBST(APPINDICATOR_CFLAGS)
  AC_SUBST(APPINDICATOR_LIBS)

diff --combined src/Makefile.am
index 1cf738f,7611095..2e4bb19
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1,22 -1,5 +1,22 @@@
  SUBDIRS = lib glade
  
 +psensor_SOURCES = \
 +      cfg.h cfg.c \
 +      notify_cmd.c notify_cmd.h \
 +      graph.h graph.c \
 +      main.c \
 +      pxdg.h pxdg.c \
 +      ui.h ui.c \
 +      ui_appindicator.h \
 +      ui_color.h ui_color.c \
 +      ui_graph.h ui_graph.c \
 +      ui_notify.h \
 +      ui_pref.h ui_pref.c \
 +      ui_sensorlist.h ui_sensorlist.c \
 +      ui_sensorpref.h ui_sensorpref.c \
 +      ui_status.h ui_status.c \
 +      ui_unity.h
 +
  # -export-dynamic is need for defining handlers in the glade file.
  AM_LDFLAGS = -Wl,--as-needed -export-dynamic
  
@@@ -26,7 -9,7 +26,7 @@@ SUBDIRS += serve
  endif
  endif
  
- AM_CPPFLAGS =-Wall -Werror \
+ AM_CPPFLAGS =-Wall \
        -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
        -DDATADIR=\""$(datadir)"\"\
        -DPSENSOR_DESKTOP_FILE=\""psensor.desktop"\"\
@@@ -52,13 -35,28 +52,13 @@@ endi
  endif
  endif
  
 -psensor_SOURCES = \
 -      cfg.h cfg.c \
 -      notify_cmd.c notify_cmd.h \
 -      graph.h graph.c \
 -      main.c \
 -      ui.h ui.c \
 -      ui_appindicator.h \
 -      ui_color.h ui_color.c \
 -      ui_graph.h ui_graph.c \
 -      ui_pref.h ui_pref.c \
 -      ui_sensorlist.h ui_sensorlist.c \
 -      ui_sensorpref.h ui_sensorpref.c \
 -      ui_status.h ui_status.c \
 -      pxdg.h pxdg.c
 -
  if GTOP
  AM_CPPFLAGS += $(GTOP_CFLAGS)
  LIBS += $(GTOP_LIBS)
  endif
  
  if LIBNOTIFY
 -psensor_SOURCES += ui_notify.h ui_notify.c
 +psensor_SOURCES += ui_notify.c
  LIBS += $(LIBNOTIFY_LIBS)
  AM_CPPFLAGS += $(LIBNOTIFY_CFLAGS)
  endif
@@@ -91,7 -89,7 +91,7 @@@ LIBS += $(LIBUDISKS2_LIBS
  endif
  
  if UNITY
 -psensor_SOURCES += ui_unity.h ui_unity.c
 +psensor_SOURCES += ui_unity.c
  AM_CPPFLAGS += $(UNITY_CFLAGS)
  LIBS += $(UNITY_LIBS) 
  endif
@@@ -109,12 -107,6 +109,12 @@@ psensor.1: main.c $(top_srcdir)/configu
        help2man --include=description.txt -N --name="Temperature monitoring application" --output=psensor.1 ./psensor$(EXEEXT)
  
  gsettings_SCHEMAS=psensor.gschema.xml
 -EXTRA_DIST = description.txt $(gsettings_SCHEMAS)
 +
 +EXTRA_DIST = description.txt\
 +      $(gsettings_SCHEMAS)\
 +      rsensor.h rsensor.c\
 +      ui_appindicator.c\
 +      ui_notify.c\
 +      ui_unity.c
  
  @GSETTINGS_RULES@