Merge 1911

.bzrignore

@@ -1,64 +1,65 @@
 Makefile
 Makefile.in
-po/*.gmo
+*-glue.h
+*-marshal.*
+*.cdbs-orig
+*.desktop
+*.desktop.in
 *.la
 *.lo
+*.loT
+*.schema-ini
+*.schemas*
+*.vala.stamp
 .libs
 .deps
 aclocal.m4
 autom4te.cache
 awn.pc
+compile
 config.guess
 config.h
+config.h.in
 config.log
 config.status
 config.sub
 configure
 depcomp
+doltcompile
+doltlibtool
+gtk-doc.make
 install-sh
-intltool-extract
-intltool-merge
-intltool-update
+intltool-*
 libtool
 ltmain.sh
 missing
+mkinstalldirs
+py-compile
 stamp-h1
-*.desktop
-*.desktop.in
-po/.intltool-merge-cache
-po/Makefile.in.in
-po/POTFILES
-po/stamp-it
-avant-applets/avant-applets.py
-avant-launchers/avant-launchers.py
-avant-preferences/avant-preferences.py
 applet-activation/awn-applet
-applets/switcher/switcher.schemas
-src/avant-window-navigator
-src/awn-applet-manager-glue.h
-src/awn-dbus-glue.h
-src/awn-marshallers.*
-src/icon-test
-compile
-py-compile
-mkinstalldirs
-libawn/*awn-enum-types.*
-libawn/*libawnmarshal.*
-libawn/libawn-marshal.*
+applets/quick-prefs/applet.c
+awn-settings/awnDefs.py
+awn-settings/awnSettings.py
 bindings/python/awn.c
-awn-manager/awnDefs.py
-awn-manager/awnManager.py
-intltool-*.in
-test/test-config-client
-gtk-doc.make
-doc/reference/html
-doc/reference/html-build.stamp
-doc/reference/html.stamp
-doc/reference/scan-build.stamp
-doc/reference/sgml-build.stamp
-doc/reference/sgml.stamp
-doc/reference/tmpl-build.stamp
-doc/reference/tmpl.stamp
+data/avant-window-navigator.schema-ini.in
+debian/*.debhelper.log
+debian/*.postinst.debhelper
+debian/*.postrm.debhelper
+debian/*.preinst.debhelper
+debian/*.prerm.debhelper
+debian/*.substvars
+debian/*-trunk/
+debian/files
+debian/stamp-autotools-files
+debian/stamp-makefile-build
+debian/stamp-patched
+debian/tmp/
+doc/reference/*.bak
+doc/reference/*-scan.c
+doc/reference/html*
+doc/reference/sgml*
+doc/reference/tmpl*
+doc/reference/tmpl/*.sgml*
 doc/reference/xml
 doc/reference/libawn-decl-list.txt
 doc/reference/libawn-decl.txt
@@ -72,61 +73,27 @@ doc/reference/libawn.hierarchy
 doc/reference/libawn.interfaces
 doc/reference/libawn.prerequisites
 doc/reference/libawn.signals
-doc/reference/*.bak
-doc/reference/tmpl/*.sgml
-doc/reference/tmpl/*.sgml.bak
-doc/reference/*-scan.c
-data/avant-window-navigator.schemas*
-config.h.in
-tests/test-vala-awn-dialog
-tests/test-vala-awn-dialog.c
-awn-manager/awn-launcher-editor
-data/avant-window-navigator.schema-ini
-src/awn
-src/awn-app-glue.h
-src/awn-panel-glue.h
-src/test
-bindings/python/awn.loT
-tests/test-applet-simple
-tests/test-awn-icon
-tests/test-config-client
-tests/test-themed-icon
-tests/test-awn-icon-box
-./tests/test-taskmanager
-applets/taskmanager/awn-applet-taskmanager.schemas*
-tests/test-awn-effects
-awn-manager/awnManagerMini.py
+doc/reference/scan-build.stamp
+libawn/*awn-enum-types.*
 m4/gtk-doc.m4
 m4/intltool.m4
+m4/libtool.m4
+m4/lt*.m4
+po/*.gmo
+po/.intltool-merge-cache
+po/Makefile.in.in
+po/POTFILES
+po/stamp-it
 shave/shave
 shave/shave-libtool
-src/awn-marshal.c
-src/awn-marshal.h
-src/stamp-awnmarshal.c
-src/stamp-awnmarshal.h
-applets/taskmanager/taskmanager-marshal.c
-applets/taskmanager/taskmanager-marshal.h
-doltcompile
-doltlibtool
-m4/lt*.m4
-m4/libtool.m4
-awn-settings/awn-launcher-editor
-awn-settings/awnDefs.py
-awn-settings/awnSettings.py
-config.guess.cdbs-orig
-config.sub.cdbs-orig
-debian/*.debhelper.log
-debian/*.postinst.debhelper
-debian/*.postrm.debhelper
-debian/*.preinst.debhelper
-debian/*.prerm.debhelper
-debian/*.substvars
-debian/*-trunk/
-debian/files
-debian/stamp-autotools-files
-debian/stamp-makefile-build
-debian/stamp-patched
-debian/tmp/
-applets/taskmanager/*-glue.h
-applets/taskmanager/awn-applet-taskmanager.schema-ini
-data/avant-window-navigator.schema-ini.in
+src/avant-window-navigator
+src/icon-test
+tests/test-applet-simple
+tests/test-awn-effects
+tests/test-awn-icon
+tests/test-awn-icon-box
+tests/test-taskmanager
+tests/test-themed-icon
+tests/test-vala-awn-dialog
+tests/test-vala-awn-dialog.c
+themes/*.awn-theme

ChangeLog

@@ -1,3 +1,95 @@
+2010-02-08  Mark Lee  <avant-wn@lazymalevolence.com>
+
+	* po/avant-window-navigator.pot:
+	Update POT file.
+
+2010-02-08  Mark Lee  <avant-wn@lazymalevolence.com>
+
+	* po/*.po:
+	Merge from <lp:~malept/awn/0.4-i18n>, revision 1459.
+
+2010-02-08  Mark Lee  <avant-wn@lazymalevolence.com>
+
+	* .bzrignore:
+	* Makefile.vala-applet:
+	* applets/quick-prefs/Makefile.am:
+	* awn-settings/Makefile.am:
+	* configure.in:
+	* data/Makefile.am:
+	* po/POTFILES.skip:
+	* themes/Makefile.am:
+	Various build fixes.
+
+2010-02-07  Mark Lee  <avant-wn@lazymalevolence.com>
+
+	* Makefile.am:
+	Reorganize, clean up.
+
+2010-02-07  Mark Lee  <avant-wn@lazymalevolence.com>
+
+	* Makefile.applet-common:
+	* Makefile.c-applet:
+	* Makefile.desktop-files:
+	* Makefile.marshal:
+	* Makefile.vala-applet:
+	* applets/expander/Makefile.am:
+	* applets/quick-prefs/Makefile.am:
+	* applets/separator/Makefile.am:
+	* applets/taskmanager/Makefile.am:
+	* awn-settings/Makefile.am:
+	* configure.in:
+	* data/Makefile.am:
+	Refactor the applet build system, to make it more compatible with the
+	one in Awn Extras.
+
+2010-02-07  Mark Lee  <avant-wn@lazymalevolence.com>
+
+	* .bzrignore:
+	Clean up.
+
+2010-02-07  Mark Lee  <avant-wn@lazymalevolence.com>
+
+	* INSTALL:
+	Update.
+
+2010-02-08  Michal Hruby  <michal.mhr@gmail.com>
+
+	* awn-settings/awn-settings.ui:
+	* awn-settings/awnSettings.py.in:
+	Expose pattern setting in awn-settings.
+
+2010-02-06  Michal Hruby  <michal.mhr@gmail.com>
+
+	* libawn/awn-effects.c:
+	Fix artifacts visible when using side orientation & 3D turn animation.
+
+2010-02-06  Michal Hruby  <michal.mhr@gmail.com>
+
+	* awn-settings/awn-settings.ui:
+	* awn-settings/awnDefs.py.in:
+	* awn-settings/awnSettings.py.in:
+	* src/awn-background.c:
+	* src/awn-defines.h:
+	Expose more color settings in Theme editor. Automatically change
+	active rectangle color on theme changes (in gtk-theme mode).
+
+2010-02-06  Michal Hruby  <michal.mhr@gmail.com>
+
+	* awn-settings/awn-settings.ui:
+	* awn-settings/awnDefs.py.in:
+	* awn-settings/awnSettings.py.in:
+	A few adjustments to Intellihide handling.
+
+2010-02-06  Michal Hruby  <michal.mhr@gmail.com>
+
+	* src/awn-background-floaty.c:
+	Fix input shape mask for Floaty style. Fixes bug #517765.
+
+2010-02-05  Michal Hruby  <michal.mhr@gmail.com>
+
+	* src/awn-panel.c:
+	Don't do the crazy DnD proxying with Gtk 2.19.5 and later.
+
 2010-02-04  Mark Lee  <avant-wn@lazymalevolence.com>
 
 	* data/Makefile.am:

INSTALL

@@ -2,7 +2,7 @@ Installation Instructions
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
    This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
@@ -159,7 +159,7 @@ Particular systems
 CC is not installed, it is recommended to use the following options in
 order to use an ANSI C compiler:
 
-     ./configure CC="cc -Ae"
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
@@ -174,6 +174,16 @@ and if that doesn't work, try
 
      ./configure CC="cc -nodtk"
 
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
@@ -189,7 +199,8 @@ type, such as `sun4', or a canonical name which has the form:
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't

Makefile.am

@@ -2,29 +2,27 @@ NULL =
 
 if HAVE_VALA
 VALA_BINDINGS = bindings/vala
+QUICK_PREFS_APPLET = applets/quick-prefs
 endif
 
 SUBDIRS = \
 	libawn \
 	src \
 	applet-activation \
+	bindings/python \
+	bindings/vala \
 	awn-settings \
-	applets/taskmanager \
 	applets/expander \
+	$(QUICK_PREFS_APPLET) \
 	applets/separator \
-	bindings/python \
-	bindings/vala \
+	applets/taskmanager \
 	po \
 	data \
 	tests \
 	doc \
 	themes \
 	$(NULL)
 
-if HAVE_VALA
-SUBDIRS += applets/quick-prefs
-endif
-
 ACLOCAL_AMFLAGS = -I m4
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
@@ -37,16 +35,18 @@ i18n-update: po/POTFILES.in po/POTFILES.skip
 		intltool-update $$lang; \
 	done)
 
-EXTRA_DIST =				\
-	intltool-extract.in		\
-	intltool-merge.in		\
-	intltool-update.in		\
-	awn.pc.in			\
-	autogen.sh
+EXTRA_DIST = \
+	autogen.sh \
+	awn.pc.in \
+	intltool-extract.in \
+	intltool-merge.in \
+	intltool-update.in \
+	$(NULL)
 
-DISTCLEANFILES =			\
-	intltool-extract		\
-	intltool-merge			\
-	intltool-update			\
-	doltcompile			\
-	doltlibtool
+DISTCLEANFILES = \
+	doltcompile \
+	doltlibtool \
+	intltool-extract \
+	intltool-merge \
+	intltool-update \
+	$(NULL)