Browse Source

Imported Upstream version 2.0.14

tags/upstream/2.0.14^0
Maximiliano Curia 7 years ago
parent
commit
3444b06416
100 changed files with 7826 additions and 5911 deletions
  1. +1331
    -944
      cinnamon.pot
  2. +0
    -1530
      config/config.guess
  3. +0
    -666
      config/config.rpath
  4. +0
    -331
      config/missing
  5. +8
    -8
      configure.ac
  6. +206
    -188
      data/org.cinnamon.gschema.xml.in
  7. BIN
      data/theme/add-workspace-hover.png
  8. BIN
      data/theme/add-workspace.png
  9. +21
    -202
      data/theme/cinnamon.css
  10. BIN
      data/theme/corner-ripple.png
  11. BIN
      data/theme/menu.png
  12. BIN
      data/theme/overview-hover.png
  13. BIN
      data/theme/overview.png
  14. +32
    -0
      data/theme/theme-changelog.txt
  15. BIN
      data/theme/thumbnail-generic.png
  16. BIN
      data/theme/thumbnail.png
  17. BIN
      data/theme/trash-icon.png
  18. +0
    -39
      debian/README.Debian
  19. +0
    -329
      debian/changelog
  20. +0
    -6
      debian/cinnamon-common.install
  21. +0
    -3
      debian/cinnamon.gsettings-override
  22. +0
    -5
      debian/cinnamon.install
  23. +0
    -4
      debian/cinnamon.lintian-overrides
  24. +0
    -1
      debian/compat
  25. +0
    -134
      debian/control
  26. +0
    -44
      debian/copyright
  27. +0
    -49
      debian/rules
  28. +0
    -1
      debian/shlibs.local
  29. +0
    -1
      debian/source/format
  30. +27
    -7
      files/etc/xdg/menus/cinnamon-applications.menu
  31. +6
    -0
      files/usr/bin/cinnamon-desktop-editor
  32. +6
    -0
      files/usr/bin/cinnamon-json-makepot
  33. +3
    -0
      files/usr/bin/cinnamon-session-cinnamon
  34. +3
    -0
      files/usr/bin/cinnamon-session-cinnamon2d
  35. +6
    -0
      files/usr/bin/cinnamon-settings-users
  36. +1
    -1
      files/usr/bin/cinnamon2d
  37. +0
    -3
      files/usr/bin/gnome-session-cinnamon
  38. +0
    -3
      files/usr/bin/gnome-session-cinnamon2d
  39. +462
    -0
      files/usr/lib/cinnamon-desktop-editor/cinnamon-desktop-editor.py
  40. +178
    -0
      files/usr/lib/cinnamon-desktop-editor/directory-editor.ui
  41. +252
    -0
      files/usr/lib/cinnamon-desktop-editor/launcher-editor.ui
  42. +239
    -0
      files/usr/lib/cinnamon-json-makepot/cinnamon-json-makepot.py
  43. +11
    -10
      files/usr/lib/cinnamon-menu-editor/cme/MainWindow.py
  44. +2
    -2
      files/usr/lib/cinnamon-menu-editor/cme/util.py
  45. +816
    -0
      files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
  46. +53
    -0
      files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.svg
  47. +231
    -0
      files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.ui
  48. +9
    -1
      files/usr/lib/cinnamon-settings/bin/ExtensionCore.py
  49. +33
    -21
      files/usr/lib/cinnamon-settings/bin/SettingsWidgets.py
  50. +2
    -14
      files/usr/lib/cinnamon-settings/bin/Spices.py
  51. +1
    -1
      files/usr/lib/cinnamon-settings/bin/XletSettings.py
  52. +92
    -9
      files/usr/lib/cinnamon-settings/bin/XletSettingsWidgets.py
  53. +234
    -41
      files/usr/lib/cinnamon-settings/cinnamon-settings.py
  54. +1
    -15
      files/usr/lib/cinnamon-settings/cinnamon-settings.ui
  55. BIN
      files/usr/lib/cinnamon-settings/data/cinnamon.png
  56. +391
    -0
      files/usr/lib/cinnamon-settings/data/icons/cat-admin.svg
  57. +0
    -57
      files/usr/lib/cinnamon-settings/data/icons/clock.svg
  58. +710
    -0
      files/usr/lib/cinnamon-settings/data/icons/date-time.svg
  59. +0
    -162
      files/usr/lib/cinnamon-settings/data/icons/menu.svg
  60. +459
    -0
      files/usr/lib/cinnamon-settings/data/icons/tiling.svg
  61. +443
    -0
      files/usr/lib/cinnamon-settings/data/icons/user.svg
  62. BIN
      files/usr/lib/cinnamon-settings/data/inactive.png
  63. BIN
      files/usr/lib/cinnamon-settings/data/user.png
  64. +6
    -6
      files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
  65. +9
    -14
      files/usr/lib/cinnamon-settings/modules/cs_calendar.py
  66. +29
    -18
      files/usr/lib/cinnamon-settings/modules/cs_default.py
  67. +67
    -73
      files/usr/lib/cinnamon-settings/modules/cs_effects.py
  68. +5
    -5
      files/usr/lib/cinnamon-settings/modules/cs_fonts.py
  69. +15
    -19
      files/usr/lib/cinnamon-settings/modules/cs_info.py
  70. +113
    -101
      files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
  71. +0
    -27
      files/usr/lib/cinnamon-settings/modules/cs_menu.py
  72. +17
    -14
      files/usr/lib/cinnamon-settings/modules/cs_mouse.py
  73. +9
    -9
      files/usr/lib/cinnamon-settings/modules/cs_themes.py
  74. +40
    -0
      files/usr/lib/cinnamon-settings/modules/cs_tiling.py
  75. +496
    -0
      files/usr/lib/cinnamon-settings/modules/cs_user.py
  76. +12
    -15
      files/usr/lib/cinnamon-settings/modules/cs_windows.py
  77. +2
    -2
      files/usr/lib/cinnamon-settings/modules/cs_workspaces.py
  78. +205
    -0
      files/usr/share/applications/cinnamon-settings-users.desktop
  79. +179
    -29
      files/usr/share/applications/cinnamon-settings.desktop
  80. +5
    -0
      files/usr/share/cinnamon-session/sessions/cinnamon.session
  81. +5
    -0
      files/usr/share/cinnamon-session/sessions/cinnamon2d.session
  82. +3
    -3
      files/usr/share/cinnamon/applets/a11y@cinnamon.org/applet.js
  83. +0
    -548
      files/usr/share/cinnamon/applets/bluetooth@cinnamon.org/applet.js
  84. +0
    -6
      files/usr/share/cinnamon/applets/bluetooth@cinnamon.org/metadata.json
  85. +4
    -4
      files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js
  86. +42
    -23
      files/usr/share/cinnamon/applets/calendar@cinnamon.org/applet.js
  87. +19
    -18
      files/usr/share/cinnamon/applets/calendar@cinnamon.org/calendar.js
  88. +1
    -1
      files/usr/share/cinnamon/applets/calendar@cinnamon.org/metadata.json
  89. +30
    -0
      files/usr/share/cinnamon/applets/calendar@cinnamon.org/settings-schema.json
  90. +16
    -19
      files/usr/share/cinnamon/applets/expo@cinnamon.org/applet.js
  91. +1
    -1
      files/usr/share/cinnamon/applets/expo@cinnamon.org/metadata.json
  92. +8
    -0
      files/usr/share/cinnamon/applets/expo@cinnamon.org/settings-schema.json
  93. +19
    -33
      files/usr/share/cinnamon/applets/keyboard@cinnamon.org/applet.js
  94. BIN
      files/usr/share/cinnamon/applets/keyboard@cinnamon.org/flags/ge.png
  95. +8
    -0
      files/usr/share/cinnamon/applets/keyboard@cinnamon.org/settings-schema.json
  96. +116
    -83
      files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js
  97. +1
    -1
      files/usr/share/cinnamon/applets/menu@cinnamon.org/metadata.json
  98. +60
    -0
      files/usr/share/cinnamon/applets/menu@cinnamon.org/settings-schema.json
  99. +14
    -6
      files/usr/share/cinnamon/applets/notifications@cinnamon.org/applet.js
  100. +1
    -1
      files/usr/share/cinnamon/applets/notifications@cinnamon.org/metadata.json

