[nautilus] (3 commits) Non-fast-forward update to branch wip/ernestask/warnings

[Ernestas Kulik <ernestask src gnome org>]

The branch 'wip/ernestask/warnings' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  bfd157f... properties-window: don’t use undefined macros in expressi
  64abb0f... general: don’t shadow variables
  1d350eb... operations-ui-manager: fix meaningless test

Commits added to the branch:

  8793283... properties-window: don’t use undefined macros in #if
  fe14247... general: don’t shadow variables
  c4f097b... operations-ui-manager: fix meaningless test