# HG changeset patch
# User chainsaw
# Date 1154870646 25200
# Node ID 543e37d18997cf2d80cfcbc290257c7edfda0dad
# Parent  c9ac8b6679c90bdbee0e5fd780ee717eb9881e35
[svn] Remove 15 instrument magic at offset 1080 because of false positive resulting in decoder segfault. Closes bug #543.

diff -r c9ac8b6679c9 -r 543e37d18997 ChangeLog
--- a/ChangeLog	Sun Aug 06 05:45:48 2006 -0700
+++ b/ChangeLog	Sun Aug 06 06:24:06 2006 -0700
@@ -1,3 +1,11 @@
+2006-08-06 12:45:48 +0000  Giacomo Lozito <james@develia.org>
+  revision [1934]
+  - a couple of fixes for notify plugin (removed some deprecated gtk+1 functions and ensure that the timeout is removed only if it actually exists)
+
+  Changes:        Modified:
+  +3 -2           trunk/Plugins/General/notify/notify.c  
+
+
 2006-08-06 09:52:27 +0000  Stephen Sokolow <deitarion@gmail.com>
   revision [1932]
   Added awareness of the difference between stopped and playing.
diff -r c9ac8b6679c9 -r 543e37d18997 Plugins/Input/modplug/modplugbmp.cpp
--- a/Plugins/Input/modplug/modplugbmp.cpp	Sun Aug 06 05:45:48 2006 -0700
+++ b/Plugins/Input/modplug/modplugbmp.cpp	Sun Aug 06 06:24:06 2006 -0700
@@ -192,10 +192,6 @@
 		vfs_fclose(file);
 		return 1;
 	}
-	if (!memcmp(magic, MOD_MAGIC_15INSTRUMENT, 4)) {
-		vfs_fclose(file);
-		return 1;
-	}
 	} /* end of if(mModProps.mGrabAmigaMOD) */
 
 	/* We didn't find the magic bytes, fall back to extension check */
diff -r c9ac8b6679c9 -r 543e37d18997 Plugins/Input/modplug/modplugbmp.h
--- a/Plugins/Input/modplug/modplugbmp.h	Sun Aug 06 05:45:48 2006 -0700
+++ b/Plugins/Input/modplug/modplugbmp.h	Sun Aug 06 06:24:06 2006 -0700
@@ -31,7 +31,6 @@
 #define MOD_MAGIC_OKTALYZER8X	(unsigned char [4]) { 0x4F, 0x4B, 0x54, 0x41 }  // "OKTA" - Atari oktalyzer 8 channel
 #define MOD_MAGIC_TAKETRACKER16	(unsigned char [4]) { 0x31, 0x36, 0x43, 0x4E }  // "16CN" - Taketracker 16 channel
 #define MOD_MAGIC_TAKETRACKER32 (unsigned char [4]) { 0x33, 0x32, 0x43, 0x4E }  // "32CN" - Taketracker 32 channel
-#define MOD_MAGIC_15INSTRUMENT	(unsigned char [4]) { 0x20, 0x20, 0x20, 0x20 }  // "    " - 15-instrument 4 channel
 
 #define S3M_MAGIC	(unsigned char [4]) { 0x53, 0x43, 0x52, 0x4D }			/* This is the SCRM string at offset 44 to 47 in the S3M header */