+ 1331
- 944
cinnamon.pot
File diff suppressed because it is too large
View File


+ 0
- 1530
config/config.guess
File diff suppressed because it is too large
View File


+ 0
- 666
config/config.rpath View File

@@ -1,666 +0,0 @@
#! /bin/sh
# Output a system dependent set of variables, describing how to set the
# run time search path of shared libraries in an executable.
#
# Copyright 1996-2007 Free Software Foundation, Inc.
# Taken from GNU libtool, 2001
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
#
# 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.
#
# The first argument passed to this file is the canonical host specification,
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
# or
# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
# should be set by the caller.
#
# The set of defined variables is at the end of this script.

# Known limitations:
# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
# than 256 bytes, otherwise the compiler driver will dump core. The only
# known workaround is to choose shorter directory names for the build
# directory and/or the installation directory.

# All known linkers require a `.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
shrext=.so

host="$1"
host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`

# Code taken from libtool.m4's _LT_CC_BASENAME.

for cc_temp in $CC""; do
case $cc_temp in
compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
\-*) ;;
*) break;;
esac
done
cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`

# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.

wl=
if test "$GCC" = yes; then
wl='-Wl,'
else
case "$host_os" in
aix*)
wl='-Wl,'
;;
darwin*)
case $cc_basename in
xlc*)
wl='-Wl,'
;;
esac
;;
mingw* | cygwin* | pw32* | os2*)
;;
hpux9* | hpux10* | hpux11*)
wl='-Wl,'
;;
irix5* | irix6* | nonstopux*)
wl='-Wl,'
;;
newsos6)
;;
linux* | k*bsd*-gnu)
case $cc_basename in
icc* | ecc*)
wl='-Wl,'
;;
pgcc | pgf77 | pgf90)
wl='-Wl,'
;;
ccc*)
wl='-Wl,'
;;
como)
wl='-lopt='
;;
*)
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*)
wl='-Wl,'
;;
esac
;;
esac
;;
osf3* | osf4* | osf5*)
wl='-Wl,'
;;
rdos*)
;;
solaris*)
wl='-Wl,'
;;
sunos4*)
wl='-Qoption ld '
;;
sysv4 | sysv4.2uw2* | sysv4.3*)
wl='-Wl,'
;;
sysv4*MP*)
;;
sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
wl='-Wl,'
;;
unicos*)
wl='-Wl,'
;;
uts4*)
;;
esac
fi

# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.

hardcode_libdir_flag_spec=
hardcode_libdir_separator=
hardcode_direct=no
hardcode_minus_L=no

case "$host_os" in
cygwin* | mingw* | pw32*)
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
if test "$GCC" != yes; then
with_gnu_ld=no
fi
;;
interix*)
# we just hope/assume this is gcc and not c89 (= MSVC++)
with_gnu_ld=yes
;;
openbsd*)
with_gnu_ld=no
;;
esac

