diff -Nru unity-lens-applications-5.8.0/ChangeLog unity-lens-applications-5.10.0/ChangeLog --- unity-lens-applications-5.8.0/ChangeLog 2012-03-23 11:56:08.000000000 +0000 +++ unity-lens-applications-5.10.0/ChangeLog 2012-04-12 07:45:06.000000000 +0000 @@ -1,5 +1,37 @@ # Generated by Makefile. Do not edit. +2012-03-27 Michal Hruby + + Fix regression where Installed apps category wasn't sorted alphabetically. Fixes: https://bugs.launchpad.net/bugs/964325. Approved by Mikkel Kamstrup Erlandsen. + +2012-03-27 Michal Hruby + + Add a manual test + +2012-03-27 Michal Hruby + + Fix regression where Installed apps category wasn't sorted alphabetically + +2012-03-27 Michal Hruby + + Set relevancies of Keywords to zero. Fixes: https://bugs.launchpad.net/bugs/960269. Approved by Mikkel Kamstrup Erlandsen. + +2012-03-27 Michal Hruby + + Add a test + +2012-03-27 Michal Hruby + + Set relevancies of Keywords to zero + +2012-03-23 Michal Hruby + + Post release bump + +2012-03-23 Michal Hruby + + Release 5.8.0 + 2012-03-15 Michal Hruby Don't search in recent apps, just filter them when searching.. Fixes: . Approved by Neil J. Patel. diff -Nru unity-lens-applications-5.8.0/compile unity-lens-applications-5.10.0/compile --- unity-lens-applications-5.8.0/compile 2012-03-12 08:34:44.000000000 +0000 +++ unity-lens-applications-5.10.0/compile 2012-02-15 14:26:16.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=2012-01-04.17; # UTC +scriptversion=2009-10-06.20; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free -# Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software +# Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -29,186 +29,21 @@ # 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 @@ -218,13 +53,11 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) - func_cl_wrapper "$@" # Doesn't return... - ;; esac ofile= cfile= +eat= for arg do @@ -233,8 +66,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) @@ -261,10 +94,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 @@ -273,7 +106,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 unity-lens-applications-5.8.0/config.guess unity-lens-applications-5.10.0/config.guess --- unity-lens-applications-5.8.0/config.guess 2012-03-12 08:34:44.000000000 +0000 +++ unity-lens-applications-5.10.0/config.guess 2012-02-15 14:26:16.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, 2012 Free Software Foundation, Inc. +# 2011 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2011-05-11' # 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,7 +17,9 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -55,8 +57,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, 2012 -Free Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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." @@ -143,7 +145,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -790,12 +792,13 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -804,9 +807,6 @@ *: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,13 +861,6 @@ 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 ;; @@ -902,16 +895,13 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo cris-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo frv-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -953,7 +943,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo or32-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -988,13 +978,13 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-tilera-linux-gnu exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo x86_64-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -1325,9 +1315,6 @@ 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 unity-lens-applications-5.8.0/config.sub unity-lens-applications-5.10.0/config.sub --- unity-lens-applications-5.8.0/config.sub 2012-03-12 08:34:44.000000000 +0000 +++ unity-lens-applications-5.10.0/config.sub 2012-02-15 14:26:16.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, 2012 Free Software Foundation, Inc. +# 2011 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2011-03-23' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,7 +21,9 @@ # 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, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -74,8 +76,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, 2012 -Free Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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." @@ -130,10 +132,6 @@ 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 ] @@ -249,22 +247,17 @@ # 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 \ @@ -298,7 +291,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rl78 | rx \ + | 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 \ @@ -307,7 +300,7 @@ | spu \ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | v850 | v850e \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -322,7 +315,8 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | picochip) + # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none ;; @@ -335,10 +329,7 @@ strongarm | thumb | xscale) basic_machine=arm-unknown ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none - ;; + xscaleeb) basic_machine=armeb-unknown ;; @@ -361,13 +352,11 @@ # 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-* \ @@ -376,10 +365,8 @@ | 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-* \ @@ -413,7 +400,7 @@ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ + | 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-* \ @@ -421,11 +408,10 @@ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ + | tile-* | tilegx-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ + | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -725,6 +711,7 @@ 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 @@ -821,18 +808,10 @@ 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 @@ -1141,8 +1120,13 @@ basic_machine=t90-cray os=-unicos ;; + # This must be matched before tile*. + tilegx*) + basic_machine=tilegx-unknown + os=-linux-gnu + ;; tile*) - basic_machine=$basic_machine-unknown + basic_machine=tile-unknown os=-linux-gnu ;; tx39) @@ -1352,7 +1336,7 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1564,6 +1548,9 @@ ;; m68000-sun) os=-sunos3 + # This also exists in the configure program, but was not the + # default. + # os=-sunos4 ;; m68*-cisco) os=-aout diff -Nru unity-lens-applications-5.8.0/configure unity-lens-applications-5.10.0/configure --- unity-lens-applications-5.8.0/configure 2012-03-23 11:55:54.000000000 +0000 +++ unity-lens-applications-5.10.0/configure 2012-04-12 07:44:44.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for unity-lens-applications 5.8.0. +# Generated by GNU Autoconf 2.68 for unity-lens-applications 5.10.0. # # Report bugs to . # @@ -632,8 +632,8 @@ # Identity of this package. PACKAGE_NAME='unity-lens-applications' PACKAGE_TARNAME='unity-lens-applications' -PACKAGE_VERSION='5.8.0' -PACKAGE_STRING='unity-lens-applications 5.8.0' +PACKAGE_VERSION='5.10.0' +PACKAGE_STRING='unity-lens-applications 5.10.0' PACKAGE_BUGREPORT='https://launchpad.net/unity-lens-applications' PACKAGE_URL='' @@ -1441,7 +1441,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 unity-lens-applications 5.8.0 to adapt to many kinds of systems. +\`configure' configures unity-lens-applications 5.10.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1512,7 +1512,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of unity-lens-applications 5.8.0:";; + short | recursive ) echo "Configuration of unity-lens-applications 5.10.0:";; esac cat <<\_ACEOF @@ -1634,7 +1634,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -unity-lens-applications configure 5.8.0 +unity-lens-applications configure 5.10.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2193,7 +2193,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by unity-lens-applications $as_me 5.8.0, which was +It was created by unity-lens-applications $as_me 5.10.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3009,7 +3009,7 @@ # Define the identity of the package. PACKAGE='unity-lens-applications' - VERSION='5.8.0' + VERSION='5.10.0' cat >>confdefs.h <<_ACEOF @@ -18044,7 +18044,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by unity-lens-applications $as_me 5.8.0, which was +This file was extended by unity-lens-applications $as_me 5.10.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18110,7 +18110,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -unity-lens-applications config.status 5.8.0 +unity-lens-applications config.status 5.10.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru unity-lens-applications-5.8.0/configure.ac unity-lens-applications-5.10.0/configure.ac --- unity-lens-applications-5.8.0/configure.ac 2012-03-23 11:55:49.000000000 +0000 +++ unity-lens-applications-5.10.0/configure.ac 2012-04-12 07:44:38.000000000 +0000 @@ -1,4 +1,4 @@ -AC_INIT(unity-lens-applications, 5.8.0, https://launchpad.net/unity-lens-applications) +AC_INIT(unity-lens-applications, 5.10.0, https://launchpad.net/unity-lens-applications) AC_COPYRIGHT([Copyright 2010-2012 Canonical]) AM_INIT_AUTOMAKE([1.11]) diff -Nru unity-lens-applications-5.8.0/debian/changelog unity-lens-applications-5.10.0/debian/changelog --- unity-lens-applications-5.8.0/debian/changelog 2012-04-12 10:01:19.000000000 +0000 +++ unity-lens-applications-5.10.0/debian/changelog 2012-04-12 10:01:19.000000000 +0000 @@ -1,3 +1,15 @@ +unity-lens-applications (5.10.0-0ubuntu1) precise; urgency=low + + * New upstream release. + - Regression: Installed apps not sorted alphabetically (LP: #964325) + - unity-applications-daemon crashed with SIGSEGV in + g_variant_get_type_info() (LP: #938382) + - Apps rank too high with exact matches in Keywords (LP: #960269) + * debian/control: + - bump Standards-Version to latest + + -- Didier Roche Thu, 12 Apr 2012 11:48:26 +0200 + unity-lens-applications (5.8.0-0ubuntu1) precise-proposed; urgency=low * New upstream release. diff -Nru unity-lens-applications-5.8.0/debian/control unity-lens-applications-5.10.0/debian/control --- unity-lens-applications-5.8.0/debian/control 2012-04-12 10:01:19.000000000 +0000 +++ unity-lens-applications-5.10.0/debian/control 2012-04-12 10:01:19.000000000 +0000 @@ -17,7 +17,7 @@ libxapian-dev, libdb-dev, libapt-pkg-dev, -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: https://launchpad.net/unity-lens-applications Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/unity-lens-applications/ubuntu diff -Nru unity-lens-applications-5.8.0/depcomp unity-lens-applications-5.10.0/depcomp --- unity-lens-applications-5.8.0/depcomp 2012-03-12 08:34:44.000000000 +0000 +++ unity-lens-applications-5.10.0/depcomp 2012-02-15 14:26:17.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2011-12-04.11; # UTC +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 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 outputting dependencies. + tmpdepfile Temporary file to use when outputing dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -90,18 +90,10 @@ # 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 @@ -166,12 +158,10 @@ ' < "$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. hp depmode also adds that space, but also prefixes the VPATH -## to the object. Take care to not repeat it in the output. +## well. ## 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 "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -415,52 +405,6 @@ 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. @@ -559,9 +503,7 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$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" + cat < "$tmpdepfile" > "$depfile" sed '1,2d' "$tmpdepfile" | tr ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation diff -Nru unity-lens-applications-5.8.0/INSTALL unity-lens-applications-5.10.0/INSTALL --- unity-lens-applications-5.8.0/INSTALL 2012-03-12 08:34:44.000000000 +0000 +++ unity-lens-applications-5.10.0/INSTALL 2012-02-15 14:26:17.000000000 +0000 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, -Inc. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008, 2009 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -226,11 +226,6 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended diff -Nru unity-lens-applications-5.8.0/install-sh unity-lens-applications-5.10.0/install-sh --- unity-lens-applications-5.8.0/install-sh 2012-03-12 08:34:44.000000000 +0000 +++ unity-lens-applications-5.10.0/install-sh 2012-02-15 14:26:16.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2009-04-28.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,10 +156,6 @@ -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;; @@ -190,10 +186,6 @@ 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 @@ -208,11 +200,7 @@ fi if test -z "$dir_arg"; then - 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 + trap '(exit $?); exit' 1 2 13 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -240,9 +228,9 @@ for src do - # Protect names problematic for `test' and other utilities. + # Protect names starting with `-'. case $src in - -* | [=\(\)!]) src=./$src;; + -*) src=./$src;; esac if test -n "$dir_arg"; then @@ -264,7 +252,12 @@ 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. @@ -392,7 +385,7 @@ case $dstdir in /*) prefix='/';; - [-=\(\)!]*) prefix='./';; + -*) prefix='./';; *) prefix='';; esac @@ -410,7 +403,7 @@ for d do - test X"$d" = X && continue + test -z "$d" && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru unity-lens-applications-5.8.0/missing unity-lens-applications-5.10.0/missing --- unity-lens-applications-5.8.0/missing 2012-03-12 08:34:44.000000000 +0000 +++ unity-lens-applications-5.10.0/missing 2012-02-15 14:26:16.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2012-01-06.13; # UTC +scriptversion=2009-04-28.21; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -84,6 +84,7 @@ 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 @@ -121,6 +122,15 @@ # 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. @@ -216,7 +226,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/'` @@ -246,7 +256,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/'` @@ -308,6 +318,41 @@ 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 unity-lens-applications-5.8.0/po/Makefile.in.in unity-lens-applications-5.10.0/po/Makefile.in.in --- unity-lens-applications-5.8.0/po/Makefile.in.in 2012-03-12 08:34:40.000000000 +0000 +++ unity-lens-applications-5.10.0/po/Makefile.in.in 2012-02-15 14:26:12.000000000 +0000 @@ -49,8 +49,8 @@ XGETTEXT = @XGETTEXT@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot +MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ALL_LINGUAS = @ALL_LINGUAS@ @@ -73,20 +73,15 @@ .SUFFIXES: .SUFFIXES: .po .pox .gmo .mo .msg .cat -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) -INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) -INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; - .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: - $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< + $(MSGFMT) -o $@ $< .po.gmo: - $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ + file=`echo $* | sed 's,.*/,,'`.gmo \ && rm -f $$file && $(GMSGFMT) -o $$file $< .po.cat: diff -Nru unity-lens-applications-5.8.0/src/config.c unity-lens-applications-5.10.0/src/config.c --- unity-lens-applications-5.8.0/src/config.c 2012-03-23 11:56:02.000000000 +0000 +++ unity-lens-applications-5.10.0/src/config.c 2012-04-12 07:44:54.000000000 +0000 @@ -15,7 +15,7 @@ #define CONFIG_BINDIR "/usr/local/bin" #define CONFIG_LOCALEDIR "/usr/local/share/locale" #define CONFIG_PACKAGE "unity-lens-applications" -#define CONFIG_VERSION "5.8.0" +#define CONFIG_VERSION "5.10.0" diff -Nru unity-lens-applications-5.8.0/src/config.vala unity-lens-applications-5.10.0/src/config.vala --- unity-lens-applications-5.8.0/src/config.vala 2012-03-23 11:56:01.000000000 +0000 +++ unity-lens-applications-5.10.0/src/config.vala 2012-04-12 07:44:53.000000000 +0000 @@ -10,5 +10,5 @@ const string PACKAGE = "unity-lens-applications"; - const string VERSION = "5.8.0"; + const string VERSION = "5.10.0"; } diff -Nru unity-lens-applications-5.8.0/src/daemon.c unity-lens-applications-5.10.0/src/daemon.c --- unity-lens-applications-5.8.0/src/daemon.c 2012-03-23 11:55:28.000000000 +0000 +++ unity-lens-applications-5.10.0/src/daemon.c 2012-04-12 07:44:54.000000000 +0000 @@ -251,100 +251,102 @@ UnityPackageSearchResult* _tmp25_; UnityPackageSearchResult* appresults; gboolean _tmp26_; - UnityPackageSearchResult* _tmp27_; - GeeSet* _tmp28_; - GeeSet* _tmp29_; - DeeTransaction* _tmp30_; - GTimer* _tmp31_; - UnityPackageSearchResult* _tmp32_; - gint _tmp33_; - GTimer* _tmp34_; - gdouble _tmp35_; - const gchar* _tmp36_; - gboolean _tmp37_; - gboolean _tmp38_; + gboolean _tmp27_; + UnityPackageSearchResult* _tmp28_; + UnityPackageSearchResult* _tmp29_; + GeeSet* _tmp30_; + GeeSet* _tmp31_; + DeeTransaction* _tmp32_; + GTimer* _tmp33_; + UnityPackageSearchResult* _tmp34_; + gint _tmp35_; + GTimer* _tmp36_; + gdouble _tmp37_; + const gchar* _tmp38_; gboolean _tmp39_; gboolean _tmp40_; - GTimer* _tmp41_; - UnityOptionsFilter* _tmp42_; - gchar* _tmp43_; + gboolean _tmp41_; + gboolean _tmp42_; + GTimer* _tmp43_; + UnityOptionsFilter* _tmp44_; + gchar* _tmp45_; gchar* zg_search_string; - ZeitgeistIndex* _tmp44_; - const gchar* _tmp45_; - ZeitgeistTimeRange* _tmp46_; - ZeitgeistTimeRange* _tmp47_; - GPtrArray* _tmp48_; - GPtrArray* _tmp49_; - GCancellable* _tmp50_; - ZeitgeistResultSet* _tmp51_; - ZeitgeistResultSet* _tmp52_; - ZeitgeistResultSet* results; + ZeitgeistIndex* _tmp46_; + const gchar* _tmp47_; + ZeitgeistTimeRange* _tmp48_; + ZeitgeistTimeRange* _tmp49_; + GPtrArray* _tmp50_; + GPtrArray* _tmp51_; + GCancellable* _tmp52_; ZeitgeistResultSet* _tmp53_; - DeeTransaction* _tmp54_; - GeeSet* _tmp55_; - GTimer* _tmp56_; - ZeitgeistResultSet* _tmp57_; - guint _tmp58_; + ZeitgeistResultSet* _tmp54_; + ZeitgeistResultSet* results; + ZeitgeistResultSet* _tmp55_; + DeeTransaction* _tmp56_; + GeeSet* _tmp57_; + GTimer* _tmp58_; ZeitgeistResultSet* _tmp59_; guint _tmp60_; - GTimer* _tmp61_; - gdouble _tmp62_; - const gchar* _tmp63_; + ZeitgeistResultSet* _tmp61_; + guint _tmp62_; + GTimer* _tmp63_; + gdouble _tmp64_; + const gchar* _tmp65_; GError* ioe; GError* e; - UnityLensSearch* _tmp64_; - const gchar* _tmp65_; - const gchar* _tmp66_; - GError* _tmp67_; + UnityLensSearch* _tmp66_; + const gchar* _tmp67_; const gchar* _tmp68_; - DeeTransaction* _tmp69_; - gboolean _tmp70_; - gboolean _tmp71_; + GError* _tmp69_; + const gchar* _tmp70_; + DeeTransaction* _tmp71_; gboolean _tmp72_; gboolean _tmp73_; gboolean _tmp74_; - UnityPackageSearcher* _tmp75_; + gboolean _tmp75_; gboolean _tmp76_; - gboolean _tmp77_; - GTimer* _tmp78_; - UnityPackageSearcher* _tmp79_; - const gchar* _tmp80_; - UnityPackageSearchResult* _tmp81_; + UnityPackageSearcher* _tmp77_; + gboolean _tmp78_; + gboolean _tmp79_; + GTimer* _tmp80_; + UnityPackageSearcher* _tmp81_; + const gchar* _tmp82_; + UnityPackageSearchResult* _tmp83_; UnityPackageSearchResult* pkgresults; - UnityPackageSearchResult* _tmp82_; - GeeSet* _tmp83_; - GeeSet* _tmp84_; - DeeSerializableModel* _tmp85_; - GTimer* _tmp86_; - UnityPackageSearchResult* _tmp87_; - gint _tmp88_; - GTimer* _tmp89_; - gdouble _tmp90_; - const gchar* _tmp91_; - GTimer* _tmp92_; - UnityLensSearch* _tmp93_; - UnityOptionsFilter* _tmp94_; - gchar* _tmp95_; + UnityPackageSearchResult* _tmp84_; + GeeSet* _tmp85_; + GeeSet* _tmp86_; + DeeSerializableModel* _tmp87_; + GTimer* _tmp88_; + UnityPackageSearchResult* _tmp89_; + gint _tmp90_; + GTimer* _tmp91_; + gdouble _tmp92_; + const gchar* _tmp93_; + GTimer* _tmp94_; + UnityLensSearch* _tmp95_; + UnityOptionsFilter* _tmp96_; + gchar* _tmp97_; gchar* filter_query; - UnityPackageSearcher* _tmp96_; - const gchar* _tmp97_; - UnityPackageSearchResult* _tmp98_; + UnityPackageSearcher* _tmp98_; + const gchar* _tmp99_; + UnityPackageSearchResult* _tmp100_; UnityPackageSearchResult* random_pkgresults; - UnityPackageSearchResult* _tmp99_; - GeeSet* _tmp100_; - GeeSet* _tmp101_; - DeeSerializableModel* _tmp102_; - GTimer* _tmp103_; - UnityPackageSearchResult* _tmp104_; - gint _tmp105_; - GTimer* _tmp106_; - gdouble _tmp107_; - DeeSerializableModel* _tmp108_; - guint _tmp109_; - UnityLensSearch* _tmp110_; - const gchar* _tmp111_; - GVariant* _tmp112_; - UnityLensSearch* _tmp113_; + UnityPackageSearchResult* _tmp101_; + GeeSet* _tmp102_; + GeeSet* _tmp103_; + DeeSerializableModel* _tmp104_; + GTimer* _tmp105_; + UnityPackageSearchResult* _tmp106_; + gint _tmp107_; + GTimer* _tmp108_; + gdouble _tmp109_; + DeeSerializableModel* _tmp110_; + guint _tmp111_; + UnityLensSearch* _tmp112_; + const gchar* _tmp113_; + GVariant* _tmp114_; + UnityLensSearch* _tmp115_; GError * _inner_error_; }; @@ -380,16 +382,17 @@ UnityPackageSearchResult* _tmp16_; UnityPackageSearchResult* appresults; UnityPackageSearchResult* _tmp17_; - GeeSet* _tmp18_; + UnityPackageSearchResult* _tmp18_; GeeSet* _tmp19_; - DeeSerializableModel* _tmp20_; - GTimer* _tmp21_; - UnityPackageSearchResult* _tmp22_; - gint _tmp23_; - GTimer* _tmp24_; - gdouble _tmp25_; - const gchar* _tmp26_; - UnityLensSearch* _tmp27_; + GeeSet* _tmp20_; + DeeSerializableModel* _tmp21_; + GTimer* _tmp22_; + UnityPackageSearchResult* _tmp23_; + gint _tmp24_; + GTimer* _tmp25_; + gdouble _tmp26_; + const gchar* _tmp27_; + UnityLensSearch* _tmp28_; }; struct _UnityApplicationsLensDaemonUpdateGlobalWithoutSearchData { @@ -500,6 +503,7 @@ static gboolean unity_applications_lens_daemon_update_scope_search_co (UnityApplicationsLensDaemonUpdateScopeSearchData* _data_); static gchar* unity_applications_lens_daemon_prepare_pkg_search_string (UnityApplicationsLensDaemon* self, UnityLensSearch* search, UnityOptionsFilter* options); gboolean unity_applications_lens_utils_is_search_empty (UnityLensSearch* search); +static void unity_applications_lens_daemon_resort_pkg_search_results (UnityApplicationsLensDaemon* self, UnityPackageSearchResult* results); GType unity_applications_lens_category_get_type (void) G_GNUC_CONST; static void unity_applications_lens_daemon_add_pkg_search_result (UnityApplicationsLensDaemon* self, UnityPackageSearchResult* results, GeeSet* installed_uris, GeeSet* available_uris, DeeModel* model, UnityApplicationsLensCategory category, guint max_add); gboolean unity_applications_lens_daemon_get_display_recent_apps (UnityApplicationsLensDaemon* self); @@ -517,8 +521,8 @@ static void unity_applications_lens_daemon_update_global_without_search_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); GIcon* unity_applications_lens_daemon_find_pkg_icon (UnityApplicationsLensDaemon* self, UnityPackageInfo* pkginfo); static gchar* unity_applications_lens_daemon_extract_desktop_id (UnityApplicationsLensDaemon* self, const gchar* desktop_file, gboolean unmangle); -static gint ___lambda4_ (UnityApplicationsLensDaemon* self, UnityPackageInfo* a, UnityPackageInfo* b); -static gint ____lambda4__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); +static gint __lambda4_ (UnityApplicationsLensDaemon* self, UnityPackageInfo* a, UnityPackageInfo* b); +static gint ___lambda4__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self); const gchar* unity_applications_lens_category_to_string (UnityApplicationsLensCategory self); UnityActivationResponse* unity_applications_lens_daemon_activate (UnityApplicationsLensDaemon* self, const gchar* uri); static void _g_list_free__g_free0_ (GList* self); @@ -1634,55 +1638,60 @@ _data_->_tmp26_ = FALSE; _data_->_tmp26_ = unity_applications_lens_daemon_local_apps_active (_data_->self); if (_data_->_tmp26_) { - _data_->_tmp27_ = _data_->appresults; - _data_->_tmp28_ = _data_->installed_uris; - _data_->_tmp29_ = _data_->available_uris; - _data_->_tmp30_ = _data_->transaction; - unity_applications_lens_daemon_add_pkg_search_result (_data_->self, _data_->_tmp27_, _data_->_tmp28_, _data_->_tmp29_, (DeeModel*) _data_->_tmp30_, UNITY_APPLICATIONS_LENS_CATEGORY_INSTALLED, (guint) 0); - } - _data_->_tmp31_ = _data_->timer; - g_timer_stop (_data_->_tmp31_); - _data_->_tmp32_ = _data_->appresults; - _data_->_tmp33_ = _data_->_tmp32_->num_hits; - _data_->_tmp34_ = _data_->timer; - _data_->_tmp35_ = 0.0; - _data_->_tmp35_ = g_timer_elapsed (_data_->_tmp34_, NULL); - _data_->_tmp36_ = _data_->pkg_search_string; - g_debug ("daemon.vala:480: Entry search listed %i Installed apps in %fms for que" \ -"ry: %s", _data_->_tmp33_, _data_->_tmp35_ * 1000, _data_->_tmp36_); - _data_->_tmp38_ = FALSE; - _data_->_tmp38_ = unity_applications_lens_daemon_local_apps_active (_data_->self); - if (_data_->_tmp38_) { - _data_->_tmp39_ = _data_->self->priv->_display_recent_apps; - _data_->_tmp37_ = _data_->_tmp39_; + _data_->_tmp27_ = _data_->has_search; + if (_data_->_tmp27_) { + _data_->_tmp28_ = _data_->appresults; + unity_applications_lens_daemon_resort_pkg_search_results (_data_->self, _data_->_tmp28_); + } + _data_->_tmp29_ = _data_->appresults; + _data_->_tmp30_ = _data_->installed_uris; + _data_->_tmp31_ = _data_->available_uris; + _data_->_tmp32_ = _data_->transaction; + unity_applications_lens_daemon_add_pkg_search_result (_data_->self, _data_->_tmp29_, _data_->_tmp30_, _data_->_tmp31_, (DeeModel*) _data_->_tmp32_, UNITY_APPLICATIONS_LENS_CATEGORY_INSTALLED, (guint) 0); + } + _data_->_tmp33_ = _data_->timer; + g_timer_stop (_data_->_tmp33_); + _data_->_tmp34_ = _data_->appresults; + _data_->_tmp35_ = _data_->_tmp34_->num_hits; + _data_->_tmp36_ = _data_->timer; + _data_->_tmp37_ = 0.0; + _data_->_tmp37_ = g_timer_elapsed (_data_->_tmp36_, NULL); + _data_->_tmp38_ = _data_->pkg_search_string; + g_debug ("daemon.vala:481: Entry search listed %i Installed apps in %fms for que" \ +"ry: %s", _data_->_tmp35_, _data_->_tmp37_ * 1000, _data_->_tmp38_); + _data_->_tmp40_ = FALSE; + _data_->_tmp40_ = unity_applications_lens_daemon_local_apps_active (_data_->self); + if (_data_->_tmp40_) { + _data_->_tmp41_ = _data_->self->priv->_display_recent_apps; + _data_->_tmp39_ = _data_->_tmp41_; } else { - _data_->_tmp37_ = FALSE; + _data_->_tmp39_ = FALSE; } - _data_->_tmp40_ = _data_->_tmp37_; - if (_data_->_tmp40_) { + _data_->_tmp42_ = _data_->_tmp39_; + if (_data_->_tmp42_) { { - _data_->_tmp41_ = _data_->timer; - g_timer_start (_data_->_tmp41_); - _data_->_tmp42_ = _data_->filter; - _data_->_tmp43_ = NULL; - _data_->_tmp43_ = unity_applications_lens_daemon_prepare_zg_search_string (_data_->self, "", _data_->_tmp42_); - _data_->zg_search_string = _data_->_tmp43_; - _data_->_tmp44_ = _data_->self->priv->zg_index; - _data_->_tmp45_ = _data_->zg_search_string; - _data_->_tmp46_ = zeitgeist_time_range_new_anytime (); - _data_->_tmp47_ = g_object_ref_sink (_data_->_tmp46_); - _data_->_tmp48_ = _data_->self->priv->zg_templates; - _data_->_tmp49_ = _g_ptr_array_ref0 (_data_->_tmp48_); - _data_->_tmp50_ = _data_->cancellable; + _data_->_tmp43_ = _data_->timer; + g_timer_start (_data_->_tmp43_); + _data_->_tmp44_ = _data_->filter; + _data_->_tmp45_ = NULL; + _data_->_tmp45_ = unity_applications_lens_daemon_prepare_zg_search_string (_data_->self, "", _data_->_tmp44_); + _data_->zg_search_string = _data_->_tmp45_; + _data_->_tmp46_ = _data_->self->priv->zg_index; + _data_->_tmp47_ = _data_->zg_search_string; + _data_->_tmp48_ = zeitgeist_time_range_new_anytime (); + _data_->_tmp49_ = g_object_ref_sink (_data_->_tmp48_); + _data_->_tmp50_ = _data_->self->priv->zg_templates; + _data_->_tmp51_ = _g_ptr_array_ref0 (_data_->_tmp50_); + _data_->_tmp52_ = _data_->cancellable; _data_->_state_ = 1; - zeitgeist_index_search (_data_->_tmp44_, _data_->_tmp45_, _data_->_tmp47_, _data_->_tmp49_, (guint32) 0, (guint32) 20, ZEITGEIST_RESULT_TYPE_MOST_RECENT_SUBJECTS, _data_->_tmp50_, unity_applications_lens_daemon_update_scope_search_ready, _data_); + zeitgeist_index_search (_data_->_tmp46_, _data_->_tmp47_, _data_->_tmp49_, _data_->_tmp51_, (guint32) 0, (guint32) 20, ZEITGEIST_RESULT_TYPE_MOST_RECENT_SUBJECTS, _data_->_tmp52_, unity_applications_lens_daemon_update_scope_search_ready, _data_); return FALSE; _state_1: - _data_->_tmp51_ = NULL; - _data_->_tmp51_ = zeitgeist_index_search_finish (_data_->_tmp44_, _data_->_res_, &_data_->_inner_error_); - _data_->_tmp52_ = _data_->_tmp51_; - _g_object_unref0 (_data_->_tmp47_); - _data_->results = _data_->_tmp52_; + _data_->_tmp53_ = NULL; + _data_->_tmp53_ = zeitgeist_index_search_finish (_data_->_tmp46_, _data_->_res_, &_data_->_inner_error_); + _data_->_tmp54_ = _data_->_tmp53_; + _g_object_unref0 (_data_->_tmp49_); + _data_->results = _data_->_tmp54_; if (_data_->_inner_error_ != NULL) { _g_free0 (_data_->zg_search_string); if (g_error_matches (_data_->_inner_error_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { @@ -1690,24 +1699,24 @@ } goto __catch3_g_error; } - _data_->_tmp53_ = _data_->results; - _data_->_tmp54_ = _data_->transaction; - _data_->_tmp55_ = _data_->installed_uris; - unity_applications_lens_daemon_append_events_with_category (_data_->self, _data_->_tmp53_, (DeeModel*) _data_->_tmp54_, (guint) UNITY_APPLICATIONS_LENS_CATEGORY_RECENT, FALSE, 6, _data_->_tmp55_); - _data_->_tmp56_ = _data_->timer; - g_timer_stop (_data_->_tmp56_); - _data_->_tmp57_ = _data_->results; - _data_->_tmp58_ = 0U; - _data_->_tmp58_ = zeitgeist_result_set_size (_data_->_tmp57_); + _data_->_tmp55_ = _data_->results; + _data_->_tmp56_ = _data_->transaction; + _data_->_tmp57_ = _data_->installed_uris; + unity_applications_lens_daemon_append_events_with_category (_data_->self, _data_->_tmp55_, (DeeModel*) _data_->_tmp56_, (guint) UNITY_APPLICATIONS_LENS_CATEGORY_RECENT, FALSE, 6, _data_->_tmp57_); + _data_->_tmp58_ = _data_->timer; + g_timer_stop (_data_->_tmp58_); _data_->_tmp59_ = _data_->results; _data_->_tmp60_ = 0U; - _data_->_tmp60_ = zeitgeist_result_set_estimated_matches (_data_->_tmp59_); - _data_->_tmp61_ = _data_->timer; - _data_->_tmp62_ = 0.0; - _data_->_tmp62_ = g_timer_elapsed (_data_->_tmp61_, NULL); - _data_->_tmp63_ = _data_->zg_search_string; - g_debug ("daemon.vala:505: Entry search found %u/%u Recently Used apps in %fms f" \ -"or query '%s'", _data_->_tmp58_, _data_->_tmp60_, _data_->_tmp62_ * 1000, _data_->_tmp63_); + _data_->_tmp60_ = zeitgeist_result_set_size (_data_->_tmp59_); + _data_->_tmp61_ = _data_->results; + _data_->_tmp62_ = 0U; + _data_->_tmp62_ = zeitgeist_result_set_estimated_matches (_data_->_tmp61_); + _data_->_tmp63_ = _data_->timer; + _data_->_tmp64_ = 0.0; + _data_->_tmp64_ = g_timer_elapsed (_data_->_tmp63_, NULL); + _data_->_tmp65_ = _data_->zg_search_string; + g_debug ("daemon.vala:506: Entry search found %u/%u Recently Used apps in %fms f" \ +"or query '%s'", _data_->_tmp60_, _data_->_tmp62_, _data_->_tmp64_ * 1000, _data_->_tmp65_); _g_object_unref0 (_data_->results); _g_free0 (_data_->zg_search_string); } @@ -1738,12 +1747,12 @@ { _data_->e = _data_->_inner_error_; _data_->_inner_error_ = NULL; - _data_->_tmp64_ = _data_->search; - _data_->_tmp65_ = unity_lens_search_get_search_string (_data_->_tmp64_); - _data_->_tmp66_ = _data_->_tmp65_; - _data_->_tmp67_ = _data_->e; - _data_->_tmp68_ = _data_->_tmp67_->message; - g_warning ("daemon.vala:513: Error performing search '%s': %s", _data_->_tmp66_, _data_->_tmp68_); + _data_->_tmp66_ = _data_->search; + _data_->_tmp67_ = unity_lens_search_get_search_string (_data_->_tmp66_); + _data_->_tmp68_ = _data_->_tmp67_; + _data_->_tmp69_ = _data_->e; + _data_->_tmp70_ = _data_->_tmp69_->message; + g_warning ("daemon.vala:514: Error performing search '%s': %s", _data_->_tmp68_, _data_->_tmp70_); _g_error_free0 (_data_->e); } __finally3: @@ -1761,8 +1770,8 @@ return FALSE; } } - _data_->_tmp69_ = _data_->transaction; - dee_transaction_commit (_data_->_tmp69_, &_data_->_inner_error_); + _data_->_tmp71_ = _data_->transaction; + dee_transaction_commit (_data_->_tmp71_, &_data_->_inner_error_); if (_data_->_inner_error_ != NULL) { _unity_package_search_result_free0 (_data_->appresults); _g_object_unref0 (_data_->available_uris); @@ -1776,90 +1785,90 @@ g_clear_error (&_data_->_inner_error_); return FALSE; } - _data_->_tmp72_ = FALSE; - _data_->_tmp72_ = unity_applications_lens_daemon_usc_apps_active (_data_->self); - if (_data_->_tmp72_) { - _data_->_tmp73_ = _data_->self->priv->_display_available_apps; - _data_->_tmp71_ = _data_->_tmp73_; - } else { - _data_->_tmp71_ = FALSE; - } - _data_->_tmp74_ = _data_->_tmp71_; + _data_->_tmp74_ = FALSE; + _data_->_tmp74_ = unity_applications_lens_daemon_usc_apps_active (_data_->self); if (_data_->_tmp74_) { - _data_->_tmp75_ = _data_->self->priv->pkgsearcher; - _data_->_tmp70_ = _data_->_tmp75_ != NULL; + _data_->_tmp75_ = _data_->self->priv->_display_available_apps; + _data_->_tmp73_ = _data_->_tmp75_; } else { - _data_->_tmp70_ = FALSE; + _data_->_tmp73_ = FALSE; } - _data_->_tmp76_ = _data_->_tmp70_; + _data_->_tmp76_ = _data_->_tmp73_; if (_data_->_tmp76_) { - _data_->_tmp77_ = _data_->has_search; - if (_data_->_tmp77_) { - _data_->_tmp78_ = _data_->timer; - g_timer_start (_data_->_tmp78_); - _data_->_tmp79_ = _data_->self->priv->pkgsearcher; - _data_->_tmp80_ = _data_->pkg_search_string; - _data_->_tmp81_ = NULL; - _data_->_tmp81_ = unity_package_searcher_search (_data_->_tmp79_, _data_->_tmp80_, (guint) 50, UNITY_PACKAGE_SEARCHTYPE_PREFIX, UNITY_PACKAGE_SORT_BY_RELEVANCY); - _data_->pkgresults = _data_->_tmp81_; - _data_->_tmp82_ = _data_->pkgresults; - _data_->_tmp83_ = _data_->installed_uris; - _data_->_tmp84_ = _data_->available_uris; - _data_->_tmp85_ = _data_->model; - unity_applications_lens_daemon_add_pkg_search_result (_data_->self, _data_->_tmp82_, _data_->_tmp83_, _data_->_tmp84_, (DeeModel*) _data_->_tmp85_, UNITY_APPLICATIONS_LENS_CATEGORY_AVAILABLE, (guint) 0); - _data_->_tmp86_ = _data_->timer; - g_timer_stop (_data_->_tmp86_); - _data_->_tmp87_ = _data_->pkgresults; - _data_->_tmp88_ = _data_->_tmp87_->num_hits; - _data_->_tmp89_ = _data_->timer; - _data_->_tmp90_ = 0.0; - _data_->_tmp90_ = g_timer_elapsed (_data_->_tmp89_, NULL); - _data_->_tmp91_ = _data_->pkg_search_string; - g_debug ("daemon.vala:532: Entry search listed %i Available apps in %fms for que" \ -"ry: %s", _data_->_tmp88_, _data_->_tmp90_ * 1000, _data_->_tmp91_); + _data_->_tmp77_ = _data_->self->priv->pkgsearcher; + _data_->_tmp72_ = _data_->_tmp77_ != NULL; + } else { + _data_->_tmp72_ = FALSE; + } + _data_->_tmp78_ = _data_->_tmp72_; + if (_data_->_tmp78_) { + _data_->_tmp79_ = _data_->has_search; + if (_data_->_tmp79_) { + _data_->_tmp80_ = _data_->timer; + g_timer_start (_data_->_tmp80_); + _data_->_tmp81_ = _data_->self->priv->pkgsearcher; + _data_->_tmp82_ = _data_->pkg_search_string; + _data_->_tmp83_ = NULL; + _data_->_tmp83_ = unity_package_searcher_search (_data_->_tmp81_, _data_->_tmp82_, (guint) 50, UNITY_PACKAGE_SEARCHTYPE_PREFIX, UNITY_PACKAGE_SORT_BY_RELEVANCY); + _data_->pkgresults = _data_->_tmp83_; + _data_->_tmp84_ = _data_->pkgresults; + _data_->_tmp85_ = _data_->installed_uris; + _data_->_tmp86_ = _data_->available_uris; + _data_->_tmp87_ = _data_->model; + unity_applications_lens_daemon_add_pkg_search_result (_data_->self, _data_->_tmp84_, _data_->_tmp85_, _data_->_tmp86_, (DeeModel*) _data_->_tmp87_, UNITY_APPLICATIONS_LENS_CATEGORY_AVAILABLE, (guint) 0); + _data_->_tmp88_ = _data_->timer; + g_timer_stop (_data_->_tmp88_); + _data_->_tmp89_ = _data_->pkgresults; + _data_->_tmp90_ = _data_->_tmp89_->num_hits; + _data_->_tmp91_ = _data_->timer; + _data_->_tmp92_ = 0.0; + _data_->_tmp92_ = g_timer_elapsed (_data_->_tmp91_, NULL); + _data_->_tmp93_ = _data_->pkg_search_string; + g_debug ("daemon.vala:533: Entry search listed %i Available apps in %fms for que" \ +"ry: %s", _data_->_tmp90_, _data_->_tmp92_ * 1000, _data_->_tmp93_); _unity_package_search_result_free0 (_data_->pkgresults); } else { - _data_->_tmp92_ = _data_->timer; - g_timer_start (_data_->_tmp92_); - _data_->_tmp93_ = _data_->search; - _data_->_tmp94_ = _data_->filter; - _data_->_tmp95_ = NULL; - _data_->_tmp95_ = unity_applications_lens_daemon_prepare_pkg_search_string (_data_->self, _data_->_tmp93_, _data_->_tmp94_); - _data_->filter_query = _data_->_tmp95_; - _data_->_tmp96_ = _data_->self->priv->pkgsearcher; - _data_->_tmp97_ = _data_->filter_query; - _data_->_tmp98_ = NULL; - _data_->_tmp98_ = unity_package_searcher_get_random_apps (_data_->_tmp96_, _data_->_tmp97_, (guint) 12); - _data_->random_pkgresults = _data_->_tmp98_; - _data_->_tmp99_ = _data_->random_pkgresults; - _data_->_tmp100_ = _data_->installed_uris; - _data_->_tmp101_ = _data_->available_uris; - _data_->_tmp102_ = _data_->model; - unity_applications_lens_daemon_add_pkg_search_result (_data_->self, _data_->_tmp99_, _data_->_tmp100_, _data_->_tmp101_, (DeeModel*) _data_->_tmp102_, UNITY_APPLICATIONS_LENS_CATEGORY_AVAILABLE, (guint) 6); - _data_->_tmp103_ = _data_->timer; - g_timer_stop (_data_->_tmp103_); - _data_->_tmp104_ = _data_->random_pkgresults; - _data_->_tmp105_ = _data_->_tmp104_->num_hits; - _data_->_tmp106_ = _data_->timer; - _data_->_tmp107_ = 0.0; - _data_->_tmp107_ = g_timer_elapsed (_data_->_tmp106_, NULL); - g_debug ("daemon.vala:543: Entry search listed %i random Available apps in %fms", _data_->_tmp105_, _data_->_tmp107_ * 1000); + _data_->_tmp94_ = _data_->timer; + g_timer_start (_data_->_tmp94_); + _data_->_tmp95_ = _data_->search; + _data_->_tmp96_ = _data_->filter; + _data_->_tmp97_ = NULL; + _data_->_tmp97_ = unity_applications_lens_daemon_prepare_pkg_search_string (_data_->self, _data_->_tmp95_, _data_->_tmp96_); + _data_->filter_query = _data_->_tmp97_; + _data_->_tmp98_ = _data_->self->priv->pkgsearcher; + _data_->_tmp99_ = _data_->filter_query; + _data_->_tmp100_ = NULL; + _data_->_tmp100_ = unity_package_searcher_get_random_apps (_data_->_tmp98_, _data_->_tmp99_, (guint) 12); + _data_->random_pkgresults = _data_->_tmp100_; + _data_->_tmp101_ = _data_->random_pkgresults; + _data_->_tmp102_ = _data_->installed_uris; + _data_->_tmp103_ = _data_->available_uris; + _data_->_tmp104_ = _data_->model; + unity_applications_lens_daemon_add_pkg_search_result (_data_->self, _data_->_tmp101_, _data_->_tmp102_, _data_->_tmp103_, (DeeModel*) _data_->_tmp104_, UNITY_APPLICATIONS_LENS_CATEGORY_AVAILABLE, (guint) 6); + _data_->_tmp105_ = _data_->timer; + g_timer_stop (_data_->_tmp105_); + _data_->_tmp106_ = _data_->random_pkgresults; + _data_->_tmp107_ = _data_->_tmp106_->num_hits; + _data_->_tmp108_ = _data_->timer; + _data_->_tmp109_ = 0.0; + _data_->_tmp109_ = g_timer_elapsed (_data_->_tmp108_, NULL); + g_debug ("daemon.vala:544: Entry search listed %i random Available apps in %fms", _data_->_tmp107_, _data_->_tmp109_ * 1000); _unity_package_search_result_free0 (_data_->random_pkgresults); _g_free0 (_data_->filter_query); } } - _data_->_tmp108_ = _data_->model; - _data_->_tmp109_ = 0U; - _data_->_tmp109_ = dee_model_get_n_rows ((DeeModel*) _data_->_tmp108_); - if (_data_->_tmp109_ == ((guint) 0)) { - _data_->_tmp110_ = _data_->search; - _data_->_tmp111_ = NULL; - _data_->_tmp111_ = _ ("Sorry, there are no applications that match your search."); - _data_->_tmp112_ = _variant_new4 (_data_->_tmp111_); - unity_lens_search_set_reply_hint (_data_->_tmp110_, "no-results-hint", _data_->_tmp112_); + _data_->_tmp110_ = _data_->model; + _data_->_tmp111_ = 0U; + _data_->_tmp111_ = dee_model_get_n_rows ((DeeModel*) _data_->_tmp110_); + if (_data_->_tmp111_ == ((guint) 0)) { + _data_->_tmp112_ = _data_->search; + _data_->_tmp113_ = NULL; + _data_->_tmp113_ = _ ("Sorry, there are no applications that match your search."); + _data_->_tmp114_ = _variant_new4 (_data_->_tmp113_); + unity_lens_search_set_reply_hint (_data_->_tmp112_, "no-results-hint", _data_->_tmp114_); } - _data_->_tmp113_ = _data_->search; - g_signal_emit_by_name (_data_->_tmp113_, "finished"); + _data_->_tmp115_ = _data_->search; + g_signal_emit_by_name (_data_->_tmp115_, "finished"); _unity_package_search_result_free0 (_data_->appresults); _g_object_unref0 (_data_->available_uris); _g_object_unref0 (_data_->installed_uris); @@ -1977,22 +1986,24 @@ _data_->_tmp16_ = unity_package_searcher_search (_data_->_tmp14_, _data_->_tmp15_, (guint) 0, UNITY_PACKAGE_SEARCHTYPE_PREFIX, UNITY_PACKAGE_SORT_BY_RELEVANCY); _data_->appresults = _data_->_tmp16_; _data_->_tmp17_ = _data_->appresults; - _data_->_tmp18_ = _data_->installed_uris; - _data_->_tmp19_ = _data_->available_uris; - _data_->_tmp20_ = _data_->model; - unity_applications_lens_daemon_add_pkg_search_result (_data_->self, _data_->_tmp17_, _data_->_tmp18_, _data_->_tmp19_, (DeeModel*) _data_->_tmp20_, UNITY_APPLICATIONS_LENS_CATEGORY_APPLICATIONS, (guint) 0); - _data_->_tmp21_ = _data_->timer; - g_timer_stop (_data_->_tmp21_); - _data_->_tmp22_ = _data_->appresults; - _data_->_tmp23_ = _data_->_tmp22_->num_hits; - _data_->_tmp24_ = _data_->timer; - _data_->_tmp25_ = 0.0; - _data_->_tmp25_ = g_timer_elapsed (_data_->_tmp24_, NULL); - _data_->_tmp26_ = _data_->search_string; - g_debug ("daemon.vala:586: Global search listed %i Installed apps in %fms for qu" \ -"ery: %s", _data_->_tmp23_, _data_->_tmp25_ * 1000, _data_->_tmp26_); - _data_->_tmp27_ = _data_->search; - g_signal_emit_by_name (_data_->_tmp27_, "finished"); + unity_applications_lens_daemon_resort_pkg_search_results (_data_->self, _data_->_tmp17_); + _data_->_tmp18_ = _data_->appresults; + _data_->_tmp19_ = _data_->installed_uris; + _data_->_tmp20_ = _data_->available_uris; + _data_->_tmp21_ = _data_->model; + unity_applications_lens_daemon_add_pkg_search_result (_data_->self, _data_->_tmp18_, _data_->_tmp19_, _data_->_tmp20_, (DeeModel*) _data_->_tmp21_, UNITY_APPLICATIONS_LENS_CATEGORY_APPLICATIONS, (guint) 0); + _data_->_tmp22_ = _data_->timer; + g_timer_stop (_data_->_tmp22_); + _data_->_tmp23_ = _data_->appresults; + _data_->_tmp24_ = _data_->_tmp23_->num_hits; + _data_->_tmp25_ = _data_->timer; + _data_->_tmp26_ = 0.0; + _data_->_tmp26_ = g_timer_elapsed (_data_->_tmp25_, NULL); + _data_->_tmp27_ = _data_->search_string; + g_debug ("daemon.vala:588: Global search listed %i Installed apps in %fms for qu" \ +"ery: %s", _data_->_tmp24_, _data_->_tmp26_ * 1000, _data_->_tmp27_); + _data_->_tmp28_ = _data_->search; + g_signal_emit_by_name (_data_->_tmp28_, "finished"); _unity_package_search_result_free0 (_data_->appresults); _g_timer_destroy0 (_data_->timer); _g_object_unref0 (_data_->available_uris); @@ -2131,7 +2142,7 @@ _data_->_tmp32_ = 0.0; _data_->_tmp32_ = g_timer_elapsed (_data_->_tmp31_, NULL); _data_->_tmp33_ = _data_->zg_search_string; - g_debug ("daemon.vala:627: Entry search found %u/%u Recently Used apps in %fms f" \ + g_debug ("daemon.vala:629: Entry search found %u/%u Recently Used apps in %fms f" \ "or query '%s'", _data_->_tmp28_, _data_->_tmp30_, _data_->_tmp32_ * 1000, _data_->_tmp33_); _g_object_unref0 (_data_->results); _g_free0 (_data_->zg_search_string); @@ -2162,7 +2173,7 @@ _data_->_tmp36_ = _data_->_tmp35_; _data_->_tmp37_ = _data_->e; _data_->_tmp38_ = _data_->_tmp37_->message; - g_warning ("daemon.vala:635: Error performing search '%s': %s", _data_->_tmp36_, _data_->_tmp38_); + g_warning ("daemon.vala:637: Error performing search '%s': %s", _data_->_tmp36_, _data_->_tmp38_); _g_error_free0 (_data_->e); } __finally4: @@ -2988,7 +2999,7 @@ } -static gint ___lambda4_ (UnityApplicationsLensDaemon* self, UnityPackageInfo* a, UnityPackageInfo* b) { +static gint __lambda4_ (UnityApplicationsLensDaemon* self, UnityPackageInfo* a, UnityPackageInfo* b) { gint result = 0; UnityPackageInfo* _tmp0_; gint _tmp1_; @@ -3061,13 +3072,22 @@ } -static gint ____lambda4__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { +static gint ___lambda4__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) { gint result; - result = ___lambda4_ (self, a, b); + result = __lambda4_ (self, a, b); return result; } +static void unity_applications_lens_daemon_resort_pkg_search_results (UnityApplicationsLensDaemon* self, UnityPackageSearchResult* results) { + UnityPackageSearchResult* _tmp0_; + g_return_if_fail (self != NULL); + g_return_if_fail (results != NULL); + _tmp0_ = results; + _tmp0_->results = g_slist_sort_with_data (_tmp0_->results, ___lambda4__gcompare_data_func, self); +} + + static void unity_applications_lens_daemon_add_pkg_search_result (UnityApplicationsLensDaemon* self, UnityPackageSearchResult* results, GeeSet* installed_uris, GeeSet* available_uris, DeeModel* model, UnityApplicationsLensCategory category, guint max_add) { UnityAppInfoManager* _tmp0_ = NULL; UnityAppInfoManager* appmanager; @@ -3075,9 +3095,8 @@ UnityFilter* _tmp2_ = NULL; UnityRatingsFilter* ratings_filter; guint n_added; - UnityApplicationsLensCategory _tmp3_; - UnityPackageSearchResult* _tmp5_; - GSList* _tmp6_; + UnityPackageSearchResult* _tmp3_; + GSList* _tmp4_; g_return_if_fail (self != NULL); g_return_if_fail (results != NULL); g_return_if_fail (installed_uris != NULL); @@ -3089,196 +3108,190 @@ _tmp2_ = unity_scope_get_filter (_tmp1_, "rating"); ratings_filter = UNITY_IS_RATINGS_FILTER (_tmp2_) ? ((UnityRatingsFilter*) _tmp2_) : NULL; n_added = (guint) 0; - _tmp3_ = category; - if (_tmp3_ != UNITY_APPLICATIONS_LENS_CATEGORY_AVAILABLE) { - UnityPackageSearchResult* _tmp4_; - _tmp4_ = results; - _tmp4_->results = g_slist_sort_with_data (_tmp4_->results, ____lambda4__gcompare_data_func, self); - } - _tmp5_ = results; - _tmp6_ = _tmp5_->results; + _tmp3_ = results; + _tmp4_ = _tmp3_->results; { GSList* pkginfo_collection = NULL; GSList* pkginfo_it = NULL; - pkginfo_collection = _tmp6_; + pkginfo_collection = _tmp4_; for (pkginfo_it = pkginfo_collection; pkginfo_it != NULL; pkginfo_it = pkginfo_it->next) { UnityPackageInfo* pkginfo = NULL; pkginfo = (UnityPackageInfo*) pkginfo_it->data; { + UnityPackageInfo* _tmp5_; + const gchar* _tmp6_; UnityPackageInfo* _tmp7_; const gchar* _tmp8_; - UnityPackageInfo* _tmp9_; - const gchar* _tmp10_; - UnityApplicationsLensCategory _tmp11_; - gchar* _tmp12_ = NULL; + UnityApplicationsLensCategory _tmp9_; + gchar* _tmp10_ = NULL; gchar* desktop_id; gchar* full_path = NULL; - UnityAppInfoManager* _tmp13_; - const gchar* _tmp14_; - GAppInfo* _tmp15_ = NULL; + UnityAppInfoManager* _tmp11_; + const gchar* _tmp12_; + GAppInfo* _tmp13_ = NULL; GAppInfo* app; - UnityAppInfoManager* _tmp16_; + UnityAppInfoManager* _tmp14_; + const gchar* _tmp15_; + gchar* _tmp16_ = NULL; const gchar* _tmp17_; - gchar* _tmp18_ = NULL; - const gchar* _tmp19_; - const gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; + const gchar* _tmp18_ = NULL; + gchar* _tmp19_ = NULL; gchar* uri; - gboolean _tmp22_ = FALSE; - GeeSet* _tmp23_; - const gchar* _tmp24_; - gboolean _tmp25_ = FALSE; - gboolean _tmp29_; + gboolean _tmp20_ = FALSE; + GeeSet* _tmp21_; + const gchar* _tmp22_; + gboolean _tmp23_ = FALSE; + gboolean _tmp27_; gchar* display_name = NULL; gchar* comment = NULL; - UnityApplicationsLensCategory _tmp30_; - gboolean _tmp49_ = FALSE; - GAppInfo* _tmp50_; - gboolean _tmp53_; - UnityApplicationsLensCategory _tmp54_; - UnityPackageInfo* _tmp81_; - GIcon* _tmp82_ = NULL; + UnityApplicationsLensCategory _tmp28_; + gboolean _tmp47_ = FALSE; + GAppInfo* _tmp48_; + gboolean _tmp51_; + UnityApplicationsLensCategory _tmp52_; + UnityPackageInfo* _tmp79_; + GIcon* _tmp80_ = NULL; GIcon* icon; - const gchar* _tmp83_ = NULL; - const gchar* _tmp84_; - const gchar* _tmp86_ = NULL; - const gchar* _tmp87_; - gchar* _tmp89_ = NULL; - const gchar* _tmp90_; - DeeModel* _tmp94_; - const gchar* _tmp95_; - GIcon* _tmp96_; - gchar* _tmp97_ = NULL; - gchar* _tmp98_; - UnityApplicationsLensCategory _tmp99_; + const gchar* _tmp81_ = NULL; + const gchar* _tmp82_; + const gchar* _tmp84_ = NULL; + const gchar* _tmp85_; + gchar* _tmp87_ = NULL; + const gchar* _tmp88_; + DeeModel* _tmp92_; + const gchar* _tmp93_; + GIcon* _tmp94_; + gchar* _tmp95_ = NULL; + gchar* _tmp96_; + UnityApplicationsLensCategory _tmp97_; + const gchar* _tmp98_; + const gchar* _tmp99_; const gchar* _tmp100_; - const gchar* _tmp101_; - const gchar* _tmp102_; + guint _tmp101_; + gboolean _tmp102_ = FALSE; guint _tmp103_; - gboolean _tmp104_ = FALSE; - guint _tmp105_; - gboolean _tmp108_; - _tmp7_ = pkginfo; - _tmp8_ = _tmp7_->desktop_file; - if (_tmp8_ == NULL) { + gboolean _tmp106_; + _tmp5_ = pkginfo; + _tmp6_ = _tmp5_->desktop_file; + if (_tmp6_ == NULL) { continue; } - _tmp9_ = pkginfo; - _tmp10_ = _tmp9_->desktop_file; - _tmp11_ = category; - _tmp12_ = unity_applications_lens_daemon_extract_desktop_id (self, _tmp10_, _tmp11_ == UNITY_APPLICATIONS_LENS_CATEGORY_AVAILABLE); - desktop_id = _tmp12_; - _tmp13_ = appmanager; - _tmp14_ = desktop_id; - _tmp15_ = unity_app_info_manager_lookup (_tmp13_, _tmp14_); - app = _tmp15_; - _tmp16_ = appmanager; - _tmp17_ = desktop_id; - _tmp18_ = unity_app_info_manager_get_path (_tmp16_, _tmp17_); + _tmp7_ = pkginfo; + _tmp8_ = _tmp7_->desktop_file; + _tmp9_ = category; + _tmp10_ = unity_applications_lens_daemon_extract_desktop_id (self, _tmp8_, _tmp9_ == UNITY_APPLICATIONS_LENS_CATEGORY_AVAILABLE); + desktop_id = _tmp10_; + _tmp11_ = appmanager; + _tmp12_ = desktop_id; + _tmp13_ = unity_app_info_manager_lookup (_tmp11_, _tmp12_); + app = _tmp13_; + _tmp14_ = appmanager; + _tmp15_ = desktop_id; + _tmp16_ = unity_app_info_manager_get_path (_tmp14_, _tmp15_); _g_free0 (full_path); - full_path = _tmp18_; - _tmp19_ = desktop_id; - _tmp20_ = string_to_string (_tmp19_); - _tmp21_ = g_strconcat ("application://", _tmp20_, NULL); - uri = _tmp21_; - _tmp23_ = installed_uris; - _tmp24_ = uri; - _tmp25_ = gee_collection_contains ((GeeCollection*) _tmp23_, _tmp24_); - if (_tmp25_) { - _tmp22_ = TRUE; + full_path = _tmp16_; + _tmp17_ = desktop_id; + _tmp18_ = string_to_string (_tmp17_); + _tmp19_ = g_strconcat ("application://", _tmp18_, NULL); + uri = _tmp19_; + _tmp21_ = installed_uris; + _tmp22_ = uri; + _tmp23_ = gee_collection_contains ((GeeCollection*) _tmp21_, _tmp22_); + if (_tmp23_) { + _tmp20_ = TRUE; } else { - GeeSet* _tmp26_; - const gchar* _tmp27_; - gboolean _tmp28_ = FALSE; - _tmp26_ = available_uris; - _tmp27_ = uri; - _tmp28_ = gee_collection_contains ((GeeCollection*) _tmp26_, _tmp27_); - _tmp22_ = _tmp28_; + GeeSet* _tmp24_; + const gchar* _tmp25_; + gboolean _tmp26_ = FALSE; + _tmp24_ = available_uris; + _tmp25_ = uri; + _tmp26_ = gee_collection_contains ((GeeCollection*) _tmp24_, _tmp25_); + _tmp20_ = _tmp26_; } - _tmp29_ = _tmp22_; - if (_tmp29_) { + _tmp27_ = _tmp20_; + if (_tmp27_) { _g_free0 (uri); _g_object_unref0 (app); _g_free0 (full_path); _g_free0 (desktop_id); continue; } - _tmp30_ = category; - switch (_tmp30_) { + _tmp28_ = category; + switch (_tmp28_) { case UNITY_APPLICATIONS_LENS_CATEGORY_INSTALLED: case UNITY_APPLICATIONS_LENS_CATEGORY_APPLICATIONS: { - GeeSet* _tmp31_; - const gchar* _tmp32_; - GAppInfo* _tmp33_; - const gchar* _tmp34_ = NULL; - gchar* _tmp35_; - GAppInfo* _tmp36_; - const gchar* _tmp37_ = NULL; - gchar* _tmp38_; - _tmp31_ = installed_uris; - _tmp32_ = uri; - gee_collection_add ((GeeCollection*) _tmp31_, _tmp32_); - _tmp33_ = app; - _tmp34_ = g_app_info_get_display_name (_tmp33_); - _tmp35_ = g_strdup (_tmp34_); + GeeSet* _tmp29_; + const gchar* _tmp30_; + GAppInfo* _tmp31_; + const gchar* _tmp32_ = NULL; + gchar* _tmp33_; + GAppInfo* _tmp34_; + const gchar* _tmp35_ = NULL; + gchar* _tmp36_; + _tmp29_ = installed_uris; + _tmp30_ = uri; + gee_collection_add ((GeeCollection*) _tmp29_, _tmp30_); + _tmp31_ = app; + _tmp32_ = g_app_info_get_display_name (_tmp31_); + _tmp33_ = g_strdup (_tmp32_); _g_free0 (display_name); - display_name = _tmp35_; - _tmp36_ = app; - _tmp37_ = g_app_info_get_description (_tmp36_); - _tmp38_ = g_strdup (_tmp37_); + display_name = _tmp33_; + _tmp34_ = app; + _tmp35_ = g_app_info_get_description (_tmp34_); + _tmp36_ = g_strdup (_tmp35_); _g_free0 (comment); - comment = _tmp38_; + comment = _tmp36_; break; } case UNITY_APPLICATIONS_LENS_CATEGORY_AVAILABLE: { - GeeSet* _tmp39_; + GeeSet* _tmp37_; + const gchar* _tmp38_; + UnityPackageInfo* _tmp39_; const gchar* _tmp40_; - UnityPackageInfo* _tmp41_; - const gchar* _tmp42_; - gchar* _tmp43_; - gchar* _tmp44_; - _tmp39_ = available_uris; - _tmp40_ = uri; - gee_collection_add ((GeeCollection*) _tmp39_, _tmp40_); - _tmp41_ = pkginfo; - _tmp42_ = _tmp41_->application_name; - _tmp43_ = g_strdup (_tmp42_); + gchar* _tmp41_; + gchar* _tmp42_; + _tmp37_ = available_uris; + _tmp38_ = uri; + gee_collection_add ((GeeCollection*) _tmp37_, _tmp38_); + _tmp39_ = pkginfo; + _tmp40_ = _tmp39_->application_name; + _tmp41_ = g_strdup (_tmp40_); _g_free0 (display_name); - display_name = _tmp43_; - _tmp44_ = g_strdup (""); + display_name = _tmp41_; + _tmp42_ = g_strdup (""); _g_free0 (comment); - comment = _tmp44_; + comment = _tmp42_; break; } default: { - UnityApplicationsLensCategory _tmp45_; - GEnumValue* _tmp46_; - gchar* _tmp47_ = NULL; - gchar* _tmp48_; - _tmp45_ = category; - _tmp46_ = g_enum_get_value (g_type_class_ref (UNITY_APPLICATIONS_LENS_TYPE_CATEGORY), _tmp45_); - _tmp47_ = g_strconcat ("Illegal category for package search ", (_tmp46_ != NULL) ? _tmp46_->value_name : NULL, NULL); - _tmp48_ = _tmp47_; - g_warning ("daemon.vala:866: %s", _tmp48_); - _g_free0 (_tmp48_); + UnityApplicationsLensCategory _tmp43_; + GEnumValue* _tmp44_; + gchar* _tmp45_ = NULL; + gchar* _tmp46_; + _tmp43_ = category; + _tmp44_ = g_enum_get_value (g_type_class_ref (UNITY_APPLICATIONS_LENS_TYPE_CATEGORY), _tmp43_); + _tmp45_ = g_strconcat ("Illegal category for package search ", (_tmp44_ != NULL) ? _tmp44_->value_name : NULL, NULL); + _tmp46_ = _tmp45_; + g_warning ("daemon.vala:872: %s", _tmp46_); + _g_free0 (_tmp46_); continue; } } - _tmp50_ = app; - if (_tmp50_ != NULL) { - GAppInfo* _tmp51_; - gboolean _tmp52_ = FALSE; - _tmp51_ = app; - _tmp52_ = g_app_info_should_show (_tmp51_); - _tmp49_ = !_tmp52_; + _tmp48_ = app; + if (_tmp48_ != NULL) { + GAppInfo* _tmp49_; + gboolean _tmp50_ = FALSE; + _tmp49_ = app; + _tmp50_ = g_app_info_should_show (_tmp49_); + _tmp47_ = !_tmp50_; } else { - _tmp49_ = FALSE; + _tmp47_ = FALSE; } - _tmp53_ = _tmp49_; - if (_tmp53_) { + _tmp51_ = _tmp47_; + if (_tmp51_) { _g_free0 (comment); _g_free0 (display_name); _g_free0 (uri); @@ -3287,23 +3300,23 @@ _g_free0 (desktop_id); continue; } - _tmp54_ = category; - if (_tmp54_ == UNITY_APPLICATIONS_LENS_CATEGORY_AVAILABLE) { - GAppInfo* _tmp55_; - gboolean _tmp56_ = FALSE; - UnityRatingsDatabase* _tmp57_; - gboolean _tmp61_; - UnityPackageInfo* _tmp72_; - const gchar* _tmp73_; - const gchar* _tmp74_ = NULL; - UnityPackageInfo* _tmp75_; - const gchar* _tmp76_; - const gchar* _tmp77_ = NULL; - gchar* _tmp78_ = NULL; - GeeSet* _tmp79_; - const gchar* _tmp80_; - _tmp55_ = app; - if (_tmp55_ != NULL) { + _tmp52_ = category; + if (_tmp52_ == UNITY_APPLICATIONS_LENS_CATEGORY_AVAILABLE) { + GAppInfo* _tmp53_; + gboolean _tmp54_ = FALSE; + UnityRatingsDatabase* _tmp55_; + gboolean _tmp59_; + UnityPackageInfo* _tmp70_; + const gchar* _tmp71_; + const gchar* _tmp72_ = NULL; + UnityPackageInfo* _tmp73_; + const gchar* _tmp74_; + const gchar* _tmp75_ = NULL; + gchar* _tmp76_ = NULL; + GeeSet* _tmp77_; + const gchar* _tmp78_; + _tmp53_ = app; + if (_tmp53_ != NULL) { _g_free0 (comment); _g_free0 (display_name); _g_free0 (uri); @@ -3312,43 +3325,43 @@ _g_free0 (desktop_id); continue; } - _tmp57_ = self->priv->ratings; - if (_tmp57_ != NULL) { - UnityRatingsFilter* _tmp58_; - gfloat _tmp59_; - gfloat _tmp60_; - _tmp58_ = ratings_filter; - _tmp59_ = unity_ratings_filter_get_rating (_tmp58_); - _tmp60_ = _tmp59_; - _tmp56_ = ((gdouble) _tmp60_) > 0.00001; + _tmp55_ = self->priv->ratings; + if (_tmp55_ != NULL) { + UnityRatingsFilter* _tmp56_; + gfloat _tmp57_; + gfloat _tmp58_; + _tmp56_ = ratings_filter; + _tmp57_ = unity_ratings_filter_get_rating (_tmp56_); + _tmp58_ = _tmp57_; + _tmp54_ = ((gdouble) _tmp58_) > 0.00001; } else { - _tmp56_ = FALSE; + _tmp54_ = FALSE; } - _tmp61_ = _tmp56_; - if (_tmp61_) { + _tmp59_ = _tmp54_; + if (_tmp59_) { UnityRatingsResult _result_ = {0}; - UnityRatingsDatabase* _tmp62_; - UnityPackageInfo* _tmp63_; - const gchar* _tmp64_; - UnityRatingsResult _tmp65_ = {0}; - gboolean _tmp66_ = FALSE; - _tmp62_ = self->priv->ratings; - _tmp63_ = pkginfo; - _tmp64_ = _tmp63_->package_name; - _tmp66_ = unity_ratings_database_query (_tmp62_, _tmp64_, &_tmp65_); - _result_ = _tmp65_; - if (_tmp66_) { - UnityRatingsResult _tmp67_; - gint32 _tmp68_; - UnityRatingsFilter* _tmp69_; - gfloat _tmp70_; - gfloat _tmp71_; - _tmp67_ = _result_; - _tmp68_ = _tmp67_.average_rating; - _tmp69_ = ratings_filter; - _tmp70_ = unity_ratings_filter_get_rating (_tmp69_); - _tmp71_ = _tmp70_; - if (((gdouble) _tmp68_) < ((_tmp71_ * 5) - 0.2)) { + UnityRatingsDatabase* _tmp60_; + UnityPackageInfo* _tmp61_; + const gchar* _tmp62_; + UnityRatingsResult _tmp63_ = {0}; + gboolean _tmp64_ = FALSE; + _tmp60_ = self->priv->ratings; + _tmp61_ = pkginfo; + _tmp62_ = _tmp61_->package_name; + _tmp64_ = unity_ratings_database_query (_tmp60_, _tmp62_, &_tmp63_); + _result_ = _tmp63_; + if (_tmp64_) { + UnityRatingsResult _tmp65_; + gint32 _tmp66_; + UnityRatingsFilter* _tmp67_; + gfloat _tmp68_; + gfloat _tmp69_; + _tmp65_ = _result_; + _tmp66_ = _tmp65_.average_rating; + _tmp67_ = ratings_filter; + _tmp68_ = unity_ratings_filter_get_rating (_tmp67_); + _tmp69_ = _tmp68_; + if (((gdouble) _tmp66_) < ((_tmp69_ * 5) - 0.2)) { _g_free0 (comment); _g_free0 (display_name); _g_free0 (uri); @@ -3367,78 +3380,78 @@ continue; } } - _tmp72_ = pkginfo; - _tmp73_ = _tmp72_->package_name; - _tmp74_ = string_to_string (_tmp73_); - _tmp75_ = pkginfo; - _tmp76_ = _tmp75_->application_name; - _tmp77_ = string_to_string (_tmp76_); - _tmp78_ = g_strconcat ("unity-install://", _tmp74_, "/", _tmp77_, NULL); + _tmp70_ = pkginfo; + _tmp71_ = _tmp70_->package_name; + _tmp72_ = string_to_string (_tmp71_); + _tmp73_ = pkginfo; + _tmp74_ = _tmp73_->application_name; + _tmp75_ = string_to_string (_tmp74_); + _tmp76_ = g_strconcat ("unity-install://", _tmp72_, "/", _tmp75_, NULL); _g_free0 (uri); - uri = _tmp78_; - _tmp79_ = available_uris; - _tmp80_ = uri; - gee_collection_add ((GeeCollection*) _tmp79_, _tmp80_); + uri = _tmp76_; + _tmp77_ = available_uris; + _tmp78_ = uri; + gee_collection_add ((GeeCollection*) _tmp77_, _tmp78_); } - _tmp81_ = pkginfo; - _tmp82_ = unity_applications_lens_daemon_find_pkg_icon (self, _tmp81_); - icon = _tmp82_; - _tmp84_ = display_name; - if (_tmp84_ != NULL) { - const gchar* _tmp85_; - _tmp85_ = display_name; - _tmp83_ = _tmp85_; + _tmp79_ = pkginfo; + _tmp80_ = unity_applications_lens_daemon_find_pkg_icon (self, _tmp79_); + icon = _tmp80_; + _tmp82_ = display_name; + if (_tmp82_ != NULL) { + const gchar* _tmp83_; + _tmp83_ = display_name; + _tmp81_ = _tmp83_; } else { - _tmp83_ = ""; + _tmp81_ = ""; } - _tmp87_ = comment; - if (_tmp87_ != NULL) { - const gchar* _tmp88_; - _tmp88_ = comment; - _tmp86_ = _tmp88_; + _tmp85_ = comment; + if (_tmp85_ != NULL) { + const gchar* _tmp86_; + _tmp86_ = comment; + _tmp84_ = _tmp86_; } else { - _tmp86_ = ""; + _tmp84_ = ""; } - _tmp90_ = full_path; - if (_tmp90_ != NULL) { - const gchar* _tmp91_; - gchar* _tmp92_; - _tmp91_ = full_path; - _tmp92_ = g_strconcat ("file://", _tmp91_, NULL); - _g_free0 (_tmp89_); - _tmp89_ = _tmp92_; + _tmp88_ = full_path; + if (_tmp88_ != NULL) { + const gchar* _tmp89_; + gchar* _tmp90_; + _tmp89_ = full_path; + _tmp90_ = g_strconcat ("file://", _tmp89_, NULL); + _g_free0 (_tmp87_); + _tmp87_ = _tmp90_; } else { - gchar* _tmp93_; - _tmp93_ = g_strdup (""); - _g_free0 (_tmp89_); - _tmp89_ = _tmp93_; + gchar* _tmp91_; + _tmp91_ = g_strdup (""); + _g_free0 (_tmp87_); + _tmp87_ = _tmp91_; } - _tmp94_ = model; - _tmp95_ = uri; - _tmp96_ = icon; - _tmp97_ = g_icon_to_string (_tmp96_); - _tmp98_ = _tmp97_; - _tmp99_ = category; - _tmp100_ = _tmp83_; - _tmp101_ = _tmp86_; - _tmp102_ = _tmp89_; - dee_model_append (_tmp94_, _tmp95_, _tmp98_, _tmp99_, "application/x-desktop", _tmp100_, _tmp101_, _tmp102_, NULL); - _g_free0 (_tmp98_); - _tmp103_ = n_added; - n_added = _tmp103_ + 1; - _tmp105_ = max_add; - if (_tmp105_ > ((guint) 0)) { - guint _tmp106_; - guint _tmp107_; - _tmp106_ = n_added; - _tmp107_ = max_add; - _tmp104_ = _tmp106_ >= _tmp107_; + _tmp92_ = model; + _tmp93_ = uri; + _tmp94_ = icon; + _tmp95_ = g_icon_to_string (_tmp94_); + _tmp96_ = _tmp95_; + _tmp97_ = category; + _tmp98_ = _tmp81_; + _tmp99_ = _tmp84_; + _tmp100_ = _tmp87_; + dee_model_append (_tmp92_, _tmp93_, _tmp96_, _tmp97_, "application/x-desktop", _tmp98_, _tmp99_, _tmp100_, NULL); + _g_free0 (_tmp96_); + _tmp101_ = n_added; + n_added = _tmp101_ + 1; + _tmp103_ = max_add; + if (_tmp103_ > ((guint) 0)) { + guint _tmp104_; + guint _tmp105_; + _tmp104_ = n_added; + _tmp105_ = max_add; + _tmp102_ = _tmp104_ >= _tmp105_; } else { - _tmp104_ = FALSE; + _tmp102_ = FALSE; } - _tmp108_ = _tmp104_; - if (_tmp108_) { - _g_free0 (_tmp89_); + _tmp106_ = _tmp102_; + if (_tmp106_) { + _g_free0 (_tmp87_); _g_object_unref0 (icon); _g_free0 (comment); _g_free0 (display_name); @@ -3450,7 +3463,7 @@ _g_object_unref0 (appmanager); return; } - _g_free0 (_tmp89_); + _g_free0 (_tmp87_); _g_object_unref0 (icon); _g_free0 (comment); _g_free0 (display_name); @@ -3524,7 +3537,7 @@ _tmp3_ = string_offset (_tmp2_, (glong) 16); pkg = _tmp3_; _tmp4_ = pkg; - g_debug ("daemon.vala:932: Installing: %s", _tmp4_); + g_debug ("daemon.vala:938: Installing: %s", _tmp4_); _tmp5_ = g_new0 (gchar*, 2 + 1); args = (_vala_array_free (args, args_length1, (GDestroyNotify) g_free), NULL); args = _tmp5_; @@ -3643,7 +3656,7 @@ _error_ = _inner_error_; _inner_error_ = NULL; _tmp38_ = orig; - g_warning ("daemon.vala:956: Failed to launch URI %s", _tmp38_); + g_warning ("daemon.vala:962: Failed to launch URI %s", _tmp38_); _tmp39_ = unity_activation_response_new (UNITY_HANDLED_TYPE_NOT_HANDLED, ""); _tmp40_ = g_object_ref_sink (_tmp39_); result = _tmp40_; @@ -3796,7 +3809,7 @@ _tmp75_ = exec_or_dir; _tmp76_ = err; _tmp77_ = _tmp76_->message; - g_warning ("daemon.vala:984: Failed to open current folder '%s' in file manager: %" \ + g_warning ("daemon.vala:990: Failed to open current folder '%s' in file manager: %" \ "s", _tmp75_, _tmp77_); _tmp78_ = unity_activation_response_new (UNITY_HANDLED_TYPE_NOT_HANDLED, ""); _tmp79_ = g_object_ref_sink (_tmp78_); @@ -3852,8 +3865,8 @@ _tmp83_ = uri; _tmp84_ = e; _tmp85_ = _tmp84_->message; - g_warning ("daemon.vala:995: Failed to spawn software-center or direct URI activat" \ -"ion '%s': %s", _tmp83_, _tmp85_); + g_warning ("daemon.vala:1001: Failed to spawn software-center or direct URI activa" \ +"tion '%s': %s", _tmp83_, _tmp85_); _tmp86_ = unity_activation_response_new (UNITY_HANDLED_TYPE_NOT_HANDLED, ""); _tmp87_ = g_object_ref_sink (_tmp86_); result = _tmp87_; @@ -3971,7 +3984,7 @@ } _tmp11_ = app_uri; if (_tmp11_ == NULL) { - g_warning ("daemon.vala:1023: Unexpected event without subject"); + g_warning ("daemon.vala:1029: Unexpected event without subject"); _g_free0 (app_uri); continue; } diff -Nru unity-lens-applications-5.8.0/src/daemon.vala unity-lens-applications-5.10.0/src/daemon.vala --- unity-lens-applications-5.8.0/src/daemon.vala 2012-03-23 11:54:43.000000000 +0000 +++ unity-lens-applications-5.10.0/src/daemon.vala 2012-04-12 07:43:55.000000000 +0000 @@ -472,6 +472,7 @@ Unity.Package.Sort.BY_NAME); if (local_apps_active ()) { + if (has_search) resort_pkg_search_results (appresults); add_pkg_search_result (appresults, installed_uris, available_uris, transaction, Category.INSTALLED); } @@ -578,7 +579,8 @@ var timer = new Timer (); var appresults = appsearcher.search (search_string, 0, Unity.Package.SearchType.PREFIX, - Unity.Package.Sort.BY_RELEVANCY); + Unity.Package.Sort.BY_RELEVANCY); + resort_pkg_search_results (appresults); add_pkg_search_result (appresults, installed_uris, available_uris, model, Category.APPLICATIONS); @@ -792,6 +794,33 @@ return desktop_id; } + + /* + * Performs secondary level sorting of the results according to popularity + * of individual desktop files. + */ + private void resort_pkg_search_results (Unity.Package.SearchResult results) + { + results.results.sort_with_data ((a, b) => + { + /* We'll cluster the relevancies into a couple of bins, because + * there can be multiple terms adding to the relevancy (especially + * when doing one/two character prefix searches - ie a "f*" search + * will have slightly higher relevancy for item with name "Search + * _f_or _f_iles" than "_F_irefox", and that's not what we want) + */ + int rel_a = a.relevancy / 10; + int rel_b = b.relevancy / 10; + if (rel_a == rel_b) + { + string id_a = extract_desktop_id (a.desktop_file); + string id_b = extract_desktop_id (b.desktop_file); + rel_a = popularity_map["application://" + id_a]; + rel_b = popularity_map["application://" + id_b]; + } + return rel_b - rel_a; // we want higher relevancy first + }); + } private void add_pkg_search_result (Unity.Package.SearchResult results, Set installed_uris, @@ -804,29 +833,6 @@ var ratings_filter = scope.get_filter ("rating") as RatingsFilter; uint n_added = 0; - if (category != Category.AVAILABLE) - { - results.results.sort_with_data ((a, b) => - { - /* We'll cluster the relevancies into a couple of bins, because - * there can be multiple terms adding to the relevancy (especially - * when doing one/two character prefix searches - ie a "f*" search - * will have slightly higher relevancy for item with name "Search - * _f_or _f_iles" than "_F_irefox", and that's not what we want) - */ - int rel_a = a.relevancy / 10; - int rel_b = b.relevancy / 10; - if (rel_a == rel_b) - { - string id_a = extract_desktop_id (a.desktop_file); - string id_b = extract_desktop_id (b.desktop_file); - rel_a = popularity_map["application://" + id_a]; - rel_b = popularity_map["application://" + id_b]; - } - return rel_b - rel_a; // we want higher relevancy first - }); - } - foreach (var pkginfo in results.results) { if (pkginfo.desktop_file == null) diff -Nru unity-lens-applications-5.8.0/src/unity-package-search.cc unity-lens-applications-5.10.0/src/unity-package-search.cc --- unity-lens-applications-5.8.0/src/unity-package-search.cc 2012-03-23 11:54:43.000000000 +0000 +++ unity-lens-applications-5.10.0/src/unity-package-search.cc 2012-03-27 10:18:33.000000000 +0000 @@ -221,8 +221,8 @@ for (i = 0; i < len; i++) { dum1 = unity_applications_lens_utils_preprocess_string (keywords[i]); - indexer->index_text (dum1, 3); - indexer->index_text (dum1, 3, "KW"); + indexer->index_text (dum1, 0); + indexer->index_text (dum1, 0, "KW"); g_free (dum1); }