1
=== modified file 'configure.ac'
2
--- configure.ac	2013-04-23 08:07:54 +0000
3
+++ configure.ac	2013-04-24 11:33:26 +0000
4
@@ -76,8 +76,8 @@
5
76
                  libsoup-gnome-2.4
76
                  libsoup-gnome-2.4
6
77
                  json-glib-1.0
77
                  json-glib-1.0
7
78
                  zeitgeist-1.0 >= 0.3.8
78
                  zeitgeist-1.0 >= 0.3.8
10
79
                  unity >= 6.90.2
79
                  unity >= 6.91.11
11
80
                  unity-extras >= 6.90.2
80
                  unity-extras >= 6.91.11
12
81
                  )
81
                  )
13
82
82
14
83
AC_SUBST(SCOPE_DAEMON_CFLAGS)
83
AC_SUBST(SCOPE_DAEMON_CFLAGS)
15
84
84
16
=== modified file 'debian/control'
17
--- debian/control	2013-03-15 13:16:17 +0000
18
+++ debian/control	2013-04-24 11:33:26 +0000
19
@@ -11,7 +11,7 @@
20
11
               libglib2.0-dev (>= 2.27),
11
               libglib2.0-dev (>= 2.27),
21
12
               libjson-glib-dev,
12
               libjson-glib-dev,
22
13
               libsoup-gnome2.4-dev,
13
               libsoup-gnome2.4-dev,
24
14
               libunity-dev (>= 6.91),
14
               libunity-dev (>= 6.91.11),
25
15
               libzeitgeist-dev (>= 0.3.8),
15
               libzeitgeist-dev (>= 0.3.8),
26
16
               valac-0.18,
16
               valac-0.18,
27
17
               xvfb,
17
               xvfb,
28
18
18
29
=== modified file 'src/remote-scope.vala'
30
--- src/remote-scope.vala	2013-04-11 15:31:07 +0000
31
+++ src/remote-scope.vala	2013-04-24 11:33:26 +0000
32
@@ -27,6 +27,7 @@
33
27
    private static int REFRESH_INTERVAL = 3600; // fetch sources & recommendations once an hour
27
    private static int REFRESH_INTERVAL = 3600; // fetch sources & recommendations once an hour
34
28
    private static int RETRY_INTERVAL = 60;     // retry sources/recommendations after a minute
28
    private static int RETRY_INTERVAL = 60;     // retry sources/recommendations after a minute
35
29
29
36
30
    private static string PREVIEW_ON_LMB = "lmb-preview";
37
30
    private Soup.Session session;
31
    private Soup.Session session;
38
31
    private PreferencesManager preferences = PreferencesManager.get_default ();
32
    private PreferencesManager preferences = PreferencesManager.get_default ();
39
32
    Gee.ArrayList<RemoteVideoFile?> recommendations;
33
    Gee.ArrayList<RemoteVideoFile?> recommendations;
40
@@ -34,8 +35,6 @@
41
34
    Zeitgeist.DataSourceRegistry zg_sources;
35
    Zeitgeist.DataSourceRegistry zg_sources;
42
35
    bool use_zeitgeist;
36
    bool use_zeitgeist;
43
36
37
44
37
    private Variant empty_asv;
45
38
46
39
    public RemoteVideoScope ()
38
    public RemoteVideoScope ()
47
40
    {
39
    {
48
41
        Object (dbus_path: "/net/launchpad/scope/remotevideos", id: "video-remote.scope");
40
        Object (dbus_path: "/net/launchpad/scope/remotevideos", id: "video-remote.scope");
49
@@ -45,7 +44,7 @@
50
45
    {
44
    {
51
46
      base.constructed ();
45
      base.constructed ();
52
47
46
54
48
      empty_asv = new Variant.array (VariantType.VARDICT.element (), {});
47
      schema.add_field (PREVIEW_ON_LMB, "b", Unity.Schema.FieldType.OPTIONAL);
55
49
48
56
50
      recommendations = new Gee.ArrayList<RemoteVideoFile?> ();
49
      recommendations = new Gee.ArrayList<RemoteVideoFile?> ();
57
51
50
58
@@ -82,8 +81,6 @@
59
82
        queue_search_changed (SearchType.DEFAULT);
81
        queue_search_changed (SearchType.DEFAULT);
60
83
      });
82
      });
61
84
83
62
85
      activate_uri.connect (on_activate_uri);
63
86
64
87
      populate_categories ();
84
      populate_categories ();
65
88
      query_list_of_sources ();
85
      query_list_of_sources ();
66
89
86
67
@@ -181,6 +178,19 @@
68
181
      });
178
      });
69
182
    }
179
    }
70
183
180
71
181
    public override async Unity.ActivationResponse? activate_result (ScopeResult result)
72
182
    {
73
183
      var realcat = result.metadata.lookup (PREVIEW_ON_LMB);
74
184
      // activation of More Suggestions should display a preview.
75
185
      if (realcat != null && realcat.get_boolean ())
76
186
      {
77
187
        var preview = yield preview_result (result);
78
188
        return new Unity.ActivationResponse.with_preview (preview);
79
189
      }
80
190
81
191
      return on_activate_uri (result.uri);
82
192
    }
83
193
84
184
    private Unity.ActivationResponse on_activate_uri (string rawuri)
194
    private Unity.ActivationResponse on_activate_uri (string rawuri)
85
185
    {
195
    {
86
186
      var fakeuri = RemoteUri.from_rawuri (rawuri);
196
      var fakeuri = RemoteUri.from_rawuri (rawuri);
87
@@ -475,7 +485,11 @@
88
475
            result_icon = anno_icon.to_string ();
485
            result_icon = anno_icon.to_string ();
89
476
          }
486
          }
90
477
487
92
478
          model.append (fake_uri.to_rawuri (), result_icon, video.category, ResultType.DEFAULT, "text/html", video.title, video.comment, video.uri, empty_asv);
488
          // aggregator scope remaps categories, so we won't get real category back;
93
489
          // put real category into metadata
94
490
          var realcat = new Variant.dict_entry (PREVIEW_ON_LMB, new Variant.variant (video.category == CAT_INDEX_MORE));
95
491
          var metadata = new Variant.array (VariantType.VARDICT.element (), {realcat});
96
492
          model.append (fake_uri.to_rawuri (), result_icon, video.category, ResultType.DEFAULT, "text/html", video.title, video.comment, video.uri, metadata);
97
479
        }
493
        }
98
480
      }
494
      }
99
481
    }
495
    }
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-04-24
Michal Hruby (community)		2013-04-23	Needs Fixing on 2013-04-24
Review via email: mp+160348@code.launchpad.net