callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #300218:

Browse Source 
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.
This commit is contained in:
Ivan, Wong Yat Cheung
2005-04-11 18:59:05 +00:00
committed by Tor Lillqvist
parent e53cc66755
commit 47b096e223
5 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
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.
2005-04-09 Matthias Clasen <mclasen@redhat.com> 2005-04-09 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkinput-xfree.c: * gdk/x11/gdkinput-xfree.c:

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
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.
2005-04-09 Matthias Clasen <mclasen@redhat.com> 2005-04-09 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkinput-xfree.c: * gdk/x11/gdkinput-xfree.c:

10
ChangeLog.pre-2-8
View File

@ -1,3 +1,13 @@
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.
2005-04-09 Matthias Clasen <mclasen@redhat.com> 2005-04-09 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkinput-xfree.c: * gdk/x11/gdkinput-xfree.c:

4
gdk/win32/gdkselection-win32.c
View File

@ -383,12 +383,14 @@ gdk_selection_convert (GdkWindow *requestor,
if (GetClipboardFormatName (fmt, sFormat, 80) > 0 && if (GetClipboardFormatName (fmt, sFormat, 80) > 0 &&
strcmp (sFormat, "UTF8_STRING")) strcmp (sFormat, "UTF8_STRING"))
{ {
GdkAtom atom;
if (!has_bmp && if (!has_bmp &&
(!strcmp (sFormat, "image/bmp") || (!strcmp (sFormat, "image/bmp") ||
!strcmp (sFormat, "image/x-bmp") || !strcmp (sFormat, "image/x-bmp") ||
!strcmp (sFormat, "image/x-MS-bmp"))) !strcmp (sFormat, "image/x-MS-bmp")))
has_bmp = TRUE; has_bmp = TRUE;
GdkAtom atom = gdk_atom_intern (sFormat, FALSE); atom = gdk_atom_intern (sFormat, FALSE);
data[i++] = atom; data[i++] = atom;
} }
} }

6
gtk/updateiconcache.c
View File

@ -24,9 +24,15 @@
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif
#include <errno.h> #include <errno.h>
#ifdef _MSC_VER
#include <sys/utime.h>
#else
#include <utime.h> #include <utime.h>
#endif
#include <glib.h> #include <glib.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>