Unity Videos Lens

Merge lp:~mhr3/unity-lens-video/only-first-capital into lp:unity-lens-video

  1. only-first-capital
  2. Merge into trunk
Proposed by Michal Hruby
Status: Merged
Approved by: Michal Hruby
Approved revision: 120
Merged at revision: 117
Proposed branch: lp:~mhr3/unity-lens-video/only-first-capital
Merge into: lp:unity-lens-video
Diff against target: 81 lines (+7/-5)
5 files modified
data/remote.scope.in.in (+1/-1)
debian/control (+0/-1)
src/Makefile.am (+2/-0)
src/scope.vala (+3/-3)
tests/unit/Makefile.am (+1/-0)
To merge this branch: bzr merge lp:~mhr3/unity-lens-video/only-first-capital
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Paweł Stołowski (community) Approve
Review via email: mp+170661@code.launchpad.net

Commit message

As per design guidelines, use capital letters only for first words.

Description of the change

As per design guidelines, use capital letters only for first words.

To post a comment you must log in.
Revision history for this message
Paweł Stołowski (stolowski) wrote :

LGTM. +1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:119
http://jenkins.qa.ubuntu.com/job/unity-lens-video-ci/7/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-video-saucy-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-video-saucy-armhf-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-video-saucy-i386-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-video-ci/7/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-lens-video-autolanding/3/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/387/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-video-saucy-amd64-autolanding/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-video-saucy-armhf-autolanding/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-video-saucy-i386-autolanding/2/console

review: Needs Fixing (continuous-integration)
lp:~mhr3/unity-lens-video/only-first-capital updated
120. By Michal Hruby

Fix also Makefile for tests

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/remote.scope.in.in'
2--- data/remote.scope.in.in 2013-05-16 11:31:51 +0000
3+++ data/remote.scope.in.in 2013-06-20 18:14:25 +0000
4@@ -1,7 +1,7 @@
5 [Scope]
6 DBusName=net.launchpad.scope.RemoteVideos
7 DBusPath=/net/launchpad/scope/remotevideos
8-_Name=Remote Videos
9+_Name=Remote videos
10 Type=video
11 Icon=@prefix@/share/unity/icons/lens-nav-video.svg
12 _Description=This is an Ubuntu search plugin that enables information from various video providers to be searched and displayed in the Dash underneath the Video header. If you do not wish to search these content sources, you can disable this search plugin.
13
14=== modified file 'debian/control'
15--- debian/control 2013-05-16 16:51:18 +0000
16+++ debian/control 2013-06-20 18:14:25 +0000
17@@ -36,7 +36,6 @@
18 Depends: ${misc:Depends},
19 ${shlibs:Depends},
20 gvfs-bin,
21- unity-lens-video,
22 Enhances: unity-lens-video
23 Description: Remote videos engine
24 This scope adds a remote videos search engine to the Video lens.
25
26=== modified file 'src/Makefile.am'
27--- src/Makefile.am 2013-05-16 11:31:51 +0000
28+++ src/Makefile.am 2013-06-20 18:14:25 +0000
29@@ -42,6 +42,7 @@
30 --pkg gio-2.0 \
31 --pkg gio-unix-2.0 \
32 --pkg glib-2.0 \
33+ --pkg gee-1.0 \
34 --pkg zeitgeist-1.0 \
35 --vapidir $(srcdir) \
36 --vapidir $(top_srcdir)/vapi \
37@@ -57,6 +58,7 @@
38 --pkg gio-2.0 \
39 --pkg gio-unix-2.0 \
40 --pkg glib-2.0 \
41+ --pkg gee-1.0 \
42 --pkg zeitgeist-1.0 \
43 --pkg libsoup-gnome-2.4 \
44 --pkg libsoup-2.4 \
45
46=== modified file 'src/scope.vala'
47--- src/scope.vala 2013-05-16 11:31:51 +0000
48+++ src/scope.vala 2013-06-20 18:14:25 +0000
49@@ -64,9 +64,9 @@
50 locate = new Locate (cache_directory, videos_folder);
51
52 search_in_global = true;
53- search_hint = _("Search Videos");
54+ search_hint = _("Search videos");
55 visible = true;
56- sources.add_option ("local", _("My Videos"), null);
57+ sources.add_option ("local", _("My videos"), null);
58 populate_categories ();
59
60 GLib.Timeout.add_seconds (REFRESH_TIMEOUT, refresh_results);
61@@ -82,7 +82,7 @@
62 var categories = new Unity.CategorySet ();
63 var icon_dir = File.new_for_path (Config.ICON_PATH);
64
65- categories.add(new Unity.Category ("local", _("My Videos"), new FileIcon (icon_dir.get_child ("group-videos.svg")), Unity.CategoryRenderer.VERTICAL_TILE));
66+ categories.add(new Unity.Category ("local", _("My videos"), new FileIcon (icon_dir.get_child ("group-videos.svg")), Unity.CategoryRenderer.VERTICAL_TILE));
67 categories.add(new Unity.Category ("online", _("Online"), new FileIcon (icon_dir.get_child ("group-internet.svg")), Unity.CategoryRenderer.VERTICAL_TILE));
68
69 this.categories = categories;
70
71=== modified file 'tests/unit/Makefile.am'
72--- tests/unit/Makefile.am 2013-05-16 11:31:51 +0000
73+++ tests/unit/Makefile.am 2013-06-20 18:14:25 +0000
74@@ -16,6 +16,7 @@
75 --pkg gio-unix-2.0 \
76 --pkg json-glib-1.0 \
77 --pkg glib-2.0 \
78+ --pkg gee-1.0 \
79 --pkg zeitgeist-1.0 \
80 --pkg libsoup-gnome-2.4 \
81 --pkg libsoup-2.4 \

Subscribers

People subscribed via source and target branches