← Back to branch summary

~ubuntu-branches/ubuntu/maverick/amarok/maverick-backports

« back to all changes in this revision

Viewing changes to src/context/scriptengine/javascript/javascriptrunner.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-09-16 12:47:14 UTC
  • mfrom: (1.77.14 upstream)
  • Revision ID: james.westby@ubuntu.com-20100916124714-i8jk9s2z4iyixmcw
Tags: 2:2.3.2-0ubuntu1
* New upstream release.
* Drop patches that are applied upstream:
  - debian/mysql_no_openssl_fix.diff
  - kubuntu/08_fix_ftbfs_glib_2.25.diff
  - kubuntu/09_fix_applet_destructor_crash.diff
* Drop patch that is not needed anymore:
  - kubuntu/05_kstatusnotifieritem_gnome_support.diff
* Adapt patch to new upstream version:
  - debian/mysqle_amarok_local_errmsg_feature.diff
  - kubuntu/10_soundmenu_support.diff
  - kubuntu/11_soundmenu_mpris2.0.diff
* Update install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/context/scriptengine/javascript/javascriptrunner.cpp
71
71
    return true;
72
72
}
73
73
 
74
 
void JavaScriptRunner::match(Plasma::RunnerContext *search)
 
74
void JavaScriptRunner::match(Plasma::RunnerContext &search)
75
75
{
76
76
    QScriptValue fun = m_self.property("match");
77
77
    if (!fun.isFunction()) {
80
80
    }
81
81
 
82
82
    QScriptValueList args;
83
 
    args << m_engine->toScriptValue(search);
 
83
    args << m_engine->toScriptValue(&search);
84
84
 
85
85
    QScriptContext *ctx = m_engine->pushContext();
86
86
    ctx->setActivationObject(m_self);