Merge lp:~larryprice/libertine-scope/full-scope-name into lp:libertine-scope

[Larry Price]

Use full scope name in canned queries to properly return from Show/Hide actions.

Use full scope name in canned queries to properly return from Show/Hide actions.

[Christopher Townsend (townsend)]

Quick inline comment.

[lp:~larryprice/libertine-scope/full-scope-name]

55. By Larry Price on 2016-07-28

remove SCOPE_PKG

[Christopher Townsend (townsend)]

Ok, thanks

review: Approve

[Libertine CI Bot (libertine-ci-bot)]

review: Approve (continuous-integration)

=== modified file 'scope/apps/action.cpp'
--- scope/apps/action.cpp	2016-07-19 20:20:12 +0000
+++ scope/apps/action.cpp	2016-07-28 16:07:51 +0000
@@ -53,14 +53,14 @@
   {
     hidden_->add(QString::fromStdString(result()["app_id"].get_string()));
 
-    usc::CannedQuery cq(SCOPE_PKG);
+    usc::CannedQuery cq(FULLY_QUALIFIED_APPS_SCOPE);
     return usc::ActivationResponse(cq);
   }
   else if (action_id_ == "show")
   {
     hidden_->remove(QString::fromStdString(result()["app_id"].get_string()));
 
-    usc::CannedQuery cq(SCOPE_PKG);
+    usc::CannedQuery cq(FULLY_QUALIFIED_APPS_SCOPE);
     return usc::ActivationResponse(cq);
   }
   return usc::ActivationResponse(usc::ActivationResponse::Status::NotHandled);

=== modified file 'scope/apps/config.h.in'
--- scope/apps/config.h.in	2016-07-19 20:20:12 +0000
+++ scope/apps/config.h.in	2016-07-28 16:07:51 +0000
@@ -16,10 +16,8 @@
 #ifndef LIBERTINE_SCOPE_CONFIG_H_
 #define LIBERTINE_SCOPE_CONFIG_H_
 
-const std::string SCOPE_PKG = "@PACKAGE_NAME@";
+const std::string FULLY_QUALIFIED_APPS_SCOPE = "@FULLY_QUALIFIED_NAME@";
 const std::string ROOT_DEPT_ID = "root_dept";
 const std::string HIDDEN_DEPT_ID = "hidden_dept";
 
 #endif // LIBERTINE_SCOPE_CONFIG_H_
-
-