← Back to branch summary

~ubuntu-branches/ubuntu/trusty/freerdp/trusty-proposed

« back to all changes in this revision

Viewing changes to libfreerdp-core/capabilities.c

  • Committer: Package Import Robot
  • Author(s): Michael Terry
  • Date: 2012-11-16 23:08:42 UTC
  • mfrom: (9.1.5 sid)
  • Revision ID: package-import@ubuntu.com-20121116230842-mnisn295dk1b0nzi
Tags: 1.0.1-2ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - debian/control, debian/rules: Drop avcodec/ffmpeg support
  - debian/patches/remote-control.diff: Fix crash in Remote Control
  - debian/patches/cherry-48ad5feb0a6ad831d863f89ed74b443021e54303.patch:
    Fix freerdp extension handling problem.
  - debian/patches/backport-from-stdin.patch: Add --from-stdin
  - debian/patches/allow-null-domain.patch: Allow null domains from stdin
* debian/patches/cherry-pick-8293c5b4cb072038fe2bdc15207ee6de4e291879:
  - Dropped, included in Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
libfreerdp-core/capabilities.c
1870
1870
        stream_seek_uint16(s); /* numberCapabilities (2 bytes) */
1871
1871
        stream_write_uint16(s, 0); /* pad2Octets (2 bytes) */
1872
1872
 
1873
 
        numberCapabilities = 14;
 
1873
        numberCapabilities = 13;
1874
1874
        rdp_write_general_capability_set(s, settings);
1875
1875
        rdp_write_bitmap_capability_set(s, settings);
1876
1876
        rdp_write_order_capability_set(s, settings);
1877
1877
        rdp_write_pointer_capability_set(s, settings);
1878
1878
        rdp_write_input_capability_set(s, settings);
1879
1879
        rdp_write_virtual_channel_capability_set(s, settings);
1880
 
        rdp_write_bitmap_cache_host_support_capability_set(s, settings);
1881
1880
        rdp_write_share_capability_set(s, settings);
1882
1881
        rdp_write_font_capability_set(s, settings);
1883
1882
        rdp_write_multifragment_update_capability_set(s, settings);
1886
1885
        rdp_write_surface_commands_capability_set(s, settings);
1887
1886
        rdp_write_bitmap_codecs_capability_set(s, settings);
1888
1887
 
 
1888
        if (settings->persistent_bitmap_cache)
 
1889
        {
 
1890
                numberCapabilities++;
 
1891
                rdp_write_bitmap_cache_host_support_capability_set(s, settings);
 
1892
        }
 
1893
 
1889
1894
        stream_get_mark(s, em);
1890
1895
 
1891
1896
        stream_set_mark(s, lm); /* go back to lengthCombinedCapabilities */