summaryrefslogtreecommitdiffstats
path: root/src/npplayer.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/npplayer.c')
-rw-r--r--src/npplayer.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/npplayer.c b/src/npplayer.c
index d338ec4..9e89dce 100644
--- a/src/npplayer.c
+++ b/src/npplayer.c
@@ -94,7 +94,7 @@ typedef struct _StreamInfo {
struct JsObject;
typedef struct _JsObject {
NPObject npobject;
- struct _JsObject * tqparent;
+ struct _JsObject * parent;
char * name;
} JsObject;
@@ -249,15 +249,15 @@ static StreamInfo *addStream (const char *url, const char *mime, const char *tar
static void createJsName (JsObject * obj, char **name, uint32_t * len) {
int slen = strlen (obj->name);
- if (obj->tqparent) {
+ if (obj->parent) {
*len += slen + 1;
- createJsName (obj->tqparent, name, len);
+ createJsName (obj->parent, name, len);
} else {
*name = (char *) malloc (*len + slen + 1);
*(*name + *len + slen) = 0;
*len = 0;
}
- if (obj->tqparent) {
+ if (obj->parent) {
*(*name + *len) = '.';
*len += 1;
}
@@ -687,8 +687,8 @@ static NPObject * windowClassAllocate (NPP instance, NPClass *aClass) {
static void windowClassDeallocate (NPObject *npobj) {
JsObject *jo = (JsObject *) npobj;
/*print ("windowClassDeallocate\n");*/
- if (jo->tqparent) {
- nsReleaseObject ((NPObject *) jo->tqparent);
+ if (jo->parent) {
+ nsReleaseObject ((NPObject *) jo->parent);
} else if (jo->name && !strncmp (jo->name, "this.__kmplayer__obj_", 21)) {
char *script = (char *) malloc (strlen (jo->name) + 7);
char *result;
@@ -793,7 +793,7 @@ static bool windowClassGetProperty (NPObject *npobj, NPIdentifier property,
}
jo.name = id;
- jo.tqparent = (JsObject *) npobj;
+ jo.parent = (JsObject *) npobj;
createJsName (&jo, (char **)&fullname.utf8characters, &fullname.utf8length);
res = nsEvaluate (npp, npobj, &fullname, result);
@@ -814,7 +814,7 @@ static bool windowClassSetProperty (NPObject *npobj, NPIdentifier property,
return false;
jo.name = id;
- jo.tqparent = (JsObject *) npobj;
+ jo.parent = (JsObject *) npobj;
createJsName (&jo, &var_name, &len);
var_val = nsVariant2Str (value);