Merge lp:~mandel/clickmanager-plugin/correct-interface-name into lp:~diegosarmentero/clickmanager-plugin/trunk

Proposed by Manuel de la Peña
Status: Approved
Approved by: Diego Sarmentero
Approved revision: 4
Proposed branch: lp:~mandel/clickmanager-plugin/correct-interface-name
Merge into: lp:~diegosarmentero/clickmanager-plugin/trunk
Diff against target: 40 lines (+4/-4)
2 files modified
download/com.canonical.applications.download_manager.xml (+1/-1)
download/downloadmanager.h (+3/-3)
To merge this branch: bzr merge lp:~mandel/clickmanager-plugin/correct-interface-name
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve
Diego Sarmentero Approve
Review via email: mp+185467@code.launchpad.net

Commit message

Uses the new interface name used by the download manager.

Description of the change

Uses the new interface name used by the download manager.

To post a comment you must log in.
Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
Revision history for this message
Mike McCracken (mikemc) wrote :

Missed an instance of DownloaderManager

ubuntu-download-manager-tests/irl_tests.py:39:MANAGER_IFACE = 'com.canonical.applications.DownloaderManager'

review: Needs Fixing
Revision history for this message
Manuel de la Peña (mandel) wrote :

> Missed an instance of DownloaderManager
>
> ubuntu-download-manager-tests/irl_tests.py:39:MANAGER_IFACE =
> 'com.canonical.applications.DownloaderManager'

There is no irl_tests.py file in this project :)

Revision history for this message
Mike McCracken (mikemc) wrote :

oops.

review: Approve

Unmerged revisions

4. By Manuel de la Peña

Use the correct download manager interface.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'download/com.canonical.applications.download_manager.xml'
2--- download/com.canonical.applications.download_manager.xml 2013-09-11 16:55:11 +0000
3+++ download/com.canonical.applications.download_manager.xml 2013-09-13 11:18:56 +0000
4@@ -1,5 +1,5 @@
5 <node>
6- <interface name="com.canonical.applications.DownloaderManager">
7+ <interface name="com.canonical.applications.DownloadManager">
8 <method name="createDownload">
9 <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="DownloadStruct"/>
10 <arg name="download" type="(sssa{sv}a{ss})" direction="in" />
11
12=== modified file 'download/downloadmanager.h'
13--- download/downloadmanager.h 2013-09-11 16:55:11 +0000
14+++ download/downloadmanager.h 2013-09-13 11:18:56 +0000
15@@ -24,14 +24,14 @@
16 #include "metatypes.h"
17
18 /*
19- * Proxy class for interface com.canonical.applications.DownloaderManager
20+ * Proxy class for interface com.canonical.applications.DownloadManager
21 */
22 class DownloadManager: public QDBusAbstractInterface
23 {
24 Q_OBJECT
25 public:
26 static inline const char *staticInterfaceName()
27- { return "com.canonical.applications.DownloaderManager"; }
28+ { return "com.canonical.applications.DownloadManager"; }
29
30 public:
31 DownloadManager(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
32@@ -99,7 +99,7 @@
33 namespace com {
34 namespace canonical {
35 namespace applications {
36- typedef ::DownloadManager DownloaderManager;
37+ typedef ::DownloadManager DownloadManager;
38 }
39 }
40 }

Subscribers

People subscribed via source and target branches