diff -Nru bamf-0.2.108/aclocal.m4 bamf-0.2.110/aclocal.m4 --- bamf-0.2.108/aclocal.m4 2012-02-03 07:12:13.000000000 +0000 +++ bamf-0.2.110/aclocal.m4 2012-02-17 11:02:24.000000000 +0000 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -634,6 +635,101 @@ fi ]) +dnl -*- mode: autoconf -*- +dnl Copyright 2009 Johan Dahlin +dnl +dnl This file is free software; the author(s) gives unlimited +dnl permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl + +# serial 1 + +m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([LT_INIT],[$0])dnl setup libtool first + + dnl enable/disable introspection + m4_if([$2], [require], + [dnl + enable_introspection=yes + ],[dnl + AC_ARG_ENABLE(introspection, + AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], + [Enable introspection for this build]),, + [enable_introspection=auto]) + ])dnl + + AC_MSG_CHECKING([for gobject-introspection]) + + dnl presence/version checking + AS_CASE([$enable_introspection], + [no], [dnl + found_introspection="no (disabled, use --enable-introspection to enable)" + ],dnl + [yes],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0],, + AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], + found_introspection=yes, + AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) + ],dnl + [auto],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) + ],dnl + [dnl + AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) + ])dnl + + AC_MSG_RESULT([$found_introspection]) + + INTROSPECTION_SCANNER= + INTROSPECTION_COMPILER= + INTROSPECTION_GENERATE= + INTROSPECTION_GIRDIR= + INTROSPECTION_TYPELIBDIR= + if test "x$found_introspection" = "xyes"; then + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection + fi + AC_SUBST(INTROSPECTION_SCANNER) + AC_SUBST(INTROSPECTION_COMPILER) + AC_SUBST(INTROSPECTION_GENERATE) + AC_SUBST(INTROSPECTION_GIRDIR) + AC_SUBST(INTROSPECTION_TYPELIBDIR) + AC_SUBST(INTROSPECTION_CFLAGS) + AC_SUBST(INTROSPECTION_LIBS) + AC_SUBST(INTROSPECTION_MAKEFILE) + + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") +]) + + +dnl Usage: +dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) + +AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) +]) + +dnl Usage: +dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) + + +AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) +]) + # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 1 (pkg-config-0.24) # @@ -794,12 +890,15 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -809,7 +908,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.11.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -825,19 +924,21 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.11.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -919,14 +1020,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 +# serial 12 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -966,6 +1067,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -1030,7 +1132,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -1095,10 +1197,13 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -1320,12 +1425,15 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -1365,8 +1473,8 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, +# 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1386,7 +1494,7 @@ [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful @@ -1532,12 +1640,15 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -1560,13 +1671,14 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -1574,13 +1686,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -1591,12 +1703,14 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_RUN_LOG(COMMAND) # ------------------- # Run COMMAND, save the exit status in ac_status, and log it. @@ -1673,12 +1787,14 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor `install' (even GNU) is that you can't @@ -1701,13 +1817,13 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -1716,13 +1832,13 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1744,10 +1860,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) @@ -1816,9 +1933,7 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([m4/expansions.m4]) m4_include([m4/gtk-doc.m4]) -m4_include([m4/introspection.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) m4_include([m4/ltsugar.m4]) diff -Nru bamf-0.2.108/compile bamf-0.2.110/compile --- bamf-0.2.108/compile 2012-02-03 07:12:16.000000000 +0000 +++ bamf-0.2.110/compile 2012-02-17 11:02:26.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2012-01-04.17; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free +# Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -29,21 +29,186 @@ # bugs to or send patches to # . +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l*) + lib=${1#-l} + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + set x "$@" "$dir/$lib.dll.lib" + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + set x "$@" "$dir/$lib.lib" + break + fi + done + IFS=$save_IFS + + test "$found" != yes && set x "$@" "$lib.lib" + shift + ;; + -L*) + func_file_conv "${1#-L}" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to . EOF @@ -53,11 +218,13 @@ echo "compile $scriptversion" exit $? ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; esac ofile= cfile= -eat= for arg do @@ -66,8 +233,8 @@ else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -94,10 +261,10 @@ done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -106,7 +273,7 @@ cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff -Nru bamf-0.2.108/config.guess bamf-0.2.110/config.guess --- bamf-0.2.108/config.guess 2012-02-03 07:12:16.000000000 +0000 +++ bamf-0.2.110/config.guess 2012-02-17 11:02:26.000000000 +0000 @@ -2,9 +2,9 @@ # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-05-11' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -57,8 +55,8 @@ Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +143,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -792,13 +790,12 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -807,6 +804,9 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -861,6 +861,13 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -895,13 +902,16 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -943,7 +953,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -978,13 +988,13 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-tilera-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -1315,6 +1325,9 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -Nru bamf-0.2.108/config.sub bamf-0.2.110/config.sub --- bamf-0.2.108/config.sub 2012-02-03 07:12:16.000000000 +0000 +++ bamf-0.2.110/config.sub 2012-02-17 11:02:26.000000000 +0000 @@ -2,9 +2,9 @@ # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-03-23' +timestamp='2012-02-10' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -76,8 +74,8 @@ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -132,6 +130,10 @@ os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -247,17 +249,22 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -291,7 +298,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -300,7 +307,7 @@ | spu \ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -315,8 +322,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -329,7 +335,10 @@ strongarm | thumb | xscale) basic_machine=arm-unknown ;; - + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; xscaleeb) basic_machine=armeb-unknown ;; @@ -352,11 +361,13 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ @@ -365,8 +376,10 @@ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -400,7 +413,7 @@ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ @@ -408,10 +421,11 @@ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -711,7 +725,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -808,10 +821,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -1120,13 +1141,8 @@ basic_machine=t90-cray os=-unicos ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1336,7 +1352,7 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1548,9 +1564,6 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout diff -Nru bamf-0.2.108/configure bamf-0.2.110/configure --- bamf-0.2.108/configure 2012-02-17 12:49:12.000000000 +0000 +++ bamf-0.2.110/configure 2012-02-17 12:49:13.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for bamf 0.2.108. +# Generated by GNU Autoconf 2.68 for bamf 0.2.110. # # Report bugs to . # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='bamf' PACKAGE_TARNAME='bamf' -PACKAGE_VERSION='0.2.108' -PACKAGE_STRING='bamf 0.2.108' +PACKAGE_VERSION='0.2.110' +PACKAGE_STRING='bamf 0.2.110' PACKAGE_BUGREPORT='dx-team@canonical.com' PACKAGE_URL='' @@ -671,9 +671,6 @@ PKG_CONFIG_PATH USE_GTK3_FALSE USE_GTK3_TRUE -expanded_datadir -expanded_bindir -expanded_libdir PKG_CONFIG ACLOCAL_AMFLAFS CPP @@ -713,6 +710,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -1379,7 +1377,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures bamf 0.2.108 to adapt to many kinds of systems. +\`configure' configures bamf 0.2.110 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1449,7 +1447,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of bamf 0.2.108:";; + short | recursive ) echo "Configuration of bamf 0.2.110:";; esac cat <<\_ACEOF @@ -1589,7 +1587,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -bamf configure 0.2.108 +bamf configure 0.2.110 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1867,7 +1865,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by bamf $as_me 0.2.108, which was +It was created by bamf $as_me 0.2.110, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2688,7 +2686,7 @@ # Define the identity of the package. PACKAGE='bamf' - VERSION='0.2.108' + VERSION='0.2.110' cat >>confdefs.h <<_ACEOF @@ -2718,9 +2716,9 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. - -AMTAR=${AMTAR-"${am_missing_run}tar"} +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5 @@ -2875,6 +2873,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3688,6 +3687,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3747,7 +3747,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -12189,6 +12189,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -12248,7 +12249,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -12543,50 +12544,9 @@ fi - - expanded_libdir=`( - case $prefix in - NONE) prefix=$ac_default_prefix ;; - *) ;; - esac - case $exec_prefix in - NONE) exec_prefix=$prefix ;; - *) ;; - esac - eval echo $libdir - )` - - - - expanded_bindir=`( - case $prefix in - NONE) prefix=$ac_default_prefix ;; - *) ;; - esac - case $exec_prefix in - NONE) exec_prefix=$prefix ;; - *) ;; - esac - eval echo $bindir - )` - - - - case $prefix in - NONE) prefix=$ac_default_prefix ;; - *) ;; - esac - - case $exec_prefix in - NONE) exec_prefix=$prefix ;; - *) ;; - esac - - expanded_datadir=`(eval echo $datadir)` - expanded_datadir=`(eval echo $expanded_datadir)` - - - +SHAMROCK_EXPAND_LIBDIR +SHAMROCK_EXPAND_BINDIR +SHAMROCK_EXPAND_DATADIR # # gtk version @@ -13618,9 +13578,7 @@ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)} INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)} INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection @@ -15269,7 +15227,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by bamf $as_me 0.2.108, which was +This file was extended by bamf $as_me 0.2.110, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15335,7 +15293,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -bamf config.status 0.2.108 +bamf config.status 0.2.110 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru bamf-0.2.108/configure.in bamf-0.2.110/configure.in --- bamf-0.2.108/configure.in 2012-02-17 12:49:12.000000000 +0000 +++ bamf-0.2.110/configure.in 2012-02-17 12:49:13.000000000 +0000 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.63]) -AC_INIT(bamf, 0.2.108, dx-team@canonical.com) +AC_INIT(bamf, 0.2.110, dx-team@canonical.com) AC_PREREQ(2.62) AC_CONFIG_SRCDIR(src/main.c) diff -Nru bamf-0.2.108/data/Makefile.in bamf-0.2.110/data/Makefile.in --- bamf-0.2.108/data/Makefile.in 2012-02-03 07:12:16.000000000 +0000 +++ bamf-0.2.110/data/Makefile.in 2012-02-17 11:02:26.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -37,8 +37,7 @@ subdir = data DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/expansions.m4 \ - $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in @@ -71,6 +70,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(servicedir)" DATA = $(service_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -202,9 +207,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -expanded_bindir = @expanded_bindir@ -expanded_datadir = @expanded_datadir@ -expanded_libdir = @expanded_libdir@ giomodulesdir = @giomodulesdir@ host = @host@ host_alias = @host_alias@ @@ -294,9 +296,7 @@ @$(NORMAL_UNINSTALL) @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(servicedir)" && rm -f $$files + dir='$(DESTDIR)$(servicedir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -351,10 +351,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru bamf-0.2.108/debian/changelog bamf-0.2.110/debian/changelog --- bamf-0.2.108/debian/changelog 2012-02-17 12:49:12.000000000 +0000 +++ bamf-0.2.110/debian/changelog 2012-02-17 12:49:13.000000000 +0000 @@ -1,3 +1,17 @@ +bamf (0.2.110-0ubuntu1) precise; urgency=low + + * New upstream release. + - BAMF does not pass make check (LP: #897148) + - BAMF requires a headless testing target (LP: #897150) + - Clicking Nautilus launcher icon fails to open a Nautilus file explorer + window when copying a file and all other Nautilus windows are closed / + bamf should skip the taskbar (LP: #784804) + * debian/libbamf0.symbols, + debian/libbamf3-0.symbols: + - updated symbols + + -- Didier Roche Fri, 17 Feb 2012 13:36:25 +0100 + bamf (0.2.108-0ubuntu2) precise; urgency=low * remove -Werror for now as there is just new glib deprecation making it diff -Nru bamf-0.2.108/debian/libbamf0.symbols bamf-0.2.110/debian/libbamf0.symbols --- bamf-0.2.108/debian/libbamf0.symbols 2012-02-17 12:49:12.000000000 +0000 +++ bamf-0.2.110/debian/libbamf0.symbols 2012-02-17 12:49:13.000000000 +0000 @@ -73,12 +73,10 @@ bamf_view_set_path@Base 0.2.60 bamf_view_set_sticky@Base 0.2.60 bamf_view_user_visible@Base 0.2.20 - bamf_window_get_application_id@Base 0.2.108 - bamf_window_get_dbus_menu_object_path@Base 0.2.108 bamf_window_get_monitor@Base 0.2.108 bamf_window_get_transient@Base 0.2.28 bamf_window_get_type@Base 0.2.20 - bamf_window_get_unique_bus_name@Base 0.2.108 + bamf_window_get_utf8_prop@Base 0.2.110 bamf_window_get_window_type@Base 0.2.46 bamf_window_get_xid@Base 0.2.20 bamf_window_last_active@Base 0.2.30 diff -Nru bamf-0.2.108/debian/libbamf3-0.symbols bamf-0.2.110/debian/libbamf3-0.symbols --- bamf-0.2.108/debian/libbamf3-0.symbols 2012-02-17 12:49:12.000000000 +0000 +++ bamf-0.2.110/debian/libbamf3-0.symbols 2012-02-17 12:49:13.000000000 +0000 @@ -73,12 +73,10 @@ bamf_view_set_path@Base 0.2.60 bamf_view_set_sticky@Base 0.2.60 bamf_view_user_visible@Base 0.2.20 - bamf_window_get_application_id@Base 0.2.108 - bamf_window_get_dbus_menu_object_path@Base 0.2.108 bamf_window_get_monitor@Base 0.2.108 bamf_window_get_transient@Base 0.2.28 bamf_window_get_type@Base 0.2.20 - bamf_window_get_unique_bus_name@Base 0.2.108 + bamf_window_get_utf8_prop@Base 0.2.110 bamf_window_get_window_type@Base 0.2.46 bamf_window_get_xid@Base 0.2.20 bamf_window_last_active@Base 0.2.30 diff -Nru bamf-0.2.108/depcomp bamf-0.2.110/depcomp --- bamf-0.2.108/depcomp 2012-02-03 07:12:18.000000000 +0000 +++ bamf-0.2.110/depcomp 2012-02-17 11:02:27.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-12-04.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ object Object file output by `PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -90,10 +90,18 @@ # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" + cygpath_u='sed s,\\\\,/,g' depmode=msvisualcpp fi +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -158,10 +166,12 @@ ' < "$tmpdepfile" | ## Some versions of gcc put a space before the `:'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -405,6 +415,52 @@ rm -f "$tmpdepfile" ;; +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test "$stat" = 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/ \1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/ / + G + p +}' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -503,7 +559,9 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" sed '1,2d' "$tmpdepfile" | tr ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation diff -Nru bamf-0.2.108/doc/Makefile.in bamf-0.2.110/doc/Makefile.in --- bamf-0.2.108/doc/Makefile.in 2012-02-03 07:12:16.000000000 +0000 +++ bamf-0.2.110/doc/Makefile.in 2012-02-17 11:02:26.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -36,8 +36,7 @@ subdir = doc DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/expansions.m4 \ - $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in @@ -218,9 +217,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -expanded_bindir = @expanded_bindir@ -expanded_datadir = @expanded_datadir@ -expanded_libdir = @expanded_libdir@ giomodulesdir = @giomodulesdir@ host = @host@ host_alias = @host_alias@ @@ -499,10 +495,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru bamf-0.2.108/doc/reference/libbamf/html/api-index-full.html bamf-0.2.110/doc/reference/libbamf/html/api-index-full.html --- bamf-0.2.108/doc/reference/libbamf/html/api-index-full.html 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/html/api-index-full.html 2012-02-17 11:10:00.000000000 +0000 @@ -59,10 +59,6 @@
-BamfApplicationPrivate, struct in BamfApplication -
-
-
bamf_application_get_application_type, function in BamfApplication
@@ -96,10 +92,6 @@
-BamfControlPrivate, struct in BamfControl -
-
-
bamf_control_get_default, function in BamfControl
@@ -129,10 +121,6 @@
-BamfFactoryPrivate, struct in BamfFactory -
-
-
bamf_factory_app_for_file, function in BamfFactory
@@ -154,10 +142,6 @@
-BamfIndicatorPrivate, struct in BamfIndicator -
-
-
bamf_indicator_get_dbus_menu_path, function in BamfIndicator
@@ -183,19 +167,19 @@
-BamfMatcher::view-closed, object signal in BamfMatcher +BamfMatcher::stacking-order-changed, object signal in BamfMatcher
-BamfMatcher::view-opened, object signal in BamfMatcher +BamfMatcher::view-closed, object signal in BamfMatcher
-BamfMatcherClass, struct in BamfMatcher +BamfMatcher::view-opened, object signal in BamfMatcher
-BamfMatcherPrivate, struct in BamfMatcher +BamfMatcherClass, struct in BamfMatcher
@@ -243,6 +227,10 @@
+bamf_matcher_get_window_stack_for_monitor, function in BamfMatcher +
+
+
bamf_matcher_get_xids_for_application, function in BamfMatcher
@@ -260,10 +248,6 @@
-BamfTabPrivate, struct in BamfTab -
-
-
BamfTabSource, struct in BamfTabSource
@@ -288,10 +272,6 @@
-BamfTabSourcePrivate, struct in BamfTabSource -
-
-
BAMF_TAB_CONST, macro in BamfTab
@@ -409,10 +389,6 @@
-BamfViewPrivate, struct in BamfView -
-
-
bamf_view_get_children, function in BamfView
@@ -486,11 +462,19 @@
+BamfWindow::maximized-changed, object signal in BamfWindow +
+
+
+BamfWindow::monitor-changed, object signal in BamfWindow +
+
+
BamfWindowClass, struct in BamfWindow
-BamfWindowPrivate, struct in BamfWindow +BamfWindowMaximizationType, enum in BamfWindow
@@ -498,10 +482,18 @@
+bamf_window_get_monitor, function in BamfWindow +
+
+
bamf_window_get_transient, function in BamfWindow
+bamf_window_get_utf8_prop, function in BamfWindow +
+
+
bamf_window_get_window_type, function in BamfWindow
@@ -513,6 +505,10 @@ bamf_window_last_active, function in BamfWindow
+
+bamf_window_maximized, function in BamfWindow +
+
diff -Nru bamf-0.2.108/doc/reference/libbamf/html/BamfApplication.html bamf-0.2.110/doc/reference/libbamf/html/BamfApplication.html --- bamf-0.2.108/doc/reference/libbamf/html/BamfApplication.html 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/html/BamfApplication.html 2012-02-17 11:10:00.000000000 +0000 @@ -43,14 +43,13 @@

