c4f013a · unity8 · git.iko.soy

git.iko.soy/unity8

even more lens → scope renames

commitc4f013ad7aa896e603105b197f4700fb11a1b66d authorMichał Sawicz <michal.sawicz@canonical.com> dateFri 14 Jun 2013, 16:14 (13 years ago) parent1af5a4c

2 files changed+1−11

compare with xenial

unifiedsplit

build_unity−10 plugins/Unity/scope.cpp+1−1

build_unity−10

@@ -6,7 +6,6 @@ SETUP=false

66UPDATE=false

77CLEAN=false

88NUM_JOBS=$(( `grep -c ^processor /proc/cpuinfo` + 1 ))

9−LENSES="applications mockmusic mockvideos"

109

1110# verified working revisions

1211LIBUNITY_REV=228

@@ -136,14 +135,6 @@ compile_hud() {

136135

137136}

138137

139−link_lenses() {

140− echo "Linking system lenses.."

141− mkdir -p $BUILD_DIR/share/unity/lenses/

142− for LENS in $LENSES; do

143− [ -e $BUILD_DIR/share/unity/lenses/$LENS ] || ln -ivs /usr/share/unity/lenses/$LENS $BUILD_DIR/share/unity/lenses/$LENS

144− done

145−}

146−

147138if $SETUP; then

148139 echo "Setting up environment for building Unity.."

149140 install_utils

@@ -163,6 +154,5 @@ else

163154 compile_libunity

164155 compile_unity_core

165156 compile_hud

166− link_lenses

167157fi

168158

plugins/Unity/scope.cpp+1−1

@@ -136,7 +136,7 @@ void Scope::onActivated(unity::dash::LocalResult const& result, unity::dash::Sco

136136void Scope::fallbackActivate(const QString& uri)

137137{

138138 /* FIXME: stripping all content before the first column because for some

139− reason the lenses give uri with junk content at their beginning.

139+ reason the scopes give uri with junk content at their beginning.

140140 */

141141 QString tweakedUri = uri;

142142 int firstColumnAt = tweakedUri.indexOf(":");