75 lines
3.5 KiB
Diff
75 lines
3.5 KiB
Diff
diff -Nru comm-1.9.1/mozilla/widget/src/gtk2/nsClipboard.cpp comm-1.9.1/mozilla/widget/src/gtk2-gil/nsClipboard.cpp
|
|
--- comm-1.9.1/mozilla/widget/src/gtk2/nsClipboard.cpp 2009-12-05 02:56:52.000000000 +0100
|
|
+++ comm-1.9.1/mozilla/widget/src/gtk2-gil/nsClipboard.cpp 2009-12-20 16:56:48.000000000 +0100
|
|
@@ -445,11 +445,11 @@
|
|
|
|
for (PRInt32 j = 0; j < n_targets; j++) {
|
|
gchar *atom_name = gdk_atom_name(targets[j]);
|
|
- if (!strcmp(atom_name, aFlavorList[i]))
|
|
+ if (!g_strcmp0(atom_name, aFlavorList[i]))
|
|
*_retval = PR_TRUE;
|
|
|
|
// X clipboard wants image/jpeg, not image/jpg
|
|
- if (!strcmp(aFlavorList[i], kJPEGImageMime) && !strcmp(atom_name, "image/jpeg"))
|
|
+ if (!g_strcmp0(aFlavorList[i], kJPEGImageMime) && !g_strcmp0(atom_name, "image/jpeg"))
|
|
*_retval = PR_TRUE;
|
|
|
|
g_free(atom_name);
|
|
diff -Nru comm-1.9.1/mozilla/widget/src/gtk2/nsDragService.cpp comm-1.9.1/mozilla/widget/src/gtk2-gil/nsDragService.cpp
|
|
--- comm-1.9.1/mozilla/widget/src/gtk2/nsDragService.cpp 2009-12-05 02:56:52.000000000 +0100
|
|
+++ comm-1.9.1/mozilla/widget/src/gtk2-gil/nsDragService.cpp 2009-12-20 17:02:42.000000000 +0100
|
|
@@ -801,15 +801,14 @@
|
|
name = gdk_atom_name(atom);
|
|
PR_LOG(sDragLm, PR_LOG_DEBUG,
|
|
("checking %s against %s\n", name, aDataFlavor));
|
|
- if (name && (strcmp(name, aDataFlavor) == 0)) {
|
|
+ if (g_strcmp0(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 &&
|
|
- name &&
|
|
- (strcmp(name, gTextUriListType) == 0) &&
|
|
- (strcmp(aDataFlavor, kURLMime) == 0)) {
|
|
+ (g_strcmp0(name, gTextUriListType) == 0) &&
|
|
+ (g_strcmp0(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"));
|
|
@@ -817,9 +816,8 @@
|
|
}
|
|
// check for automatic _NETSCAPE_URL -> text/x-moz-url mapping
|
|
if (*_retval == PR_FALSE &&
|
|
- name &&
|
|
- (strcmp(name, gMozUrlType) == 0) &&
|
|
- (strcmp(aDataFlavor, kURLMime) == 0)) {
|
|
+ (g_strcmp0(name, gMozUrlType) == 0) &&
|
|
+ (g_strcmp0(aDataFlavor, kURLMime) == 0)) {
|
|
PR_LOG(sDragLm, PR_LOG_DEBUG,
|
|
("good! ( it's _NETSCAPE_URL and \
|
|
we're checking against text/x-moz-url )\n"));
|
|
@@ -827,10 +825,9 @@
|
|
}
|
|
// check for auto text/plain -> text/unicode mapping
|
|
if (*_retval == PR_FALSE &&
|
|
- name &&
|
|
- (strcmp(name, kTextMime) == 0) &&
|
|
- ((strcmp(aDataFlavor, kUnicodeMime) == 0) ||
|
|
- (strcmp(aDataFlavor, kFileMime) == 0))) {
|
|
+ (g_strcmp0(name, kTextMime) == 0) &&
|
|
+ ((g_strcmp0(aDataFlavor, kUnicodeMime) == 0) ||
|
|
+ (g_strcmp0(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"));
|
|
@@ -951,7 +948,7 @@
|
|
GdkAtom atom = GDK_POINTER_TO_ATOM(tmp->data);
|
|
gchar *name = NULL;
|
|
name = gdk_atom_name(atom);
|
|
- if (strcmp(name, gMimeListType) == 0)
|
|
+ if (g_strcmp0(name, gMimeListType) == 0)
|
|
retval = PR_TRUE;
|
|
g_free(name);
|
|
if (retval)
|