← Back to branch summary

~ubuntu-branches/ubuntu/trusty/plymouth/trusty-proposed

« back to all changes in this revision

Viewing changes to src/plugins/splash/script/script-execute.c

  • Committer: Scott James Remnant
  • Date: 2010-03-25 16:44:25 UTC
  • mfrom: (1016.2.1 upstream)
  • Revision ID: scott@netsplit.com-20100325164425-daotztzazohftmt4
Merge upstream 0.8.1 release

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/splash/script/script-execute.c
302
302
      this_obj = script_evaluate (state, name_exp->data.dual.sub_a);
303
303
      char *this_key_name = script_obj_as_string (this_key);
304
304
      script_obj_unref (this_key);
305
 
      func_obj = script_obj_hash_get_element (this_obj, this_key_name);
 
305
      func_obj = script_obj_hash_peek_element (this_obj, this_key_name);
 
306
 
 
307
      if (!func_obj && script_obj_is_string (this_obj))
 
308
        {
 
309
          script_obj_t *string_hash = script_obj_hash_peek_element (state->global, "String");
 
310
          func_obj = script_obj_hash_peek_element (string_hash, this_key_name);
 
311
          script_obj_unref (string_hash);
 
312
        }
 
313
 
 
314
      if (!func_obj)
 
315
        func_obj = script_obj_hash_get_element (this_obj, this_key_name);
 
316
 
306
317
      free(this_key_name);
307
318
    }
308
319
  else if (name_exp->type == SCRIPT_EXP_TYPE_TERM_VAR)
323
334
    }
324
335
  else
325
336
    {
326
 
      func_obj = script_evaluate (state, exp->data.function_exe.name);
 
337
      func_obj = script_evaluate (state, name_exp);
327
338
    }
328
339
  
329
340
  ply_list_t *parameter_expressions = exp->data.function_exe.parameters;