Merge pull request #89 from infirit/1.6

Cherrypick usefull commits from master

7 files changed, 39 insertions, 79 deletions

diff --git a/Makefile.am b/Makefile.am
index 0691df3..edc59dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,23 +41,16 @@ DISTCHECK_CONFIGURE_FLAGS = 				\
 	--disable-applets				\
 	--disable-tests
 
-distclean-local:
-	if test $(srdcir) = .; then :; else \
-		rm -f ChangeLog; \
-	fi
-
-ChangeLog:
-	@echo Creating $@
-	@if test -d "$(srcdir)/.git"; then \
-	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat -M -C --name-status  --date=short --no-color) | fmt --split-only > [email protected] \
-	  && mv -f [email protected] $@ \
-	  || ($(RM) [email protected]; \
-	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
-	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
+dist-hook:
+	@if test -d "$(srcdir)/.git"; \
+	then \
+		echo Creating ChangeLog && \
+		( cd "$(top_srcdir)" && \
+		 echo '# Generated by Makefile. Do not edit.'; echo; \
+		 $(top_srcdir)/missing --run git log --stat ) > ChangeLog.tmp \
+		&& mv -f ChangeLog.tmp $(distdir)/ChangeLog \
+		|| ( rm -f ChangeLog.tmp ; \
+			echo Failed to generate ChangeLog >&2 ); \
 	else \
-	  test -f $@ || \
-	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
-	  echo A git checkout and git-log is required to generate this file >> $@); \
+		echo A git clone is required to generate a ChangeLog >&2; \
 	fi
-
-.PHONY: ChangeLog
diff --git a/applets/brightness/Makefile.am b/applets/brightness/Makefile.am
index 5e9e834..fd8b54c 100644
--- a/applets/brightness/Makefile.am
+++ b/applets/brightness/Makefile.am
@@ -20,6 +20,7 @@ AM_CPPFLAGS =							\
 	-DEGG_LOGGING="\"GPM_LOGGING\""				\
 	-DEGG_CONSOLE="\"GPM_CONSOLE\""				\
 	-I$(top_srcdir)/libdbus-glib				\
+	$(DISABLE_DEPRECATED)
 	$(NULL)
 
 libexec_PROGRAMS=mate-brightness-applet
diff --git a/applets/inhibit/Makefile.am b/applets/inhibit/Makefile.am
index fa12b4b..c3244c1 100644
--- a/applets/inhibit/Makefile.am
+++ b/applets/inhibit/Makefile.am
@@ -20,6 +20,7 @@ AM_CPPFLAGS =							\
 	-DEGG_LOGGING="\"GPM_LOGGING\""				\
 	-DEGG_CONSOLE="\"GPM_CONSOLE\""				\
 	-I$(top_srcdir)/libdbus-glib				\
+	$(DISABLE_DEPRECATED)					\
 	$(NULL)
 
 libexec_PROGRAMS=mate-inhibit-applet
diff --git a/configure.ac b/configure.ac
index 89309ff..34e6153 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,31 @@ if test x$enable_strict != xno; then
 	fi
 fi
 
-if test "$GCC" = "yes"; then
+AC_ARG_ENABLE(deprecated,
+        [AS_HELP_STRING([--enable-deprecated],
+                [Warn about deprecated usages [default=no]])],,
+         [enable_deprecated=no])
+
+if test "x$enable_deprecated" = "xno"; then
+	DISABLE_DEPRECATED=" \
+	-DG_DISABLE_SINGLE_INCLUDES \
+	-DGTK_DISABLE_SINGLE_INCLUDES \
+	-DG_DISABLE_DEPRECATED \
+	-DGTK_DISABLE_DEPRECATED \
+	-DGDK_DISABLE_DEPRECATED \
+	-DGDK_MULTIHEAD_SAFE \
+	-DGTK_MULTIHEAD_SAFE \
+	-DGSEAL_ENABLE"
+
+	CPPFLAGS="$CPPFLAGS $DISABLE_DEPRECATED"
+fi
+
+AC_ARG_ENABLE(extra-warn,
+        [AS_HELP_STRING([--enable-extra-warn],
+                [Enable extra warnings. gcc only. [default=no]])],,
+         [enable_extra_warn=no])
+
+if test "x$enable_extra_warn" = "xyes" && test "$GCC" = "yes"; then
 	WARNINGFLAGS="$WARNINGFLAGS -Wall"
 	WARNINGFLAGS="$WARNINGFLAGS -Wcast-align -Wno-uninitialized"
 	WARNINGFLAGS="$WARNINGFLAGS -Wmissing-declarations"
diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD
deleted file mode 100644
index 8bf46d4..0000000
--- a/distro/archlinux/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-pkgname=mate-power-manager
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="Session daemon that makes it easy to manage your laptop or desktop system for Mate Desktop"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libmatenotify' 'libunique' 'libcanberra' 'hicolor-icon-theme' 'upower' 'libmatekeyring')
-makedepends=('intltool' 'pkgconfig' 'mate-doc-utils' 'mate-panel' 'mate-control-center')
-options=('!emptydirs')
-install=mate-power-manager.install
-url="http://matsusoft.com.ar/projects"
-groups=('mate-extras')
-source=(http://sourceforge.net/projects/matede/files/${pkgver}/${pkgname}.tar.gz/download)
-sha256sums=('2a48bf5930740a7dfa3a380a215b55ef2975256f75ada45915c1f210641ff3bb')
-
-build() {
-	cd "${srcdir}/${pkgname}"
-
-	./configure --prefix=/usr --sysconfdir=/etc \
-		--localstatedir=/var \
-		--libexecdir=/usr/lib/${pkgname} \
-		--disable-scrollkeeper || return 1
-		#--enable-applets
-		#--with-dbus-services=/usr/share/dbus-1/services \
-		#--with-dpms-ext \
-
-	make || return 1
-}
-
-package() {
-    cd "$srcdir/$pkgname"
-
-	make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
-
-	install -m755 -d "${pkgdir}/usr/share/mateconf/schemas"
-	mateconf-merge-schema "${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas" --domain ${pkgname} ${pkgdir}/etc/mateconf/schemas/*.schemas || return 1
-	rm -f ${pkgdir}/etc/mateconf/schemas/*.schemas
-}
diff --git a/distro/archlinux/mate-power-manager.install b/distro/archlinux/mate-power-manager.install
deleted file mode 100644
index 1e3ac8e..0000000
--- a/distro/archlinux/mate-power-manager.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=mate-power-manager
-
-post_install() {
-	usr/sbin/mateconfpkg --install ${pkgname}
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-	pre_remove $1
-}
-
-post_upgrade() {
-	post_install $1
-}
-
-pre_remove() {
-	usr/sbin/mateconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/src/Makefile.am b/src/Makefile.am
index a10b98b..350e0cf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,6 +37,7 @@ AM_CPPFLAGS =						\
 	-DEGG_LOGGING="\"GPM_LOGGING\""			\
 	-DEGG_CONSOLE="\"GPM_CONSOLE\""			\
 	-I$(top_srcdir)					\
+	$(DISABLE_DEPRECATED)				\
 	$(NULL)
 
 bin_PROGRAMS =						\