wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out changeset c9c35333436b / Bug 495392 due to build bustage

Browse Source
This commit is contained in:
Mark Banner 2009-11-24 22:25:42 +00:00
parent 634d51a728
commit 6f30d1612e
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
widget/src/gtk2/nsClipboard.cpp
View File

@ -431,11 +431,11 @@ nsClipboard::HasDataMatchingFlavors(const char** aFlavorList, PRUint32 aLength,
for (PRInt32 j = 0; j < n_targets; j++) {
gchar *atom_name = gdk_atom_name(targets[j]);
if (!g_strcmp0(atom_name, aFlavorList[i]))
if (!strcmp(atom_name, aFlavorList[i]))
*_retval = PR_TRUE;
// X clipboard wants image/jpeg, not image/jpg
if (!g_strcmp0(aFlavorList[i], kJPEGImageMime) && !g_strcmp0(atom_name, "image/jpeg"))
if (!strcmp(aFlavorList[i], kJPEGImageMime) && !strcmp(atom_name, "image/jpeg"))
*_retval = PR_TRUE;
g_free(atom_name);

21
widget/src/gtk2/nsDragService.cpp
View File

@ -831,14 +831,15 @@ nsDragService::IsDataFlavorSupported(const char *aDataFlavor,
name = gdk_atom_name(atom);
PR_LOG(sDragLm, PR_LOG_DEBUG,
("checking %s against %s\n", name, aDataFlavor));
if (g_strcmp0(name, aDataFlavor) == 0) {
if (name && (strcmp(name, aDataFlavor) == 0)) {
PR_LOG(sDragLm, PR_LOG_DEBUG, ("good!\n"));
*_retval = PR_TRUE;
}
// check for automatic text/uri-list -> text/x-moz-url mapping
if (*_retval == PR_FALSE &&
(g_strcmp0(name, gTextUriListType) == 0) &&
(g_strcmp0(aDataFlavor, kURLMime) == 0)) {
name &&
(strcmp(name, gTextUriListType) == 0) &&
(strcmp(aDataFlavor, kURLMime) == 0)) {
PR_LOG(sDragLm, PR_LOG_DEBUG,
("good! ( it's text/uri-list and \
we're checking against text/x-moz-url )\n"));
@ -846,8 +847,9 @@ nsDragService::IsDataFlavorSupported(const char *aDataFlavor,
}
// check for automatic _NETSCAPE_URL -> text/x-moz-url mapping
if (*_retval == PR_FALSE &&
(g_strcmp0(name, gMozUrlType) == 0) &&
(g_strcmp0(aDataFlavor, kURLMime) == 0)) {
name &&
(strcmp(name, gMozUrlType) == 0) &&
(strcmp(aDataFlavor, kURLMime) == 0)) {
PR_LOG(sDragLm, PR_LOG_DEBUG,
("good! ( it's _NETSCAPE_URL and \
we're checking against text/x-moz-url )\n"));
@ -855,9 +857,10 @@ nsDragService::IsDataFlavorSupported(const char *aDataFlavor,
}
// check for auto text/plain -> text/unicode mapping
if (*_retval == PR_FALSE &&
(g_strcmp0(name, kTextMime) == 0) &&
((g_strcmp0(aDataFlavor, kUnicodeMime) == 0) ||
(g_strcmp0(aDataFlavor, kFileMime) == 0))) {
name &&
(strcmp(name, kTextMime) == 0) &&
((strcmp(aDataFlavor, kUnicodeMime) == 0) ||
(strcmp(aDataFlavor, kFileMime) == 0))) {
PR_LOG(sDragLm, PR_LOG_DEBUG,
("good! ( it's text plain and we're checking \
against text/unicode or application/x-moz-file)\n"));
@ -978,7 +981,7 @@ nsDragService::IsTargetContextList(void)
GdkAtom atom = GDK_POINTER_TO_ATOM(tmp->data);
gchar *name = NULL;
name = gdk_atom_name(atom);
if (g_strcmp0(name, gMimeListType) == 0)
if (strcmp(name, gMimeListType) == 0)
retval = PR_TRUE;
g_free(name);
if (retval)