Merge lp:~mhr3/unity-scope-home/revert-r133 into lp:unity-scope-home

[Michal Hruby]

Revert r133

Revert r133, as it seems to be causing an issue with the surfacing mode.

[Łukasz Zemczak (sil2100)]

Let's try this, yes. We can re-introduce this change if needed.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:134
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/52/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-armhf-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-i386-ci/16

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/52/rebuild

review: Approve (continuous-integration)

=== modified file 'configure.ac'
--- configure.ac	2013-07-18 10:31:24 +0000
+++ configure.ac	2013-07-22 11:05:30 +0000
@@ -187,7 +187,6 @@
   src/config.vala
   tests/unit/config-tests.vala
   data/home.scope.in
-  data/master-scopes/applications.scope.in
   data/master-scopes/files.scope.in
   data/master-scopes/music.scope.in
   data/master-scopes/video.scope.in

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2013-07-18 10:31:24 +0000
+++ data/Makefile.am	2013-07-22 11:05:30 +0000
@@ -5,7 +5,6 @@
 #
 scope_in_files = \
 	home.scope.in \
-	master-scopes/applications.scope.in \
 	master-scopes/files.scope.in \
 	master-scopes/music.scope.in \
 	master-scopes/video.scope.in \

=== removed file 'data/master-scopes/applications.scope.in.in'
--- data/master-scopes/applications.scope.in.in	2013-07-18 10:31:47 +0000
+++ data/master-scopes/applications.scope.in.in	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-[Scope]
-DBusName=com.canonical.Unity.Scope.Home
-DBusPath=/com/canonical/unity/masterscope/applicatrions
-Icon=@prefix@/share/unity/icons/lens-nav-app.svg
-_Name=Applications
-_SearchHint=Search applications
-Type=applications
-IsMaster=true
-Shortcut=a
-
-[Desktop Entry]
-X-Ubuntu-Gettext-Domain=unity-scope-home
-
-[Category apps]
-_Name=Applications
-Icon=@prefix@/share/icons/unity-icon-theme/places/svg/group-apps.svg
-DedupField=uri
-
-[Category recently-used]
-_Name=Recently used
-Icon=@prefix@/share/icons/unity-icon-theme/places/svg/group-apps.svg
-DedupField=uri
-
-[Category recent]
-_Name=Recent apps
-Icon=@prefix@/share/icons/unity-icon-theme/places/svg/group-apps.svg
-DedupField=uri
-
-[Category installed]
-_Name=Installed
-Icon=@prefix@/share/icons/unity-icon-theme/places/svg/group-installed.svg
-DedupField=uri
-
-[Category more]
-_Name=More suggestions
-Icon=@prefix@/share/icons/unity-icon-theme/places/svg/group-treat-yourself.svg
-DedupField=uri
-
-[Filter type]
-_Name=Type
-Type=filter-checkoption
-SortType=display-name
-OptionIDs=accessories;education;game;graphics;internet;fonts;office;media;customisation;accessibility;developer;science-and-engineering;scopes;system
-_OptionNames=Accessories;Education;Games;Graphics;Internet;Fonts;Office;Media;Customisation;Accessibility;Developer;Science & Engineering;Search plugins;System
-
-[Filter unity-sources]
-_Name=Sources
-Type=filter-checkoption
-SortType=display-name
-OptionIDs=local;usc
-_OptionNames=Local apps;Software center

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2013-07-18 10:40:20 +0000
+++ po/POTFILES.in	2013-07-22 11:05:30 +0000
@@ -1,7 +1,6 @@
 [encoding: UTF-8]
 src/scope.vala
 [type: gettext/ini]data/home.scope.in.in
-[type: gettext/ini]data/master-scopes/applications.scope.in.in
 [type: gettext/ini]data/master-scopes/books.scope.in.in
 [type: gettext/ini]data/master-scopes/boxes.scope.in.in
 [type: gettext/ini]data/master-scopes/calendar.scope.in.in