diff options
| author | Benjamin Pierce <bcpierce00@users.noreply.github.com> | 2018-02-26 09:39:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-26 09:39:20 -0500 |
| commit | 85890a453362c48861bc4209be893065023fe50b (patch) | |
| tree | 88969613862f941e852df5f5a729fe5466800f34 | |
| parent | 1da5309d455e39de2516e976af3edffa081a3005 (diff) | |
| parent | 2e7ea9481c6c3ff2ec513c39f73cfe15c0763c06 (diff) | |
| download | unison-master.zip unison-master.tar.gz unison-master.tar.bz2 | |
Merge pull request #164 from david-geiger/masterHEADorigin/masterorigin/HEADmaster
Fix for lablgtk >= 2.18.6
| -rw-r--r-- | src/uigtk2.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/uigtk2.ml b/src/uigtk2.ml index 2ba6d79..04c4da4 100644 --- a/src/uigtk2.ml +++ b/src/uigtk2.ml @@ -89,12 +89,12 @@ let fontItalic = lazy (Pango.Font.from_string "italic") (* This does not work with the current version of Lablgtk, due to a bug let icon = GdkPixbuf.from_data ~width:48 ~height:48 ~has_alpha:true - (Gpointer.region_of_string Pixmaps.icon_data) + (Gpointer.region_of_bytes Pixmaps.icon_data) *) let icon = let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in Gpointer.blit - (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p); + (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p); p let leftPtrWatch = |