Opera 12.15 Source Code
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

PiFixes.patch 3.4KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100
  1. diff --git a/adjunct/bittorrent/bt-upload.cpp b/adjunct/bittorrent/bt-upload.cpp
  2. index b748be6..c1587ae 100644
  3. --- a/adjunct/bittorrent/bt-upload.cpp
  4. +++ b/adjunct/bittorrent/bt-upload.cpp
  5. @@ -517,14 +517,14 @@ OpByteBuffer *UploadTransferBT::OnRequest(BTPacket* packet)
  6. DEBUGTRACE_UP(UNI_L("ILLEGAL length: %d\n"), length);
  7. // error, too large request
  8. Close();
  9. - return FALSE;
  10. + return NULL;
  11. }
  12. if(offset + length > m_filesize )
  13. {
  14. DEBUGTRACE_UP(UNI_L("ILLEGAL size: %d\n"), offset + length);
  15. // error, size larger than file
  16. Close();
  17. - return FALSE;
  18. + return NULL;
  19. }
  20. for(P2PFilePart* fragment = m_requested ; fragment != NULL; fragment = fragment->m_next )
  21. diff --git a/adjunct/bittorrent/connection.cpp b/adjunct/bittorrent/connection.cpp
  22. index f79bf93..a0a9523 100644
  23. --- a/adjunct/bittorrent/connection.cpp
  24. +++ b/adjunct/bittorrent/connection.cpp
  25. @@ -1551,7 +1551,7 @@ BTClientConnector *BTServerConnector::VerifyHandshake(OpByteBuffer& buffer, P2PS
  26. if(buffer.DataSize() < 7)
  27. {
  28. - return FALSE;
  29. + return NULL;
  30. }
  31. // Check for BitTorrent handshake
  32. diff --git a/modules/liblcms/src/cmstypes.c b/modules/liblcms/src/cmstypes.c
  33. index c2d6f94..0e9d4e0 100644
  34. --- a/modules/liblcms/src/cmstypes.c
  35. +++ b/modules/liblcms/src/cmstypes.c
  36. @@ -2368,9 +2368,9 @@ cmsStage* ReadSetOfCurves(struct _cms_typehandler_struct* self, cmsIOHANDLER* io
  37. cmsUInt32Number i;
  38. cmsStage* Lin = NULL;
  39. - if (nCurves > cmsMAXCHANNELS) return FALSE;
  40. + if (nCurves > cmsMAXCHANNELS) return NULL;
  41. - if (!io -> Seek(io, Offset)) return FALSE;
  42. + if (!io -> Seek(io, Offset)) return NULL;
  43. for (i=0; i < nCurves; i++)
  44. Curves[i] = NULL;
  45. @@ -5082,7 +5082,7 @@ void *Type_Dictionary_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* i
  46. if (DisplayNameMLU != NULL) cmsMLUfree(DisplayNameMLU);
  47. if (DisplayValueMLU != NULL) cmsMLUfree(DisplayValueMLU);
  48. - if (!rc) return FALSE;
  49. + if (!rc) return NULL;
  50. }
  51. FreeArray(&a);
  52. diff --git a/platforms/quix/module.build/autoupdatechecker.conf.py b/platforms/quix/module.build/autoupdatechecker.conf.py
  53. index 340e0e6..b6d9b9b 100644
  54. --- a/platforms/quix/module.build/autoupdatechecker.conf.py
  55. +++ b/platforms/quix/module.build/autoupdatechecker.conf.py
  56. @@ -9,7 +9,7 @@ def libraries(binary='opera'):
  57. if binary == 'opera_autoupdatechecker':
  58. # Use system libs
  59. libs.append(util.PkgConfig('sqlite3'))
  60. - libs.append(util.PkgConfig('tinyxml', static=True))
  61. + libs.append(util.PkgConfig('tinyxml'))
  62. libs.append(util.PkgConfig('libcurl'))
  63. return libs
  64. diff --git a/platforms/unix/base/x11/x11_globals.h b/platforms/unix/base/x11/x11_globals.h
  65. index 7511001..933d72b 100644
  66. --- a/platforms/unix/base/x11/x11_globals.h
  67. +++ b/platforms/unix/base/x11/x11_globals.h
  68. @@ -33,7 +33,7 @@ public:
  69. :visual(0)
  70. ,id(None)
  71. ,colormap(None)
  72. - ,fbconfig(None)
  73. + ,fbconfig(NULL)
  74. ,depth(0)
  75. ,image_bpp(0)
  76. ,r_mask(0)
  77. diff --git a/platforms/unix/base/x11/x11_mdebuffer.cpp b/platforms/unix/base/x11/x11_mdebuffer.cpp
  78. index 5c13ea0..67e5da8 100644
  79. --- a/platforms/unix/base/x11/x11_mdebuffer.cpp
  80. +++ b/platforms/unix/base/x11/x11_mdebuffer.cpp
  81. @@ -46,8 +46,8 @@ X11MdeBuffer::X11MdeBuffer(X11Types::Display *display,
  82. ,m_window(window)
  83. ,m_widget(g_x11->GetWidgetList()->FindWidget(window))
  84. ,m_visual(visual)
  85. - ,m_gc(None)
  86. - ,m_plugin_gc(None)
  87. + ,m_gc(NULL)
  88. + ,m_plugin_gc(NULL)
  89. {
  90. }