diff options
| author | Ivan, Wong Yat Cheung <email@ivanwong.info> | 2005-04-11 18:59:05 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-04-11 18:59:05 +0000 |
| commit | 47b096e223350efe73a2c0f05402b11fb8dd3e3c (patch) | |
| tree | 2acf9813b585f11e5c4d77b08150676988a3e59f /gdk/win32/gdkselection-win32.c | |
| parent | e53cc66755366c406dc6a684739e8d14fb0b18db (diff) | |
| download | gtk+-47b096e223350efe73a2c0f05402b11fb8dd3e3c.tar.gz | |
Fix #300218:
2005-04-11 Ivan, Wong Yat Cheung <email@ivanwong.info>
Fix #300218:
* gdk/win32/gdkselection-win32.c (gdk_selection_convert): Fix
C99ism.
* gtk/updateiconcache.c: Guard inclusion of unistd.h and
utime.h.
Diffstat (limited to 'gdk/win32/gdkselection-win32.c')
| -rw-r--r-- | gdk/win32/gdkselection-win32.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gdk/win32/gdkselection-win32.c b/gdk/win32/gdkselection-win32.c index d5edb2d08b..1bcdaa5497 100644 --- a/gdk/win32/gdkselection-win32.c +++ b/gdk/win32/gdkselection-win32.c @@ -383,12 +383,14 @@ gdk_selection_convert (GdkWindow *requestor, if (GetClipboardFormatName (fmt, sFormat, 80) > 0 && strcmp (sFormat, "UTF8_STRING")) { + GdkAtom atom; + if (!has_bmp && (!strcmp (sFormat, "image/bmp") || !strcmp (sFormat, "image/x-bmp") || !strcmp (sFormat, "image/x-MS-bmp"))) has_bmp = TRUE; - GdkAtom atom = gdk_atom_intern (sFormat, FALSE); + atom = gdk_atom_intern (sFormat, FALSE); data[i++] = atom; } } |