marlin r1155 - in trunk: marlin src

[iain svn gnome org]

Author: iain
Date: 2007-03-11 00:56:39 +0000 (Sun, 11 Mar 2007)
New Revision: 1155
ViewCVS link: http://svn.gnome.org/viewcvs/marlin?rev=1155&view=rev

Modified:
   trunk/marlin/marlin-progress-dialog.c
   trunk/marlin/marlin-sample-view.c
   trunk/src/marlin-window.c
Log:
Fix crasher when cancelling a load operation
Allow the marker colour to be set with the gtkrc file