ld_shlibs=yes
if test "$with_gnu_ld" = yes; then
# Set some defaults for GNU ld with shared library support. These
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
# Unlike libtool, we use -rpath here, not --rpath, since the documented
# option of GNU ld is called -rpath, not --rpath.
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
case "$host_os" in
aix3* | aix4* | aix5*)
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
fi
;;
amigaos*)
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
# Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
# that the semantics of dynamic libraries on AmigaOS, at least up
# to version 4, is to share data among multiple programs linked
# with the same dynamic library. Since this doesn't match the
# behavior of shared libraries on other platforms, we cannot use
# them.
ld_shlibs=no
;;
beos*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
:
else
ld_shlibs=no
fi
;;
cygwin* | mingw* | pw32*)
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
:
else
ld_shlibs=no
fi
;;
interix[3-9]*)
hardcode_direct=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
gnu* | linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
:
else
ld_shlibs=no
fi
;;
netbsd*)
;;
solaris*)
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
ld_shlibs=no
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
:
else
ld_shlibs=no
fi
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
case `$LD -v 2>&1` in
*\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
ld_shlibs=no
;;
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
else
ld_shlibs=no
fi
;;
esac
;;
sunos4*)
hardcode_direct=yes
;;
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
:
else
ld_shlibs=no
fi
;;
esac
if test "$ld_shlibs" = no; then
hardcode_libdir_flag_spec=
fi
else
case "$host_os" in
aix3*)
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
if test "$GCC" = yes; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
hardcode_direct=unsupported
fi
;;
aix4* | aix5*)
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
else
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
case $host_os in aix4.[23]|aix4.[23].*|aix5*)
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
break
fi
done
;;
esac
fi
hardcode_direct=yes
hardcode_libdir_separator=':'
if test "$GCC" = yes; then
case $host_os in aix4.[012]|aix4.[012].*)
collect2name=`${CC} -print-prog-name=collect2`
if test -f "$collect2name" && \
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
:
else
# We have old collect2
hardcode_direct=unsupported
hardcode_minus_L=yes
hardcode_libdir_flag_spec='-L$libdir'
hardcode_libdir_separator=
fi
;;
esac
fi
# Begin _LT_AC_SYS_LIBPATH_AIX.
echo 'int main () { return 0; }' > conftest.c
${CC} ${LDFLAGS} conftest.c -o conftest
aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
fi
if test -z "$aix_libpath"; then
aix_libpath="/usr/lib:/lib"
fi
rm -f conftest.c conftest
# End _LT_AC_SYS_LIBPATH_AIX.
if test "$aix_use_runtimelinking" = yes; then
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
else
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
fi
fi
;;
amigaos*)
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
# see comment about different semantics on the GNU ld section
ld_shlibs=no
;;
bsdi[45]*)
;;
cygwin* | mingw* | pw32*)
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
libext=lib
;;
darwin* | rhapsody*)
hardcode_direct=no
if test "$GCC" = yes ; then
:
else
case $cc_basename in
xlc*)
;;
*)
ld_shlibs=no
;;
esac
fi
;;
dgux*)
hardcode_libdir_flag_spec='-L$libdir'
;;
freebsd1*)
ld_shlibs=no
;;
freebsd2.2*)
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
;;
freebsd2*)
hardcode_direct=yes
hardcode_minus_L=yes
;;
freebsd* | dragonfly*)
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
;;
hpux9*)
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
;;
hpux10*)
if test "$with_gnu_ld" = no; then
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_separator=:
hardcode_direct=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
fi
;;
hpux11*)
if test "$with_gnu_ld" = no; then
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_separator=:
case $host_cpu in
hppa*64*|ia64*)
hardcode_direct=no
;;
*)
hardcode_direct=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
hardcode_minus_L=yes
;;
esac
fi
;;
irix5* | irix6* | nonstopux*)
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=:
;;
netbsd*)
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
;;
newsos6)
hardcode_direct=yes
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=:
;;
openbsd*)
if test -f /usr/libexec/ld.so; then
hardcode_direct=yes
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
else
case "$host_os" in
openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
fi
else
ld_shlibs=no
fi
;;
os2*)
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
;;
osf3*)
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator=:
;;
osf4* | osf5*)
if test "$GCC" = yes; then
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
# Both cc and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
fi
hardcode_libdir_separator=:
;;
solaris*)
hardcode_libdir_flag_spec='-R$libdir'
;;
sunos4*)
hardcode_libdir_flag_spec='-L$libdir'
hardcode_direct=yes
hardcode_minus_L=yes
;;
sysv4)
case $host_vendor in
sni)
hardcode_direct=yes # is this really true???
;;
siemens)
hardcode_direct=no
;;
motorola)
hardcode_direct=no #Motorola manual says yes, but my tests say they lie
;;
esac
;;
sysv4.3*)
;;
sysv4*MP*)
if test -d /usr/nec; then
ld_shlibs=yes
fi
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
;;
sysv5* | sco3.2v5* | sco5v6*)
hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
hardcode_libdir_separator=':'
;;
uts4*)
hardcode_libdir_flag_spec='-L$libdir'
;;
*)
ld_shlibs=no
;;
esac
fi

# Check dynamic linker characteristics
# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
# Unlike libtool.m4, here we don't care about _all_ names of the library, but
# only about the one the linker finds when passed -lNAME. This is the last
# element of library_names_spec in libtool.m4, or possibly two of them if the
# linker has special search rules.
library_names_spec= # the last element of library_names_spec in libtool.m4
libname_spec='lib$name'
case "$host_os" in
aix3*)
library_names_spec='$libname.a'
;;
aix4* | aix5*)
library_names_spec='$libname$shrext'
;;
amigaos*)
library_names_spec='$libname.a'
;;
beos*)
library_names_spec='$libname$shrext'
;;
bsdi[45]*)
library_names_spec='$libname$shrext'
;;
cygwin* | mingw* | pw32*)
shrext=.dll
library_names_spec='$libname.dll.a $libname.lib'
;;
darwin* | rhapsody*)
shrext=.dylib
library_names_spec='$libname$shrext'
;;
dgux*)
library_names_spec='$libname$shrext'
;;
freebsd1*)
;;
freebsd* | dragonfly*)
case "$host_os" in
freebsd[123]*)
library_names_spec='$libname$shrext$versuffix' ;;
*)
library_names_spec='$libname$shrext' ;;
esac
;;
gnu*)
library_names_spec='$libname$shrext'
;;
hpux9* | hpux10* | hpux11*)
case $host_cpu in
ia64*)
shrext=.so
;;
hppa*64*)
shrext=.sl
;;
*)
shrext=.sl
;;
esac
library_names_spec='$libname$shrext'
;;
interix[3-9]*)
library_names_spec='$libname$shrext'
;;
irix5* | irix6* | nonstopux*)
library_names_spec='$libname$shrext'
case "$host_os" in
irix5* | nonstopux*)
libsuff= shlibsuff=
;;
*)
case $LD in
*-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
*-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
*-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
*) libsuff= shlibsuff= ;;
esac
;;
esac
;;
linux*oldld* | linux*aout* | linux*coff*)
;;
linux* | k*bsd*-gnu)
library_names_spec='$libname$shrext'
;;
knetbsd*-gnu)
library_names_spec='$libname$shrext'
;;
netbsd*)
library_names_spec='$libname$shrext'
;;
newsos6)
library_names_spec='$libname$shrext'
;;
nto-qnx*)
library_names_spec='$libname$shrext'
;;
openbsd*)
library_names_spec='$libname$shrext$versuffix'
;;
os2*)
libname_spec='$name'
shrext=.dll
library_names_spec='$libname.a'
;;
osf3* | osf4* | osf5*)
library_names_spec='$libname$shrext'
;;
rdos*)
;;
solaris*)
library_names_spec='$libname$shrext'
;;
sunos4*)
library_names_spec='$libname$shrext$versuffix'
;;
sysv4 | sysv4.3*)
library_names_spec='$libname$shrext'
;;
sysv4*MP*)
library_names_spec='$libname$shrext'
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
library_names_spec='$libname$shrext'
;;
uts4*)
library_names_spec='$libname$shrext'
;;
esac

sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`

LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF

# How to pass a linker flag through the compiler.
wl="$escaped_wl"

# Static library suffix (normally "a").
libext="$libext"

# Shared library suffix (normally "so").
shlibext="$shlibext"

# Format of library name prefix.
libname_spec="$escaped_libname_spec"

# Library names that the linker finds when passed -lNAME.
library_names_spec="$escaped_library_names_spec"

# Flag to hardcode \$libdir into a binary during linking.
# This must work even if \$libdir does not exist.
hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"

# Whether we need a single -rpath flag with a separated argument.
hardcode_libdir_separator="$hardcode_libdir_separator"

# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
# resulting binary.
hardcode_direct="$hardcode_direct"

# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
# resulting binary.
hardcode_minus_L="$hardcode_minus_L"

EOF

+ 0
- 331
config/missing View File

@@ -1,331 +0,0 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.

scriptversion=2012-01-06.13; # UTC

# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.

# 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
# the Free Software Foundation; either version 2, or (at your option)
# any later version.

# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# 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 <http://www.gnu.org/licenses/>.

# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.

if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
fi

run=:
sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
sed_minuso='s/.* -o \([^ ]*\).*/\1/p'

# In the cases where this matters, `missing' is being run in the
# srcdir already.
if test -f configure.ac; then
configure_ac=configure.ac
else
configure_ac=configure.in
fi

msg="missing on your system"

case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
# Exit code 63 means version mismatch. This often happens
# when the user try to use an ancient version of a tool on
# a file that requires a minimum version. In this case we
# we should proceed has if the program had been absent, or
# if --run hadn't been passed.
if test $? = 63; then
run=:
msg="probably too old"
fi
;;

-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...

Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
error status if there is no known handling for PROGRAM.

Options:
-h, --help display this help and exit
-v, --version output version information and exit
--run try to run the given command, and emulate it if it fails

Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
yacc create \`y.tab.[ch]', if possible, from existing .[ch]

Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
\`g' are ignored when checking the name.

Send bug reports to <bug-automake@gnu.org>."
exit $?
;;

-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
echo "missing $scriptversion (GNU Automake)"
exit $?
;;

-*)
echo 1>&2 "$0: Unknown \`$1' option"
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
;;

esac

# normalize program name to check for.
program=`echo "$1" | sed '
s/^gnu-//; t
s/^gnu//; t
s/^g//; t'`

# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program). This is about non-GNU programs, so use $1 not
# $program.
case $1 in
lex*|yacc*)
# Not GNU programs, they don't have --version.
;;

*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
# Could not run --version or --help. This is probably someone
# running `$TOOL --version' or `$TOOL --help' to check whether
# $TOOL exists and not knowing $TOOL uses missing.
exit 1
fi
;;
esac

# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
;;

autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
;;

autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
esac
done
touch $touch_files
;;

automake*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
sed 's/\.am$/.in/' |
while read f; do touch "$f"; done
;;

autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."

file=`echo "$*" | sed -n "$sed_output"`
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo "#! /bin/sh"
echo "# Created by GNU Automake missing as a replacement of"
echo "# $ $@"
echo "exit 0"
chmod +x $file
exit 1
fi
;;

bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
if test $# -ne 1; then
eval LASTARG=\${$#}
case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
if test ! -f y.tab.h; then
echo >y.tab.h
fi
if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;

lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
if test $# -ne 1; then
eval LASTARG=\${$#}
case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;

help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."

file=`echo "$*" | sed -n "$sed_output"`
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
exit $?
fi
;;

makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
file=`echo "$*" | sed -n "$sed_output"`
test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
file=`sed -n '
/^@setfilename/{
s/.* \([^ ]*\) *$/\1/
p
q
}' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
# If the file does not exist, the user really needs makeinfo;
# let's fail without touching anything.
test -f $file || exit 1
touch $file
;;

*)
echo 1>&2 "\
WARNING: \`$1' is needed, and is $msg.
You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
;;
esac

exit 0

# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:

+ 8
- 8
configure.ac View File

@@ -1,5 +1,5 @@
AC_PREREQ(2.63)
AC_INIT([cinnamon],[1.9.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=cinnamon],[cinnamon])
AC_INIT([cinnamon],[2.0.14],[https://bugzilla.gnome.org/enter_bug.cgi?product=cinnamon],[cinnamon])

AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([src/cinnamon-global.c])
@@ -62,8 +62,8 @@ AM_CONDITIONAL(BUILD_RECORDER, $build_recorder)

CLUTTER_MIN_VERSION=1.7.5
GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
GJS_MIN_VERSION=1.29.18
MUFFIN_MIN_VERSION=1.0.5
GJS_MIN_VERSION=1.9.0
MUFFIN_MIN_VERSION=1.9.1
GTK_MIN_VERSION=3.0.0
GIO_MIN_VERSION=2.29.10
POLKIT_MIN_VERSION=0.100
@@ -74,7 +74,7 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
gio-unix-2.0 dbus-glib-1 libxml-2.0
gtk+-3.0 >= $GTK_MIN_VERSION
libmuffin >= $MUFFIN_MIN_VERSION
gjs-internals-1.0 >= $GJS_MIN_VERSION
cjs-internals-1.0 >= $GJS_MIN_VERSION
libgnome-menu-3.0 $recorder_modules gconf-2.0
gdk-x11-3.0 libsoup-2.4 gl
clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
@@ -88,7 +88,7 @@ PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0)

PKG_CHECK_MODULES(CINNAMON_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)

GJS_VERSION=`$PKG_CONFIG --modversion gjs-internals-1.0`
GJS_VERSION=`$PKG_CONFIG --modversion cjs-internals-1.0`
AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're linking to])
AC_SUBST([GJS_VERSION], ["$GJS_VERSION"])

@@ -104,11 +104,11 @@ AC_CHECK_FUNCS(JS_NewGlobalObject XFixesCreatePointerBarrier)
CFLAGS=$saved_CFLAGS
LIBS=$saved_LIBS

PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 gnome-desktop-3.0 >= 2.90.0 x11)
PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 cinnamon-desktop >= 1.0.0 x11)
PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-3.0)
PKG_CHECK_MODULES(TRAY, gtk+-3.0)
PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7)
PKG_CHECK_MODULES(DESKTOP_SCHEMAS, cinnamon-desktop >= 1.0.0)

AC_MSG_CHECKING([for bluetooth support])
PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
@@ -129,7 +129,7 @@ MUFFIN_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmuffin`
AC_SUBST(MUFFIN_GIR_DIR)
AC_SUBST(MUFFIN_TYPELIB_DIR)

GJS_CONSOLE=`$PKG_CONFIG --variable=gjs_console gjs-1.0`
GJS_CONSOLE=`$PKG_CONFIG --variable=cjs_console cjs-1.0`
AC_SUBST(GJS_CONSOLE)

AC_CHECK_FUNCS(fdwalk)


+ 206
- 188
data/org.cinnamon.gschema.xml.in View File

@@ -22,7 +22,7 @@
</key>
<key name="enabled-applets" type="as">
<default>['panel1:left:0:menu@cinnamon.org', 'panel1:left:1:show-desktop@cinnamon.org', 'panel1:left:2:panel-launchers@cinnamon.org', 'panel1:left:3:window-list@cinnamon.org', 'panel1:right:0:notifications@cinnamon.org', 'panel1:right:1:settings@cinnamon.org', 'panel1:right:2:removable-drives@cinnamon.org', 'panel1:right:3:keyboard@cinnamon.org', 'panel1:right:4:bluetooth@cinnamon.org', 'panel1:right:5:network@cinnamon.org', 'panel1:right:6:sound@cinnamon.org', 'panel1:right:7:power@cinnamon.org', 'panel1:right:8:systray@cinnamon.org', 'panel1:right:9:calendar@cinnamon.org', 'panel1:right:10:windows-quick-list@cinnamon.org']</default>
<default>['panel1:left:0:menu@cinnamon.org', 'panel1:left:1:show-desktop@cinnamon.org', 'panel1:left:2:panel-launchers@cinnamon.org', 'panel1:left:3:window-list@cinnamon.org', 'panel1:right:0:notifications@cinnamon.org', 'panel1:right:1:user@cinnamon.org', 'panel1:right:2:removable-drives@cinnamon.org', 'panel1:right:3:keyboard@cinnamon.org', 'panel1:right:4:bluetooth@cinnamon.org', 'panel1:right:5:network@cinnamon.org', 'panel1:right:6:sound@cinnamon.org', 'panel1:right:7:power@cinnamon.org', 'panel1:right:8:systray@cinnamon.org', 'panel1:right:9:calendar@cinnamon.org', 'panel1:right:10:windows-quick-list@cinnamon.org']</default>
<_summary>Uuids of applets to enable</_summary>
<_description>
Cinnamon applets have a uuid property; this key lists applets
@@ -146,14 +146,6 @@
</_description>
</key>

<key name="keyboard-applet-use-flags" type="b">
<default>true</default>
<_summary>Use flags to display the keyboard layouts</_summary>
<_description>
Whether to use flags to display the keyboard layouts.
</_description>
</key>

<key name="desktop-effects" type="b">
<default>true</default>
<_summary>Enable desktop effects</_summary>
@@ -290,94 +282,52 @@
Duration of the effect (in milliseconds)
</_description>
</key>
<key name="desktop-layout" type="s">
<default>"traditional"</default>
<_summary>Layout style</_summary>
<_description>
Layout styles: traditional (1 panel at the bottom), flipped (1 panel on top), classic (1 panel on top, 1 panel at the bottom)
</_description>
</key>
<key name="date-format" type="s">
<default>"YYYY-MM-DD"</default>
<_summary>Date format</_summary>
<_description>
Format used for dates.
</_description>
</key>
<key type="s" name="menu-text">
<default>"Menu"</default>
<_summary>Text for the menu</_summary>

<key type="s" name="desktop-effects-tile-effect">
<default>"none"</default>
<_summary>Effect used when maximizing windows</_summary>
<_description>
The text shown in the Menu label.
An effect: none
</_description>
</key>
<key type="s" name="menu-icon">
<default>"/usr/share/cinnamon/theme/menu.png"</default>
<_summary>Icon for the menu</_summary>
<key name="desktop-effects-tile-transition" type="s">
<default>"easeInBack"</default>
<_summary>Transition used when maximizing windows</_summary>
<_description>
The icon shown in the Menu button.
A Tweener transition
</_description>
</key>
<key type="i" name="menu-hover-delay">
<default>0</default>
<_summary>Duration of the delay before which a category is selected when it is hovered</_summary>
<key type="i" name="desktop-effects-tile-time">
<default>400</default>
<_summary>Duration of the effect (in milliseconds)</_summary>
<_description>
Duration of the delay (in milliseconds)
Duration of the effect (in milliseconds)
</_description>
</key>

<key type="b" name="activate-menu-applet-on-hover">
<default>false</default>
<_summary>Enable or disable activation menu applet on hover</_summary>
<key name="desktop-layout" type="s">
<default>"traditional"</default>
<_summary>Layout style</_summary>
<_description>
Another way to open the menu by just hovering the mouse pointer as opposed to clicking on it.
Layout styles: traditional (1 panel at the bottom), flipped (1 panel on top), classic (1 panel on top, 1 panel at the bottom)
</_description>
</key>
<key type="b" name="menu-enable-autoscroll">
<default>true</default>
<_summary>Enable or disable autoscrolling in application list</_summary>
<key name="date-format" type="s">
<default>"YYYY-MM-DD"</default>
<_summary>Date format</_summary>
<_description>
Toggles the auto-scrolling regions at the top and bottom of the app list
Format used for dates.
</_description>
</key>
<key type="b" name="display-notifications">
<default>true</default>
<_summary>Whether notifications are to be displayed</_summary>
</key>

<key type="b" name="menu-show-places">
<default>true</default>
<_summary>Enable or disable display of places in menu applet</_summary>
<_description>
Toggles displaying the 'Places' category in the menu applet
</_description>
</key>

<key type="b" name="menu-show-recent">
<default>true</default>
<_summary>Enable or disable display of recent files in menu applet</_summary>
<_description>
Toggles displaying the 'Recent files' category in the menu applet
</_description>
</key>

<key type="b" name="menu-search-filesystem">
<default>false</default>
<_summary>Enable or disable filesystem path entry in search box</_summary>
<_description>
Toggles whether pressing TAB within the search box autocompletes
paths within the filesystem. Matches are also shown in the
application list and can be clicked to open with default handler.
</_description>
</key>

<key type="i" name="number-workspaces">
<default>2</default>
<_summary>Number of workspaces in Cinnamon session</_summary>
@@ -391,22 +341,6 @@
<_description>Properties of overview corners, in the form functionality:hover:icon. The order in which properties are displayed is top left, top right, bottom left, bottom right.</_description>
</key>

<key name="expo-applet-hover" type="b">
<default>false</default>
<_summary>Expo applet: Activate on hover</_summary>
<_description>
Whether the expo applet triggers only when you click, or when you hover on it
</_description>
</key>
<key name="scale-applet-hover" type="b">
<default>false</default>
<_summary>Scale applet: Activate on hover</_summary>
<_description>
Whether the scale applet triggers only when you click, or when you hover on it
</_description>
</key>
<key name="panel-launchers" type="as">
<default>[ 'firefox.desktop', 'gnome-terminal.desktop', 'nemo.desktop']</default>
<_summary>Desktop files of the applications to put in the panel launchers applet</_summary>
@@ -551,6 +485,14 @@
</description>
</key>
<key name="window-list-applet-alert" type="b">
<default>true</default>
<summary>Enable window list alerts</summary>
<description>
Enable window list alerts
</description>
</key>

<key name="bring-windows-to-current-workspace" type="b">
<default>false</default>
<summary>Brings windows requiring attention to the current workspace</summary>
@@ -589,12 +531,12 @@
<_summary>Whether or not to show possible completions in the run dialog (Alt-F2)</_summary>
</key>

<child name="calendar" schema="org.cinnamon.calendar"/>
<child name="theme" schema="org.cinnamon.theme"/>
<child name="recorder" schema="org.cinnamon.recorder"/>
<child name="keyboard" schema="org.cinnamon.keyboard"/>
<child name="power" schema="org.cinnamon.power" />
<child name="desklets" schema="org.cinnamon.desklets" />
<child name="sounds" schema="org.cinnamon.sounds" />

<key name="enable-vfade" type="b">
<default>false</default>
@@ -603,6 +545,15 @@
Whether the vfade effect is enabled or not
</_description>
</key>

<key name="hide-snap-osd" type="b">
<default>false</default>
<_summary>Prevent the tile/snap OSD from showing</_summary>
<_description>
Hide the snap OSD.
</_description>
</key>

</schema>
<schema id="org.cinnamon.theme" path="/org/cinnamon/theme/"
@@ -635,35 +586,6 @@
</key>
</schema>

<schema id="org.cinnamon.calendar" path="/org/cinnamon/calendar/"
gettext-domain="@GETTEXT_PACKAGE@">
<key name="show-weekdate" type="b">
<default>false</default>
<_summary>Show the week date in the calendar</_summary>
<_description>
If true, display the ISO week date in the calendar.
</_description>
</key>
<key name="date-format" type="s">
<default>'%a %b %e, %H:%M'</default>
<_summary>Format for the date in the panel</_summary>
<_description>
Format used to show the date in the panel.
</_description>
</key>
<key name="date-format-full" type="s">
<default>'%A %B %e, %Y'</default>
<_summary>Format for the date in the applet menu</_summary>
<_description>
Format used to show the date in the applet menu.
</_description>
</key>
</schema>

<schema id="org.cinnamon.recorder" path="/org/cinnamon/recorder/"
gettext-domain="@GETTEXT_PACKAGE@">
<key name="framerate" type="i">
@@ -702,58 +624,6 @@
</key>
</schema>

<schema id="org.cinnamon.overrides" path="/org/cinnamon/overrides/">
<key name="custom-keybindings-to-3-6" type="b">
<default>false</default>
<summary>Run-once flag to see if custom keybindings have been converted to gsettings</summary>
<description>
Run-once flag to see if custom keybindings have been converted to gsettings
</description>
</key>

<key name="attach-modal-dialogs" type="b">
<default>false</default>
<summary>Attach modal dialog to the parent window</summary>
<description>
This key overrides the key in org.gnome.muffin when running
Cinnamon.
</description>
</key>

<key name="button-layout" type="s">
<default>":minimize,maximize,close"</default>
<summary>Arrangement of buttons on the titlebar</summary>
<description>
This key overrides the key in org.gnome.desktop.wm.preferences when
running Cinnamon.
</description>
</key>

<key name="edge-tiling" type="b">
<default>true</default>
<summary>Enable edge tiling when dropping windows on screen edges</summary>
<description>
This key overrides the key in org.gnome.muffin when running Cinnamon.
</description>
</key>

<key type="b" name="workspace-cycle">
<default>false</default>
<summary>Allow cycling through workspaces</summary>
<description>
This key overrides the key in org.cinnamon.muffin when running Cinnamon.
</description>
</key>

<key name="workspaces-only-on-primary" type="b">
<default>false</default>
<summary>Workspaces only on primary monitor</summary>
<description>
This key overrides the key in org.gnome.muffin when running Cinnamon.
</description>
</key>
</schema>

<schema id="org.cinnamon.background" path="/org/cinnamon/background/">
<key name="mode" type="s">
<default>"wallpaper"</default>
@@ -804,26 +674,174 @@
</schema>
<schema id="org.cinnamon.desklets" path="/org/cinnamon/desklets/"
gettext-domain="@GETTEXT_PACKAGE@">
<child name="clock" schema="org.cinnamon.desklets.clock"/>
gettext-domain="@GETTEXT_PACKAGE@">
<child name="launcher" schema="org.cinnamon.desklets.launcher" />
</schema>

<schema id="org.cinnamon.desklets.clock" path="/org/cinnamon/desklets/clock/"
gettext-domain="@GETTEXT_PACKAGE@">
<key name="date-format" type="s">
<default>'%H:%M'</default>
<_summary>The date format for the clock desklet</_summary>
<_description>
The format to be used in the clock desklet
</_description>
</key>
<schema id="org.cinnamon.sounds" path="/org/cinnamon/sounds/">
<key name="switch-enabled" type="b">
<default>false</default>
<summary>Whether to play a sound when switching workspaces</summary>
<description>
Whether to play a sound when switching workspaces.
</description>
</key>
<key name="switch-file" type="s">
<default>""</default>
<summary>Which sound to play when switching workspaces</summary>
<description>
Which sound to play when switching workspaces.
</description>
</key>

<key name="close-enabled" type="b">
<default>false</default>
<summary>Whether to play a sound when closing windows</summary>
<description>
Whether to play a sound when closing windows.
</description>
</key>
<key name="close-file" type="s">
<default>""</default>
<summary>Which sound to play when closing windows</summary>
<description>
Which sound to play when closing windows.
</description>
</key>

<key name="map-enabled" type="b">
<default>false</default>
<summary>Whether to play a sound when mapping windows</summary>
<description>
Whether to play a sound when mapping windows.
</description>
</key>
<key name="map-file" type="s">
<default>""</default>
<summary>Which sound to play when mapping windows</summary>
<description>
Which sound to play when mapping windows.
</description>
</key>

<key name="minimize-enabled" type="b">
<default>false</default>
<summary>Whether to play a sound when minimizing windows</summary>
<description>
Whether to play a sound when minimizing windows.
</description>
</key>
<key name="minimize-file" type="s">
<default>""</default>
<summary>Which sound to play when minimizing windows</summary>
<description>
Which sound to play when minimizing windows.
</description>
</key>

<key name="maximize-enabled" type="b">
<default>false</default>
<summary>Whether to play a sound when maximizing windows</summary>
<description>
Whether to play a sound when maximizing windows.
</description>
</key>
<key name="maximize-file" type="s">
<default>""</default>
<summary>Which sound to play when maximizing windows</summary>
<description>
Which sound to play when maximizing windows.
</description>
</key>

<key name="unmaximize-enabled" type="b">
<default>false</default>
<summary>Whether to play a sound when unmaximizing windows</summary>
<description>
Whether to play a sound when unmaximizing windows.
</description>
</key>
<key name="unmaximize-file" type="s">
<default>""</default>
<summary>Which sound to play when unmaximizing windows</summary>
<description>
Which sound to play when unmaximizing windows.
</description>
</key>

<key name="tile-enabled" type="b">
<default>false</default>
<summary>Whether to play a sound when tiling windows</summary>
<description>
Whether to play a sound when tiling windows.
</description>
</key>
<key name="tile-file" type="s">
<default>""</default>
<summary>Which sound to play when tiling windows</summary>
<description>
Which sound to play when tiling windows.
</description>
</key>

<key name="login-enabled" type="b">
<default>false</default>
<summary>Whether to play a sound during login</summary>
<description>
Whether to play a sound during login.
</description>
</key>
<key name="login-file" type="s">
<default>""</default>
<summary>Which sound to play when switching windows</summary>
<description>
Which sound to play during login.
</description>
</key>

<key name="plug-enabled" type="b">
<default>false</default>
<summary>Whether to play a sound when a device is plugged</summary>
<description>
Whether to play a sound when a device is plugged.
</description>
</key>
<key name="plug-file" type="s">
<default>""</default>
<summary>Which sound to play when a device is plugged</summary>
<description>
Which sound to play when a device is plugged.
</description>
</key>

<key name="unplug-enabled" type="b">
<default>false</default>
<summary>Whether to play a sound when a device is unplugged</summary>
<description>
Whether to play a sound when a device is unplugged.
</description>
</key>
<key name="unplug-file" type="s">
<default>""</default>
<summary>Which sound to play when a device is plugged</summary>
<description>
Which sound to play when a device is unplugged.
</description>
</key>

<key type="i" name="font-size">
<default>50</default>
<_summary>The font size for the clock deskelt</_summary>
<_description> The font size to be used to display the time on the clock desklet</_description>
</key>
</schema>

<schema id="org.cinnamon.desklets.launcher" path="/org/cinnamon/desklets/launcher/"
gettext-domain="@GETTEXT_PACKAGE@">
<key name="launcher-list" type="as">


BIN
data/theme/add-workspace-hover.png View File

Before After
Width: 35  |  Height: 200  |  Size: 806 B Width: 35  |  Height: 200  |  Size: 474 B

BIN
data/theme/add-workspace.png View File

Before After
Width: 35  |  Height: 200  |  Size: 713 B Width: 35  |  Height: 200  |  Size: 427 B

+ 21
- 202
data/theme/cinnamon.css View File

@@ -63,7 +63,6 @@ StScrollBar StButton#vhandle:hover {
* Shared button properties
* ===================================================================*/
.notification-button, .notification-icon-button,
.hotplug-notification-item, .hotplug-resident-eject-button,
.modal-dialog-button {
color: white;
border: 1px solid #8b8b8b;
@@ -72,18 +71,16 @@ StScrollBar StButton#vhandle:hover {
background-gradient-end: rgba(255, 255, 255, 0);
}
.notification-button:hover,
.notification-icon-button:hover, .hotplug-notification-item:hover,
.hotplug-resident-eject-button:hover, .modal-dialog-button:hover {
.notification-icon-button:hover, .modal-dialog-button:hover {
background-gradient-start: rgba(255, 255, 255, 0.3);
background-gradient-end: rgba(255, 255, 255, 0.1);
}
.notification-button:focus,
.notification-icon-button:focus, .hotplug-notification-item:focus,
.notification-icon-button:focus,
.modal-dialog-button:focus {
border: 2px solid #8b8b8b;
}
.notification-button:active, .notification-icon-button:active,
.hotplug-notification-item:active, .hotplug-resident-eject-button:active,
.modal-dialog-button:active, .modal-dialog-button:pressed {
background-gradient-start: rgba(255, 255, 255, 0);
background-gradient-end: rgba(255, 255, 255, 0.2);
@@ -701,12 +698,11 @@ StScrollBar StButton#vhandle:hover {
spacing: 10px;
}
.notification-button {
border-radius: 18px;
font-size: 11pt;
padding: 4px 42px 5px;
border-radius: 5px;
padding: 4px 8px 5px;
}
.notification-button:focus {
padding: 3px 41px 4px;
padding: 3px 8px 4px;
}
.notification-icon-button {
border-radius: 5px;
@@ -718,52 +714,6 @@ StScrollBar StButton#vhandle:hover {
.notification-icon-button > StIcon {
icon-size: 36px;
}
.hotplug-transient-box {
spacing: 6px;
padding: 2px 72px 2px 12px;
}
.hotplug-notification-item {
padding: 2px 10px;
border-radius: 18px;
font-size: 10.5pt;
}
.hotplug-notification-item:focus {
padding: 1px 71px 1px 11px;
}
.hotplug-notification-item-icon {
icon-size: 24px;
padding: 2px 5px;
}
.hotplug-resident-box {
spacing: 8px;
}
.hotplug-resident-mount {
spacing: 8px;
border-radius: 4px;
color: #ccc;
}
.hotplug-resident-mount:hover {
background-gradient-direction: horizontal;
background-gradient-start: rgba(255, 255, 255, 0.1);
background-gradient-end: rgba(255, 255, 255, 0);
color: #fff;
}
.hotplug-resident-mount-label {
color: inherit;
padding-left: 6px;
}
.hotplug-resident-mount-icon {
icon-size: 24px;
padding-left: 6px;
}
.hotplug-resident-eject-icon {
icon-size: 16px;
}
.hotplug-resident-eject-button {
padding: 7px;
border-radius: 5px;
color: #ccc;
}
#notification StEntry {
padding: 4px;
border-radius: 4px;
@@ -934,79 +884,7 @@ StScrollBar StButton#vhandle:hover {
.lightbox {
background-color: rgba(0, 0, 0, 0.4);
}
/* ===================================================================
* End session dialog
* ===================================================================*/
.end-session-dialog {
spacing: 42px;
}
.end-session-dialog-subject {
font-size: 12pt;
font-weight: bold;
color: #666666;
padding-top: 10px;
padding-left: 17px;
padding-bottom: 30px;
}
.end-session-dialog-subject:rtl {
padding-left: 0px;
padding-right: 17px;
}
.end-session-dialog-description {
font-size: 10pt;
color: white;
padding-left: 17px;
width: 28em;
}
.end-session-dialog-description:rtl {
padding-right: 17px;
}
.end-session-dialog-logout-icon {
border: 2px solid #8b8b8b;
border-radius: 5px;
width: 32px;
height: 32px;
}
.end-session-dialog-shutdown-icon {
width: 32px;
height: 32px;
}
.end-session-dialog-app-list {
font-size: 10pt;
max-height: 200px;
padding-top: 42px;
padding-left: 49px;
padding-right: 32px;
}
.end-session-dialog-app-list:rtl {
padding-right: 49px;
padding-left: 32px;
}
.end-session-dialog-app-list-item {
color: #ccc;
}
.end-session-dialog-app-list-item:hover {
color: white;
}
.end-session-dialog-app-list-item:ltr {
padding-right: 1em;
}
.end-session-dialog-app-list-item:rtl {
padding-left: 1em;
}
.end-session-dialog-app-list-item-icon:ltr {
padding-right: 17px;
}
.end-session-dialog-app-list-item-icon:rtl {
padding-left: 17px;
}
.end-session-dialog-app-list-item-name {
font-size: 10pt;
}
.end-session-dialog-app-list-item-description {
font-size: 8pt;
color: #444444;
}

/* CinnamonMountOperation Dialogs */
.cinnamon-mount-operation-icon {
icon-size: 48px;
@@ -1075,80 +953,6 @@ StScrollBar StButton#vhandle:hover {
.show-processes-dialog-app-list-item-name {
font-size: 10pt;
}
/* ===================================================================
* Policykit authentication dialog
* ===================================================================*/
.polkit-dialog {
/* this is the width of the entire modal popup */
width: 500px;
}
.polkit-dialog-main-layout {
spacing: 24px;
padding: 10px;
}
.polkit-dialog-message-layout {
spacing: 16px;
}
.polkit-dialog-headline {
font-size: 12pt;
font-weight: bold;
color: #666666;
}
.polkit-dialog-description {
font-size: 10pt;
color: white;
}
.polkit-dialog-user-layout {
padding-left: 10px;
spacing: 10px;
}
.polkit-dialog-user-layout:rtl {
padding-left: 0px;
padding-right: 10px;
}
.polkit-dialog-user-root-label {
color: #ff0000;
}
.polkit-dialog-password-label:ltr {
padding-right: 0.5em;
}
.polkit-dialog-password-label:rtl {
padding-left: 0.5em;
}
.polkit-dialog-password-entry {
background-gradient-start: rgb(236,236,236);
background-gradient-end: white;
background-gradient-direction: vertical;
color: black;
border-radius: 5px;
border: 2px solid #555753;
}
.polkit-dialog-password-entry:focus {
border: 2px solid #3465a4;
}
.polkit-dialog-password-entry .capslock-warning {
icon-size: 16px;
warning-color: #999;
padding: 0 4px;
}
.polkit-dialog-error-label {
font-size: 10pt;
color: #ffff00;
padding-bottom: 8px;
}
.polkit-dialog-info-label {
font-size: 10pt;
padding-bottom: 8px;
}
/* intentionally left transparent to avoid dialog changing size */
.polkit-dialog-null-label {
font-size: 10pt;
color: rgba(0,0,0,0);
padding-bottom: 8px;
}
.network-dialog-secret-table {
spacing-rows: 15px;
}
/* ===================================================================
* Magnifier
* ===================================================================*/
@@ -1793,3 +1597,18 @@ StScrollBar StButton#vhandle:hover {
.flashspot {
background-color: white;
}

/* Snap/tile OSD popup */

.snap-osd {
font-size: 18pt;
border-radius: 24px;
background-color: rgba(85, 85, 85, 0.9);
border: 2px solid #868686;
color: #babdb6;
padding-right: 20px;
padding-left: 20px;
padding-bottom: 20px;
padding-top: 20px;
text-align: center;
}

BIN
data/theme/corner-ripple.png View File

Before After
Width: 104  |  Height: 104  |  Size: 8.8 KiB Width: 104  |  Height: 104  |  Size: 4.9 KiB

BIN
data/theme/menu.png View File

Before After
Width: 72  |  Height: 72  |  Size: 7.7 KiB Width: 72  |  Height: 72  |  Size: 4.3 KiB

BIN
data/theme/overview-hover.png View File

Before After
Width: 32  |  Height: 32  |  Size: 1.4 KiB Width: 32  |  Height: 32  |  Size: 838 B

BIN
data/theme/overview.png View File

Before After
Width: 32  |  Height: 32  |  Size: 989 B Width: 32  |  Height: 32  |  Size: 585 B

+ 32
- 0
data/theme/theme-changelog.txt View File

@@ -0,0 +1,32 @@
Since 1.8...

.notification-button {
- border-radius: 18px;
- font-size: 11pt;
- padding: 4px 42px 5px;
+ border-radius: 5px;
+ padding: 4px 8px 5px;
}
.notification-button:focus {
- padding: 3px 41px 4px;
+ padding: 3px 8px 4px;
}

+/* Snap/tile OSD popup */
+
+.snap-osd {
+ font-size: 18pt;
+ border-radius: 24px;
+ background-color: rgba(85, 85, 85, 0.9);
+ border: 2px solid #868686;
+ color: #babdb6;
+ padding-right: 20px;
+ padding-left: 20px;
+ padding-bottom: 20px;
+ padding-top: 20px;
+ text-align: center;
+}





BIN
data/theme/thumbnail-generic.png View File

Before After
Width: 256  |  Height: 144  |  Size: 70 KiB Width: 256  |  Height: 144  |  Size: 60 KiB

BIN
data/theme/thumbnail.png View File

Before After
Width: 256  |  Height: 144  |  Size: 64 KiB Width: 256  |  Height: 144  |  Size: 55 KiB

BIN
data/theme/trash-icon.png View File

Before After
Width: 256  |  Height: 256  |  Size: 6.8 KiB Width: 256  |  Height: 256  |  Size: 2.8 KiB

+ 0
- 39
debian/README.Debian View File

@@ -1,39 +0,0 @@
Cinnamon for Debian
======================

1. Running

There are two main ways of running Cinnamon: replacing your current
GNOME window manager and panel components, or inside a Xephyr window,
as a way to quickly try it out without compromising your
environment. At this stage one of the options may work better than the
other, depending on various factors, including your drivers.

To run Cinnamon under Xephyr you first need to install the
xserver-xephyr package, and then run Cinnamon with the --xephyr
parameter:

$ cinnamon --xephyr

2. It's SLOW as hell!

To run Cinnamon you need to have proper DRI, and a video driver
that Clutter likes. In some Intel cards, Kernel-Mode Setting (KMS) may
help. In case Cinnamon runs but is extremely slow you can try
enabling KMS or running it with CLUTTER_VBLANK=none in its
environment. See http://bugzilla.openedhand.com/show_bug.cgi?id=1730.

3. If you have enough corage...

Cinnamon installs a .desktop file which makes it possible to make
it the default for your session, replacing metacity/gnome-panel. To
make it the default all you need to do is set the following gconf key
to 'cinnamon':

/desktop/gnome/session/required_components/windowmanager

Here's the gconftool command, if you're feeling lazy:

$ gconftool-2 -t string -s /desktop/gnome/session/required_components/windowmanager cinnamon

-- Gustavo Noronha Silva <kov@debian.org>, Tue, 20 Oct 2009 14:50:12 -0200

+ 0
- 329
debian/changelog View File

@@ -1,329 +0,0 @@
cinnamon (1.9.1) olivia; urgency=low

* 1.9.1

-- Clement Lefebvre <root@linuxmint.com> Sat, 01 Jun 2013 22:16:16 +0100

cinnamon (1.8.7) olivia; urgency=low

* 1.8.7

-- Clement Lefebvre <root@linuxmint.com> Sat, 01 Jun 2013 14:57:52 +0100

cinnamon (1.8.6) olivia; urgency=low

* 1.8.6

-- Clement Lefebvre <root@linuxmint.com> Thu, 23 May 2013 16:28:18 +0100

cinnamon (1.8.5) olivia; urgency=low

* 1.8.5

-- Clement Lefebvre <root@linuxmint.com> Wed, 22 May 2013 17:34:29 +0100

cinnamon (1.8.4) olivia; urgency=low

* 1.8.4

-- Clement Lefebvre <root@linuxmint.com> Wed, 22 May 2013 16:15:07 +0100

cinnamon (1.8.3) olivia; urgency=low