Synopsis

struct              BamfApplication;
 struct              BamfApplicationClass;
-                    BamfApplicationPrivate;
 const gchar *       bamf_application_get_application_type
                                                         (BamfApplication *application);
 const gchar *       bamf_application_get_desktop_file   (BamfApplication *application);
-GList *             bamf_application_get_windows        (BamfApplication *application);
-GArray *            bamf_application_get_xids           (BamfApplication *application);
 gboolean            bamf_application_get_show_menu_stubs
                                                         (BamfApplication *application);
+GList *             bamf_application_get_windows        (BamfApplication *application);
+GArray *            bamf_application_get_xids           (BamfApplication *application);
@@ -95,13 +94,6 @@
-

BamfApplicationPrivate

-
typedef struct _BamfApplicationPrivate BamfApplicationPrivate;
-

-

-
-
-

bamf_application_get_application_type ()

const gchar *       bamf_application_get_application_type
                                                         (BamfApplication *application);
@@ -133,6 +125,14 @@
+

bamf_application_get_show_menu_stubs ()

+
gboolean            bamf_application_get_show_menu_stubs
+                                                        (BamfApplication *application);
+

+

+
+
+

bamf_application_get_windows ()

GList *             bamf_application_get_windows        (BamfApplication *application);

@@ -177,14 +177,6 @@

-
-
-

bamf_application_get_show_menu_stubs ()

-
gboolean            bamf_application_get_show_menu_stubs
-                                                        (BamfApplication *application);
-

-

-

Signal Details

diff -Nru bamf-0.2.108/doc/reference/libbamf/html/BamfControl.html bamf-0.2.110/doc/reference/libbamf/html/BamfControl.html --- bamf-0.2.108/doc/reference/libbamf/html/BamfControl.html 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/html/BamfControl.html 2012-02-17 11:10:00.000000000 +0000 @@ -41,7 +41,6 @@

Synopsis

struct              BamfControl;
 struct              BamfControlClass;
-                    BamfControlPrivate;
 BamfControl *       bamf_control_get_default            (void);
 void                bamf_control_insert_desktop_file    (BamfControl *control,
                                                          const gchar *desktop_file);
@@ -88,13 +87,6 @@
-

BamfControlPrivate

-
typedef struct _BamfControlPrivate BamfControlPrivate;
-

-

-
-
-

bamf_control_get_default ()

BamfControl *       bamf_control_get_default            (void);

diff -Nru bamf-0.2.108/doc/reference/libbamf/html/BamfFactory.html bamf-0.2.110/doc/reference/libbamf/html/BamfFactory.html --- bamf-0.2.108/doc/reference/libbamf/html/BamfFactory.html 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/html/BamfFactory.html 2012-02-17 11:10:00.000000000 +0000 @@ -41,13 +41,12 @@

Synopsis

struct              BamfFactory;
 struct              BamfFactoryClass;
-                    BamfFactoryPrivate;
-BamfView *          bamf_factory_view_for_path          (BamfFactory *factory,
-                                                         const char *path);
 BamfApplication *   bamf_factory_app_for_file           (BamfFactory *factory,
                                                          const char *path,
                                                          gboolean create);
 BamfFactory *       bamf_factory_get_default            (void);
+BamfView *          bamf_factory_view_for_path          (BamfFactory *factory,
+                                                         const char *path);
@@ -83,21 +82,6 @@
-

BamfFactoryPrivate

-
typedef struct _BamfFactoryPrivate BamfFactoryPrivate;
-

-

-
-
-
-

bamf_factory_view_for_path ()

-
BamfView *          bamf_factory_view_for_path          (BamfFactory *factory,
-                                                         const char *path);
-

-

-
-
-

bamf_factory_app_for_file ()

BamfApplication *   bamf_factory_app_for_file           (BamfFactory *factory,
                                                          const char *path,
@@ -112,6 +96,14 @@
+
+
+

bamf_factory_view_for_path ()

+
BamfView *          bamf_factory_view_for_path          (BamfFactory *factory,
+                                                         const char *path);
+

+

+
diff -Nru bamf-0.2.108/doc/reference/libbamf/html/BamfMatcher.html bamf-0.2.110/doc/reference/libbamf/html/BamfMatcher.html --- bamf-0.2.108/doc/reference/libbamf/html/BamfMatcher.html 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/html/BamfMatcher.html 2012-02-17 11:10:00.000000000 +0000 @@ -43,32 +43,34 @@

Synopsis

struct              BamfMatcher;
 struct              BamfMatcherClass;
-                    BamfMatcherPrivate;
-BamfMatcher *       bamf_matcher_get_default            (void);
+gboolean            bamf_matcher_application_is_running (BamfMatcher *matcher,
+                                                         const gchar *application);
 BamfApplication *   bamf_matcher_get_active_application (BamfMatcher *matcher);
 BamfWindow *        bamf_matcher_get_active_window      (BamfMatcher *matcher);
-BamfApplication *   bamf_matcher_get_application_for_xid
+BamfApplication *   bamf_matcher_get_application_for_desktop_file
                                                         (BamfMatcher *matcher,
-                                                         guint32 xid);
+                                                         const gchar *desktop_file_path,
+                                                         gboolean create_if_not_found);
 BamfApplication *   bamf_matcher_get_application_for_window
                                                         (BamfMatcher *matcher,
                                                          BamfWindow *window);
-gboolean            bamf_matcher_application_is_running (BamfMatcher *matcher,
-                                                         const gchar *application);
+BamfApplication *   bamf_matcher_get_application_for_xid
+                                                        (BamfMatcher *matcher,
+                                                         guint32 xid);
 GList *             bamf_matcher_get_applications       (BamfMatcher *matcher);
-void                bamf_matcher_register_favorites     (BamfMatcher *matcher,
-                                                         const gchar **favorites);
+BamfMatcher *       bamf_matcher_get_default            (void);
 GList *             bamf_matcher_get_running_applications
                                                         (BamfMatcher *matcher);
 GList *             bamf_matcher_get_tabs               (BamfMatcher *matcher);
-GArray *            bamf_matcher_get_xids_for_application
+GList *             bamf_matcher_get_window_stack_for_monitor
                                                         (BamfMatcher *matcher,
-                                                         const gchar *application);
+                                                         gint monitor);
 GList *             bamf_matcher_get_windows            (BamfMatcher *matcher);
-BamfApplication *   bamf_matcher_get_application_for_desktop_file
+GArray *            bamf_matcher_get_xids_for_application
                                                         (BamfMatcher *matcher,
-                                                         const gchar *desktop_file_path,
-                                                         gboolean create_if_not_found);
+                                                         const gchar *application);
+void                bamf_matcher_register_favorites     (BamfMatcher *matcher,
+                                                         const gchar **favorites);
@@ -83,6 +85,7 @@ 
   "active-application-changed"                     
   "active-window-changed"                          
+  "stacking-order-changed"                         
   "view-closed"                                    
   "view-opened"
@@ -113,26 +116,11 @@
-

BamfMatcherPrivate

-
typedef struct _BamfMatcherPrivate BamfMatcherPrivate;
-

-

-
-
-
-

bamf_matcher_get_default ()

-
BamfMatcher *       bamf_matcher_get_default            (void);
+

bamf_matcher_application_is_running ()

+
gboolean            bamf_matcher_application_is_running (BamfMatcher *matcher,
+                                                         const gchar *application);

-Returns the default matcher. This matcher is owned by bamf and shared between other callers.

-
-- - - - -

Returns :

A new BamfMatcher. [transfer none] -
@@ -182,12 +170,22 @@
-

bamf_matcher_get_application_for_xid ()

-
BamfApplication *   bamf_matcher_get_application_for_xid
+
bamf_matcher_get_application_for_desktop_file ()

+
BamfApplication *   bamf_matcher_get_application_for_desktop_file
                                                         (BamfMatcher *matcher,
-                                                         guint32 xid);

+                                                         const gchar *desktop_file_path,
+                                                         gboolean create_if_not_found);

-Used to fetch the BamfApplication containing the passed xid. +

+
+
+
+

bamf_matcher_get_application_for_window ()

+
BamfApplication *   bamf_matcher_get_application_for_window
+                                                        (BamfMatcher *matcher,
+                                                         BamfWindow *window);
+

+Used to fetch the BamfApplication containing the passed window.

@@ -198,8 +196,8 @@ - - + + @@ -211,12 +209,12 @@
-

bamf_matcher_get_application_for_window ()

-
BamfApplication *   bamf_matcher_get_application_for_window
+
bamf_matcher_get_application_for_xid ()

+
BamfApplication *   bamf_matcher_get_application_for_xid
                                                         (BamfMatcher *matcher,
-                                                         BamfWindow *window);

+                                                         guint32 xid);

-Used to fetch the BamfApplication containing the passed window. +Used to fetch the BamfApplication containing the passed xid.

xid :

The XID to search for

window :

The window to look for

Returns :
@@ -227,8 +225,8 @@ - - + + @@ -240,14 +238,6 @@
-

bamf_matcher_application_is_running ()

-
gboolean            bamf_matcher_application_is_running (BamfMatcher *matcher,
-                                                         const gchar *application);
-

-

-
-
-

bamf_matcher_get_applications ()

GList *             bamf_matcher_get_applications       (BamfMatcher *matcher);

@@ -271,26 +261,18 @@

-

bamf_matcher_register_favorites ()

-
void                bamf_matcher_register_favorites     (BamfMatcher *matcher,
-                                                         const gchar **favorites);
+

bamf_matcher_get_default ()

+
BamfMatcher *       bamf_matcher_get_default            (void);

-Used to effect how bamf performs matching. Desktop files passed to this method will -be prefered by bamf to system desktop files. +Returns the default matcher. This matcher is owned by bamf and shared between other callers.

window :

The window to look for

xid :

The XID to search for

Returns :
- - - - + + - - - - - - +

matcher :

a BamfMatcher +

Returns :

A new BamfMatcher. [transfer none]

favorites :

an array of strings, each containing an absolute path to a .desktop file
@@ -342,12 +324,33 @@
-

bamf_matcher_get_xids_for_application ()

-
GArray *            bamf_matcher_get_xids_for_application
+
bamf_matcher_get_window_stack_for_monitor ()

+
GList *             bamf_matcher_get_window_stack_for_monitor
                                                         (BamfMatcher *matcher,
-                                                         const gchar *application);

+                                                         gint monitor);

+Used to fetch all windows that BAMF knows about in the requested screen, +in stacking bottom-to-top order.

+
++ + + + + + + + + + + + + + +

matcher :

a BamfMatcher +

monitor :

the monitor you want the stack from, negative value to get all

Returns :

A list of BamfWindow. [element-type Bamf.View][transfer container] +
@@ -374,14 +377,37 @@
-

bamf_matcher_get_application_for_desktop_file ()

-
BamfApplication *   bamf_matcher_get_application_for_desktop_file
+
bamf_matcher_get_xids_for_application ()

+
GArray *            bamf_matcher_get_xids_for_application
                                                         (BamfMatcher *matcher,
-                                                         const gchar *desktop_file_path,
-                                                         gboolean create_if_not_found);

+                                                         const gchar *application);

+
+
+

bamf_matcher_register_favorites ()

+
void                bamf_matcher_register_favorites     (BamfMatcher *matcher,
+                                                         const gchar **favorites);
+

+Used to effect how bamf performs matching. Desktop files passed to this method will +be prefered by bamf to system desktop files. +

+
++ + + + + + + + + + +

matcher :

a BamfMatcher +

favorites :

an array of strings, each containing an absolute path to a .desktop file
+

Signal Details

@@ -432,6 +458,27 @@
+

The "stacking-order-changed" signal

+
void                user_function                      (BamfMatcher *bamfmatcher,
+                                                        gpointer     user_data)
+

+

+
++ + + + + + + + + + +

bamfmatcher :

the object which received the signal.

user_data :

user data set when the signal handler was connected.
+
+
+

The "view-closed" signal

void                user_function                      (BamfMatcher *bamfmatcher,
                                                         GObject     *arg1,
diff -Nru bamf-0.2.108/doc/reference/libbamf/html/BamfTabSource.html bamf-0.2.110/doc/reference/libbamf/html/BamfTabSource.html
--- bamf-0.2.108/doc/reference/libbamf/html/BamfTabSource.html	2012-02-03 07:14:42.000000000 +0000
+++ bamf-0.2.110/doc/reference/libbamf/html/BamfTabSource.html	2012-02-17 11:10:00.000000000 +0000
@@ -46,10 +46,6 @@
 
#define             BAMF_TAB_SOURCE_CONST               (obj)
 struct              BamfTabSource;
 struct              BamfTabSourceClass;
-                    BamfTabSourcePrivate;
-gboolean            bamf_tab_source_show_tab            (BamfTabSource *source,
-                                                         char *tab_id,
-                                                         GError *error);
 char **             bamf_tab_source_get_tab_ids         (BamfTabSource *source);
 GArray *            bamf_tab_source_get_tab_preview     (BamfTabSource *source,
                                                          char *tab_id);
@@ -57,6 +53,9 @@
                                                          char *tab_id);
 guint32             bamf_tab_source_get_tab_xid         (BamfTabSource *source,
                                                          char *tab_id);
+gboolean            bamf_tab_source_show_tab            (BamfTabSource *source,
+                                                         char *tab_id,
+                                                         GError *error);
@@ -120,22 +119,6 @@
-

BamfTabSourcePrivate

-
typedef struct _BamfTabSourcePrivate BamfTabSourcePrivate;
-

-

-
-
-
-

bamf_tab_source_show_tab ()

-
gboolean            bamf_tab_source_show_tab            (BamfTabSource *source,
-                                                         char *tab_id,
-                                                         GError *error);
-

-

-
-
-

bamf_tab_source_get_tab_ids ()

char **             bamf_tab_source_get_tab_ids         (BamfTabSource *source);

@@ -165,6 +148,15 @@

+
+
+

bamf_tab_source_show_tab ()

+
gboolean            bamf_tab_source_show_tab            (BamfTabSource *source,
+                                                         char *tab_id,
+                                                         GError *error);
+

+

+

Property Details

diff -Nru bamf-0.2.108/doc/reference/libbamf/html/BamfView.html bamf-0.2.110/doc/reference/libbamf/html/BamfView.html --- bamf-0.2.108/doc/reference/libbamf/html/BamfView.html 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/html/BamfView.html 2012-02-17 11:10:00.000000000 +0000 @@ -46,20 +46,19 @@ 
enum                BamfClickBehavior;
 struct              BamfView;
 struct              BamfViewClass;
-                    BamfViewPrivate;
 GList *             bamf_view_get_children              (BamfView *view);
-gboolean            bamf_view_is_closed                 (BamfView *view);
+BamfClickBehavior   bamf_view_get_click_suggestion      (BamfView *view);
+gchar *             bamf_view_get_icon                  (BamfView *view);
+gchar *             bamf_view_get_name                  (BamfView *view);
+const gchar *       bamf_view_get_view_type             (BamfView *view);
 gboolean            bamf_view_is_active                 (BamfView *view);
+gboolean            bamf_view_is_closed                 (BamfView *view);
 gboolean            bamf_view_is_running                (BamfView *view);
