← Back to branch summary

~larry-e-works/uci-engine/amqp-to-kombu

« back to all changes in this revision

Viewing changes to cupstream2distro/tests/data/bzrlogs/withdashlogdiff

  • Committer: Francis Ginther
  • Date: 2014-06-10 20:42:46 UTC
  • mto: This revision was merged to the branch mainline in revision 571.
  • Revision ID: francis.ginther@canonical.com-20140610204246-b1bsrik7nlcolqy7
Import lp:cupstream2distro rev 605.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cupstream2distro/tests/data/bzrlogs/withdashlogdiff
 
1
------------------------------------------------------------
 
2
revno: 8 [merge]
 
3
author: Diego Sarmentero <diego.sarmentero@gmail.com>, Manuel de la Pena <manuel@canonical.com>
 
4
committer: Tarmac
 
5
branch nick: trunk
 
6
timestamp: Fri 2013-09-20 15:20:22 +0000
 
7
message:
 
8
  - Update download manager API (BUG: #1224538).
 
9
  
 
10
  Approved by PS Jenkins bot, Roberto Alsina.
 
11
diff:
 
12
=== modified file 'src/download/com.canonical.applications.download_manager.xml'
 
13
--- src/download/com.canonical.applications.download_manager.xml        2013-09-11 16:55:11 +0000
 
14
+++ src/download/com.canonical.applications.download_manager.xml        2013-09-13 11:00:50 +0000
 
15
@@ -1,5 +1,5 @@
 
16
 <node>
 
17
-  <interface name="com.canonical.applications.DownloaderManager">
 
18
+  <interface name="com.canonical.applications.DownloadManager">
 
19
     <method name="createDownload">
 
20
         <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="DownloadStruct"/>
 
21
         <arg name="download" type="(sssa{sv}a{ss})" direction="in" />
 
22
 
 
23
=== modified file 'src/download/downloadmanager.h'
 
24
--- src/download/downloadmanager.h      2013-09-11 16:55:11 +0000
 
25
+++ src/download/downloadmanager.h      2013-09-13 11:00:50 +0000
 
26
@@ -24,14 +24,14 @@
 
27
 #include "metatypes.h"
 
28
 
 
29
 /*
 
30
- * Proxy class for interface com.canonical.applications.DownloaderManager
 
31
+ * Proxy class for interface com.canonical.applications.DownloadManager
 
32
  */
 
33
 class DownloadManager: public QDBusAbstractInterface
 
34
 {
 
35
     Q_OBJECT
 
36
 public:
 
37
     static inline const char *staticInterfaceName()
 
38
-    { return "com.canonical.applications.DownloaderManager"; }
 
39
+    { return "com.canonical.applications.DownloadManager"; }
 
40
 
 
41
 public:
 
42
     DownloadManager(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
 
43
@@ -99,7 +99,7 @@
 
44
 namespace com {
 
45
   namespace canonical {
 
46
     namespace applications {
 
47
-      typedef ::DownloadManager DownloaderManager;
 
48
+      typedef ::DownloadManager DownloadManager;
 
49
     }
 
50
   }
 
51
 }
 
52
------------------------------------------------------------
 
53
Use --include-merged or -n0 to see merged revisions.