From b36881a24053db392965267a83c5359d67041712 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Tue, 19 Mar 2013 19:47:01 +0100
Subject: unity: s/UBUS_PLACE_VIEW_CLOSE_REQUEST/UBUS_OVERLAY_CLOSE_REQUEST/g

(bzr r3227.1.15)
---
 dash/DashController.cpp |  2 +-
 dash/DashView.cpp       | 10 +++++-----
 dash/LensBar.cpp        |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'dash')

diff --git a/dash/DashController.cpp b/dash/DashController.cpp
index 9e9c3c27a..b7c6861fb 100644
--- a/dash/DashController.cpp
+++ b/dash/DashController.cpp
@@ -159,7 +159,7 @@ void Controller::RegisterUBusInterests()
 {
   ubus_manager_.RegisterInterest(UBUS_DASH_EXTERNAL_ACTIVATION,
                                  sigc::mem_fun(this, &Controller::OnExternalShowDash));
-  ubus_manager_.RegisterInterest(UBUS_PLACE_VIEW_CLOSE_REQUEST,
+  ubus_manager_.RegisterInterest(UBUS_OVERLAY_CLOSE_REQUEST,
                                  sigc::mem_fun(this, &Controller::OnExternalHideDash));
   place_entry_request_id_ =
     ubus_manager_.RegisterInterest(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
diff --git a/dash/DashView.cpp b/dash/DashView.cpp
index d0d30ae85..fef7c2286 100644
--- a/dash/DashView.cpp
+++ b/dash/DashView.cpp
@@ -1135,7 +1135,7 @@ void DashView::OnActivateRequest(GVariant* args)
   }
   else if (/* visible_ && */ handled_type == NOT_HANDLED)
   {
-    ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST, NULL,
+    ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST, NULL,
                               glib::Source::Priority::HIGH);
   }
   else if (/* visible_ && */ handled_type == GOTO_DASH_URI)
@@ -1363,7 +1363,7 @@ void DashView::OnUriActivatedReply(std::string const& uri, HandledType type, Len
     return;
   }
 
-  ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
+  ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
 }
 
 bool DashView::DoFallbackActivation(std::string const& fake_uri)
@@ -1441,7 +1441,7 @@ bool DashView::InspectKeyEvent(unsigned int eventType,
     else if (search_bar_->search_string != "")
       search_bar_->search_string = "";
     else
-      ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
+      ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
 
     return true;
   }
@@ -1511,7 +1511,7 @@ nux::Area* DashView::KeyNavIteration(nux::KeyNavDirection direction)
 
 void DashView::ProcessDndEnter()
 {
-  ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
+  ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
 }
 
 nux::Area* DashView::FindKeyFocusArea(unsigned int key_symbol,
@@ -1561,7 +1561,7 @@ nux::Area* DashView::FindKeyFocusArea(unsigned int key_symbol,
 
     if (close_key.first == special_keys_state && close_key.second == x11_key_code)
     {
-      ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
+      ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
       return nullptr;
     }
 
diff --git a/dash/LensBar.cpp b/dash/LensBar.cpp
index ef9d1bf19..d01689626 100644
--- a/dash/LensBar.cpp
+++ b/dash/LensBar.cpp
@@ -144,7 +144,7 @@ void LensBar::DoOpenLegalise()
 
   g_creat(legal_seen_file_path_.c_str(), S_IRWXU);
 
-  ubus_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
+  ubus_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
 }
 
 void LensBar::AddLens(Lens::Ptr& lens)
-- 
cgit v1.2.3