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
=== modified file 'data/remote.scope.in.in'
--- data/remote.scope.in.in 2013-05-16 11:31:51 +0000
+++ data/remote.scope.in.in 2013-06-20 18:14:25 +0000
@@ -1,7 +1,7 @@
1[Scope]1[Scope]
2DBusName=net.launchpad.scope.RemoteVideos2DBusName=net.launchpad.scope.RemoteVideos
3DBusPath=/net/launchpad/scope/remotevideos3DBusPath=/net/launchpad/scope/remotevideos
4_Name=Remote Videos4_Name=Remote videos
5Type=video5Type=video
6Icon=@prefix@/share/unity/icons/lens-nav-video.svg6Icon=@prefix@/share/unity/icons/lens-nav-video.svg
7_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.7_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.
88
=== modified file 'debian/control'
--- debian/control 2013-05-16 16:51:18 +0000
+++ debian/control 2013-06-20 18:14:25 +0000
@@ -36,7 +36,6 @@
36Depends: ${misc:Depends},36Depends: ${misc:Depends},
37 ${shlibs:Depends},37 ${shlibs:Depends},
38 gvfs-bin,38 gvfs-bin,
39 unity-lens-video,
40Enhances: unity-lens-video39Enhances: unity-lens-video
41Description: Remote videos engine40Description: Remote videos engine
42 This scope adds a remote videos search engine to the Video lens.41 This scope adds a remote videos search engine to the Video lens.
4342
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2013-05-16 11:31:51 +0000
+++ src/Makefile.am 2013-06-20 18:14:25 +0000
@@ -42,6 +42,7 @@
42 --pkg gio-2.0 \42 --pkg gio-2.0 \
43 --pkg gio-unix-2.0 \43 --pkg gio-unix-2.0 \
44 --pkg glib-2.0 \44 --pkg glib-2.0 \
45 --pkg gee-1.0 \
45 --pkg zeitgeist-1.0 \46 --pkg zeitgeist-1.0 \
46 --vapidir $(srcdir) \47 --vapidir $(srcdir) \
47 --vapidir $(top_srcdir)/vapi \48 --vapidir $(top_srcdir)/vapi \
@@ -57,6 +58,7 @@
57 --pkg gio-2.0 \58 --pkg gio-2.0 \
58 --pkg gio-unix-2.0 \59 --pkg gio-unix-2.0 \
59 --pkg glib-2.0 \60 --pkg glib-2.0 \
61 --pkg gee-1.0 \
60 --pkg zeitgeist-1.0 \62 --pkg zeitgeist-1.0 \
61 --pkg libsoup-gnome-2.4 \63 --pkg libsoup-gnome-2.4 \
62 --pkg libsoup-2.4 \64 --pkg libsoup-2.4 \
6365
=== modified file 'src/scope.vala'
--- src/scope.vala 2013-05-16 11:31:51 +0000
+++ src/scope.vala 2013-06-20 18:14:25 +0000
@@ -64,9 +64,9 @@
64 locate = new Locate (cache_directory, videos_folder);64 locate = new Locate (cache_directory, videos_folder);
6565
66 search_in_global = true;66 search_in_global = true;
67 search_hint = _("Search Videos");67 search_hint = _("Search videos");
68 visible = true;68 visible = true;
69 sources.add_option ("local", _("My Videos"), null);69 sources.add_option ("local", _("My videos"), null);
70 populate_categories ();70 populate_categories ();
7171
72 GLib.Timeout.add_seconds (REFRESH_TIMEOUT, refresh_results);72 GLib.Timeout.add_seconds (REFRESH_TIMEOUT, refresh_results);
@@ -82,7 +82,7 @@
82 var categories = new Unity.CategorySet ();82 var categories = new Unity.CategorySet ();
83 var icon_dir = File.new_for_path (Config.ICON_PATH);83 var icon_dir = File.new_for_path (Config.ICON_PATH);
8484
85 categories.add(new Unity.Category ("local", _("My Videos"), new FileIcon (icon_dir.get_child ("group-videos.svg")), Unity.CategoryRenderer.VERTICAL_TILE));85 categories.add(new Unity.Category ("local", _("My videos"), new FileIcon (icon_dir.get_child ("group-videos.svg")), Unity.CategoryRenderer.VERTICAL_TILE));
86 categories.add(new Unity.Category ("online", _("Online"), new FileIcon (icon_dir.get_child ("group-internet.svg")), Unity.CategoryRenderer.VERTICAL_TILE));86 categories.add(new Unity.Category ("online", _("Online"), new FileIcon (icon_dir.get_child ("group-internet.svg")), Unity.CategoryRenderer.VERTICAL_TILE));
8787
88 this.categories = categories;88 this.categories = categories;
8989
=== modified file 'tests/unit/Makefile.am'
--- tests/unit/Makefile.am 2013-05-16 11:31:51 +0000
+++ tests/unit/Makefile.am 2013-06-20 18:14:25 +0000
@@ -16,6 +16,7 @@
16 --pkg gio-unix-2.0 \16 --pkg gio-unix-2.0 \
17 --pkg json-glib-1.0 \17 --pkg json-glib-1.0 \
18 --pkg glib-2.0 \18 --pkg glib-2.0 \
19 --pkg gee-1.0 \
19 --pkg zeitgeist-1.0 \20 --pkg zeitgeist-1.0 \
20 --pkg libsoup-gnome-2.4 \21 --pkg libsoup-gnome-2.4 \
21 --pkg libsoup-2.4 \22 --pkg libsoup-2.4 \

Subscribers

People subscribed via source and target branches