← Back to branch summary

~thalexander/unity/update-fsf-address

« back to all changes in this revision

Viewing changes to UnityCore/ScopeProxy.cpp

  • Committer: Eleni Maria Stea
  • Date: 2013-11-08 15:04:14 UTC
  • mfrom: (3591 trunk)
  • mto: This revision was merged to the branch mainline in revision 3597.
  • Revision ID: elenimaria.stea@canonical.com-20131108150414-1adkyb1bbe3zxppg
merged to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
UnityCore/ScopeProxy.cpp
401
401
    glib::HintsMap hints;
402
402
    if (!owner_->form_factor().empty())
403
403
    {
404
 
      hints["form-factor"] = g_variant_new_string(owner_->form_factor().c_str());
 
404
      hints["form-factor"] = owner_->form_factor();
405
405
    }
406
406
    hints["changed-filter-row"] = filter->VariantValue();
407
407
    Search(last_search_, hints, nullptr, cancel_scope_);
521
521
        glib::HintsMap updated_hints(hints);
522
522
        if (!owner_->form_factor().empty())
523
523
        {
524
 
          updated_hints["form-factor"] = g_variant_new_string(owner_->form_factor().c_str());
 
524
          updated_hints["form-factor"] = owner_->form_factor();
525
525
        }
526
526
        Search(search_string, updated_hints, callback, canc);
527
527
      }
791
791
void ScopeProxy::Search(std::string const& search_string, glib::HintsMap const& user_hints, SearchCallback const& callback, GCancellable* cancellable)
792
792
{
793
793
  glib::HintsMap hints = user_hints;
794
 
  if (!form_factor.Get().empty() && hints.find("form-factor") == hints.end())
 
794
  if (!form_factor().empty() && hints.find("form-factor") == hints.end())
795
795
  {
796
 
    hints["form-factor"] = g_variant_new_string(form_factor().c_str());
 
796
    hints["form-factor"] = form_factor();
797
797
  }
798
798
  pimpl->Search(search_string, hints, callback, cancellable);
799
799
}