← Back to branch summary

~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools.march-merge

« back to all changes in this revision

Viewing changes to libvmtools/i18n.c

  • Committer: Nate Muench
  • Date: 2012-03-22 17:50:13 UTC
  • mfrom: (1.4.7)
  • Revision ID: nowiwilldestroyabydos@gmail.com-20120322175013-0jh30wfk7ut20rdj
Tags: 2012.03.13-651368-0ubuntu1
* Merge latest upstream git tag.
* debian/rules: Removed glib2.0 compatibility CFLAG.
  - Packaging can now build without it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libvmtools/i18n.c
738
738
      dfltdir = Util_SafeStrdup(VMTOOLS_DATA_DIR);
739
739
#else
740
740
      dfltdir = GuestApp_GetInstallPath();
741
 
      ASSERT_MEM_ALLOC(dfltdir);
742
741
#endif
743
 
      catdir = dfltdir;
 
742
      catdir = (dfltdir) ? dfltdir : ".";
744
743
   }
745
744
 
746
745
   file = g_strdup_printf("%s%smessages%s%s%s%s.vmsg",