← Back to branch summary

~ubuntu-branches/ubuntu/quantal/open-vm-tools/quantal-201210021442

« back to all changes in this revision

Viewing changes to services/plugins/powerOps/powerOps.c

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2011-03-31 14:20:05 UTC
  • mfrom: (1.4.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110331142005-3n9red91p7ogkweo
Tags: 2011.03.28-387002-0ubuntu1
https://launchpad.net/bugs/727342
https://launchpad.net/bugs/332323
https://launchpad.net/bugs/332323
* Merge latest upstream git tag.  This has the unlocked_ioctl change
  needed to fix dkms build failures (LP: #727342)
* Changes in debian/rules:
  - work around a bug in toolbox/Makefile, where install-exec-hook is
    not happening.  This needs to get fixed the right way.
  - don't install 'vmware-user' which seems to no longer exist
  - move /etc/xdg into open-vm-toolbox (which should be done using .install)
* debian/open-vm-tools.init: add 'modprobe [-r] vmblock'. (LP: #332323)
* debian/rules and debian/open-vm-toolbox.lintian-overrides:
  - Make vmware-user-suid-wrapper suid-root (LP: #332323)

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/plugins/powerOps/powerOps.c
349
349
   GSource *watch;
350
350
   GError *err = NULL;
351
351
 
352
 
   argv[0] = g_filename_from_utf8(script, -1, NULL, NULL, &err);
 
352
   argv[0] = g_locale_from_utf8(script, -1, NULL, NULL, &err);
353
353
   if (err != NULL) {
354
 
      g_error("Conversion error: %s\n", err->message);
 
354
      g_debug("Conversion error: %s\n", err->message);
 
355
      /*
 
356
       * If we could not convert to current locate let's hope that
 
357
       * what we have is a useable script name and use it directly.
 
358
       */
 
359
      argv[0] = g_strdup(script);
355
360
   }
356
361
   argv[1] = NULL;
357
362