+gboolean            bamf_view_is_sticky                 (BamfView *view);
 gboolean            bamf_view_is_urgent                 (BamfView *view);
-gchar *             bamf_view_get_name                  (BamfView *view);
-gchar *             bamf_view_get_icon                  (BamfView *view);
-gboolean            bamf_view_user_visible              (BamfView *view);
-const gchar *       bamf_view_get_view_type             (BamfView *view);
 void                bamf_view_set_sticky                (BamfView *view,
                                                          gboolean value);
-gboolean            bamf_view_is_sticky                 (BamfView *view);
-BamfClickBehavior   bamf_view_get_click_suggestion      (BamfView *view);
+gboolean            bamf_view_user_visible              (BamfView *view);
@@ -159,13 +158,6 @@
-

BamfViewPrivate

-
typedef struct _BamfViewPrivate BamfViewPrivate;
-

-

-
-
-

bamf_view_get_children ()

GList *             bamf_view_get_children              (BamfView *view);

@@ -190,17 +182,17 @@

-

bamf_view_is_closed ()

-
gboolean            bamf_view_is_closed                 (BamfView *view);
+

bamf_view_get_click_suggestion ()

+
BamfClickBehavior   bamf_view_get_click_suggestion      (BamfView *view);

-

bamf_view_is_active ()

-
gboolean            bamf_view_is_active                 (BamfView *view);
+

bamf_view_get_icon ()

+
gchar *             bamf_view_get_icon                  (BamfView *view);

-Determines if the view is currently active and focused by the user. Useful for an active window indicator. +Gets the icon of a view. This icon is used to visually represent the view.

@@ -213,10 +205,10 @@
-

bamf_view_is_running ()

-
gboolean            bamf_view_is_running                (BamfView *view);
+

bamf_view_get_name ()

+
gchar *             bamf_view_get_name                  (BamfView *view);

-Determines if the view is currently requiring attention. Useful for a running window indicator. +Gets the name of a view. This name is a short name best used to represent the view with text.

@@ -229,33 +221,34 @@
-

bamf_view_is_urgent ()

-
gboolean            bamf_view_is_urgent                 (BamfView *view);
-

-

-
-
-
-

bamf_view_get_name ()

-
gchar *             bamf_view_get_name                  (BamfView *view);
+

bamf_view_get_view_type ()

+
const gchar *       bamf_view_get_view_type             (BamfView *view);

-Gets the name of a view. This name is a short name best used to represent the view with text. +The view type of a window is a short string used to represent all views of the same class. These +descriptions should not be used to do casting as they are not considered stable.

- + + - + + + + + +

view :

 a BamfView

Returns :

A gchar*. [transfer full] +
-

bamf_view_get_icon ()

-
gchar *             bamf_view_get_icon                  (BamfView *view);
+

bamf_view_is_active ()

+
gboolean            bamf_view_is_active                 (BamfView *view);

-Gets the icon of a view. This icon is used to visually represent the view. +Determines if the view is currently active and focused by the user. Useful for an active window indicator.

@@ -268,70 +261,69 @@
-

bamf_view_user_visible ()

-
gboolean            bamf_view_user_visible              (BamfView *view);
-
-- - - - - - - - - - -

view :

a BamfView -

Returns :

a boolean useful for determining if a particular view is "user visible". User visible -is a concept relating to whether or not a window should be shown in a launcher tasklist.
+

bamf_view_is_closed ()

+
gboolean            bamf_view_is_closed                 (BamfView *view);
+

+

-

bamf_view_get_view_type ()

-
const gchar *       bamf_view_get_view_type             (BamfView *view);
+

bamf_view_is_running ()

+
gboolean            bamf_view_is_running                (BamfView *view);

-The view type of a window is a short string used to represent all views of the same class. These -descriptions should not be used to do casting as they are not considered stable. +Determines if the view is currently requiring attention. Useful for a running window indicator.

- - + - - - - - - +

view :

 a BamfView

Returns :

A gchar*. [transfer full] -
-

bamf_view_set_sticky ()

-
void                bamf_view_set_sticky                (BamfView *view,
-                                                         gboolean value);
+

bamf_view_is_sticky ()

+
gboolean            bamf_view_is_sticky                 (BamfView *view);

-

bamf_view_is_sticky ()

-
gboolean            bamf_view_is_sticky                 (BamfView *view);
+

bamf_view_is_urgent ()

+
gboolean            bamf_view_is_urgent                 (BamfView *view);

-

bamf_view_get_click_suggestion ()

-
BamfClickBehavior   bamf_view_get_click_suggestion      (BamfView *view);
+

bamf_view_set_sticky ()

+
void                bamf_view_set_sticky                (BamfView *view,
+                                                         gboolean value);

+
+
+

bamf_view_user_visible ()

+
gboolean            bamf_view_user_visible              (BamfView *view);
+
++ + + + + + + + + + +

view :

a BamfView +

Returns :

a boolean useful for determining if a particular view is "user visible". User visible +is a concept relating to whether or not a window should be shown in a launcher tasklist.
+

Property Details

diff -Nru bamf-0.2.108/doc/reference/libbamf/html/BamfWindow.html bamf-0.2.110/doc/reference/libbamf/html/BamfWindow.html --- bamf-0.2.108/doc/reference/libbamf/html/BamfWindow.html 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/html/BamfWindow.html 2012-02-17 11:10:00.000000000 +0000 @@ -26,6 +26,8 @@ Description  |  Object Hierarchy +  |  + Signals
@@ -41,12 +43,16 @@

Synopsis

struct              BamfWindow;
 struct              BamfWindowClass;
-                    BamfWindowPrivate;
+enum                BamfWindowMaximizationType;
 enum                BamfWindowType;
+gint                bamf_window_get_monitor             (BamfWindow *self);
 BamfWindow *        bamf_window_get_transient           (BamfWindow *self);
+gchar *             bamf_window_get_utf8_prop           (BamfWindow *self,
+                                                         const char *prop);
 BamfWindowType      bamf_window_get_window_type         (BamfWindow *self);
 guint32             bamf_window_get_xid                 (BamfWindow *self);
 time_t              bamf_window_last_active             (BamfWindow *self);
+BamfWindowMaximizationType bamf_window_maximized        (BamfWindow *self);
@@ -59,6 +65,13 @@
+

Signals

+
+  "maximized-changed"                              : Run First
+  "monitor-changed"                                : Run First
+
+
+

Description

BamfWindow is the base class that all windows need to derive from. @@ -88,8 +101,14 @@

-

BamfWindowPrivate

-
typedef struct _BamfWindowPrivate BamfWindowPrivate;
+

enum BamfWindowMaximizationType

+
typedef enum {
+  BAMF_WINDOW_FLOATING,              /* Floating window */
+  BAMF_WINDOW_HORIZONTAL_MAXIMIZED,  /* Horizontally maximized window */
+  BAMF_WINDOW_VERTICAL_MAXIMIZED,    /* Vertically maximized window */
+  BAMF_WINDOW_MAXIMIZED              /* Maximized window */
+} BamfWindowMaximizationType;
+

@@ -112,6 +131,13 @@
+

bamf_window_get_monitor ()

+
gint                bamf_window_get_monitor             (BamfWindow *self);
+

+

+
+
+

bamf_window_get_transient ()

BamfWindow *        bamf_window_get_transient           (BamfWindow *self);

@@ -119,6 +145,14 @@

+

bamf_window_get_utf8_prop ()

+
gchar *             bamf_window_get_utf8_prop           (BamfWindow *self,
+                                                         const char *prop);
+

+

+
+
+

bamf_window_get_window_type ()

BamfWindowType      bamf_window_get_window_type         (BamfWindow *self);

@@ -138,6 +172,61 @@

+
+
+

bamf_window_maximized ()

+
BamfWindowMaximizationType bamf_window_maximized        (BamfWindow *self);
+

+

+
+ +
+

Signal Details

+
+

The "maximized-changed" signal

+
void                user_function                      (BamfWindow *bamfwindow,
+                                                        gint        arg1,
+                                                        gint        arg2,
+                                                        gpointer    user_data)       : Run First
+

+

+
++ + + + + + + + + + +

bamfwindow :

the object which received the signal.

user_data :

user data set when the signal handler was connected.
+
+
+
+

The "monitor-changed" signal

+
void                user_function                      (BamfWindow *bamfwindow,
+                                                        gint        arg1,
+                                                        gint        arg2,
+                                                        gpointer    user_data)       : Run First
+

+

+
++ + + + + + + + + + +

bamfwindow :

the object which received the signal.

user_data :

user data set when the signal handler was connected.
+
diff -Nru bamf-0.2.108/doc/reference/libbamf/html/ch01.html bamf-0.2.110/doc/reference/libbamf/html/ch01.html --- bamf-0.2.108/doc/reference/libbamf/html/ch01.html 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/html/ch01.html 2012-02-17 11:10:00.000000000 +0000 @@ -21,7 +21,7 @@

-Classes

