← Back to branch summary

~brandontschaefer/unity/lp.1099815-fix

« back to all changes in this revision

Viewing changes to dash/DashView.cpp

  • Committer: Tarmac
  • Author(s): Marco Trevisan (Treviño)
  • Date: 2013-03-20 01:14:35 UTC
  • mfrom: (3227.1.15 shutdown-fixes)
  • Revision ID: tarmac-20130320011435-nvuabw5dkcpsm0cf
unity: s/UBUS_PLACE_VIEW_CLOSE_REQUEST/UBUS_OVERLAY_CLOSE_REQUEST/g.

Approved by PS Jenkins bot, Brandon Schaefer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dash/DashView.cpp
1135
1135
  }
1136
1136
  else if (/* visible_ && */ handled_type == NOT_HANDLED)
1137
1137
  {
1138
 
    ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST, NULL,
 
1138
    ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST, NULL,
1139
1139
                              glib::Source::Priority::HIGH);
1140
1140
  }
1141
1141
  else if (/* visible_ && */ handled_type == GOTO_DASH_URI)
1363
1363
    return;
1364
1364
  }
1365
1365
 
1366
 
  ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
 
1366
  ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
1367
1367
}
1368
1368
 
1369
1369
bool DashView::DoFallbackActivation(std::string const& fake_uri)
1441
1441
    else if (search_bar_->search_string != "")
1442
1442
      search_bar_->search_string = "";
1443
1443
    else
1444
 
      ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
 
1444
      ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
1445
1445
 
1446
1446
    return true;
1447
1447
  }
1511
1511
 
1512
1512
void DashView::ProcessDndEnter()
1513
1513
{
1514
 
  ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
 
1514
  ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
1515
1515
}
1516
1516
 
1517
1517
nux::Area* DashView::FindKeyFocusArea(unsigned int key_symbol,
1561
1561
 
1562
1562
    if (close_key.first == special_keys_state && close_key.second == x11_key_code)
1563
1563
    {
1564
 
      ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
 
1564
      ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
1565
1565
      return nullptr;
1566
1566
    }
1567
1567