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

[Ken VanDine]

Fixed conflict with nih-dbus and our own i18n wrapper

Fixed conflict with nih-dbus and our own i18n wrapper

[Michael Sheldon (michael-sheldon)]

Approved (same as lp:~ken-vandine/content-hub/lp1394211)

review: Approve

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-08-14 11:49:28 +0000
+++ po/CMakeLists.txt	2014-11-19 19:53:41 +0000
@@ -20,7 +20,7 @@
                           -D ${CMAKE_SOURCE_DIR}
                           --from-code=UTF-8
                           --c++ --qt --add-comments=TRANSLATORS
-                          --keyword=_
+                          --keyword=__
                           -j
                           --package-name=content-hub
                           --copyright-holder='Canonical Ltd.'
 
=== modified file 'src/com/ubuntu/content/detail/i18n.cpp'
--- src/com/ubuntu/content/detail/i18n.cpp	2014-05-01 17:03:40 +0000
+++ src/com/ubuntu/content/detail/i18n.cpp	2014-11-19 19:53:41 +0000
@@ -36,7 +36,7 @@
     textdomain(domain);
 }
 
-QString _(const char *text, const char *domain)
+QString __(const char *text, const char *domain)
 {
     return QString::fromUtf8(dgettext(domain, text));
 }
 
=== modified file 'src/com/ubuntu/content/detail/i18n.h'
--- src/com/ubuntu/content/detail/i18n.h	2014-05-01 17:03:40 +0000
+++ src/com/ubuntu/content/detail/i18n.h	2014-11-19 19:53:41 +0000
@@ -31,7 +31,7 @@
 {
 
 void initTr(const char *domain, const char *localeDir);
-QString _(const char *text, const char *domain = 0);
+QString __(const char *text, const char *domain = 0);
 
 }
 }
 
=== modified file 'src/com/ubuntu/content/detail/service.cpp'
--- src/com/ubuntu/content/detail/service.cpp	2014-08-04 17:56:09 +0000
+++ src/com/ubuntu/content/detail/service.cpp	2014-11-19 19:53:41 +0000
@@ -207,13 +207,13 @@
     t->Charge(QVariantList());
 }
 
-void download_notify (cucd::Transfer* t)
+void cucd::Service::download_notify (cucd::Transfer* t)
 {
     TRACE() << Q_FUNC_INFO;
     notify_init(t->source().toStdString().c_str());
     NotifyNotification* notification;
 
-    notification = notify_notification_new (_("Download Complete"),
+    notification = notify_notification_new (__("Download Complete").toStdString().c_str(),
                                             "",
                                             "save");
 
@@ -231,14 +231,14 @@
 
     notify_notification_add_action (notification,
                                     "action_accept",
-                                    _("Open"),
+                                    __("Open").toStdString().c_str(),
                                     action_accept,
                                     t,
                                     NULL);
 
     notify_notification_add_action (notification,
                                     "action_dismiss",
-                                    _("Dismiss"),
+                                    __("Dismiss").toStdString().c_str(),
                                     action_dismiss,
                                     t,
                                     NULL);
@@ -256,7 +256,7 @@
     notify_init("Download Manager");
     NotifyNotification* notification;
 
-    notification = notify_notification_new (_("Download Failed"),
+    notification = notify_notification_new (__("Download Failed").toStdString().c_str(),
                                             errorMessage.toStdString().c_str(),
                                             "save");
 
 
=== modified file 'src/com/ubuntu/content/detail/service.h'
--- src/com/ubuntu/content/detail/service.h	2014-08-04 17:56:09 +0000
+++ src/com/ubuntu/content/detail/service.h	2014-11-19 19:53:41 +0000
@@ -28,6 +28,7 @@
 
 #include <com/ubuntu/applicationmanager/application_manager.h>
 #include "handler.h"
+#include "transfer.h"
 
 namespace com
 {
@@ -78,6 +79,7 @@
     void handle_exports(int);
     void handler_unregistered(const QString&);
     QDBusObjectPath CreateTransfer(const QString&, const QString&, int, const QString&);
+    void download_notify (com::ubuntu::content::detail::Transfer*);
 
 };
 }