+Classes
BamfMatcher — The base class for all matchers diff -Nru bamf-0.2.108/doc/reference/libbamf/html/index.sgml bamf-0.2.110/doc/reference/libbamf/html/index.sgml --- bamf-0.2.108/doc/reference/libbamf/html/index.sgml 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/html/index.sgml 2012-02-17 11:10:00.000000000 +0000 @@ -6,38 +6,46 @@ - - + - + - + - + - + - + + + + - + + + + + + + @@ -45,10 +53,9 @@ - - + @@ -56,7 +63,6 @@ - @@ -72,12 +78,11 @@ - - + @@ -94,19 +99,18 @@ - - + + + + + + - - - - - - + @@ -130,12 +134,11 @@ - + - diff -Nru bamf-0.2.108/doc/reference/libbamf/html/libbamf.devhelp2 bamf-0.2.110/doc/reference/libbamf/html/libbamf.devhelp2 --- bamf-0.2.108/doc/reference/libbamf/html/libbamf.devhelp2 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/html/libbamf.devhelp2 2012-02-17 11:10:00.000000000 +0000 @@ -18,41 +18,45 @@ - - + - + - + - + - + - + + + - + + + + + + - - + - @@ -61,12 +65,11 @@ - - + @@ -74,19 +77,18 @@ - - + + + + + + - - - - - - + @@ -102,12 +104,11 @@ - + - diff -Nru bamf-0.2.108/doc/reference/libbamf/libbamf-sections.txt bamf-0.2.110/doc/reference/libbamf/libbamf-sections.txt --- bamf-0.2.108/doc/reference/libbamf/libbamf-sections.txt 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/libbamf-sections.txt 2012-02-17 11:10:00.000000000 +0000 @@ -1,41 +1,22 @@
-bamf-window -BamfWindow -BamfWindow -BamfWindowClass -BamfWindowPrivate -BamfWindowType -bamf_window_get_transient -bamf_window_get_window_type -bamf_window_get_xid -bamf_window_last_active - -BAMF_WINDOW -BAMF_IS_WINDOW -BAMF_TYPE_WINDOW -bamf_window_get_type -BAMF_WINDOW_CLASS -BAMF_IS_WINDOW_CLASS -BAMF_WINDOW_GET_CLASS -
- -
-bamf-indicator -BamfIndicator -BamfIndicator -BamfIndicatorClass -BamfIndicatorPrivate -bamf_indicator_get_remote_path -bamf_indicator_get_remote_address -bamf_indicator_get_dbus_menu_path +bamf-application +BamfApplication +BamfApplication +BamfApplicationClass +bamf_application_get_application_type +bamf_application_get_desktop_file +bamf_application_get_show_menu_stubs +bamf_application_get_windows +bamf_application_get_xids -BAMF_INDICATOR -BAMF_IS_INDICATOR -BAMF_TYPE_INDICATOR -bamf_indicator_get_type -BAMF_INDICATOR_CLASS -BAMF_IS_INDICATOR_CLASS -BAMF_INDICATOR_GET_CLASS +BAMF_APPLICATION +BAMF_APPLICATION_CLASS +BAMF_APPLICATION_GET_CLASS +BAMF_IS_APPLICATION +BAMF_IS_APPLICATION_CLASS +BAMF_TYPE_APPLICATION +BamfApplicationPrivate +bamf_application_get_type
@@ -43,7 +24,6 @@ BamfControl BamfControl BamfControlClass -BamfControlPrivate bamf_control_get_default bamf_control_insert_desktop_file bamf_control_register_application_for_pid @@ -51,33 +31,105 @@ bamf_control_set_approver_behavior BAMF_CONTROL +BAMF_CONTROL_CLASS +BAMF_CONTROL_GET_CLASS BAMF_IS_CONTROL +BAMF_IS_CONTROL_CLASS BAMF_TYPE_CONTROL +BamfControlPrivate bamf_control_get_type -BAMF_CONTROL_CLASS -BAMF_IS_CONTROL_CLASS -BAMF_CONTROL_GET_CLASS
-bamf-application -BamfApplication -BamfApplication -BamfApplicationClass -BamfApplicationPrivate -bamf_application_get_application_type -bamf_application_get_desktop_file -bamf_application_get_windows -bamf_application_get_xids -bamf_application_get_show_menu_stubs +bamf-factory +BamfFactory +BamfFactory +BamfFactoryClass +bamf_factory_app_for_file +bamf_factory_get_default +bamf_factory_view_for_path -BAMF_APPLICATION -BAMF_IS_APPLICATION -BAMF_TYPE_APPLICATION -bamf_application_get_type -BAMF_APPLICATION_CLASS -BAMF_IS_APPLICATION_CLASS -BAMF_APPLICATION_GET_CLASS +BAMF_FACTORY +BAMF_FACTORY_CLASS +BAMF_FACTORY_GET_CLASS +BAMF_IS_FACTORY +BAMF_IS_FACTORY_CLASS +BAMF_TYPE_FACTORY +BamfFactoryPrivate +bamf_factory_get_type +
+ +
+bamf-indicator +BamfIndicator +BamfIndicator +BamfIndicatorClass +bamf_indicator_get_dbus_menu_path +bamf_indicator_get_remote_address +bamf_indicator_get_remote_path + +BAMF_INDICATOR +BAMF_INDICATOR_CLASS +BAMF_INDICATOR_GET_CLASS +BAMF_IS_INDICATOR +BAMF_IS_INDICATOR_CLASS +BAMF_TYPE_INDICATOR +BamfIndicatorPrivate +bamf_indicator_get_type +
+ +
+bamf-matcher +BamfMatcher +BamfMatcher +BamfMatcherClass +bamf_matcher_application_is_running +bamf_matcher_get_active_application +bamf_matcher_get_active_window +bamf_matcher_get_application_for_desktop_file +bamf_matcher_get_application_for_window +bamf_matcher_get_application_for_xid +bamf_matcher_get_applications +bamf_matcher_get_default +bamf_matcher_get_running_applications +bamf_matcher_get_tabs +bamf_matcher_get_window_stack_for_monitor +bamf_matcher_get_windows +bamf_matcher_get_xids_for_application +bamf_matcher_register_favorites + +BAMF_IS_MATCHER +BAMF_IS_MATCHER_CLASS +BAMF_MATCHER +BAMF_MATCHER_CLASS +BAMF_MATCHER_GET_CLASS +BAMF_TYPE_MATCHER +BamfMatcherPrivate +bamf_matcher_get_type +
+ +
+bamf-tab +BamfTab +BAMF_TAB_CONST +BamfTab +BamfTabClass +bamf_tab_get_id +bamf_tab_get_preview +bamf_tab_get_uri +bamf_tab_new +bamf_tab_set_preview +bamf_tab_set_uri +bamf_tab_show + +BAMF_IS_TAB +BAMF_IS_TAB_CLASS +BAMF_TAB +BAMF_TAB_CLASS +BAMF_TAB_GET_CLASS +BAMF_TYPE_TAB +BamfTabPrivate +bamf_tab_get_type
@@ -86,20 +138,20 @@ BAMF_TAB_SOURCE_CONST BamfTabSource BamfTabSourceClass -BamfTabSourcePrivate -bamf_tab_source_show_tab bamf_tab_source_get_tab_ids bamf_tab_source_get_tab_preview bamf_tab_source_get_tab_uri bamf_tab_source_get_tab_xid +bamf_tab_source_show_tab -BAMF_TAB_SOURCE BAMF_IS_TAB_SOURCE -BAMF_TYPE_TAB_SOURCE -bamf_tab_source_get_type -BAMF_TAB_SOURCE_CLASS BAMF_IS_TAB_SOURCE_CLASS +BAMF_TAB_SOURCE +BAMF_TAB_SOURCE_CLASS BAMF_TAB_SOURCE_GET_CLASS +BAMF_TYPE_TAB_SOURCE +BamfTabSourcePrivate +bamf_tab_source_get_type
@@ -108,107 +160,65 @@ BamfClickBehavior BamfView BamfViewClass -BamfViewPrivate bamf_view_get_children -bamf_view_is_closed +bamf_view_get_click_suggestion +bamf_view_get_icon +bamf_view_get_name +bamf_view_get_view_type bamf_view_is_active +bamf_view_is_closed bamf_view_is_running +bamf_view_is_sticky bamf_view_is_urgent -bamf_view_get_name -bamf_view_get_icon -bamf_view_user_visible -bamf_view_get_view_type bamf_view_set_sticky -bamf_view_is_sticky -bamf_view_get_click_suggestion +bamf_view_user_visible -BAMF_VIEW BAMF_IS_VIEW +BAMF_IS_VIEW_CLASS BAMF_TYPE_VIEW -bamf_view_get_type +BAMF_VIEW BAMF_VIEW_CLASS -BAMF_IS_VIEW_CLASS BAMF_VIEW_GET_CLASS +BamfViewPrivate +bamf_view_get_type
-bamf-tab -BamfTab -BAMF_TAB_CONST -BamfTab -BamfTabClass -BamfTabPrivate -bamf_tab_get_id -bamf_tab_get_preview -bamf_tab_set_preview -bamf_tab_get_uri -bamf_tab_set_uri -bamf_tab_show -bamf_tab_new - -BAMF_TAB -BAMF_IS_TAB -BAMF_TYPE_TAB -bamf_tab_get_type -BAMF_TAB_CLASS -BAMF_IS_TAB_CLASS -BAMF_TAB_GET_CLASS +bamf-view-private +bamf_view_get_path +bamf_view_remote_ready +bamf_view_set_icon +bamf_view_set_name +bamf_view_set_path
-bamf-matcher -BamfMatcher -BamfMatcher -BamfMatcherClass -BamfMatcherPrivate -bamf_matcher_get_default -bamf_matcher_get_active_application -bamf_matcher_get_active_window -bamf_matcher_get_application_for_xid -bamf_matcher_get_application_for_window -bamf_matcher_application_is_running -bamf_matcher_get_applications -bamf_matcher_register_favorites -bamf_matcher_get_running_applications -bamf_matcher_get_tabs -bamf_matcher_get_xids_for_application -bamf_matcher_get_windows -bamf_matcher_get_application_for_desktop_file +bamf-window +BamfWindow +BamfWindow +BamfWindowClass +BamfWindowMaximizationType +BamfWindowType +bamf_window_get_monitor +bamf_window_get_transient +bamf_window_get_utf8_prop +bamf_window_get_window_type +bamf_window_get_xid +bamf_window_last_active +bamf_window_maximized -BAMF_MATCHER -BAMF_IS_MATCHER -BAMF_TYPE_MATCHER -bamf_matcher_get_type -BAMF_MATCHER_CLASS -BAMF_IS_MATCHER_CLASS -BAMF_MATCHER_GET_CLASS +BAMF_IS_WINDOW +BAMF_IS_WINDOW_CLASS +BAMF_TYPE_WINDOW +BAMF_WINDOW +BAMF_WINDOW_CLASS +BAMF_WINDOW_GET_CLASS +BamfWindowPrivate +bamf_window_get_type
-bamf-factory -BamfFactory -BamfFactory -BamfFactoryClass -BamfFactoryPrivate -bamf_factory_view_for_path -bamf_factory_app_for_file -bamf_factory_get_default - -BAMF_FACTORY -BAMF_IS_FACTORY -BAMF_TYPE_FACTORY -bamf_factory_get_type -BAMF_FACTORY_CLASS -BAMF_IS_FACTORY_CLASS -BAMF_FACTORY_GET_CLASS -
+libbamf -
-bamf-view-private -bamf_view_set_path -bamf_view_get_path -bamf_view_remote_ready -bamf_view_set_name -bamf_view_set_icon
diff -Nru bamf-0.2.108/doc/reference/libbamf/Makefile.in bamf-0.2.110/doc/reference/libbamf/Makefile.in --- bamf-0.2.108/doc/reference/libbamf/Makefile.in 2012-02-03 07:12:17.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/Makefile.in 2012-02-17 11:02:26.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -43,8 +43,7 @@ $(top_srcdir)/gtk-doc.make subdir = doc/reference/libbamf ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/expansions.m4 \ - $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in @@ -185,9 +184,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -expanded_bindir = @expanded_bindir@ -expanded_datadir = @expanded_datadir@ -expanded_libdir = @expanded_libdir@ giomodulesdir = @giomodulesdir@ host = @host@ host_alias = @host_alias@ @@ -345,6 +341,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/gtk-doc.make: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -414,10 +411,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-application.sgml bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-application.sgml --- bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-application.sgml 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-application.sgml 2012-02-17 11:10:00.000000000 +0000 @@ -9,11 +9,13 @@ + + @@ -49,12 +51,6 @@ @parent_class: - - - - - - @@ -73,7 +69,7 @@ @Returns: - + @@ -82,7 +78,7 @@ @Returns: - + @@ -91,7 +87,7 @@ @Returns: - + diff -Nru bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-control.sgml bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-control.sgml --- bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-control.sgml 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-control.sgml 2012-02-17 11:10:00.000000000 +0000 @@ -9,11 +9,13 @@ + + @@ -33,12 +35,6 @@ @parent_class: - - - - - - diff -Nru bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-factory.sgml bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-factory.sgml --- bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-factory.sgml 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-factory.sgml 2012-02-17 11:10:00.000000000 +0000 @@ -9,11 +9,13 @@ + + @@ -33,39 +35,33 @@ @parent_class: - - - - - - - + @factory: @path: +@create: @Returns: - + -@factory: -@path: -@create: +@void: @Returns: - + -@void: +@factory: +@path: @Returns: diff -Nru bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-indicator.sgml bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-indicator.sgml --- bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-indicator.sgml 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-indicator.sgml 2012-02-17 11:10:00.000000000 +0000 @@ -9,11 +9,13 @@ + + @@ -35,13 +37,7 @@ @parent_class: - - - - - - - + @@ -59,7 +55,7 @@ @Returns: - + diff -Nru bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-matcher.sgml bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-matcher.sgml --- bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-matcher.sgml 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-matcher.sgml 2012-02-17 11:10:00.000000000 +0000 @@ -9,11 +9,13 @@ + + @@ -44,15 +46,14 @@ @arg1: @arg2: - + @bamfmatcher: the object which received the signal. -@arg1: - + @@ -60,25 +61,28 @@ @bamfmatcher: the object which received the signal. @arg1: - + -@parent_class: +@bamfmatcher: the object which received the signal. +@arg1: - + +@parent_class: - + -@void: +@matcher: +@application: @Returns: @@ -100,13 +104,14 @@ @Returns: - + @matcher: -@xid: +@desktop_file_path: +@create_if_not_found: @Returns: @@ -120,13 +125,13 @@ @Returns: - + @matcher: -@application: +@xid: @Returns: @@ -139,13 +144,13 @@ @Returns: - + -@matcher: -@favorites: +@void: +@Returns: @@ -166,13 +171,13 @@ @Returns: - + @matcher: -@application: +@monitor: @Returns: @@ -185,14 +190,22 @@ @Returns: - + @matcher: -@desktop_file_path: -@create_if_not_found: +@application: @Returns: + + + + + +@matcher: +@favorites: + + diff -Nru bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-tab.sgml bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-tab.sgml --- bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-tab.sgml 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-tab.sgml 2012-02-17 11:10:00.000000000 +0000 @@ -9,11 +9,13 @@ + + @@ -52,12 +54,6 @@ @_tab_padding5: @_tab_padding6: - - - - - - @@ -76,25 +72,26 @@ @Returns: - + @self: -@uri: +@Returns: - + -@self: +@id: +@uri: @Returns: - + @@ -103,21 +100,20 @@ @uri: - + @self: +@uri: - + -@id: -@uri: -@Returns: +@self: diff -Nru bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-tab-source.sgml bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-tab-source.sgml --- bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-tab-source.sgml 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-tab-source.sgml 2012-02-17 11:10:00.000000000 +0000 @@ -9,11 +9,13 @@ + + @@ -77,33 +79,26 @@ @tab_uri: @tab_xid: - - - - - - - + @source: -@tab_id: -@error: @Returns: - + @source: +@tab_id: @Returns: - + @@ -113,7 +108,7 @@ @Returns: - + @@ -123,13 +118,14 @@ @Returns: - + @source: @tab_id: +@error: @Returns: diff -Nru bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-view-private.sgml bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-view-private.sgml --- bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-view-private.sgml 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-view-private.sgml 2012-02-17 11:10:00.000000000 +0000 @@ -9,27 +9,29 @@ + + - + @view: -@dbus_path: +@Returns: - + @@ -38,13 +40,13 @@ @Returns: - + @view: -@Returns: +@icon: @@ -56,12 +58,12 @@ @name: - + @view: -@icon: +@dbus_path: diff -Nru bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-view.sgml bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-view.sgml --- bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-view.sgml 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-view.sgml 2012-02-17 11:10:00.000000000 +0000 @@ -9,11 +9,13 @@ + + @@ -153,12 +155,6 @@ @user_visible_changed: @name_changed: - - - - - - @@ -168,7 +164,7 @@ @Returns: - + @@ -177,7 +173,7 @@ @Returns: - + @@ -186,7 +182,7 @@ @Returns: - + @@ -195,7 +191,7 @@ @Returns: - + @@ -204,7 +200,7 @@ @Returns: - + @@ -213,7 +209,7 @@ @Returns: - + @@ -222,7 +218,7 @@ @Returns: - + @@ -231,7 +227,7 @@ @Returns: - + @@ -240,25 +236,25 @@ @Returns: - + @view: -@value: +@Returns: - + @view: -@Returns: +@value: - + diff -Nru bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-window.sgml bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-window.sgml --- bamf-0.2.108/doc/reference/libbamf/tmpl/bamf-window.sgml 2012-02-03 07:14:42.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/tmpl/bamf-window.sgml 2012-02-17 11:10:00.000000000 +0000 @@ -9,11 +9,13 @@ + + @@ -26,6 +28,24 @@ + + + + + +@bamfwindow: the object which received the signal. +@arg1: +@arg2: + + + + + + +@bamfwindow: the object which received the signal. +@arg1: +@arg2: + @@ -35,11 +55,15 @@ @monitor_changed: @maximized_changed: - + +@BAMF_WINDOW_FLOATING: +@BAMF_WINDOW_HORIZONTAL_MAXIMIZED: +@BAMF_WINDOW_VERTICAL_MAXIMIZED: +@BAMF_WINDOW_MAXIMIZED: @@ -55,6 +79,15 @@ @BAMF_WINDOW_UTILITY: @BAMF_WINDOW_SPLASHSCREEN: + + + + + +@self: +@Returns: + + @@ -64,6 +97,16 @@ @Returns: + + + + + +@self: +@prop: +@Returns: + + @@ -91,3 +134,12 @@ @Returns: + + + + + +@self: +@Returns: + + diff -Nru bamf-0.2.108/doc/reference/libbamf/tmpl/libbamf.sgml bamf-0.2.110/doc/reference/libbamf/tmpl/libbamf.sgml --- bamf-0.2.108/doc/reference/libbamf/tmpl/libbamf.sgml 1970-01-01 00:00:00.000000000 +0000 +++ bamf-0.2.110/doc/reference/libbamf/tmpl/libbamf.sgml 2012-02-17 11:10:00.000000000 +0000 @@ -0,0 +1,24 @@ + +libbamf + + + + + + + + + + + + + + + + + + + + + + diff -Nru bamf-0.2.108/doc/reference/Makefile.in bamf-0.2.110/doc/reference/Makefile.in --- bamf-0.2.108/doc/reference/Makefile.in 2012-02-03 07:12:16.000000000 +0000 +++ bamf-0.2.110/doc/reference/Makefile.in 2012-02-17 11:02:26.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -36,8 +36,7 @@ subdir = doc/reference DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/expansions.m4 \ - $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in @@ -218,9 +217,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -expanded_bindir = @expanded_bindir@ -expanded_datadir = @expanded_datadir@ -expanded_libdir = @expanded_libdir@ giomodulesdir = @giomodulesdir@ host = @host@ host_alias = @host_alias@ @@ -499,10 +495,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru bamf-0.2.108/install-sh bamf-0.2.110/install-sh --- bamf-0.2.108/install-sh 2012-02-03 07:12:16.000000000 +0000 +++ bamf-0.2.110/install-sh 2012-02-17 11:02:26.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-01-19.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -156,6 +156,10 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -200,7 +208,11 @@ fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for `test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -385,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru bamf-0.2.108/lib/libbamf/bamf-application.c bamf-0.2.110/lib/libbamf/bamf-application.c --- bamf-0.2.108/lib/libbamf/bamf-application.c 2012-02-03 07:09:26.000000000 +0000 +++ bamf-0.2.110/lib/libbamf/bamf-application.c 2012-02-17 10:58:15.000000000 +0000 @@ -462,7 +462,7 @@ BamfApplication *self; GKeyFile *desktop_keyfile; GKeyFileFlags flags; - const gchar *type; + gchar *type; gboolean supported = FALSE; // check that we support this kind of desktop file @@ -475,6 +475,7 @@ supported = TRUE; g_key_file_free (desktop_keyfile); + g_free (type); } if (!supported) return NULL; diff -Nru bamf-0.2.108/lib/libbamf/bamf-matcher.c bamf-0.2.110/lib/libbamf/bamf-matcher.c --- bamf-0.2.108/lib/libbamf/bamf-matcher.c 2012-02-03 07:09:26.000000000 +0000 +++ bamf-0.2.110/lib/libbamf/bamf-matcher.c 2012-02-17 10:58:15.000000000 +0000 @@ -471,7 +471,7 @@ g_warning ("Failed to fetch paths: %s", error->message); g_error_free (error); - return FALSE; + return NULL; } g_return_val_if_fail (array, NULL); @@ -512,7 +512,7 @@ g_warning ("Failed to fetch paths: %s", error->message); g_error_free (error); - return FALSE; + return NULL; } g_return_val_if_fail (array, NULL); @@ -555,7 +555,7 @@ g_warning ("Failed to fetch paths: %s", error->message); g_error_free (error); - return FALSE; + return NULL; } g_return_val_if_fail (array, NULL); diff -Nru bamf-0.2.108/lib/libbamf/bamf-tab-source-glue.h bamf-0.2.110/lib/libbamf/bamf-tab-source-glue.h --- bamf-0.2.108/lib/libbamf/bamf-tab-source-glue.h 2011-01-20 16:10:13.000000000 +0000 +++ bamf-0.2.110/lib/libbamf/bamf-tab-source-glue.h 2012-02-17 11:00:01.000000000 +0000 @@ -10,7 +10,7 @@ #ifdef G_ENABLE_DEBUG #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) +#define g_marshal_value_peek_char(v) g_value_get_schar (v) #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) #define g_marshal_value_peek_int(v) g_value_get_int (v) #define g_marshal_value_peek_uint(v) g_value_get_uint (v) diff -Nru bamf-0.2.108/lib/libbamf/bamf-view.c bamf-0.2.110/lib/libbamf/bamf-view.c --- bamf-0.2.108/lib/libbamf/bamf-view.c 2012-02-03 07:09:26.000000000 +0000 +++ bamf-0.2.110/lib/libbamf/bamf-view.c 2012-02-17 10:58:15.000000000 +0000 @@ -170,6 +170,7 @@ G_TYPE_INVALID)) { g_warning ("Unable to fetch children: %s\n", error->message); + g_error_free (error); return NULL; } @@ -469,8 +470,8 @@ if (priv->cached_children) { - g_object_ref (view); - priv->cached_children = g_list_prepend (priv->cached_children, view); + g_list_free_full (priv->cached_children, g_object_unref); + priv->cached_children = NULL; } g_signal_emit (G_OBJECT (self), view_signals[CHILD_ADDED], 0, view); @@ -481,34 +482,16 @@ { BamfView *view; BamfViewPrivate *priv; - view = NULL; + view = bamf_factory_view_for_path (bamf_factory_get_default (), path); priv = self->priv; if (priv->cached_children) { - GList *l; - for (l = priv->cached_children; l; l = l->next) - { - BamfView *cur_view = BAMF_VIEW (l->data); - if (g_strcmp0 (bamf_view_get_path (cur_view), path) == 0) - { - view = cur_view; - priv->cached_children = g_list_delete_link (priv->cached_children, l); - break; - } - } - - if (!BAMF_IS_VIEW (view)) - { - g_list_free_full (priv->cached_children, g_object_unref); - priv->cached_children = NULL; - } + g_list_free_full (priv->cached_children, g_object_unref); + priv->cached_children = NULL; } g_signal_emit (G_OBJECT (self), view_signals[CHILD_REMOVED], 0, view); - - if (BAMF_IS_VIEW (view)) - g_object_unref (view); } static void @@ -568,14 +551,14 @@ priv->is_closed = TRUE; - if (priv->sticky && priv->proxy) + if (priv->cached_children) { - if (priv->cached_children) - { - g_list_free_full (priv->cached_children, g_object_unref); - priv->cached_children = NULL; - } + g_list_free_full (priv->cached_children, g_object_unref); + priv->cached_children = NULL; + } + if (priv->sticky && priv->proxy) + { dbus_g_proxy_disconnect_signal (priv->proxy, "ActiveChanged", (GCallback) bamf_view_on_active_changed, diff -Nru bamf-0.2.108/lib/libbamf/bamf-window.c bamf-0.2.110/lib/libbamf/bamf-window.c --- bamf-0.2.108/lib/libbamf/bamf-window.c 2012-02-03 07:09:26.000000000 +0000 +++ bamf-0.2.110/lib/libbamf/bamf-window.c 2012-02-17 10:58:15.000000000 +0000 @@ -218,9 +218,6 @@ } priv->xid = bamf_window_get_xid (self); - priv->application_id = bamf_window_get_application_id (self); - priv->unique_bus_name = bamf_window_get_unique_bus_name (self); - priv->dbus_menu_object_path = bamf_window_get_dbus_menu_object_path (self); priv->monitor = bamf_window_get_monitor (self); priv->maximized = bamf_window_maximized (self); @@ -253,10 +250,10 @@ } gchar * -bamf_window_get_application_id (BamfWindow *self) +bamf_window_get_utf8_prop (BamfWindow *self, const char* xprop) { BamfWindowPrivate *priv; - char *app_id = NULL; + char *result = NULL; GError *error = NULL; g_return_val_if_fail (BAMF_IS_WINDOW (self), NULL); @@ -271,105 +268,26 @@ return NULL; if (!dbus_g_proxy_call (priv->proxy, - "ApplicationID", + "Xprop", &error, + G_TYPE_STRING, xprop, G_TYPE_INVALID, - G_TYPE_STRING, &app_id, + G_TYPE_STRING, &result, G_TYPE_INVALID)) { - g_warning ("Failed to fetch application id: %s", error->message); + g_warning ("Failed to fetch property: %s", error->message); g_error_free (error); return NULL; } - if (app_id && app_id[0] != '\0') + if (result && result[0] == '\0') { - g_free (app_id); - app_id = NULL; + g_free (result); + result = NULL; } - return app_id; -} - -gchar * -bamf_window_get_unique_bus_name (BamfWindow *self) -{ - BamfWindowPrivate *priv; - char *bus_name = NULL; - GError *error = NULL; - - g_return_val_if_fail (BAMF_IS_WINDOW (self), NULL); - priv = self->priv; - - if (priv->unique_bus_name) - { - return priv->unique_bus_name; - } - - if (!bamf_view_remote_ready (BAMF_VIEW (self))) - return NULL; - - if (!dbus_g_proxy_call (priv->proxy, - "UniqueBusName", - &error, - G_TYPE_INVALID, - G_TYPE_STRING, &bus_name, - G_TYPE_INVALID)) - { - g_warning ("Failed to fetch unique bus name: %s", error->message); - g_error_free (error); - - return NULL; - } - - if (bus_name && bus_name[0] != '\0') - { - g_free (bus_name); - bus_name = NULL; - } - - return bus_name; -} - -gchar * -bamf_window_get_dbus_menu_object_path (BamfWindow *self) -{ - BamfWindowPrivate *priv; - char *menu_object = NULL; - GError *error = NULL; - - g_return_val_if_fail (BAMF_IS_WINDOW (self), NULL); - priv = self->priv; - - if (priv->dbus_menu_object_path) - { - return priv->dbus_menu_object_path; - } - - if (!bamf_view_remote_ready (BAMF_VIEW (self))) - return NULL; - - if (!dbus_g_proxy_call (priv->proxy, - "DBusMenuObjectPath", - &error, - G_TYPE_INVALID, - G_TYPE_STRING, &menu_object, - G_TYPE_INVALID)) - { - g_warning ("Failed to fetch menu object path: %s", error->message); - g_error_free (error); - - return NULL; - } - - if (menu_object && menu_object[0] != '\0') - { - g_free (menu_object); - menu_object = NULL; - } - - return menu_object; + return result; } gint diff -Nru bamf-0.2.108/lib/libbamf/bamf-window.h bamf-0.2.110/lib/libbamf/bamf-window.h --- bamf-0.2.108/lib/libbamf/bamf-window.h 2012-02-03 07:09:26.000000000 +0000 +++ bamf-0.2.110/lib/libbamf/bamf-window.h 2012-02-17 10:58:15.000000000 +0000 @@ -104,11 +104,7 @@ guint32 bamf_window_get_xid (BamfWindow *self); -gchar * bamf_window_get_application_id (BamfWindow *self); - -gchar * bamf_window_get_unique_bus_name (BamfWindow *self); - -gchar * bamf_window_get_dbus_menu_object_path (BamfWindow *self); +gchar * bamf_window_get_utf8_prop (BamfWindow *self, const char* prop); gint bamf_window_get_monitor (BamfWindow *self); diff -Nru bamf-0.2.108/lib/libbamf/Makefile.in bamf-0.2.110/lib/libbamf/Makefile.in --- bamf-0.2.108/lib/libbamf/Makefile.in 2012-02-03 07:12:17.000000000 +0000 +++ bamf-0.2.110/lib/libbamf/Makefile.in 2012-02-17 11:02:27.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,8 +57,7 @@ $(srcdir)/libbamf3.pc.in $(top_srcdir)/Makefile.am.marshal subdir = lib/libbamf ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/expansions.m4 \ - $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in @@ -89,6 +88,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libbamf_pcdir)" \ "$(DESTDIR)$(library_includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) @@ -272,9 +277,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -expanded_bindir = @expanded_bindir@ -expanded_datadir = @expanded_datadir@ -expanded_libdir = @expanded_libdir@ giomodulesdir = @giomodulesdir@ host = @host@ host_alias = @host_alias@ @@ -412,6 +414,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/Makefile.am.marshal: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -456,9 +459,9 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libbamf.la: $(libbamf_la_OBJECTS) $(libbamf_la_DEPENDENCIES) +libbamf.la: $(libbamf_la_OBJECTS) $(libbamf_la_DEPENDENCIES) $(EXTRA_libbamf_la_DEPENDENCIES) $(libbamf_la_LINK) $(am_libbamf_la_rpath) $(libbamf_la_OBJECTS) $(libbamf_la_LIBADD) $(LIBS) -libbamf3.la: $(libbamf3_la_OBJECTS) $(libbamf3_la_DEPENDENCIES) +libbamf3.la: $(libbamf3_la_OBJECTS) $(libbamf3_la_DEPENDENCIES) $(EXTRA_libbamf3_la_DEPENDENCIES) $(libbamf3_la_LINK) $(am_libbamf3_la_rpath) $(libbamf3_la_OBJECTS) $(libbamf3_la_LIBADD) $(LIBS) mostlyclean-compile: @@ -671,9 +674,7 @@ @$(NORMAL_UNINSTALL) @list='$(libbamf_pc_DATA)'; test -n "$(libbamf_pcdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libbamf_pcdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libbamf_pcdir)" && rm -f $$files + dir='$(DESTDIR)$(libbamf_pcdir)'; $(am__uninstall_files_from_dir) install-library_includeHEADERS: $(library_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(library_includedir)" || $(MKDIR_P) "$(DESTDIR)$(library_includedir)" @@ -691,9 +692,7 @@ @$(NORMAL_UNINSTALL) @list='$(library_include_HEADERS)'; test -n "$(library_includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(library_includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(library_includedir)" && rm -f $$files + dir='$(DESTDIR)$(library_includedir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -796,10 +795,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru bamf-0.2.108/m4/expansions.m4 bamf-0.2.110/m4/expansions.m4 --- bamf-0.2.108/m4/expansions.m4 2010-11-05 13:31:31.000000000 +0000 +++ bamf-0.2.110/m4/expansions.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -AC_DEFUN([SHAMROCK_EXPAND_LIBDIR], -[ - expanded_libdir=`( - case $prefix in - NONE) prefix=$ac_default_prefix ;; - *) ;; - esac - case $exec_prefix in - NONE) exec_prefix=$prefix ;; - *) ;; - esac - eval echo $libdir - )` - AC_SUBST(expanded_libdir) -]) - -AC_DEFUN([SHAMROCK_EXPAND_BINDIR], -[ - expanded_bindir=`( - case $prefix in - NONE) prefix=$ac_default_prefix ;; - *) ;; - esac - case $exec_prefix in - NONE) exec_prefix=$prefix ;; - *) ;; - esac - eval echo $bindir - )` - AC_SUBST(expanded_bindir) -]) - -AC_DEFUN([SHAMROCK_EXPAND_DATADIR], -[ - case $prefix in - NONE) prefix=$ac_default_prefix ;; - *) ;; - esac - - case $exec_prefix in - NONE) exec_prefix=$prefix ;; - *) ;; - esac - - expanded_datadir=`(eval echo $datadir)` - expanded_datadir=`(eval echo $expanded_datadir)` - - AC_SUBST(expanded_datadir) -]) - diff -Nru bamf-0.2.108/m4/i18n.m4 bamf-0.2.110/m4/i18n.m4 --- bamf-0.2.108/m4/i18n.m4 2010-11-05 13:31:31.000000000 +0000 +++ bamf-0.2.110/m4/i18n.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -AC_DEFUN([SHAMROCK_CONFIGURE_I18N], -[ - #IT_PROG_INTLTOOL([0.35.0]) - #AC_PROG_INTLTOOL([0.21]) - - ALL_LINGUAS=`grep -v '^#' $srcdir/po/LINGUAS | sed -r ':a;N;$!ba;s/\n/ /g; s/[ ]+/ /g'` - GETTEXT_PACKAGE=$1 - AC_SUBST(GETTEXT_PACKAGE) - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package]) - AM_GLIB_GNU_GETTEXT - AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS']) -]) - diff -Nru bamf-0.2.108/m4/introspection.m4 bamf-0.2.110/m4/introspection.m4 --- bamf-0.2.108/m4/introspection.m4 2010-11-05 13:31:31.000000000 +0000 +++ bamf-0.2.110/m4/introspection.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,96 +0,0 @@ -dnl -*- mode: autoconf -*- -dnl Copyright 2009 Johan Dahlin -dnl -dnl This file is free software; the author(s) gives unlimited -dnl permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl - -# serial 1 - -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first - - dnl enable/disable introspection - m4_if([$2], [require], - [dnl - enable_introspection=yes - ],[dnl - AC_ARG_ENABLE(introspection, - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], - [Enable introspection for this build]),, - [enable_introspection=auto]) - ])dnl - - AC_MSG_CHECKING([for gobject-introspection]) - - dnl presence/version checking - AS_CASE([$enable_introspection], - [no], [dnl - found_introspection="no (disabled, use --enable-introspection to enable)" - ],dnl - [yes],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0],, - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], - found_introspection=yes, - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) - ],dnl - [auto],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) - ],dnl - [dnl - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) - ])dnl - - AC_MSG_RESULT([$found_introspection]) - - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= - INTROSPECTION_GENERATE= - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)} - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)} - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) - AC_SUBST(INTROSPECTION_CFLAGS) - AC_SUBST(INTROSPECTION_LIBS) - AC_SUBST(INTROSPECTION_MAKEFILE) - - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -]) - - -dnl Usage: -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) - -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -]) - -dnl Usage: -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) - - -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -]) diff -Nru bamf-0.2.108/m4/programs.m4 bamf-0.2.110/m4/programs.m4 --- bamf-0.2.108/m4/programs.m4 2010-11-05 13:31:31.000000000 +0000 +++ bamf-0.2.110/m4/programs.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -AC_DEFUN([SHAMROCK_FIND_PROGRAM], -[ - AC_PATH_PROG($1, $2, $3) - AC_SUBST($1) -]) - -AC_DEFUN([SHAMROCK_FIND_PROGRAM_OR_BAIL], -[ - SHAMROCK_FIND_PROGRAM($1, $2, no) - if test "x$$1" = "xno"; then - AC_MSG_ERROR([You need to install '$2']) - fi -]) - - diff -Nru bamf-0.2.108/m4/util.m4 bamf-0.2.110/m4/util.m4 --- bamf-0.2.108/m4/util.m4 2010-11-05 13:31:31.000000000 +0000 +++ bamf-0.2.110/m4/util.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -AC_DEFUN([SHAMROCK_CONCAT], -[ - $1="$$1 $$2" -]) - -AC_DEFUN([SHAMROCK_CONCAT_MODULE], -[ - SHAMROCK_CONCAT($1_CFLAGS, $2_CFLAGS) - SHAMROCK_CONCAT($1_LIBS, $2_LIBS) -]) - diff -Nru bamf-0.2.108/Makefile.am bamf-0.2.110/Makefile.am --- bamf-0.2.108/Makefile.am 2011-08-04 06:57:25.000000000 +0000 +++ bamf-0.2.110/Makefile.am 2012-02-17 11:05:24.000000000 +0000 @@ -9,6 +9,6 @@ data \ doc -EXTRA_DIST = COPYING.LGPL autogen.sh build.rules.mk m4/i18n.m4 m4/programs.m4 m4/util.m4 +EXTRA_DIST = COPYING.LGPL autogen.sh build.rules.mk DISTCHECK_CONFIGURE_FLAGS = --enable-introspection=no --enable-gtk-doc diff -Nru bamf-0.2.108/Makefile.in bamf-0.2.110/Makefile.in --- bamf-0.2.108/Makefile.in 2012-02-03 07:12:18.000000000 +0000 +++ bamf-0.2.110/Makefile.in 2012-02-17 11:05:30.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -40,8 +40,7 @@ TODO compile config.guess config.sub depcomp install-sh \ ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/expansions.m4 \ - $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in @@ -74,9 +73,11 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -105,6 +106,8 @@ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAFS = @ACLOCAL_AMFLAFS@ @@ -234,9 +237,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -expanded_bindir = @expanded_bindir@ -expanded_datadir = @expanded_datadir@ -expanded_libdir = @expanded_libdir@ giomodulesdir = @giomodulesdir@ host = @host@ host_alias = @host_alias@ @@ -275,13 +275,13 @@ data \ doc -EXTRA_DIST = COPYING.LGPL autogen.sh build.rules.mk m4/i18n.m4 m4/programs.m4 m4/util.m4 +EXTRA_DIST = COPYING.LGPL autogen.sh build.rules.mk DISTCHECK_CONFIGURE_FLAGS = --enable-introspection=no --enable-gtk-doc all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -317,10 +317,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -549,7 +547,11 @@ $(am__remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__remove_distdir) dist-lzma: distdir @@ -557,7 +559,7 @@ $(am__remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) dist-tarZ: distdir @@ -588,6 +590,8 @@ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -607,6 +611,7 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -635,8 +640,16 @@ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -667,10 +680,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -758,8 +776,8 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-generic distclean-hdr \ + dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ + dist-zip distcheck distclean distclean-generic distclean-hdr \ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ diff -Nru bamf-0.2.108/missing bamf-0.2.110/missing --- bamf-0.2.108/missing 2012-02-03 07:12:16.000000000 +0000 +++ bamf-0.2.110/missing 2012-02-17 11:02:26.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.13; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,6 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -122,15 +121,6 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -226,7 +216,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -256,7 +246,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -318,41 +308,6 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. diff -Nru bamf-0.2.108/src/bamf-gdbus-browser-generated.c bamf-0.2.110/src/bamf-gdbus-browser-generated.c --- bamf-0.2.108/src/bamf-gdbus-browser-generated.c 2012-02-03 07:10:22.000000000 +0000 +++ bamf-0.2.110/src/bamf-gdbus-browser-generated.c 2012-02-17 11:00:05.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.31.12. DO NOT EDIT. + * Generated by gdbus-codegen 2.31.16. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ @@ -1739,7 +1739,7 @@ struct _BamfDBusBrowserSkeletonPrivate { - GValueArray *properties; + GValue *properties; GList *changed_properties; GSource *changed_properties_idle_source; GMainContext *context; diff -Nru bamf-0.2.108/src/bamf-gdbus-browser-generated.h bamf-0.2.110/src/bamf-gdbus-browser-generated.h --- bamf-0.2.108/src/bamf-gdbus-browser-generated.h 2012-02-03 07:10:22.000000000 +0000 +++ bamf-0.2.110/src/bamf-gdbus-browser-generated.h 2012-02-17 11:00:05.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.31.12. DO NOT EDIT. + * Generated by gdbus-codegen 2.31.16. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru bamf-0.2.108/src/bamf-gdbus-generated.c bamf-0.2.110/src/bamf-gdbus-generated.c --- bamf-0.2.108/src/bamf-gdbus-generated.c 2012-02-03 07:10:22.000000000 +0000 +++ bamf-0.2.110/src/bamf-gdbus-generated.c 2012-02-17 11:00:05.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.31.12. DO NOT EDIT. + * Generated by gdbus-codegen 2.31.16. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ @@ -1426,7 +1426,7 @@ struct _BamfDBusControlSkeletonPrivate { - GValueArray *properties; + GValue *properties; GList *changed_properties; GSource *changed_properties_idle_source; GMainContext *context; @@ -4926,7 +4926,7 @@ struct _BamfDBusMatcherSkeletonPrivate { - GValueArray *properties; + GValue *properties; GList *changed_properties; GSource *changed_properties_idle_source; GMainContext *context; diff -Nru bamf-0.2.108/src/bamf-gdbus-generated.h bamf-0.2.110/src/bamf-gdbus-generated.h --- bamf-0.2.108/src/bamf-gdbus-generated.h 2012-02-03 07:10:22.000000000 +0000 +++ bamf-0.2.110/src/bamf-gdbus-generated.h 2012-02-17 11:00:05.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.31.12. DO NOT EDIT. + * Generated by gdbus-codegen 2.31.16. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru bamf-0.2.108/src/bamf-gdbus-indicator-source-generated.c bamf-0.2.110/src/bamf-gdbus-indicator-source-generated.c --- bamf-0.2.108/src/bamf-gdbus-indicator-source-generated.c 2012-02-03 07:10:22.000000000 +0000 +++ bamf-0.2.110/src/bamf-gdbus-indicator-source-generated.c 2012-02-17 11:00:05.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.31.12. DO NOT EDIT. + * Generated by gdbus-codegen 2.31.16. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ @@ -949,7 +949,7 @@ struct _StatusNotifierApproverSkeletonPrivate { - GValueArray *properties; + GValue *properties; GList *changed_properties; GSource *changed_properties_idle_source; GMainContext *context; diff -Nru bamf-0.2.108/src/bamf-gdbus-indicator-source-generated.h bamf-0.2.110/src/bamf-gdbus-indicator-source-generated.h --- bamf-0.2.108/src/bamf-gdbus-indicator-source-generated.h 2012-02-03 07:10:22.000000000 +0000 +++ bamf-0.2.110/src/bamf-gdbus-indicator-source-generated.h 2012-02-17 11:00:05.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.31.12. DO NOT EDIT. + * Generated by gdbus-codegen 2.31.16. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru bamf-0.2.108/src/bamf-gdbus-view-generated.c bamf-0.2.110/src/bamf-gdbus-view-generated.c --- bamf-0.2.108/src/bamf-gdbus-view-generated.c 2012-02-03 07:10:22.000000000 +0000 +++ bamf-0.2.110/src/bamf-gdbus-view-generated.c 2012-02-17 11:00:05.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.31.12. DO NOT EDIT. + * Generated by gdbus-codegen 2.31.16. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ @@ -2987,7 +2987,7 @@ struct _BamfDBusItemViewSkeletonPrivate { - GValueArray *properties; + GValue *properties; GList *changed_properties; GSource *changed_properties_idle_source; GMainContext *context; @@ -3397,7 +3397,10 @@ bamf_dbus_item_view_skeleton_finalize (GObject *object) { BamfDBusItemViewSkeleton *skeleton = BAMF_DBUS_ITEM_VIEW_SKELETON (object); - g_value_array_free (skeleton->priv->properties); + guint n; + for (n = 0; n < 4; n++) + g_value_unset (&skeleton->priv->properties[n]); + g_free (skeleton->priv->properties); g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free); if (skeleton->priv->changed_properties_idle_source != NULL) g_source_destroy (skeleton->priv->changed_properties_idle_source); @@ -3415,7 +3418,7 @@ BamfDBusItemViewSkeleton *skeleton = BAMF_DBUS_ITEM_VIEW_SKELETON (object); g_assert (prop_id != 0 && prop_id - 1 < 4); g_mutex_lock (&skeleton->priv->lock); - g_value_copy (&skeleton->priv->properties->values[prop_id - 1], value); + g_value_copy (&skeleton->priv->properties[prop_id - 1], value); g_mutex_unlock (&skeleton->priv->lock); } @@ -3437,7 +3440,7 @@ GVariant *variant; const GValue *cur_value; - cur_value = &skeleton->priv->properties->values[cp->prop_id - 1]; + cur_value = &skeleton->priv->properties[cp->prop_id - 1]; if (!_g_value_equal (cur_value, &cp->orig_value)) { variant = g_dbus_gvalue_to_gvariant (cur_value, G_VARIANT_TYPE (cp->info->parent_struct.signature)); @@ -3533,11 +3536,11 @@ g_assert (prop_id != 0 && prop_id - 1 < 4); g_mutex_lock (&skeleton->priv->lock); g_object_freeze_notify (object); - if (!_g_value_equal (value, &skeleton->priv->properties->values[prop_id - 1])) + if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1])) { if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL) - _bamf_dbus_item_view_schedule_emit_changed (skeleton, _bamf_dbus_item_view_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties->values[prop_id - 1]); - g_value_copy (value, &skeleton->priv->properties->values[prop_id - 1]); + _bamf_dbus_item_view_schedule_emit_changed (skeleton, _bamf_dbus_item_view_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]); + g_value_copy (value, &skeleton->priv->properties[prop_id - 1]); g_object_notify_by_pspec (object, pspec); } g_mutex_unlock (&skeleton->priv->lock); @@ -3550,15 +3553,11 @@ skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, BAMF_DBUS_ITEM_TYPE_VIEW_SKELETON, BamfDBusItemViewSkeletonPrivate); g_mutex_init (&skeleton->priv->lock); skeleton->priv->context = g_main_context_ref_thread_default (); - skeleton->priv->properties = g_value_array_new (4); - g_value_array_append (skeleton->priv->properties, NULL); - g_value_init (&skeleton->priv->properties->values[0], G_TYPE_BOOLEAN); - g_value_array_append (skeleton->priv->properties, NULL); - g_value_init (&skeleton->priv->properties->values[1], G_TYPE_BOOLEAN); - g_value_array_append (skeleton->priv->properties, NULL); - g_value_init (&skeleton->priv->properties->values[2], G_TYPE_BOOLEAN); - g_value_array_append (skeleton->priv->properties, NULL); - g_value_init (&skeleton->priv->properties->values[3], G_TYPE_BOOLEAN); + skeleton->priv->properties = g_new0 (GValue, 4); + g_value_init (&skeleton->priv->properties[0], G_TYPE_BOOLEAN); + g_value_init (&skeleton->priv->properties[1], G_TYPE_BOOLEAN); + g_value_init (&skeleton->priv->properties[2], G_TYPE_BOOLEAN); + g_value_init (&skeleton->priv->properties[3], G_TYPE_BOOLEAN); } static gboolean @@ -3567,7 +3566,7 @@ BamfDBusItemViewSkeleton *skeleton = BAMF_DBUS_ITEM_VIEW_SKELETON (object); gboolean value; g_mutex_lock (&skeleton->priv->lock); - value = g_value_get_boolean (&(skeleton->priv->properties->values[0])); + value = g_value_get_boolean (&(skeleton->priv->properties[0])); g_mutex_unlock (&skeleton->priv->lock); return value; } @@ -3578,7 +3577,7 @@ BamfDBusItemViewSkeleton *skeleton = BAMF_DBUS_ITEM_VIEW_SKELETON (object); gboolean value; g_mutex_lock (&skeleton->priv->lock); - value = g_value_get_boolean (&(skeleton->priv->properties->values[1])); + value = g_value_get_boolean (&(skeleton->priv->properties[1])); g_mutex_unlock (&skeleton->priv->lock); return value; } @@ -3589,7 +3588,7 @@ BamfDBusItemViewSkeleton *skeleton = BAMF_DBUS_ITEM_VIEW_SKELETON (object); gboolean value; g_mutex_lock (&skeleton->priv->lock); - value = g_value_get_boolean (&(skeleton->priv->properties->values[2])); + value = g_value_get_boolean (&(skeleton->priv->properties[2])); g_mutex_unlock (&skeleton->priv->lock); return value; } @@ -3600,7 +3599,7 @@ BamfDBusItemViewSkeleton *skeleton = BAMF_DBUS_ITEM_VIEW_SKELETON (object); gboolean value; g_mutex_lock (&skeleton->priv->lock); - value = g_value_get_boolean (&(skeleton->priv->properties->values[3])); + value = g_value_get_boolean (&(skeleton->priv->properties[3])); g_mutex_unlock (&skeleton->priv->lock); return value; } @@ -4919,7 +4918,7 @@ struct _BamfDBusItemApplicationSkeletonPrivate { - GValueArray *properties; + GValue *properties; GList *changed_properties; GSource *changed_properties_idle_source; GMainContext *context; @@ -5328,37 +5327,24 @@ FALSE }; -static const _ExtendedGDBusArgInfo _bamf_dbus_item_window_method_info_application_id_OUT_ARG_id = +static const _ExtendedGDBusArgInfo _bamf_dbus_item_window_method_info_xprop_IN_ARG_xprop = { { -1, - "id", + "xprop", "s", NULL }, FALSE }; -static const _ExtendedGDBusArgInfo * const _bamf_dbus_item_window_method_info_application_id_OUT_ARG_pointers[] = +static const _ExtendedGDBusArgInfo * const _bamf_dbus_item_window_method_info_xprop_IN_ARG_pointers[] = { - &_bamf_dbus_item_window_method_info_application_id_OUT_ARG_id, + &_bamf_dbus_item_window_method_info_xprop_IN_ARG_xprop, NULL }; -static const _ExtendedGDBusMethodInfo _bamf_dbus_item_window_method_info_application_id = -{ - { - -1, - "ApplicationID", - NULL, - (GDBusArgInfo **) &_bamf_dbus_item_window_method_info_application_id_OUT_ARG_pointers, - NULL - }, - "handle-application-id", - FALSE -}; - -static const _ExtendedGDBusArgInfo _bamf_dbus_item_window_method_info_unique_bus_name_OUT_ARG_name = +static const _ExtendedGDBusArgInfo _bamf_dbus_item_window_method_info_xprop_OUT_ARG_name = { { -1, @@ -5369,52 +5355,22 @@ FALSE }; -static const _ExtendedGDBusArgInfo * const _bamf_dbus_item_window_method_info_unique_bus_name_OUT_ARG_pointers[] = +static const _ExtendedGDBusArgInfo * const _bamf_dbus_item_window_method_info_xprop_OUT_ARG_pointers[] = { - &_bamf_dbus_item_window_method_info_unique_bus_name_OUT_ARG_name, + &_bamf_dbus_item_window_method_info_xprop_OUT_ARG_name, NULL }; -static const _ExtendedGDBusMethodInfo _bamf_dbus_item_window_method_info_unique_bus_name = +static const _ExtendedGDBusMethodInfo _bamf_dbus_item_window_method_info_xprop = { { -1, - "UniqueBusName", - NULL, - (GDBusArgInfo **) &_bamf_dbus_item_window_method_info_unique_bus_name_OUT_ARG_pointers, - NULL - }, - "handle-unique-bus-name", - FALSE -}; - -static const _ExtendedGDBusArgInfo _bamf_dbus_item_window_method_info_dbus_menu_object_path_OUT_ARG_object_path = -{ - { - -1, - "object_path", - "s", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _bamf_dbus_item_window_method_info_dbus_menu_object_path_OUT_ARG_pointers[] = -{ - &_bamf_dbus_item_window_method_info_dbus_menu_object_path_OUT_ARG_object_path, - NULL -}; - -static const _ExtendedGDBusMethodInfo _bamf_dbus_item_window_method_info_dbus_menu_object_path = -{ - { - -1, - "DBusMenuObjectPath", - NULL, - (GDBusArgInfo **) &_bamf_dbus_item_window_method_info_dbus_menu_object_path_OUT_ARG_pointers, + "Xprop", + (GDBusArgInfo **) &_bamf_dbus_item_window_method_info_xprop_IN_ARG_pointers, + (GDBusArgInfo **) &_bamf_dbus_item_window_method_info_xprop_OUT_ARG_pointers, NULL }, - "handle-dbus-menu-object-path", + "handle-xprop", FALSE }; @@ -5483,9 +5439,7 @@ &_bamf_dbus_item_window_method_info_get_xid, &_bamf_dbus_item_window_method_info_transient, &_bamf_dbus_item_window_method_info_window_type, - &_bamf_dbus_item_window_method_info_application_id, - &_bamf_dbus_item_window_method_info_unique_bus_name, - &_bamf_dbus_item_window_method_info_dbus_menu_object_path, + &_bamf_dbus_item_window_method_info_xprop, &_bamf_dbus_item_window_method_info_monitor, &_bamf_dbus_item_window_method_info_maximized, NULL @@ -5632,14 +5586,12 @@ /** * BamfDBusItemWindowIface: * @parent_iface: The parent interface. - * @handle_application_id: Handler for the #BamfDBusItemWindow::handle-application-id signal. - * @handle_dbus_menu_object_path: Handler for the #BamfDBusItemWindow::handle-dbus-menu-object-path signal. * @handle_get_xid: Handler for the #BamfDBusItemWindow::handle-get-xid signal. * @handle_maximized: Handler for the #BamfDBusItemWindow::handle-maximized signal. * @handle_monitor: Handler for the #BamfDBusItemWindow::handle-monitor signal. * @handle_transient: Handler for the #BamfDBusItemWindow::handle-transient signal. - * @handle_unique_bus_name: Handler for the #BamfDBusItemWindow::handle-unique-bus-name signal. * @handle_window_type: Handler for the #BamfDBusItemWindow::handle-window-type signal. + * @handle_xprop: Handler for the #BamfDBusItemWindow::handle-xprop signal. * @maximized_changed: Handler for the #BamfDBusItemWindow::maximized-changed signal. * @monitor_changed: Handler for the #BamfDBusItemWindow::monitor-changed signal. * @@ -5717,70 +5669,27 @@ G_TYPE_DBUS_METHOD_INVOCATION); /** - * BamfDBusItemWindow::handle-application-id: + * BamfDBusItemWindow::handle-xprop: * @object: A #BamfDBusItemWindow. * @invocation: A #GDBusMethodInvocation. + * @arg_xprop: Argument passed by remote caller. * - * Signal emitted when a remote caller is invoking the ApplicationID() D-Bus method. + * Signal emitted when a remote caller is invoking the Xprop() D-Bus method. * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call bamf_dbus_item_window_complete_application_id() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call bamf_dbus_item_window_complete_xprop() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. * * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. */ - g_signal_new ("handle-application-id", + g_signal_new ("handle-xprop", G_TYPE_FROM_INTERFACE (iface), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (BamfDBusItemWindowIface, handle_application_id), + G_STRUCT_OFFSET (BamfDBusItemWindowIface, handle_xprop), g_signal_accumulator_true_handled, NULL, g_cclosure_marshal_generic, G_TYPE_BOOLEAN, - 1, - G_TYPE_DBUS_METHOD_INVOCATION); - - /** - * BamfDBusItemWindow::handle-unique-bus-name: - * @object: A #BamfDBusItemWindow. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the UniqueBusName() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call bamf_dbus_item_window_complete_unique_bus_name() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-unique-bus-name", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (BamfDBusItemWindowIface, handle_unique_bus_name), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 1, - G_TYPE_DBUS_METHOD_INVOCATION); - - /** - * BamfDBusItemWindow::handle-dbus-menu-object-path: - * @object: A #BamfDBusItemWindow. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the DBusMenuObjectPath() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call bamf_dbus_item_window_complete_dbus_menu_object_path() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-dbus-menu-object-path", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (BamfDBusItemWindowIface, handle_dbus_menu_object_path), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 1, - G_TYPE_DBUS_METHOD_INVOCATION); + 2, + G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING); /** * BamfDBusItemWindow::handle-monitor: @@ -6201,126 +6110,31 @@ } /** - * bamf_dbus_item_window_call_application_id: + * bamf_dbus_item_window_call_xprop: * @proxy: A #BamfDBusItemWindowProxy. + * @arg_xprop: Argument to pass with the method invocation. * @cancellable: (allow-none): A #GCancellable or %NULL. * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. * @user_data: User data to pass to @callback. * - * Asynchronously invokes the ApplicationID() D-Bus method on @proxy. + * Asynchronously invokes the Xprop() D-Bus method on @proxy. * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call bamf_dbus_item_window_call_application_id_finish() to get the result of the operation. + * You can then call bamf_dbus_item_window_call_xprop_finish() to get the result of the operation. * - * See bamf_dbus_item_window_call_application_id_sync() for the synchronous, blocking version of this method. + * See bamf_dbus_item_window_call_xprop_sync() for the synchronous, blocking version of this method. */ void -bamf_dbus_item_window_call_application_id ( +bamf_dbus_item_window_call_xprop ( BamfDBusItemWindow *proxy, + const gchar *arg_xprop, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) { g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "ApplicationID", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * bamf_dbus_item_window_call_application_id_finish: - * @proxy: A #BamfDBusItemWindowProxy. - * @out_id: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to bamf_dbus_item_window_call_application_id(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with bamf_dbus_item_window_call_application_id(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -bamf_dbus_item_window_call_application_id_finish ( - BamfDBusItemWindow *proxy, - gchar **out_id, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(s)", - out_id); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * bamf_dbus_item_window_call_application_id_sync: - * @proxy: A #BamfDBusItemWindowProxy. - * @out_id: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the ApplicationID() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See bamf_dbus_item_window_call_application_id() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -bamf_dbus_item_window_call_application_id_sync ( - BamfDBusItemWindow *proxy, - gchar **out_id, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "ApplicationID", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(s)", - out_id); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * bamf_dbus_item_window_call_unique_bus_name: - * @proxy: A #BamfDBusItemWindowProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the UniqueBusName() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call bamf_dbus_item_window_call_unique_bus_name_finish() to get the result of the operation. - * - * See bamf_dbus_item_window_call_unique_bus_name_sync() for the synchronous, blocking version of this method. - */ -void -bamf_dbus_item_window_call_unique_bus_name ( - BamfDBusItemWindow *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "UniqueBusName", - g_variant_new ("()"), + "Xprop", + g_variant_new ("(s)", + arg_xprop), G_DBUS_CALL_FLAGS_NONE, -1, cancellable, @@ -6329,18 +6143,18 @@ } /** - * bamf_dbus_item_window_call_unique_bus_name_finish: + * bamf_dbus_item_window_call_xprop_finish: * @proxy: A #BamfDBusItemWindowProxy. * @out_name: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to bamf_dbus_item_window_call_unique_bus_name(). + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to bamf_dbus_item_window_call_xprop(). * @error: Return location for error or %NULL. * - * Finishes an operation started with bamf_dbus_item_window_call_unique_bus_name(). + * Finishes an operation started with bamf_dbus_item_window_call_xprop(). * * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. */ gboolean -bamf_dbus_item_window_call_unique_bus_name_finish ( +bamf_dbus_item_window_call_xprop_finish ( BamfDBusItemWindow *proxy, gchar **out_name, GAsyncResult *res, @@ -6359,29 +6173,32 @@ } /** - * bamf_dbus_item_window_call_unique_bus_name_sync: + * bamf_dbus_item_window_call_xprop_sync: * @proxy: A #BamfDBusItemWindowProxy. + * @arg_xprop: Argument to pass with the method invocation. * @out_name: (out): Return location for return parameter or %NULL to ignore. * @cancellable: (allow-none): A #GCancellable or %NULL. * @error: Return location for error or %NULL. * - * Synchronously invokes the UniqueBusName() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * Synchronously invokes the Xprop() D-Bus method on @proxy. The calling thread is blocked until a reply is received. * - * See bamf_dbus_item_window_call_unique_bus_name() for the asynchronous version of this method. + * See bamf_dbus_item_window_call_xprop() for the asynchronous version of this method. * * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. */ gboolean -bamf_dbus_item_window_call_unique_bus_name_sync ( +bamf_dbus_item_window_call_xprop_sync ( BamfDBusItemWindow *proxy, + const gchar *arg_xprop, gchar **out_name, GCancellable *cancellable, GError **error) { GVariant *_ret; _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "UniqueBusName", - g_variant_new ("()"), + "Xprop", + g_variant_new ("(s)", + arg_xprop), G_DBUS_CALL_FLAGS_NONE, -1, cancellable, @@ -6397,104 +6214,6 @@ } /** - * bamf_dbus_item_window_call_dbus_menu_object_path: - * @proxy: A #BamfDBusItemWindowProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the DBusMenuObjectPath() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call bamf_dbus_item_window_call_dbus_menu_object_path_finish() to get the result of the operation. - * - * See bamf_dbus_item_window_call_dbus_menu_object_path_sync() for the synchronous, blocking version of this method. - */ -void -bamf_dbus_item_window_call_dbus_menu_object_path ( - BamfDBusItemWindow *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "DBusMenuObjectPath", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * bamf_dbus_item_window_call_dbus_menu_object_path_finish: - * @proxy: A #BamfDBusItemWindowProxy. - * @out_object_path: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to bamf_dbus_item_window_call_dbus_menu_object_path(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with bamf_dbus_item_window_call_dbus_menu_object_path(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -bamf_dbus_item_window_call_dbus_menu_object_path_finish ( - BamfDBusItemWindow *proxy, - gchar **out_object_path, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(s)", - out_object_path); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * bamf_dbus_item_window_call_dbus_menu_object_path_sync: - * @proxy: A #BamfDBusItemWindowProxy. - * @out_object_path: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the DBusMenuObjectPath() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See bamf_dbus_item_window_call_dbus_menu_object_path() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -bamf_dbus_item_window_call_dbus_menu_object_path_sync ( - BamfDBusItemWindow *proxy, - gchar **out_object_path, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "DBusMenuObjectPath", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(s)", - out_object_path); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** * bamf_dbus_item_window_call_monitor: * @proxy: A #BamfDBusItemWindowProxy. * @cancellable: (allow-none): A #GCancellable or %NULL. @@ -6754,38 +6473,17 @@ } /** - * bamf_dbus_item_window_complete_application_id: - * @object: A #BamfDBusItemWindow. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @id: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the ApplicationID() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -bamf_dbus_item_window_complete_application_id ( - BamfDBusItemWindow *object, - GDBusMethodInvocation *invocation, - const gchar *id) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(s)", - id)); -} - -/** - * bamf_dbus_item_window_complete_unique_bus_name: + * bamf_dbus_item_window_complete_xprop: * @object: A #BamfDBusItemWindow. * @invocation: (transfer full): A #GDBusMethodInvocation. * @name: Parameter to return. * - * Helper function used in service implementations to finish handling invocations of the UniqueBusName() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * Helper function used in service implementations to finish handling invocations of the Xprop() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. * * This method will free @invocation, you cannot use it afterwards. */ void -bamf_dbus_item_window_complete_unique_bus_name ( +bamf_dbus_item_window_complete_xprop ( BamfDBusItemWindow *object, GDBusMethodInvocation *invocation, const gchar *name) @@ -6796,27 +6494,6 @@ } /** - * bamf_dbus_item_window_complete_dbus_menu_object_path: - * @object: A #BamfDBusItemWindow. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @object_path: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the DBusMenuObjectPath() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -bamf_dbus_item_window_complete_dbus_menu_object_path ( - BamfDBusItemWindow *object, - GDBusMethodInvocation *invocation, - const gchar *object_path) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(s)", - object_path)); -} - -/** * bamf_dbus_item_window_complete_monitor: * @object: A #BamfDBusItemWindow. * @invocation: (transfer full): A #GDBusMethodInvocation. @@ -7205,7 +6882,7 @@ struct _BamfDBusItemWindowSkeletonPrivate { - GValueArray *properties; + GValue *properties; GList *changed_properties; GSource *changed_properties_idle_source; GMainContext *context; @@ -8293,7 +7970,7 @@ struct _BamfDBusItemIndicatorSkeletonPrivate { - GValueArray *properties; + GValue *properties; GList *changed_properties; GSource *changed_properties_idle_source; GMainContext *context; @@ -9732,7 +9409,7 @@ struct _BamfDBusItemTabSkeletonPrivate { - GValueArray *properties; + GValue *properties; GList *changed_properties; GSource *changed_properties_idle_source; GMainContext *context; diff -Nru bamf-0.2.108/src/bamf-gdbus-view-generated.h bamf-0.2.110/src/bamf-gdbus-view-generated.h --- bamf-0.2.108/src/bamf-gdbus-view-generated.h 2012-02-03 07:10:22.000000000 +0000 +++ bamf-0.2.110/src/bamf-gdbus-view-generated.h 2012-02-17 11:00:05.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.31.12. DO NOT EDIT. + * Generated by gdbus-codegen 2.31.16. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ @@ -743,14 +743,6 @@ GTypeInterface parent_iface; - gboolean (*handle_application_id) ( - BamfDBusItemWindow *object, - GDBusMethodInvocation *invocation); - - gboolean (*handle_dbus_menu_object_path) ( - BamfDBusItemWindow *object, - GDBusMethodInvocation *invocation); - gboolean (*handle_get_xid) ( BamfDBusItemWindow *object, GDBusMethodInvocation *invocation); @@ -767,13 +759,14 @@ BamfDBusItemWindow *object, GDBusMethodInvocation *invocation); - gboolean (*handle_unique_bus_name) ( + gboolean (*handle_window_type) ( BamfDBusItemWindow *object, GDBusMethodInvocation *invocation); - gboolean (*handle_window_type) ( + gboolean (*handle_xprop) ( BamfDBusItemWindow *object, - GDBusMethodInvocation *invocation); + GDBusMethodInvocation *invocation, + const gchar *arg_xprop); void (*maximized_changed) ( BamfDBusItemWindow *object, @@ -809,21 +802,11 @@ GDBusMethodInvocation *invocation, guint type); -void bamf_dbus_item_window_complete_application_id ( - BamfDBusItemWindow *object, - GDBusMethodInvocation *invocation, - const gchar *id); - -void bamf_dbus_item_window_complete_unique_bus_name ( +void bamf_dbus_item_window_complete_xprop ( BamfDBusItemWindow *object, GDBusMethodInvocation *invocation, const gchar *name); -void bamf_dbus_item_window_complete_dbus_menu_object_path ( - BamfDBusItemWindow *object, - GDBusMethodInvocation *invocation, - const gchar *object_path); - void bamf_dbus_item_window_complete_monitor ( BamfDBusItemWindow *object, GDBusMethodInvocation *invocation, @@ -904,60 +887,26 @@ GCancellable *cancellable, GError **error); -void bamf_dbus_item_window_call_application_id ( - BamfDBusItemWindow *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean bamf_dbus_item_window_call_application_id_finish ( - BamfDBusItemWindow *proxy, - gchar **out_id, - GAsyncResult *res, - GError **error); - -gboolean bamf_dbus_item_window_call_application_id_sync ( - BamfDBusItemWindow *proxy, - gchar **out_id, - GCancellable *cancellable, - GError **error); - -void bamf_dbus_item_window_call_unique_bus_name ( +void bamf_dbus_item_window_call_xprop ( BamfDBusItemWindow *proxy, + const gchar *arg_xprop, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); -gboolean bamf_dbus_item_window_call_unique_bus_name_finish ( +gboolean bamf_dbus_item_window_call_xprop_finish ( BamfDBusItemWindow *proxy, gchar **out_name, GAsyncResult *res, GError **error); -gboolean bamf_dbus_item_window_call_unique_bus_name_sync ( +gboolean bamf_dbus_item_window_call_xprop_sync ( BamfDBusItemWindow *proxy, + const gchar *arg_xprop, gchar **out_name, GCancellable *cancellable, GError **error); -void bamf_dbus_item_window_call_dbus_menu_object_path ( - BamfDBusItemWindow *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean bamf_dbus_item_window_call_dbus_menu_object_path_finish ( - BamfDBusItemWindow *proxy, - gchar **out_object_path, - GAsyncResult *res, - GError **error); - -gboolean bamf_dbus_item_window_call_dbus_menu_object_path_sync ( - BamfDBusItemWindow *proxy, - gchar **out_object_path, - GCancellable *cancellable, - GError **error); - void bamf_dbus_item_window_call_monitor ( BamfDBusItemWindow *proxy, GCancellable *cancellable, diff -Nru bamf-0.2.108/src/bamf-indicator-source.c bamf-0.2.110/src/bamf-indicator-source.c --- bamf-0.2.108/src/bamf-indicator-source.c 2012-02-03 07:09:26.000000000 +0000 +++ bamf-0.2.110/src/bamf-indicator-source.c 2012-02-17 10:58:15.000000000 +0000 @@ -226,6 +226,7 @@ GDBusProxy *gproxy; GError *error = NULL; gchar *owner; + GVariant* result; gproxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES| @@ -257,7 +258,7 @@ g_variant_builder_init (&array, G_VARIANT_TYPE ("as")); g_variant_builder_add_value (&tuple, g_variant_builder_end (&array)); - g_dbus_proxy_call_sync (gproxy, "XAyatanaRegisterNotificationApprover", + result = g_dbus_proxy_call_sync (gproxy, "XAyatanaRegisterNotificationApprover", g_variant_builder_end (&tuple), G_DBUS_CALL_FLAGS_NONE, -1, @@ -271,6 +272,7 @@ (GCallback) status_notifier_proxy_owner_changed, self); + g_variant_unref (result); if (self->priv->proxy) g_object_unref (self->priv->proxy); diff -Nru bamf-0.2.108/src/bamf-legacy-window.c bamf-0.2.110/src/bamf-legacy-window.c --- bamf-0.2.108/src/bamf-legacy-window.c 2012-02-03 07:09:26.000000000 +0000 +++ bamf-0.2.110/src/bamf-legacy-window.c 2012-02-17 10:58:15.000000000 +0000 @@ -402,48 +402,15 @@ } char * -bamf_legacy_window_get_app_id (BamfLegacyWindow *self) +bamf_legacy_window_get_utf8_xprop (BamfLegacyWindow *self, const char* prop) { g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (self), NULL); - if (BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_app_id) - return BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_app_id (self); - - if (!self->priv->legacy_window) - return NULL; - - guint xid = bamf_legacy_window_get_xid (self); - return bamf_xutils_get_window_hint (xid, "_DBUS_APPLICATION_ID"); -} - -char * -bamf_legacy_window_get_unique_bus_name (BamfLegacyWindow *self) -{ - g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (self), NULL); - - if (BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_unique_bus_name) - return BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_unique_bus_name (self); - - if (!self->priv->legacy_window) - return NULL; - - guint xid = bamf_legacy_window_get_xid (self); - return bamf_xutils_get_window_hint (xid, "_DBUS_UNIQUE_NAME"); -} - -char * -bamf_legacy_window_get_menu_object_path (BamfLegacyWindow *self) -{ - g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (self), NULL); - - if (BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_menu_object_path) - return BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_menu_object_path (self); - if (!self->priv->legacy_window) return NULL; guint xid = bamf_legacy_window_get_xid (self); - return bamf_xutils_get_window_hint (xid, "_DBUS_OBJECT_PATH"); + return bamf_xutils_get_window_hint (xid, prop, XInternAtom(gdk_x11_get_default_xdisplay (), "UTF8_STRING", False)); } static void diff -Nru bamf-0.2.108/src/bamf-legacy-window.h bamf-0.2.110/src/bamf-legacy-window.h --- bamf-0.2.108/src/bamf-legacy-window.h 2012-02-03 07:09:26.000000000 +0000 +++ bamf-0.2.110/src/bamf-legacy-window.h 2012-02-17 10:58:15.000000000 +0000 @@ -140,11 +140,7 @@ BamfLegacyWindow * bamf_legacy_window_get_transient (BamfLegacyWindow *self); -char * bamf_legacy_window_get_app_id (BamfLegacyWindow *self); - -char * bamf_legacy_window_get_unique_bus_name (BamfLegacyWindow *self); - -char * bamf_legacy_window_get_menu_object_path (BamfLegacyWindow *self); +char * bamf_legacy_window_get_utf8_xprop (BamfLegacyWindow *self, const char* prop); gint bamf_legacy_window_get_stacking_position (BamfLegacyWindow *self); diff -Nru bamf-0.2.108/src/bamf-matcher.c bamf-0.2.110/src/bamf-matcher.c --- bamf-0.2.108/src/bamf-matcher.c 2012-02-03 07:09:26.000000000 +0000 +++ bamf-0.2.110/src/bamf-matcher.c 2012-02-17 10:58:15.000000000 +0000 @@ -1356,7 +1356,7 @@ g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (window), NULL); Window xid = bamf_legacy_window_get_xid (window); - return bamf_xutils_get_window_hint (xid, atom_name); + return bamf_xutils_get_window_hint (xid, atom_name, XA_STRING); } static void @@ -1365,7 +1365,7 @@ g_return_if_fail (BAMF_LEGACY_WINDOW (window)); Window xid = bamf_legacy_window_get_xid (window); - bamf_xutils_set_window_hint (xid, atom_name, data); + bamf_xutils_set_window_hint (xid, atom_name, XA_STRING, data); } static char * diff -Nru bamf-0.2.108/src/bamf-window.c bamf-0.2.110/src/bamf-window.c --- bamf-0.2.108/src/bamf-window.c 2012-02-03 07:09:26.000000000 +0000 +++ bamf-0.2.110/src/bamf-window.c 2012-02-17 10:58:15.000000000 +0000 @@ -224,24 +224,10 @@ } char * -bamf_window_get_app_id (BamfWindow *self) +bamf_window_get_xprop (BamfWindow *self, const char* prop) { g_return_val_if_fail (BAMF_IS_WINDOW (self), NULL); - return bamf_legacy_window_get_app_id (self->priv->legacy_window); -} - -char * -bamf_window_get_unique_bus_name (BamfWindow *self) -{ - g_return_val_if_fail (BAMF_IS_WINDOW (self), NULL); - return bamf_legacy_window_get_unique_bus_name (self->priv->legacy_window); -} - -char * -bamf_window_get_menu_object_path (BamfWindow *self) -{ - g_return_val_if_fail (BAMF_IS_WINDOW (self), NULL); - return bamf_legacy_window_get_menu_object_path (self->priv->legacy_window); + return bamf_legacy_window_get_utf8_xprop(self->priv->legacy_window, prop); } BamfWindowMaximizationType @@ -324,25 +310,12 @@ } static gboolean -on_dbus_handle_application_id (BamfDBusItemWindow *interface, - GDBusMethodInvocation *invocation, - BamfWindow *self) -{ - char *app_id = bamf_legacy_window_get_app_id (self->priv->legacy_window); - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(s)", app_id ? app_id : "")); - - g_free (app_id); - - return TRUE; -} - -static gboolean -on_dbus_handle_unique_bus_name (BamfDBusItemWindow *interface, - GDBusMethodInvocation *invocation, - BamfWindow *self) +on_dbus_handle_xprop (BamfDBusItemWindow *interface, + GDBusMethodInvocation *invocation, + const gchar *prop, + BamfWindow *self) { - char *bus_name = bamf_legacy_window_get_unique_bus_name (self->priv->legacy_window); + char *bus_name = bamf_window_get_xprop (self, prop); g_dbus_method_invocation_return_value (invocation, g_variant_new ("(s)", bus_name ? bus_name : "")); @@ -352,20 +325,6 @@ } static gboolean -on_dbus_handle_dbus_menu_object_path (BamfDBusItemWindow *interface, - GDBusMethodInvocation *invocation, - BamfWindow *self) -{ - char *obj_path = bamf_window_get_menu_object_path (self); - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(s)", obj_path ? obj_path : "")); - - g_free (obj_path); - - return TRUE; -} - -static gboolean on_dbus_handle_monitor (BamfDBusItemWindow *interface, GDBusMethodInvocation *invocation, BamfWindow *self) @@ -543,14 +502,8 @@ g_signal_connect (self->priv->dbus_iface, "handle-window-type", G_CALLBACK (on_dbus_handle_window_type), self); - g_signal_connect (self->priv->dbus_iface, "handle-application-id", - G_CALLBACK (on_dbus_handle_application_id), self); - - g_signal_connect (self->priv->dbus_iface, "handle-unique-bus-name", - G_CALLBACK (on_dbus_handle_unique_bus_name), self); - - g_signal_connect (self->priv->dbus_iface, "handle-dbus-menu-object-path", - G_CALLBACK (on_dbus_handle_dbus_menu_object_path), self); + g_signal_connect (self->priv->dbus_iface, "handle-xprop", + G_CALLBACK (on_dbus_handle_xprop), self); g_signal_connect (self->priv->dbus_iface, "handle-monitor", G_CALLBACK (on_dbus_handle_monitor), self); diff -Nru bamf-0.2.108/src/bamf-window.h bamf-0.2.110/src/bamf-window.h --- bamf-0.2.108/src/bamf-window.h 2012-02-03 07:09:26.000000000 +0000 +++ bamf-0.2.110/src/bamf-window.h 2012-02-17 10:58:15.000000000 +0000 @@ -74,11 +74,7 @@ gint bamf_window_get_stack_position (BamfWindow *window); -char * bamf_window_get_app_id (BamfWindow *self); - -char * bamf_window_get_unique_bus_name (BamfWindow *self); - -char * bamf_window_get_menu_object_path (BamfWindow *self); +char * bamf_window_get_xprop (BamfWindow *self, const char* prop); BamfWindowMaximizationType bamf_window_maximized (BamfWindow *self); diff -Nru bamf-0.2.108/src/bamf-xutils.c bamf-0.2.110/src/bamf-xutils.c --- bamf-0.2.108/src/bamf-xutils.c 2012-02-03 07:09:26.000000000 +0000 +++ bamf-0.2.110/src/bamf-xutils.c 2012-02-17 10:58:15.000000000 +0000 @@ -22,12 +22,12 @@ #include char * -bamf_xutils_get_window_hint (Window xid, const char *atom_name) +bamf_xutils_get_window_hint (Window xid, const char *atom_name, Atom type) { Display *XDisplay; Atom atom; char *hint = NULL; - Atom type; + Atom result_type; gint format; gulong numItems; gulong bytesAfter; @@ -58,8 +58,8 @@ 0, G_MAXINT, FALSE, - XA_STRING, - &type, + type, + &result_type, &format, &numItems, &bytesAfter, @@ -78,7 +78,7 @@ } void -bamf_xutils_set_window_hint (Window xid, const char *atom_name, const char *data) +bamf_xutils_set_window_hint (Window xid, const char *atom_name, Atom type, const char *data) { Display *XDisplay; gboolean close_display = TRUE; @@ -104,7 +104,7 @@ XInternAtom (XDisplay, atom_name, FALSE), - XA_STRING, + type, 8, PropModeReplace, (unsigned char *) data, diff -Nru bamf-0.2.108/src/bamf-xutils.h bamf-0.2.110/src/bamf-xutils.h --- bamf-0.2.108/src/bamf-xutils.h 2012-02-03 07:09:26.000000000 +0000 +++ bamf-0.2.110/src/bamf-xutils.h 2012-02-17 10:58:15.000000000 +0000 @@ -26,7 +26,7 @@ #include #include -void bamf_xutils_set_window_hint (Window xid, const char *atom_name, const char *data); -char* bamf_xutils_get_window_hint (Window xid, const char *atom_name); +void bamf_xutils_set_window_hint (Window xid, const char *atom_name, Atom type, const char *data); +char* bamf_xutils_get_window_hint (Window xid, const char *atom_name, Atom type); #endif diff -Nru bamf-0.2.108/src/Makefile.in bamf-0.2.110/src/Makefile.in --- bamf-0.2.108/src/Makefile.in 2012-02-03 07:12:17.000000000 +0000 +++ bamf-0.2.110/src/Makefile.in 2012-02-17 11:02:27.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -55,8 +55,7 @@ bamfdaemon_PROGRAMS = bamfdaemon$(EXEEXT) subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/expansions.m4 \ - $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in @@ -244,9 +243,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -expanded_bindir = @expanded_bindir@ -expanded_datadir = @expanded_datadir@ -expanded_libdir = @expanded_libdir@ giomodulesdir = @giomodulesdir@ host = @host@ host_alias = @host_alias@ @@ -413,6 +409,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/Makefile.am.marshal: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -465,7 +462,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -bamfdaemon$(EXEEXT): $(bamfdaemon_OBJECTS) $(bamfdaemon_DEPENDENCIES) +bamfdaemon$(EXEEXT): $(bamfdaemon_OBJECTS) $(bamfdaemon_DEPENDENCIES) $(EXTRA_bamfdaemon_DEPENDENCIES) @rm -f bamfdaemon$(EXEEXT) $(bamfdaemon_LINK) $(bamfdaemon_OBJECTS) $(bamfdaemon_LDADD) $(LIBS) @@ -904,10 +901,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru bamf-0.2.108/src/org.ayatana.bamf.view.xml bamf-0.2.110/src/org.ayatana.bamf.view.xml --- bamf-0.2.108/src/org.ayatana.bamf.view.xml 2012-02-03 07:09:26.000000000 +0000 +++ bamf-0.2.110/src/org.ayatana.bamf.view.xml 2012-02-17 10:58:15.000000000 +0000 @@ -90,15 +90,10 @@ - - - - + + - - - diff -Nru bamf-0.2.108/tests/bamfdaemon/Makefile.in bamf-0.2.110/tests/bamfdaemon/Makefile.in --- bamf-0.2.108/tests/bamfdaemon/Makefile.in 2012-02-03 07:12:17.000000000 +0000 +++ bamf-0.2.110/tests/bamfdaemon/Makefile.in 2012-02-17 11:02:27.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -38,8 +38,7 @@ subdir = tests/bamfdaemon DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/expansions.m4 \ - $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in @@ -227,9 +226,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -expanded_bindir = @expanded_bindir@ -expanded_datadir = @expanded_datadir@ -expanded_libdir = @expanded_libdir@ giomodulesdir = @giomodulesdir@ host = @host@ host_alias = @host_alias@ @@ -385,7 +381,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -test-bamf$(EXEEXT): $(test_bamf_OBJECTS) $(test_bamf_DEPENDENCIES) +test-bamf$(EXEEXT): $(test_bamf_OBJECTS) $(test_bamf_DEPENDENCIES) $(EXTRA_test_bamf_DEPENDENCIES) @rm -f test-bamf$(EXEEXT) $(test_bamf_LINK) $(test_bamf_OBJECTS) $(test_bamf_LDADD) $(LIBS) @@ -880,10 +876,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: distclean-generic: diff -Nru bamf-0.2.108/tests/bamfdaemon/test-window.c bamf-0.2.110/tests/bamfdaemon/test-window.c --- bamf-0.2.108/tests/bamfdaemon/test-window.c 2012-02-03 07:09:26.000000000 +0000 +++ bamf-0.2.110/tests/bamfdaemon/test-window.c 2012-02-17 10:58:15.000000000 +0000 @@ -32,9 +32,6 @@ static void test_vmaximized (void); static void test_hmaximized (void); static void test_hmaximized (void); -static void test_application_id (void); -static void test_dbus_menu_object_path (void); -static void test_unique_bus_name (void); static gboolean signal_seen = FALSE; static gboolean signal_result = FALSE; @@ -46,9 +43,6 @@ g_test_add_func (DOMAIN"/Allocation", test_allocation); g_test_add_func (DOMAIN"/Xid", test_xid); - g_test_add_func (DOMAIN"/ApplicationID", test_application_id); - g_test_add_func (DOMAIN"/DBusMenuObjectPath", test_dbus_menu_object_path); - g_test_add_func (DOMAIN"/UniqueBusName", test_unique_bus_name); g_test_add_func (DOMAIN"/Events/Active", test_active); g_test_add_func (DOMAIN"/Events/Urgent", test_urgent); g_test_add_func (DOMAIN"/Events/UserVisible", test_user_visible); @@ -325,55 +319,4 @@ g_object_unref (window); g_object_unref (test); -} - -void -test_application_id (void) -{ - BamfWindow *window; - BamfLegacyWindowTest *test; - - test = bamf_legacy_window_test_new (20," Window X", "class", "exec"); - bamf_legacy_window_test_set_application_id (test, "org.test.bamf.id"); - - window = bamf_window_new (BAMF_LEGACY_WINDOW (test)); - - g_assert (g_strcmp0 (bamf_window_get_app_id (window), "org.test.bamf.id") == 0); - - g_object_unref (window); - g_object_unref (test); -} - -void -test_dbus_menu_object_path (void) -{ - BamfWindow *window; - BamfLegacyWindowTest *test; - - test = bamf_legacy_window_test_new (20, "Window X", "class", "exec"); - bamf_legacy_window_test_set_dbus_menu_object_path (test, "/org/test/bamf/path"); - - window = bamf_window_new (BAMF_LEGACY_WINDOW (test)); - - g_assert (g_strcmp0 (bamf_window_get_menu_object_path (window), "/org/test/bamf/path") == 0); - - g_object_unref (window); - g_object_unref (test); -} - -void -test_unique_bus_name (void) -{ - BamfWindow *window; - BamfLegacyWindowTest *test; - - test = bamf_legacy_window_test_new (20, "Window X", "class", "exec"); - bamf_legacy_window_test_set_unique_bus_name (test, "org.test.bamf.name"); - - window = bamf_window_new (BAMF_LEGACY_WINDOW (test)); - - g_assert (g_strcmp0 (bamf_window_get_unique_bus_name (window), "org.test.bamf.name") == 0); - - g_object_unref (window); - g_object_unref (test); -} +} \ No newline at end of file diff -Nru bamf-0.2.108/tests/functional/Makefile.in bamf-0.2.110/tests/functional/Makefile.in --- bamf-0.2.108/tests/functional/Makefile.in 2012-02-03 07:12:17.000000000 +0000 +++ bamf-0.2.110/tests/functional/Makefile.in 2012-02-17 11:02:27.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,8 +39,7 @@ subdir = tests/functional DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/expansions.m4 \ - $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in @@ -224,9 +223,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -expanded_bindir = @expanded_bindir@ -expanded_datadir = @expanded_datadir@ -expanded_libdir = @expanded_libdir@ giomodulesdir = @giomodulesdir@ host = @host@ host_alias = @host_alias@ @@ -370,16 +366,16 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -alt-tabber$(EXEEXT): $(alt_tabber_OBJECTS) $(alt_tabber_DEPENDENCIES) +alt-tabber$(EXEEXT): $(alt_tabber_OBJECTS) $(alt_tabber_DEPENDENCIES) $(EXTRA_alt_tabber_DEPENDENCIES) @rm -f alt-tabber$(EXEEXT) $(LINK) $(alt_tabber_OBJECTS) $(alt_tabber_LDADD) $(LIBS) -desktop-file-launcher$(EXEEXT): $(desktop_file_launcher_OBJECTS) $(desktop_file_launcher_DEPENDENCIES) +desktop-file-launcher$(EXEEXT): $(desktop_file_launcher_OBJECTS) $(desktop_file_launcher_DEPENDENCIES) $(EXTRA_desktop_file_launcher_DEPENDENCIES) @rm -f desktop-file-launcher$(EXEEXT) $(desktop_file_launcher_LINK) $(desktop_file_launcher_OBJECTS) $(desktop_file_launcher_LDADD) $(LIBS) -interaction-tester$(EXEEXT): $(interaction_tester_OBJECTS) $(interaction_tester_DEPENDENCIES) +interaction-tester$(EXEEXT): $(interaction_tester_OBJECTS) $(interaction_tester_DEPENDENCIES) $(EXTRA_interaction_tester_DEPENDENCIES) @rm -f interaction-tester$(EXEEXT) $(LINK) $(interaction_tester_OBJECTS) $(interaction_tester_LDADD) $(LIBS) -tab-source-test$(EXEEXT): $(tab_source_test_OBJECTS) $(tab_source_test_DEPENDENCIES) +tab-source-test$(EXEEXT): $(tab_source_test_OBJECTS) $(tab_source_test_DEPENDENCIES) $(EXTRA_tab_source_test_DEPENDENCIES) @rm -f tab-source-test$(EXEEXT) $(LINK) $(tab_source_test_OBJECTS) $(tab_source_test_LDADD) $(LIBS) @@ -573,10 +569,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru bamf-0.2.108/tests/libbamf/Makefile.in bamf-0.2.110/tests/libbamf/Makefile.in --- bamf-0.2.108/tests/libbamf/Makefile.in 2012-02-03 07:12:18.000000000 +0000 +++ bamf-0.2.110/tests/libbamf/Makefile.in 2012-02-17 11:02:27.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -38,8 +38,7 @@ subdir = tests/libbamf DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/expansions.m4 \ - $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in @@ -205,9 +204,6 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ -expanded_bindir = @expanded_bindir@ -expanded_datadir = @expanded_datadir@ -expanded_libdir = @expanded_libdir@ giomodulesdir = @giomodulesdir@ host = @host@ host_alias = @host_alias@ @@ -313,7 +309,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -test-libbamf$(EXEEXT): $(test_libbamf_OBJECTS) $(test_libbamf_DEPENDENCIES) +test-libbamf$(EXEEXT): $(test_libbamf_OBJECTS) $(test_libbamf_DEPENDENCIES) $(EXTRA_test_libbamf_DEPENDENCIES) @rm -f test-libbamf$(EXEEXT) $(LINK) $(test_libbamf_OBJECTS) $(test_libbamf_LDADD) $(LIBS) @@ -478,10 +474,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: distclean-generic: