Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Renamed files to Cinnamon

  • Loading branch information...
commit 80a525d024c81b2e3c292f27f1c1d70728fe5567 1 parent 10654a5
@clefebvre clefebvre authored
Showing with 4,243 additions and 4,243 deletions.
  1. 0  .pc/03_remove-glx-dependency-on-armel.patch/src/{gnome-shell-plugin.c → cinnamon-plugin.c}
  2. +1 −1  ABOUT-NLS
  3. +1 −1  Makefile.am
  4. +18 −18 Makefile.in
  5. +7 −7 NEWS
  6. +7 −7 README
  7. +12 −12 aclocal.m4
  8. +2 −2 autogen.sh
  9. +6 −6 browser-plugin/Makefile.am
  10. +37 −37 browser-plugin/Makefile.in
  11. +3 −3 browser-plugin/README
  12. +18 −18 browser-plugin/browser-plugin.c
  13. +1 −1  config.h.in
  14. +1 −1  config/compile
  15. +1 −1  config/depcomp
  16. +1 −1  config/install-sh
  17. +46 −46 config/ltmain.sh
  18. +260 −260 configure
  19. +14 −14 configure.ac
  20. +7 −7 data/Makefile.am
  21. +19 −19 data/Makefile.in
  22. +3 −3 data/{gnome-shell.desktop.in.in → cinnamon.desktop.in.in}
  23. +21 −21 data/{gnome-shell.schemas → cinnamon.schemas}
  24. +12 −12 data/{org.gnome.shell.gschema.xml.in → org.cinnamon.gschema.xml.in}
  25. +1 −1  data/theme/calendar-today.svg
  26. +10 −10 data/theme/{gnome-shell.css → cinnamon.css}
  27. +1 −1  data/theme/filter-selected-ltr.svg
  28. +1 −1  data/theme/filter-selected-rtl.svg
  29. +1 −1  data/theme/panel-button-highlight-narrow.svg
  30. +1 −1  data/theme/panel-button-highlight-wide.svg
  31. +10 −10 debian/README.Debian
  32. +68 −68 debian/changelog
  33. +1 −1  debian/{gnome-shell.gsettings-override → cinnamon.gsettings-override}
  34. +4 −0 debian/cinnamon.lintian-overrides
  35. +6 −6 debian/control
  36. +6 −6 debian/control.in
  37. +1 −1  debian/copyright
  38. +0 −4 debian/gnome-shell.lintian-overrides
  39. +8 −8 debian/patches/03_remove-glx-dependency-on-armel.patch
  40. +3 −3 debian/rules
  41. +1 −1  debian/watch
  42. +3 −3 js/Makefile.am
  43. +15 −15 js/Makefile.in
  44. +1 −1  js/gdm/fingerprint.js
  45. +2 −2 js/gdm/loginDialog.js
  46. +2 −2 js/misc/config.js
  47. +1 −1  js/misc/config.js.in
  48. +3 −3 js/misc/docInfo.js
  49. +2 −2 js/misc/modemManager.js
  50. +4 −4 js/misc/util.js
  51. +2 −2 js/perf/core.js
  52. +7 −7 js/ui/altTab.js
  53. +13 −13 js/ui/appDisplay.js
  54. +4 −4 js/ui/appFavorites.js
  55. +3 −3 js/ui/automountManager.js
  56. +5 −5 js/ui/autorunManager.js
  57. +3 −3 js/ui/boxpointer.js
  58. +8 −8 js/ui/calendar.js
  59. +10 −10 js/ui/{shellDBus.js → cinnamonDBus.js}
  60. 0  js/ui/{shellEntry.js → cinnamonEntry.js}
  61. +21 −21 js/ui/{shellMountOperation.js → cinnamonMountOperation.js}
  62. +3 −3 js/ui/contactDisplay.js
  63. +7 −7 js/ui/ctrlAltTab.js
  64. +6 −6 js/ui/dash.js
  65. +4 −4 js/ui/dateMenu.js
  66. +8 −8 js/ui/dnd.js
  67. +7 −7 js/ui/endSessionDialog.js
  68. +6 −6 js/ui/environment.js
  69. +14 −14 js/ui/extensionSystem.js
  70. +4 −4 js/ui/iconGrid.js
  71. +3 −3 js/ui/keyboard.js
  72. +2 −2 js/ui/layout.js
  73. +1 −1  js/ui/link.js
  74. +8 −8 js/ui/lookingGlass.js
  75. +4 −4 js/ui/magnifier.js
  76. +9 −9 js/ui/magnifierDBus.js
  77. +36 −36 js/ui/main.js
  78. +8 −8 js/ui/messageTray.js
  79. +5 −5 js/ui/mintMenu.js
  80. +7 −7 js/ui/modalDialog.js
  81. +5 −5 js/ui/networkAgent.js
  82. +5 −5 js/ui/notificationDaemon.js
  83. +8 −8 js/ui/overview.js
  84. +26 −26 js/ui/panel.js
  85. +2 −2 js/ui/panelMenu.js
  86. +8 −8 js/ui/placeDisplay.js
  87. +6 −6 js/ui/polkitAuthenticationAgent.js
  88. +8 −8 js/ui/popupMenu.js
  89. +4 −4 js/ui/runDialog.js
  90. +26 −26 js/ui/scripting.js
  91. +3 −3 js/ui/search.js
  92. +1 −1  js/ui/searchDisplay.js
  93. +2 −2 js/ui/showDesktopButton.js
  94. +1 −1  js/ui/status/accessibility.js
  95. +1 −1  js/ui/status/bluetooth.js
  96. +3 −3 js/ui/status/keyboard.js
  97. +2 −2 js/ui/status/network.js
  98. +1 −1  js/ui/status/power.js
  99. +5 −5 js/ui/status/volume.js
  100. +2 −2 js/ui/statusIconDispatcher.js
  101. +18 −18 js/ui/telepathyClient.js
  102. +7 −7 js/ui/tweener.js
  103. +5 −5 js/ui/userMenu.js
  104. +6 −6 js/ui/viewSelector.js
  105. +2 −2 js/ui/windowAttentionHandler.js
  106. +63 −63 js/ui/windowManager.js
  107. +14 −14 js/ui/windowlist.js
  108. +9 −9 js/ui/workspace.js
  109. +2 −2 js/ui/workspaceSwitcherPopup.js
  110. +7 −7 js/ui/workspaceThumbnail.js
  111. +2 −2 js/ui/workspacesView.js
  112. +2 −2 js/ui/xdndHandler.js
  113. +1 −1  m4/gettext.m4
  114. +1 −1  m4/intltool.m4
  115. +1 −1  m4/lib-link.m4
  116. +54 −54 m4/libtool.m4
  117. +1 −1  m4/lt~obsolete.m4
  118. +1 −1  man/Makefile.am
  119. +13 −13 man/Makefile.in
  120. +9 −9 man/{gnome-shell.1 → cinnamon.1}
  121. +7 −7 po/Makefile.in.in
  122. +10 −10 po/POTFILES.in
  123. +2 −2 po/POTFILES.skip
  124. +23 −23 po/af.po
  125. +46 −46 po/an.po
  126. +45 −45 po/ar.po
  127. +49 −49 po/as.po
  128. +49 −49 po/ast.po
  129. +45 −45 po/be.po
  130. +47 −47 po/bg.po
  131. +46 −46 po/bn.po
  132. +54 −54 po/bn_IN.po
  133. +52 −52 po/ca.po
  134. +52 −52 po/ca@valencia.po
  135. +51 −51 po/cs.po
  136. +50 −50 po/da.po
  137. +55 −55 po/de.po
  138. +49 −49 po/el.po
  139. +51 −51 po/en_GB.po
  140. +48 −48 po/eo.po
  141. +54 −54 po/es.po
  142. +14 −14 po/et.po
  143. +50 −50 po/eu.po
  144. +47 −47 po/fa.po
  145. +22 −22 po/fi.po
  146. +51 −51 po/fr.po
  147. +47 −47 po/ga.po
  148. +57 −57 po/gl.po
  149. +50 −50 po/gu.po
  150. +53 −53 po/he.po
  151. +52 −52 po/hi.po
  152. +54 −54 po/hu.po
  153. +52 −52 po/id.po
  154. +54 −54 po/it.po
  155. +53 −53 po/ja.po
  156. +48 −48 po/kn.po
  157. +46 −46 po/ko.po
  158. +44 −44 po/ku.po
  159. +50 −50 po/lt.po
  160. +50 −50 po/lv.po
  161. +48 −48 po/mr.po
  162. +53 −53 po/ms.po
  163. +50 −50 po/nb.po
  164. +50 −50 po/nl.po
  165. +50 −50 po/nn.po
  166. +52 −52 po/or.po
  167. +49 −49 po/pa.po
  168. +49 −49 po/pl.po
  169. +47 −47 po/pt.po
  170. +52 −52 po/pt_BR.po
  171. +52 −52 po/ro.po
  172. +48 −48 po/ru.po
  173. +54 −54 po/sk.po
  174. +48 −48 po/sl.po
  175. +48 −48 po/sr.po
  176. +49 −49 po/sr@latin.po
  177. +51 −51 po/sv.po
  178. +47 −47 po/ta.po
  179. +49 −49 po/te.po
  180. +50 −50 po/th.po
  181. +50 −50 po/tr.po
  182. +52 −52 po/ug.po
  183. +50 −50 po/uk.po
  184. +53 −53 po/vi.po
  185. +54 −54 po/zh_CN.po
Sorry, we could not display the entire diff because too many files (359) changed.
View
0  ...ependency-on-armel.patch/src/gnome-shell-plugin.c → ...x-dependency-on-armel.patch/src/cinnamon-plugin.c
File renamed without changes
View
2  ABOUT-NLS
@@ -106,7 +106,7 @@ only have to set the `LANG' environment variable to the appropriate
setting `LANG', otherwise the setting of `LANG' will not have the
desired effect. Here `LL' is an ISO 639 two-letter language code, and
`CC' is an ISO 3166 two-letter country code. For example, let's
-suppose that you speak German and live in Germany. At the shell
+suppose that you speak German and live in Germany. At the cinnamon
prompt, merely execute `setenv LANG de_DE' (in `csh'),
`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
This can be done from your `.login' or `.profile' file, once and for
View
2  Makefile.am
@@ -12,7 +12,7 @@ EXTRA_DIST = \
# These are files checked into Git that we don't want to distribute
DIST_EXCLUDE = \
.gitignore \
- gnome-shell.doap \
+ cinnamon.doap \
MAINTAINERS \
tools/build/*
View
36 Makefile.in
@@ -170,8 +170,8 @@ GLIB_LIBS = @GLIB_LIBS@
GLIB_MKENUMS = @GLIB_MKENUMS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
-GNOME_SHELL_CFLAGS = @GNOME_SHELL_CFLAGS@
-GNOME_SHELL_LIBS = @GNOME_SHELL_LIBS@
+CINNAMON_CFLAGS = @CINNAMON_CFLAGS@
+CINNAMON_LIBS = @CINNAMON_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
GREP = @GREP@
GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
@@ -248,17 +248,17 @@ PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHELL_HOTPLUG_SNIFFER_CFLAGS = @SHELL_HOTPLUG_SNIFFER_CFLAGS@
-SHELL_HOTPLUG_SNIFFER_LIBS = @SHELL_HOTPLUG_SNIFFER_LIBS@
-SHELL_PERF_HELPER_CFLAGS = @SHELL_PERF_HELPER_CFLAGS@
-SHELL_PERF_HELPER_LIBS = @SHELL_PERF_HELPER_LIBS@
-SHELL_SYSTEM_CA_FILE = @SHELL_SYSTEM_CA_FILE@
+CINNAMON = @CINNAMON@
+CINNAMON_HOTPLUG_SNIFFER_CFLAGS = @CINNAMON_HOTPLUG_SNIFFER_CFLAGS@
+CINNAMON_HOTPLUG_SNIFFER_LIBS = @CINNAMON_HOTPLUG_SNIFFER_LIBS@
+CINNAMON_PERF_HELPER_CFLAGS = @CINNAMON_PERF_HELPER_CFLAGS@
+CINNAMON_PERF_HELPER_LIBS = @CINNAMON_PERF_HELPER_LIBS@
+CINNAMON_SYSTEM_CA_FILE = @CINNAMON_SYSTEM_CA_FILE@
STRIP = @STRIP@
ST_CFLAGS = @ST_CFLAGS@
ST_LIBS = @ST_LIBS@
-TEST_SHELL_RECORDER_CFLAGS = @TEST_SHELL_RECORDER_CFLAGS@
-TEST_SHELL_RECORDER_LIBS = @TEST_SHELL_RECORDER_LIBS@
+TEST_CINNAMON_RECORDER_CFLAGS = @TEST_CINNAMON_RECORDER_CFLAGS@
+TEST_CINNAMON_RECORDER_LIBS = @TEST_CINNAMON_RECORDER_LIBS@
TRAY_CFLAGS = @TRAY_CFLAGS@
TRAY_LIBS = @TRAY_LIBS@
TYPELIBDIR = @TYPELIBDIR@
@@ -338,7 +338,7 @@ EXTRA_DIST = \
# These are files checked into Git that we don't want to distribute
DIST_EXCLUDE = \
.gitignore \
- gnome-shell.doap \
+ cinnamon.doap \
MAINTAINERS \
tools/build/*
@@ -365,15 +365,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
- echo ' $(SHELL) ./config.status'; \
- $(SHELL) ./config.status;; \
+ echo ' $(CINNAMON) ./config.status'; \
+ $(CINNAMON) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(CINNAMON) ./config.status $@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(CINNAMON) ./config.status $@ $(am__depfiles_maybe);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
+ $(CINNAMON) ./config.status --recheck
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(am__cd) $(srcdir) && $(AUTOCONF)
@@ -389,7 +389,7 @@ config.h: stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
+ cd $(top_builddir) && $(CINNAMON) ./config.status config.h
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
@@ -398,7 +398,7 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
js/misc/config.js: $(top_builddir)/config.status $(top_srcdir)/js/misc/config.js.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
+ cd $(top_builddir) && $(CINNAMON) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
View
14 NEWS
@@ -67,7 +67,7 @@ Translations:
3.2.0
=====
* Prevent the fallback on-screen keyboard from showing up while
- GNOME Shell is running [Dan, #659865]
+ Cinnamon is running [Dan, #659865]
* Disable code to reposition windows around the on-screen keyboard;
it wasn't finished or working properly. [Dan; #659643]
* Fix interaction between on-screen keyboard and notifications
@@ -161,7 +161,7 @@ Translations:
========
* Add a browser plugin - this plugin, tied to extensions.gnome.org,
- allows users to download and install shell extensions, and enable,
+ allows users to download and install cinnamon extensions, and enable,
disable, and uninstall extensions they already have installed.
[Jasper; #658070, #658612]
* Improve adding links to URLs in notifications [Dan; #636252]
@@ -250,7 +250,7 @@ Translations:
* Support default actions for notifications [Florian; #655818]
* Networking
- Stop using nm-applet for dialogs; do them as proper system modal
- dialogs in the shell code. [Giovanni; #650244]
+ dialogs in Cinnamon code. [Giovanni; #650244]
- Fix handling of hidden access points [Giovanni; #646454]
* Telepathy integration
- Support subscription requests [Guillaume, Xavier; #653941]
@@ -314,7 +314,7 @@ Translations:
[Jasper, Guillaume; #649356, #654139]
- Only remove icons when the sender quits from D-Bus, not when it
closes its last window [Neha, Marina; #645764]
- - Solve problems switching chats between shell and Empathy
+ - Solve problems switching chats between cinnamon and Empathy
[Guillaume; #654237]
- Fix handling of bad GMarkup in messages [Dan; #650298]
- Never show notifications when the screensaver is active [Dan; #654550]
@@ -401,7 +401,7 @@ Translations:
* Fix problems with scrolling in overflow for alt-Tab switcher
[Dan Winship, Adel; #647807]
* Mark relationships between labels and actors for accessibility [Alejandro]
-* Add org.gnome.shell.enabled-extensions complementing disabled-extensions
+* Add org.cinnamon.enabled-extensions complementing disabled-extensions
GSetting [Tassilo; #651088]
* Visual tweaks [Jakub, Jasper; #646261, #652715]
* Switch to building against clutter-1.7 with independent Cogl [Adel; #653397]
@@ -487,7 +487,7 @@ Translations:
- Miscellaneous minor bug fixes [Dan, Giovanni, Owen]
645981, 646558, 646443, 646708, 646968
* Application menu and icon
- - Fix bug where application menu icon was missing at GNOME Shell
+ - Fix bug where application menu icon was missing at Cinnamon
startup. [Florian]
https://bugzilla.gnome.org/show_bug.cgi?id=644122
- Fix missing application menu for dialog windows [Colin]
@@ -552,7 +552,7 @@ Translations:
user is using the scrollbar. [Owen Taylor]
https://bugzilla.gnome.org/show_bug.cgi?id=646825
-Contributors to GNOME Shell 3.0
+Contributors to Cinnamon 3.0
===============================
Code:
View
14 README
@@ -1,20 +1,20 @@
-GNOME Shell provides core user interface functions for the GNOME 3 desktop,
-like switching to windows and launching applications. GNOME Shell takes
+Cinnamon provides core user interface functions for the GNOME 3 desktop,
+like switching to windows and launching applications. Cinnamon takes
advantage of the capabilities of modern graphics hardware and introduces
innovative user interface concepts to provide a visually attractive and
easy to use experience.
-For more information about GNOME Shell, including instructions on how
-to build GNOME Shell from source and how to get involved with the project,
+For more information about Cinnamon, including instructions on how
+to build Cinnamon from source and how to get involved with the project,
see:
- http://live.gnome.org/GnomeShell
+ http://live.gnome.org/Cinnamon
-Bugs should be reported at http://bugzilla.gnome.org against the 'gnome-shell'
+Bugs should be reported at http://bugzilla.gnome.org against the 'cinnamon'
product.
License
=======
-GNOME Shell is distributed under the terms of the GNU General Public License,
+Cinnamon is distributed under the terms of the GNU General Public License,
version 2 or later. See the COPYING file for details.
View
24 aclocal.m4
@@ -91,7 +91,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
# and then we would define $MISSING as
-# MISSING="\${SHELL} $am_aux_dir/missing"
+# MISSING="\${CINNAMON} $am_aux_dir/missing"
# This will work as long as MISSING is not called from configure, because
# unfortunately $(top_srcdir) has no meaning in configure.
# However there are other variables, like CC, which are often used in
@@ -119,7 +119,7 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
# serial 9
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# AM_CONDITIONAL(NAME, CINNAMON-CONDITION)
# -------------------------------------
# Define a conditional.
AC_DEFUN([AM_CONDITIONAL],
@@ -267,7 +267,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
if depmode=$depmode \
source=sub/conftest.c object=$am__obj \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ $CINNAMON ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
@@ -519,7 +519,7 @@ AC_CONFIG_COMMANDS_PRE(dnl
dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
+dnl mangled by Autoconf and run in a cinnamon conditional statement.
m4_define([_AC_COMPILER_EXEEXT],
m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
@@ -559,9 +559,9 @@ AC_DEFUN([AM_PROG_INSTALL_SH],
if test x"${install_sh}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ install_sh="\${CINNAMON} '$am_aux_dir/install-sh'" ;;
*)
- install_sh="\${SHELL} $am_aux_dir/install-sh"
+ install_sh="\${CINNAMON} $am_aux_dir/install-sh"
esac
fi
AC_SUBST(install_sh)])
@@ -743,12 +743,12 @@ AC_REQUIRE_AUX_FILE([missing])dnl
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ MISSING="\${CINNAMON} \"$am_aux_dir/missing\"" ;;
*)
- MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ MISSING="\${CINNAMON} $am_aux_dir/missing" ;;
esac
fi
-# Use eval to expand $SHELL
+# Use eval to expand $CINNAMON
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
@@ -1069,7 +1069,7 @@ case $srcdir in
AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
esac
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do `set' in a subcinnamon so we don't clobber the current cinnamon's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
@@ -1085,7 +1085,7 @@ if (
&& test "$[*]" != "X conftest.file $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # if, for instance, CONFIG_CINNAMON is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
@@ -1622,7 +1622,7 @@ main ()
printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
printf("***\n");
printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+ printf("*** probably means that the wrong copy of the pkg-config cinnamon script is\n");
printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
printf("*** correct copy of pkg-config. (In this case, you will have to\n");
View
4 autogen.sh
@@ -4,12 +4,12 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
-PKG_NAME="gnome-shell"
+PKG_NAME="cinnamon"
(test -f $srcdir/configure.ac \
&& test -d $srcdir/src) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
- echo " top-level gnome-shell directory"
+ echo " top-level cinnamon directory"
exit 1
}
View
12 browser-plugin/Makefile.am
@@ -1,21 +1,21 @@
mozillalibdir = $(BROWSER_PLUGIN_DIR)
-mozillalib_LTLIBRARIES = libgnome-shell-browser-plugin.la
+mozillalib_LTLIBRARIES = libcinnamon-browser-plugin.la
-libgnome_shell_browser_plugin_la_LDFLAGS = -module -avoid-version -no-undefined
+libgnome_cinnamon_browser_plugin_la_LDFLAGS = -module -avoid-version -no-undefined
-libgnome_shell_browser_plugin_la_LIBADD = \
+libgnome_cinnamon_browser_plugin_la_LIBADD = \
$(BROWSER_PLUGIN_LIBS)
-libgnome_shell_browser_plugin_la_SOURCES = \
+libgnome_cinnamon_browser_plugin_la_SOURCES = \
browser-plugin.c \
npapi/npapi.h \
npapi/npfunctions.h \
npapi/npruntime.h \
npapi/nptypes.h
-libgnome_shell_browser_plugin_la_CFLAGS = \
+libgnome_cinnamon_browser_plugin_la_CFLAGS = \
$(BROWSER_PLUGIN_CFLAGS) \
-DG_DISABLE_DEPRECATED \
- -DG_LOG_DOMAIN=\"GnomeShellBrowserPlugin\"
+ -DG_LOG_DOMAIN=\"CinnamonBrowserPlugin\"
View
74 browser-plugin/Makefile.in
@@ -76,20 +76,20 @@ am__base_list = \
am__installdirs = "$(DESTDIR)$(mozillalibdir)"
LTLIBRARIES = $(mozillalib_LTLIBRARIES)
am__DEPENDENCIES_1 =
-libgnome_shell_browser_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libgnome_shell_browser_plugin_la_OBJECTS = \
- libgnome_shell_browser_plugin_la-browser-plugin.lo
-libgnome_shell_browser_plugin_la_OBJECTS = \
- $(am_libgnome_shell_browser_plugin_la_OBJECTS)
+libgnome_cinnamon_browser_plugin_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libgnome_cinnamon_browser_plugin_la_OBJECTS = \
+ libgnome_cinnamon_browser_plugin_la-browser-plugin.lo
+libgnome_cinnamon_browser_plugin_la_OBJECTS = \
+ $(am_libgnome_cinnamon_browser_plugin_la_OBJECTS)
AM_V_lt = $(am__v_lt_$(V))
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
am__v_lt_0 = --silent
-libgnome_shell_browser_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+libgnome_cinnamon_browser_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(libgnome_shell_browser_plugin_la_CFLAGS) $(CFLAGS) \
- $(libgnome_shell_browser_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
+ $(libgnome_cinnamon_browser_plugin_la_CFLAGS) $(CFLAGS) \
+ $(libgnome_cinnamon_browser_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+depcomp = $(CINNAMON) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -114,8 +114,8 @@ am__v_CCLD_0 = @echo " CCLD " $@;
AM_V_GEN = $(am__v_GEN_$(V))
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
-SOURCES = $(libgnome_shell_browser_plugin_la_SOURCES)
-DIST_SOURCES = $(libgnome_shell_browser_plugin_la_SOURCES)
+SOURCES = $(libgnome_cinnamon_browser_plugin_la_SOURCES)
+DIST_SOURCES = $(libgnome_cinnamon_browser_plugin_la_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -171,8 +171,8 @@ GLIB_LIBS = @GLIB_LIBS@
GLIB_MKENUMS = @GLIB_MKENUMS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
-GNOME_SHELL_CFLAGS = @GNOME_SHELL_CFLAGS@
-GNOME_SHELL_LIBS = @GNOME_SHELL_LIBS@
+CINNAMON_CFLAGS = @CINNAMON_CFLAGS@
+CINNAMON_LIBS = @CINNAMON_LIBS@
GOBJECT_QUERY = @GOBJECT_QUERY@
GREP = @GREP@
GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
@@ -249,17 +249,17 @@ PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SHELL_HOTPLUG_SNIFFER_CFLAGS = @SHELL_HOTPLUG_SNIFFER_CFLAGS@
-SHELL_HOTPLUG_SNIFFER_LIBS = @SHELL_HOTPLUG_SNIFFER_LIBS@
-SHELL_PERF_HELPER_CFLAGS = @SHELL_PERF_HELPER_CFLAGS@
-SHELL_PERF_HELPER_LIBS = @SHELL_PERF_HELPER_LIBS@
-SHELL_SYSTEM_CA_FILE = @SHELL_SYSTEM_CA_FILE@
+CINNAMON = @CINNAMON@
+CINNAMON_HOTPLUG_SNIFFER_CFLAGS = @CINNAMON_HOTPLUG_SNIFFER_CFLAGS@
+CINNAMON_HOTPLUG_SNIFFER_LIBS = @CINNAMON_HOTPLUG_SNIFFER_LIBS@
+CINNAMON_PERF_HELPER_CFLAGS = @CINNAMON_PERF_HELPER_CFLAGS@
+CINNAMON_PERF_HELPER_LIBS = @CINNAMON_PERF_HELPER_LIBS@
+CINNAMON_SYSTEM_CA_FILE = @CINNAMON_SYSTEM_CA_FILE@
STRIP = @STRIP@
ST_CFLAGS = @ST_CFLAGS@
ST_LIBS = @ST_LIBS@
-TEST_SHELL_RECORDER_CFLAGS = @TEST_SHELL_RECORDER_CFLAGS@
-TEST_SHELL_RECORDER_LIBS = @TEST_SHELL_RECORDER_LIBS@
+TEST_CINNAMON_RECORDER_CFLAGS = @TEST_CINNAMON_RECORDER_CFLAGS@
+TEST_CINNAMON_RECORDER_LIBS = @TEST_CINNAMON_RECORDER_LIBS@
TRAY_CFLAGS = @TRAY_CFLAGS@
TRAY_LIBS = @TRAY_LIBS@
TYPELIBDIR = @TYPELIBDIR@
@@ -326,22 +326,22 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
mozillalibdir = $(BROWSER_PLUGIN_DIR)
-mozillalib_LTLIBRARIES = libgnome-shell-browser-plugin.la
-libgnome_shell_browser_plugin_la_LDFLAGS = -module -avoid-version -no-undefined
-libgnome_shell_browser_plugin_la_LIBADD = \
+mozillalib_LTLIBRARIES = libcinnamon-browser-plugin.la
+libgnome_cinnamon_browser_plugin_la_LDFLAGS = -module -avoid-version -no-undefined
+libgnome_cinnamon_browser_plugin_la_LIBADD = \
$(BROWSER_PLUGIN_LIBS)
-libgnome_shell_browser_plugin_la_SOURCES = \
+libgnome_cinnamon_browser_plugin_la_SOURCES = \
browser-plugin.c \
npapi/npapi.h \
npapi/npfunctions.h \
npapi/npruntime.h \
npapi/nptypes.h
-libgnome_shell_browser_plugin_la_CFLAGS = \
+libgnome_cinnamon_browser_plugin_la_CFLAGS = \
$(BROWSER_PLUGIN_CFLAGS) \
-DG_DISABLE_DEPRECATED \
- -DG_LOG_DOMAIN=\"GnomeShellBrowserPlugin\"
+ -DG_LOG_DOMAIN=\"CinnamonBrowserPlugin\"
all: all-am
@@ -365,8 +365,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(CINNAMON) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(CINNAMON) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@@ -408,8 +408,8 @@ clean-mozillalibLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libgnome-shell-browser-plugin.la: $(libgnome_shell_browser_plugin_la_OBJECTS) $(libgnome_shell_browser_plugin_la_DEPENDENCIES)
- $(AM_V_CCLD)$(libgnome_shell_browser_plugin_la_LINK) -rpath $(mozillalibdir) $(libgnome_shell_browser_plugin_la_OBJECTS) $(libgnome_shell_browser_plugin_la_LIBADD) $(LIBS)
+libcinnamon-browser-plugin.la: $(libgnome_cinnamon_browser_plugin_la_OBJECTS) $(libgnome_cinnamon_browser_plugin_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(libgnome_cinnamon_browser_plugin_la_LINK) -rpath $(mozillalibdir) $(libgnome_cinnamon_browser_plugin_la_OBJECTS) $(libgnome_cinnamon_browser_plugin_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -417,7 +417,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_browser_plugin_la-browser-plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_cinnamon_browser_plugin_la-browser-plugin.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -443,13 +443,13 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-libgnome_shell_browser_plugin_la-browser-plugin.lo: browser-plugin.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnome_shell_browser_plugin_la_CFLAGS) $(CFLAGS) -MT libgnome_shell_browser_plugin_la-browser-plugin.lo -MD -MP -MF $(DEPDIR)/libgnome_shell_browser_plugin_la-browser-plugin.Tpo -c -o libgnome_shell_browser_plugin_la-browser-plugin.lo `test -f 'browser-plugin.c' || echo '$(srcdir)/'`browser-plugin.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnome_shell_browser_plugin_la-browser-plugin.Tpo $(DEPDIR)/libgnome_shell_browser_plugin_la-browser-plugin.Plo
+libgnome_cinnamon_browser_plugin_la-browser-plugin.lo: browser-plugin.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnome_cinnamon_browser_plugin_la_CFLAGS) $(CFLAGS) -MT libgnome_cinnamon_browser_plugin_la-browser-plugin.lo -MD -MP -MF $(DEPDIR)/libgnome_cinnamon_browser_plugin_la-browser-plugin.Tpo -c -o libgnome_cinnamon_browser_plugin_la-browser-plugin.lo `test -f 'browser-plugin.c' || echo '$(srcdir)/'`browser-plugin.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnome_cinnamon_browser_plugin_la-browser-plugin.Tpo $(DEPDIR)/libgnome_cinnamon_browser_plugin_la-browser-plugin.Plo
@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='browser-plugin.c' object='libgnome_shell_browser_plugin_la-browser-plugin.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='browser-plugin.c' object='libgnome_cinnamon_browser_plugin_la-browser-plugin.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnome_shell_browser_plugin_la_CFLAGS) $(CFLAGS) -c -o libgnome_shell_browser_plugin_la-browser-plugin.lo `test -f 'browser-plugin.c' || echo '$(srcdir)/'`browser-plugin.c
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnome_cinnamon_browser_plugin_la_CFLAGS) $(CFLAGS) -c -o libgnome_cinnamon_browser_plugin_la-browser-plugin.lo `test -f 'browser-plugin.c' || echo '$(srcdir)/'`browser-plugin.c
mostlyclean-libtool:
-rm -f *.lo
View
6 browser-plugin/README
@@ -1,15 +1,15 @@
-The GNOME Shell Browser Plugin provides integration with gnome-shell and the
+The Cinnamon Browser Plugin provides integration with cinnamon and the
corresponding extensions repository, codenamed "SweetTooth". The plugin allows
the extensions repository to provide good integration, letting the website
know which extensions are enabled and disabled, and allowing the website to
enable, disable and install them.
-Bugs should be reported at http://bugzilla.gnome.org against the 'gnome-shell'
+Bugs should be reported at http://bugzilla.gnome.org against the 'cinnamon'
product.
License
=======
-The GNOME Shell Browser Plugin, like GNOME Shell itself is distributed under
+The Cinnamon Browser Plugin, like Cinnamon itself is distributed under
the GNU General Public License, version 2 or later. The plugin also contains
header files from the "NPAPI SDK" project, tri-licensed under MPL 1.1, GPL 2.0
and LGPL 2.1. These headers are third-party sources and can be retrieved from:
View
36 browser-plugin/browser-plugin.c
@@ -35,11 +35,11 @@
#include <json-glib/json-glib.h>
#define ORIGIN "extensions.gnome.org"
-#define PLUGIN_NAME "Gnome Shell Integration"
-#define PLUGIN_DESCRIPTION "This plugin provides integration with Gnome Shell " \
+#define PLUGIN_NAME "Cinnamon Integration"
+#define PLUGIN_DESCRIPTION "This plugin provides integration with Cinnamon " \
"for live extension enabling and disabling. " \
"It can be used only by extensions.gnome.org"
-#define PLUGIN_MIME_STRING "application/x-gnome-shell-integration::Gnome Shell Integration Dummy Content-Type";
+#define PLUGIN_MIME_STRING "application/x-cinnamon-integration::Cinnamon Integration Dummy Content-Type";
#define PLUGIN_API_VERSION 1
@@ -223,18 +223,18 @@ NPP_New(NPMIMEType mimetype,
data->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
G_DBUS_PROXY_FLAGS_NONE,
NULL, /* interface info */
- "org.gnome.Shell",
- "/org/gnome/Shell",
- "org.gnome.Shell",
+ "org.Cinnamon",
+ "/org/Cinnamon",
+ "org.Cinnamon",
NULL, /* GCancellable */
&error);
if (!data->proxy)
{
- /* ignore error if the shell is not running, otherwise warn */
+ /* ignore error if Cinnamon is not running, otherwise warn */
if (error->domain != G_DBUS_ERROR ||
error->code != G_DBUS_ERROR_NAME_HAS_NO_OWNER)
{
- g_warning ("Failed to set up Shell proxy: %s", error->message);
+ g_warning ("Failed to set up Cinnamon proxy: %s", error->message);
}
g_clear_error (&error);
return NPERR_GENERIC_ERROR;
@@ -273,7 +273,7 @@ typedef struct {
} PluginObject;
static void
-on_shell_signal (GDBusProxy *proxy,
+on_cinnamon_signal (GDBusProxy *proxy,
gchar *sender_name,
gchar *signal_name,
GVariant *parameters,
@@ -313,7 +313,7 @@ plugin_object_allocate (NPP instance,
obj->instance = instance;
obj->proxy = g_object_ref (data->proxy);
obj->signal_id = g_signal_connect (obj->proxy, "g-signal",
- G_CALLBACK (on_shell_signal), obj);
+ G_CALLBACK (on_cinnamon_signal), obj);
g_debug ("plugin object created");
@@ -337,7 +337,7 @@ plugin_object_deallocate (NPObject *npobj)
}
static NPIdentifier api_version_id;
-static NPIdentifier shell_version_id;
+static NPIdentifier cinnamon_version_id;
static NPIdentifier get_info_id;
static NPIdentifier list_extensions_id;
static NPIdentifier enable_extension_id;
@@ -600,7 +600,7 @@ plugin_get_api_version (PluginObject *obj,
}
static gboolean
-plugin_get_shell_version (PluginObject *obj,
+plugin_get_cinnamon_version (PluginObject *obj,
NPVariant *result)
{
GVariant *res;
@@ -612,11 +612,11 @@ plugin_get_shell_version (PluginObject *obj,
ret = TRUE;
res = g_dbus_proxy_get_cached_property (obj->proxy,
- "ShellVersion");
+ "CinnamonVersion");
if (res == NULL)
{
- g_warning ("Failed to grab shell version.");
+ g_warning ("Failed to grab cinnamon version.");
version = "-1";
}
else
@@ -710,7 +710,7 @@ plugin_object_has_property (NPObject *npobj,
{
return (name == onextension_changed_id ||
name == api_version_id ||
- name == shell_version_id);
+ name == cinnamon_version_id);
}
static bool
@@ -726,8 +726,8 @@ plugin_object_get_property (NPObject *npobj,
obj = (PluginObject*) npobj;
if (name == api_version_id)
return plugin_get_api_version (obj, result);
- else if (name == shell_version_id)
- return plugin_get_shell_version (obj, result);
+ else if (name == cinnamon_version_id)
+ return plugin_get_cinnamon_version (obj, result);
else if (name == onextension_changed_id)
{
if (obj->listener)
@@ -790,7 +790,7 @@ init_methods_and_properties (void)
{
/* this is the JS public API; it is manipulated through NPIdentifiers for speed */
api_version_id = funcs.getstringidentifier ("apiVersion");
- shell_version_id = funcs.getstringidentifier ("shellVersion");
+ cinnamon_version_id = funcs.getstringidentifier ("cinnamonVersion");
get_info_id = funcs.getstringidentifier ("getExtensionInfo");
list_extensions_id = funcs.getstringidentifier ("listExtensions");
View
2  config.h.in
@@ -111,7 +111,7 @@
#undef PACKAGE_VERSION
/* The system TLS CA list */
-#undef SHELL_SYSTEM_CA_FILE
+#undef CINNAMON_SYSTEM_CA_FILE
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
View
2  config/compile
@@ -133,7 +133,7 @@ rmdir "$lockdir"
exit $ret
# Local Variables:
-# mode: shell-script
+# mode: cinnamon-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
View
2  config/depcomp
@@ -620,7 +620,7 @@ esac
exit 0
# Local Variables:
-# mode: shell-script
+# mode: cinnamon-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
View
2  config/install-sh
@@ -47,7 +47,7 @@ IFS=" "" $nl"
# set DOITPROG to echo to test this script
-# Don't use :- since 4.3BSD and earlier shells don't like it.
+# Don't use :- since 4.3BSD and earlier cinnamons don't like it.
doit=${DOITPROG-}
if test -z "$doit"; then
doit_exec=exec
View
92 config/ltmain.sh
@@ -33,7 +33,7 @@
# Provide generalized library-building support services.
#
# --config show all configuration variables
-# --debug enable verbose shell tracing
+# --debug enable verbose cinnamon tracing
# -n, --dry-run display commands without modifying any files
# --features display basic configuration information and exit
# --mode=MODE use operation mode MODE
@@ -65,7 +65,7 @@
# include the following information:
#
# host-triplet: $host
-# shell: $SHELL
+# cinnamon: $CINNAMON
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
@@ -126,7 +126,7 @@ $lt_unset CDPATH
# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
+# is ksh but when the cinnamon is invoked as "sh" and the current value of
# the _XPG environment variable is not equal to 1 (one), the special
# positional parameter $0, within a function call, is the name of the
# function.
@@ -145,7 +145,7 @@ test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
: ${MV="mv -f"}
: ${RM="rm -f"}
: ${SED="/bin/sed"}
-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+: ${CINNAMON="${CONFIG_CINNAMON-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
# Global variables:
@@ -175,14 +175,14 @@ func_dirname ()
else
func_dirname_result="$func_dirname_result${2}"
fi
-} # func_dirname may be replaced by extended shell implementation
+} # func_dirname may be replaced by extended cinnamon implementation
# func_basename file
func_basename ()
{
func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
+} # func_basename may be replaced by extended cinnamon implementation
# func_dirname_and_basename file append nondir_replacement
@@ -207,7 +207,7 @@ func_dirname_and_basename ()
func_dirname_result="$func_dirname_result${2}"
fi
func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
+} # func_dirname_and_basename may be replaced by extended cinnamon implementation
# func_stripname prefix suffix name
@@ -222,7 +222,7 @@ func_stripname ()
.*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
esac
-} # func_stripname may be replaced by extended shell implementation
+} # func_stripname may be replaced by extended cinnamon implementation
# These SED scripts presuppose an absolute path with a trailing slash.
@@ -605,10 +605,10 @@ func_quote_for_eval ()
esac
case $func_quote_for_eval_unquoted_result in
- # Double-quote args containing shell metacharacters to delay
+ # Double-quote args containing cinnamon metacharacters to delay
# word splitting, command substitution and and variable
# expansion for a subsequent eval.
- # Many Bourne shells cannot handle close brackets correctly
+ # Many Bourne cinnamons cannot handle close brackets correctly
# in scan sets, so we specify it separately.
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
@@ -633,9 +633,9 @@ func_quote_for_expand ()
esac
case $my_arg in
- # Double-quote args containing shell metacharacters to delay
+ # Double-quote args containing cinnamon metacharacters to delay
# word splitting and command substitution for a subsequent eval.
- # Many Bourne shells cannot handle close brackets correctly
+ # Many Bourne cinnamons cannot handle close brackets correctly
# in scan sets, so we specify it separately.
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
my_arg="\"$my_arg\""
@@ -696,7 +696,7 @@ func_show_eval_locale ()
}
# func_tr_sh
-# Turn $1 into a string suitable for a shell variable name.
+# Turn $1 into a string suitable for a cinnamon variable name.
# Result is stored in $func_tr_sh_result. All characters
# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
# if $1 begins with a digit, a '_' is prepended as well.
@@ -766,7 +766,7 @@ func_help ()
s/^# *$//
s*\$progname*'$progname'*
s*\$host*'"$host"'*
- s*\$SHELL*'"$SHELL"'*
+ s*\$CINNAMON*'"$CINNAMON"'*
s*\$LTCC*'"$LTCC"'*
s*\$LTCFLAGS*'"$LTCFLAGS"'*
s*\$LD*'"$LD"'*
@@ -798,7 +798,7 @@ func_missing_arg ()
# func_split_short_opt shortopt
-# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# Set func_split_short_opt_name and func_split_short_opt_arg cinnamon
# variables after splitting SHORTOPT after the 2nd character.
func_split_short_opt ()
{
@@ -807,11 +807,11 @@ func_split_short_opt ()
func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
+} # func_split_short_opt may be replaced by extended cinnamon implementation
# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
+# Set func_split_long_opt_name and func_split_long_opt_arg cinnamon
# variables after splitting LONGOPT at the `=' sign.
func_split_long_opt ()
{
@@ -820,7 +820,7 @@ func_split_long_opt ()
func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
+} # func_split_long_opt may be replaced by extended cinnamon implementation
exit_cmd=:
@@ -841,31 +841,31 @@ extracted_serial=0
# If this variable is set in any of the actions, the command in it
# will be execed at the end. This prevents here-documents from being
-# left over by shells.
+# left over by cinnamons.
exec_cmd=
# func_append var value
-# Append VALUE to the end of shell variable VAR.
+# Append VALUE to the end of cinnamon variable VAR.
func_append ()
{
eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
+} # func_append may be replaced by extended cinnamon implementation
# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
+# Quote VALUE and append to the end of cinnamon variable VAR, separated
# by a space.
func_append_quoted ()
{
func_quote_for_eval "${2}"
eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
+} # func_append_quoted may be replaced by extended cinnamon implementation
# func_arith arithmetic-term...
func_arith ()
{
func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
+} # func_arith may be replaced by extended cinnamon implementation
# func_len string
@@ -873,21 +873,21 @@ func_arith ()
func_len ()
{
func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
+} # func_len may be replaced by extended cinnamon implementation
# func_lo2o object
func_lo2o ()
{
func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
+} # func_lo2o may be replaced by extended cinnamon implementation
# func_xform libobj-or-source
func_xform ()
{
func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
+} # func_xform may be replaced by extended cinnamon implementation
# func_fatal_configuration arg...
@@ -1066,7 +1066,7 @@ opt_verbose=false
shift
case $opt in
--debug|-x) opt_debug='set -x'
- func_echo "enabling shell trace mode"
+ func_echo "enabling cinnamon trace mode"
$opt_debug
;;
--dry-run|--dryrun|-n)
@@ -1382,7 +1382,7 @@ func_infer_tag ()
CC_expanded=`func_echo_all $CC`
CC_quoted_expanded=`func_echo_all $CC_quoted`
case $@ in
- # Blanks in the command may have been stripped by the calling shell,
+ # Blanks in the command may have been stripped by the calling cinnamon,
# but not from the CC environment variable when configure was run.
" $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
" $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
@@ -1395,7 +1395,7 @@ func_infer_tag ()
eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
CC_quoted=
for arg in $CC; do
- # Double-quote args containing other shell metacharacters.
+ # Double-quote args containing other cinnamon metacharacters.
func_append_quoted CC_quoted "$arg"
done
CC_expanded=`func_echo_all $CC`
@@ -1486,7 +1486,7 @@ func_convert_core_file_wine_to_w32 ()
if test -n "$1"; then
# Unfortunately, winepath does not exit with a non-zero error code, so we
# are forced to check the contents of stdout. On the other hand, if the
- # command is not found, the shell will set an exit code of 127 and print
+ # command is not found, the cinnamon will set an exit code of 127 and print
# *an error message* to stdout. So we must check for both error code of
# zero AND non-empty stdout, which explains the odd construction:
func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
@@ -2104,7 +2104,7 @@ func_mode_compile ()
func_quote_for_eval "$libobj"
test "X$libobj" != "X$func_quote_for_eval_result" \
&& $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \
- && func_warning "libobj name \`$libobj' may not contain shell special characters."
+ && func_warning "libobj name \`$libobj' may not contain cinnamon special characters."
func_dirname_and_basename "$obj" "/" ""
objname="$func_basename_result"
xdir="$func_dirname_result"
@@ -2609,7 +2609,7 @@ func_mode_execute ()
fi
;;
esac
- # Quote arguments (to preserve shell metacharacters).
+ # Quote arguments (to preserve cinnamon metacharacters).
func_append_quoted args "$file"
done
@@ -2770,7 +2770,7 @@ func_mode_install ()
$opt_debug
# There may be an optional sh(1) argument at the beginning of
# install_prog (especially on Windows NT).
- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ if test "$nonopt" = "$CINNAMON" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
case $nonopt in *shtool*) :;; *) false;; esac; then
# Aesthetically quote it.
@@ -3218,7 +3218,7 @@ func_mode_install ()
if test -n "$current_libdirs"; then
# Maybe just do a dry run.
$opt_dry_run && current_libdirs=" -n$current_libdirs"
- exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ exec_cmd='$CINNAMON $progpath $preserve_args --finish$current_libdirs'
else
exit $EXIT_SUCCESS
fi
@@ -3353,7 +3353,7 @@ extern \"C\" {
eval "curr_lafile=\$libfile_$func_tr_sh_result"
dlprefile_dlbasename=""
if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
- # Use subshell, to avoid clobbering current variable values
+ # Use subcinnamon, to avoid clobbering current variable values
dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
if test -n "$dlprefile_dlname" ; then
func_basename "$dlprefile_dlname"
@@ -3533,7 +3533,7 @@ static const void *lt_preloaded_setup() {
# return the library type of file 'arg'
#
# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
+# Has to be a cinnamon function in order to 'eat' the argument
# that is supplied when $file_magic_command is called.
# Despite the name, also deal with 64 bit binaries.
func_win32_libid ()
@@ -3568,7 +3568,7 @@ func_win32_libid ()
*DLL*)
win32_libid_type="x86 DLL"
;;
- *executable*) # but shell scripts are "executable" too...
+ *executable*) # but cinnamon scripts are "executable" too...
case $win32_fileres in
*MS\ Windows\ PE\ Intel*)
win32_libid_type="x86 DLL"
@@ -3835,7 +3835,7 @@ func_emit_wrapper ()
func_emit_wrapper_arg1=${1-no}
$ECHO "\
-#! $SHELL
+#! $CINNAMON
# $output - temporary wrapper script for $objdir/$outputname
# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
@@ -3864,7 +3864,7 @@ fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
-# The HP-UX ksh and POSIX shell print the target directory to stdout
+# The HP-UX ksh and POSIX cinnamon print the target directory to stdout
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -4959,8 +4959,8 @@ EOF
\\\" -> \"
\\\\\" -> \\"
*/
-#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define CINNAMON_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define CINNAMON_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
char **
prepare_spawn (char **argv)
{
@@ -4982,9 +4982,9 @@ prepare_spawn (char **argv)
if (string[0] == '\0')
new_argv[i] = xstrdup ("\"\"");
- else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+ else if (strpbrk (string, CINNAMON_SPECIAL_CHARS) != NULL)
{
- int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+ int quote_around = (strpbrk (string, CINNAMON_SPACE_CHARS) != NULL);
size_t length;
unsigned int backslashes;
const char *s;
@@ -9240,7 +9240,7 @@ EOF
fi
done
# Quote the link command for shipping.
- relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+ relink_command="(cd `pwd`; $CINNAMON $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
if test "$hardcode_automatic" = yes ; then
relink_command=
@@ -9629,7 +9629,7 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
# ### END LIBTOOL TAG CONFIG: disable-static
# Local Variables:
-# mode:shell-script
+# mode:cinnamon-script
# sh-indentation:2
# End:
# vi:sw=2
View
520 configure
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for gnome-shell 3.2.1.
+# Generated by GNU Autoconf 2.68 for cinnamon 3.2.1.
#
-# Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell>.
+# Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=cinnamon>.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -42,7 +42,7 @@ export as_nl
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
+# Prefer a ksh cinnamon builtin over an external printf program on Solaris,
# but without wasting forks for bash or zsh.
if test -z "$BASH_VERSION$ZSH_VERSION" \
&& (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
@@ -136,7 +136,7 @@ export LANGUAGE
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-if test "x$CONFIG_SHELL" = x; then
+if test "x$CONFIG_CINNAMON" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
@@ -201,12 +201,12 @@ do
case $as_dir in #(
/*)
for as_base in sh bash ksh sh5; do
- # Try only shells that exist, to save several forks.
- as_shell=$as_dir/$as_base
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
- CONFIG_SHELL=$as_shell as_have_required=yes
- if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ # Try only cinnamons that exist, to save several forks.
+ as_cinnamon=$as_dir/$as_base
+ if { test -f "$as_cinnamon" || test -f "$as_cinnamon.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_cinnamon"; } 2>/dev/null; then :
+ CONFIG_CINNAMON=$as_cinnamon as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_cinnamon"; } 2>/dev/null; then :
break 2
fi
fi
@@ -214,57 +214,57 @@ fi
esac
as_found=false
done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
- { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
- CONFIG_SHELL=$SHELL as_have_required=yes
+$as_found || { if { test -f "$CINNAMON" || test -f "$CINNAMON.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$CINNAMON"; } 2>/dev/null; then :
+ CONFIG_CINNAMON=$CINNAMON as_have_required=yes
fi; }
IFS=$as_save_IFS
- if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
+ if test "x$CONFIG_CINNAMON" != x; then :
+ # We cannot yet assume a decent cinnamon, so we have to provide a
+ # neutralization value for cinnamons without unset; and this also
+ # works around cinnamons that cannot unset nonexistent variables.
+ # Preserve -v and -x to the replacement cinnamon.
BASH_ENV=/dev/null
ENV=/dev/null
(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
+ export CONFIG_CINNAMON
case $- in # ((((
*v*x* | *x*v* ) as_opts=-vx ;;
*v* ) as_opts=-v ;;
*x* ) as_opts=-x ;;
* ) as_opts= ;;
esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ exec "$CONFIG_CINNAMON" $as_opts "$as_myself" ${1+"$@"}
fi
if test x$as_have_required = xno; then :
- $as_echo "$0: This script requires a shell more modern than all"
- $as_echo "$0: the shells that I found on your system."
+ $as_echo "$0: This script requires a cinnamon more modern than all"
+ $as_echo "$0: the cinnamons that I found on your system."
if test x${ZSH_VERSION+set} = xset ; then
$as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell
+$0: https://bugzilla.gnome.org/enter_bug.cgi?product=cinnamon
$0: about your system, including any error possibly output
-$0: before this message. Then install a modern shell, or
-$0: manually run the script under such a shell if you do
+$0: before this message. Then install a modern cinnamon, or
+$0: manually run the script under such a cinnamon if you do
$0: have one."
fi
exit 1
fi
fi
fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
+CINNAMON=${CONFIG_CINNAMON-/bin/sh}
+export CINNAMON
# Unset more variables known to interfere with behavior of common tools.
CLICOLOR_FORCE= GREP_OPTIONS=
unset CLICOLOR_FORCE GREP_OPTIONS
## --------------------- ##
-## M4sh Shell Functions. ##
+## M4sh Cinnamon Functions. ##
## --------------------- ##
# as_fn_unset VAR
# ---------------
@@ -285,7 +285,7 @@ as_fn_set_status ()
# as_fn_exit STATUS
# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+# Exit the cinnamon with STATUS, even in a "trap 0" or "set -e" context.
as_fn_exit ()
{
set +e
@@ -343,7 +343,7 @@ $as_echo X"$as_dir" |
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
+# advantage of any cinnamon optimizations that allow amortized linear growth over
# repeated appends, instead of the typical quadratic growth present in naive
# implementations.
if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
@@ -361,7 +361,7 @@ fi # as_fn_append
# as_fn_arith ARG...
# ------------------
# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# global $as_val. Take advantage of cinnamons that can avoid forks. The arguments
# must be portable across $(()) and expr.
if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
eval 'as_fn_arith ()
@@ -459,7 +459,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX cinnamon" >&2; as_fn_exit 1; }
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
@@ -545,7 +545,7 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-SHELL=${CONFIG_SHELL-/bin/sh}
+CINNAMON=${CONFIG_CINNAMON-/bin/sh}
test -n "$DJDIR" || exec 7<&0 </dev/null
@@ -569,14 +569,14 @@ MFLAGS=
MAKEFLAGS=
# Identity of this package.
-PACKAGE_NAME='gnome-shell'
-PACKAGE_TARNAME='gnome-shell'
+PACKAGE_NAME='cinnamon'
+PACKAGE_TARNAME='cinnamon'
PACKAGE_VERSION='3.2.1'
-PACKAGE_STRING='gnome-shell 3.2.1'
-PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell'
+PACKAGE_STRING='cinnamon 3.2.1'
+PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=cinnamon'
PACKAGE_URL=''
-ac_unique_file="src/shell-global.c"
+ac_unique_file="src/cinnamon-global.c"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -619,7 +619,7 @@ am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
BROWSER_PLUGIN_DIR
-SHELL_SYSTEM_CA_FILE
+CINNAMON_SYSTEM_CA_FILE
USE_JHBUILD_WRAPPER_SCRIPT_FALSE
USE_JHBUILD_WRAPPER_SCRIPT_TRUE
TYPELIBDIR
@@ -663,16 +663,16 @@ INTROSPECTION_SCANNER
GJS_VERSION
BROWSER_PLUGIN_LIBS
BROWSER_PLUGIN_CFLAGS
-SHELL_HOTPLUG_SNIFFER_LIBS
-SHELL_HOTPLUG_SNIFFER_CFLAGS
-SHELL_PERF_HELPER_LIBS
-SHELL_PERF_HELPER_CFLAGS
-GNOME_SHELL_LIBS
-GNOME_SHELL_CFLAGS
+CINNAMON_HOTPLUG_SNIFFER_LIBS
+CINNAMON_HOTPLUG_SNIFFER_CFLAGS
+CINNAMON_PERF_HELPER_LIBS
+CINNAMON_PERF_HELPER_CFLAGS
+CINNAMON_LIBS
+CINNAMON_CFLAGS
BUILD_RECORDER_FALSE
BUILD_RECORDER_TRUE
-TEST_SHELL_RECORDER_LIBS
-TEST_SHELL_RECORDER_CFLAGS
+TEST_CINNAMON_RECORDER_LIBS
+TEST_CINNAMON_RECORDER_CFLAGS
pkgpyexecdir
pyexecdir
pkgpythondir
@@ -848,7 +848,7 @@ PACKAGE_VERSION
PACKAGE_TARNAME
PACKAGE_NAME
PATH_SEPARATOR
-SHELL'
+CINNAMON'
ac_subst_files=''
ac_user_opts='
enable_option_checking
@@ -888,14 +888,14 @@ CPP
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
-TEST_SHELL_RECORDER_CFLAGS
-TEST_SHELL_RECORDER_LIBS
-GNOME_SHELL_CFLAGS
-GNOME_SHELL_LIBS
-SHELL_PERF_HELPER_CFLAGS
-SHELL_PERF_HELPER_LIBS
-SHELL_HOTPLUG_SNIFFER_CFLAGS
-SHELL_HOTPLUG_SNIFFER_LIBS
+TEST_CINNAMON_RECORDER_CFLAGS
+TEST_CINNAMON_RECORDER_LIBS
+CINNAMON_CFLAGS
+CINNAMON_LIBS
+CINNAMON_PERF_HELPER_CFLAGS
+CINNAMON_PERF_HELPER_LIBS
+CINNAMON_HOTPLUG_SNIFFER_CFLAGS
+CINNAMON_HOTPLUG_SNIFFER_LIBS
BROWSER_PLUGIN_CFLAGS
BROWSER_PLUGIN_LIBS
ST_CFLAGS
@@ -1018,7 +1018,7 @@ do
-disable-* | --disable-*)
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
+ # Reject names that are not valid cinnamon variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
@@ -1044,7 +1044,7 @@ do
-enable-* | --enable-*)
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
+ # Reject names that are not valid cinnamon variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
as_fn_error $? "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
@@ -1248,7 +1248,7 @@ do
-with-* | --with-*)
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
+ # Reject names that are not valid cinnamon variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
@@ -1264,7 +1264,7 @@ do
-without-* | --without-*)
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
+ # Reject names that are not valid cinnamon variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
as_fn_error $? "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
@@ -1302,7 +1302,7 @@ Try \`$0 --help' for more information"
*=*)
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
- # Reject names that are not valid shell variable names.
+ # Reject names that are not valid cinnamon variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
@@ -1453,7 +1453,7 @@ if test "$ac_init_help" = "long"; then
# 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 gnome-shell 3.2.1 to adapt to many kinds of systems.
+\`configure' configures cinnamon 3.2.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1501,7 +1501,7 @@ Fine tuning of the installation directories:
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/gnome-shell]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/cinnamon]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1523,7 +1523,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gnome-shell 3.2.1:";;
+ short | recursive ) echo "Configuration of cinnamon 3.2.1:";;
esac
cat <<\_ACEOF
@@ -1554,7 +1554,7 @@ Optional Features:
--enable-compile-warnings=[no/minimum/yes/maximum/error]
Turn on compiler warnings
--jhbuild-wrapper-script=yes
- Make "gnome-shell" script work for jhbuild
+ Make "cinnamon" script work for jhbuild
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1590,23 +1590,23 @@ Some influential environment variables:
directories to add to pkg-config's search path
PKG_CONFIG_LIBDIR
path overriding pkg-config's built-in search path
- TEST_SHELL_RECORDER_CFLAGS
- C compiler flags for TEST_SHELL_RECORDER, overriding pkg-config
- TEST_SHELL_RECORDER_LIBS
- linker flags for TEST_SHELL_RECORDER, overriding pkg-config
- GNOME_SHELL_CFLAGS
- C compiler flags for GNOME_SHELL, overriding pkg-config
- GNOME_SHELL_LIBS
- linker flags for GNOME_SHELL, overriding pkg-config
- SHELL_PERF_HELPER_CFLAGS
- C compiler flags for SHELL_PERF_HELPER, overriding pkg-config
- SHELL_PERF_HELPER_LIBS
- linker flags for SHELL_PERF_HELPER, overriding pkg-config
- SHELL_HOTPLUG_SNIFFER_CFLAGS
- C compiler flags for SHELL_HOTPLUG_SNIFFER, overriding
+ TEST_CINNAMON_RECORDER_CFLAGS
+ C compiler flags for TEST_CINNAMON_RECORDER, overriding pkg-config
+ TEST_CINNAMON_RECORDER_LIBS
+ linker flags for TEST_CINNAMON_RECORDER, overriding pkg-config
+ CINNAMON_CFLAGS
+ C compiler flags for CINNAMON, overriding pkg-config
+ CINNAMON_LIBS
+ linker flags for CINNAMON, overriding pkg-config
+ CINNAMON_PERF_HELPER_CFLAGS
+ C compiler flags for CINNAMON_PERF_HELPER, overriding pkg-config
+ CINNAMON_PERF_HELPER_LIBS
+ linker flags for CINNAMON_PERF_HELPER, overriding pkg-config
+ CINNAMON_HOTPLUG_SNIFFER_CFLAGS
+ C compiler flags for CINNAMON_HOTPLUG_SNIFFER, overriding
pkg-config
- SHELL_HOTPLUG_SNIFFER_LIBS
- linker flags for SHELL_HOTPLUG_SNIFFER, overriding pkg-config
+ CINNAMON_HOTPLUG_SNIFFER_LIBS
+ linker flags for CINNAMON_HOTPLUG_SNIFFER, overriding pkg-config
BROWSER_PLUGIN_CFLAGS
C compiler flags for BROWSER_PLUGIN, overriding pkg-config
BROWSER_PLUGIN_LIBS
@@ -1635,7 +1635,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell>.
+Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=cinnamon>.
_ACEOF
ac_status=$?
fi
@@ -1684,10 +1684,10 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
# Check for guested configure.
if test -f "$ac_srcdir/configure.gnu"; then
echo &&
- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+ $CINNAMON "$ac_srcdir/configure.gnu" --help=recursive
elif test -f "$ac_srcdir/configure"; then
echo &&
- $SHELL "$ac_srcdir/configure" --help=recursive
+ $CINNAMON "$ac_srcdir/configure" --help=recursive
else
$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi || ac_status=$?
@@ -1698,7 +1698,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gnome-shell configure 3.2.1
+cinnamon configure 3.2.1
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2044,7 +2044,7 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
( $as_echo "## --------------------------------------------------------------------------- ##
-## Report this to https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell ##
+## Report this to https://bugzilla.gnome.org/enter_bug.cgi?product=cinnamon ##
## --------------------------------------------------------------------------- ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
@@ -2067,7 +2067,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gnome-shell $as_me 3.2.1, which was
+It was created by cinnamon $as_me 3.2.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2123,7 +2123,7 @@ _ACEOF
# Keep a trace of the command line.
# Strip out --no-create and --no-recursion so they do not pile up.
# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
+# Also quote any args containing cinnamon meta-characters.
# Make two passes to allow for proper duplicate-argument suppression.
ac_configure_args=
ac_configure_args0=
@@ -2445,9 +2445,9 @@ fi
# and are intended to be withdrawn in a future Autoconf release.
# They can cause serious problems if a builder's source tree is in a directory
# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+ac_config_guess="$CINNAMON $ac_aux_dir/config.guess" # Please don't use this var.
+ac_config_sub="$CINNAMON $ac_aux_dir/config.sub" # Please don't use this var.
+ac_configure="$CINNAMON $ac_aux_dir/configure" # Please don't use this var.
@@ -2533,7 +2533,7 @@ fi
if test "${ac_cv_path_install+set}" = set; then
INSTALL=$ac_cv_path_install
else
- # As a last resort, use the slow shell script. Don't cache a
+ # As a last resort, use the slow cinnamon script. Don't cache a
# value for INSTALL within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
@@ -2569,7 +2569,7 @@ case $srcdir in
as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
esac
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do `set' in a subcinnamon so we don't clobber the current cinnamon's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
@@ -2585,7 +2585,7 @@ if (
&& test "$*" != "X conftest.file $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # if, for instance, CONFIG_CINNAMON is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
@@ -2619,12 +2619,12 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ MISSING="\${CINNAMON} \"$am_aux_dir/missing\"" ;;
*)
- MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ MISSING="\${CINNAMON} $am_aux_dir/missing" ;;
esac
fi
-# Use eval to expand $SHELL
+# Use eval to expand $CINNAMON
if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
@@ -2636,9 +2636,9 @@ fi
if test x"${install_sh}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ install_sh="\${CINNAMON} '$am_aux_dir/install-sh'" ;;
*)
- install_sh="\${SHELL} $am_aux_dir/install-sh"
+ install_sh="\${CINNAMON} $am_aux_dir/install-sh"
esac
fi
@@ -2774,7 +2774,7 @@ fi
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
- # As a last resort, use the slow shell script. Don't cache a
+ # As a last resort, use the slow cinnamon script. Don't cache a
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
@@ -2840,7 +2840,7 @@ if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
+CINNAMON = /bin/sh
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
@@ -2893,7 +2893,7 @@ fi
# Define the identity of the package.
- PACKAGE='gnome-shell'
+ PACKAGE='cinnamon'
VERSION='3.2.1'
@@ -3989,7 +3989,7 @@ else
if depmode=$depmode \
source=sub/conftest.c object=$am__obj \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ $CINNAMON ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
@@ -4032,7 +4032,7 @@ else
fi
-# Needed for per-target cflags, like in gnomeshell-taskpanel
+# Needed for per-target cflags, like in cinnamon-taskpanel
if test "x$CC" != xcc; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
@@ -4188,8 +4188,8 @@ macro_revision='1.3293'
ltmain="$ac_aux_dir/ltmain.sh"
# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+$CINNAMON "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ as_fn_error $? "cannot run $CINNAMON $ac_aux_dir/config.sub" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
@@ -4198,11 +4198,11 @@ if ${ac_cv_build+:} false; then :
else
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+ ac_build_alias=`$CINNAMON "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ac_cv_build=`$CINNAMON "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ as_fn_error $? "$CINNAMON $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
@@ -4219,7 +4219,7 @@ build_cpu=$1
build_vendor=$2
shift; shift
# Remember, the first character of IFS is used to create $*,
-# except with old shells:
+# except with old cinnamons:
build_os=$*
IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -4233,8 +4233,8 @@ else
if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ ac_cv_host=`$CINNAMON "$ac_aux_dir/config.sub" $host_alias` ||
+ as_fn_error $? "$CINNAMON $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
@@ -4252,7 +4252,7 @@ host_cpu=$1
host_vendor=$2
shift; shift
# Remember, the first character of IFS is used to create $*,
-# except with old shells:
+# except with old cinnamons:
host_os=$*
IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo &