Merge lp:~ken-vandine/content-hub/rtm-lp1394211 into lp:content-hub/rtm-14.09

Proposed by Ken VanDine on 2014-11-19
Status: Merged
Approved by: Michael Sheldon on 2014-11-19
Approved revision: 139
Merged at revision: 142
Proposed branch: lp:~ken-vandine/content-hub/rtm-lp1394211
Merge into: lp:content-hub/rtm-14.09
Diff against target: 104 lines (+10/-8)
5 files modified
po/CMakeLists.txt (+1/-1)
src/com/ubuntu/content/detail/i18n.cpp (+1/-1)
src/com/ubuntu/content/detail/i18n.h (+1/-1)
src/com/ubuntu/content/detail/service.cpp (+5/-5)
src/com/ubuntu/content/detail/service.h (+2/-0)
To merge this branch: bzr merge lp:~ken-vandine/content-hub/rtm-lp1394211
Reviewer Review Type Date Requested Status
Michael Sheldon (community) 2014-11-19 Approve on 2014-11-19
Review via email: mp+242262@code.launchpad.net

Commit message

Fixed conflict with nih-dbus and our own i18n wrapper

Description of the change

Fixed conflict with nih-dbus and our own i18n wrapper

To post a comment you must log in.
Michael Sheldon (michael-sheldon) wrote :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/CMakeLists.txt'
2--- po/CMakeLists.txt 2014-08-14 11:49:28 +0000
3+++ po/CMakeLists.txt 2014-11-19 19:53:41 +0000
4@@ -20,7 +20,7 @@
5 -D ${CMAKE_SOURCE_DIR}
6 --from-code=UTF-8
7 --c++ --qt --add-comments=TRANSLATORS
8- --keyword=_
9+ --keyword=__
10 -j
11 --package-name=content-hub
12 --copyright-holder='Canonical Ltd.'
13
14=== modified file 'src/com/ubuntu/content/detail/i18n.cpp'
15--- src/com/ubuntu/content/detail/i18n.cpp 2014-05-01 17:03:40 +0000
16+++ src/com/ubuntu/content/detail/i18n.cpp 2014-11-19 19:53:41 +0000
17@@ -36,7 +36,7 @@
18 textdomain(domain);
19 }
20
21-QString _(const char *text, const char *domain)
22+QString __(const char *text, const char *domain)
23 {
24 return QString::fromUtf8(dgettext(domain, text));
25 }
26
27=== modified file 'src/com/ubuntu/content/detail/i18n.h'
28--- src/com/ubuntu/content/detail/i18n.h 2014-05-01 17:03:40 +0000
29+++ src/com/ubuntu/content/detail/i18n.h 2014-11-19 19:53:41 +0000
30@@ -31,7 +31,7 @@
31 {
32
33 void initTr(const char *domain, const char *localeDir);
34-QString _(const char *text, const char *domain = 0);
35+QString __(const char *text, const char *domain = 0);
36
37 }
38 }
39
40=== modified file 'src/com/ubuntu/content/detail/service.cpp'
41--- src/com/ubuntu/content/detail/service.cpp 2014-08-04 17:56:09 +0000
42+++ src/com/ubuntu/content/detail/service.cpp 2014-11-19 19:53:41 +0000
43@@ -207,13 +207,13 @@
44 t->Charge(QVariantList());
45 }
46
47-void download_notify (cucd::Transfer* t)
48+void cucd::Service::download_notify (cucd::Transfer* t)
49 {
50 TRACE() << Q_FUNC_INFO;
51 notify_init(t->source().toStdString().c_str());
52 NotifyNotification* notification;
53
54- notification = notify_notification_new (_("Download Complete"),
55+ notification = notify_notification_new (__("Download Complete").toStdString().c_str(),
56 "",
57 "save");
58
59@@ -231,14 +231,14 @@
60
61 notify_notification_add_action (notification,
62 "action_accept",
63- _("Open"),
64+ __("Open").toStdString().c_str(),
65 action_accept,
66 t,
67 NULL);
68
69 notify_notification_add_action (notification,
70 "action_dismiss",
71- _("Dismiss"),
72+ __("Dismiss").toStdString().c_str(),
73 action_dismiss,
74 t,
75 NULL);
76@@ -256,7 +256,7 @@
77 notify_init("Download Manager");
78 NotifyNotification* notification;
79
80- notification = notify_notification_new (_("Download Failed"),
81+ notification = notify_notification_new (__("Download Failed").toStdString().c_str(),
82 errorMessage.toStdString().c_str(),
83 "save");
84
85
86=== modified file 'src/com/ubuntu/content/detail/service.h'
87--- src/com/ubuntu/content/detail/service.h 2014-08-04 17:56:09 +0000
88+++ src/com/ubuntu/content/detail/service.h 2014-11-19 19:53:41 +0000
89@@ -28,6 +28,7 @@
90
91 #include <com/ubuntu/applicationmanager/application_manager.h>
92 #include "handler.h"
93+#include "transfer.h"
94
95 namespace com
96 {
97@@ -78,6 +79,7 @@
98 void handle_exports(int);
99 void handler_unregistered(const QString&);
100 QDBusObjectPath CreateTransfer(const QString&, const QString&, int, const QString&);
101+ void download_notify (com::ubuntu::content::detail::Transfer*);
102
103 };
104 }

Subscribers

People subscribed via source and target branches