1.1 --- a/src/gui/gtkui.c	Wed Oct 31 09:10:23 2007 +0000
     1.2 +++ b/src/gui/gtkui.c	Wed Oct 31 11:53:35 2007 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /**
     1.5 - * $Id: gtkui.c,v 1.9 2007-10-31 09:10:23 nkeynes Exp $
     1.6 + * $Id: gtkui.c,v 1.10 2007-10-31 11:53:35 nkeynes Exp $
     1.7   *
     1.8   * Core GTK-based user interface
     1.9   *
    1.10 @@ -25,7 +25,6 @@
    1.11  #include "gui/gtkui.h"
    1.12  
    1.13  
    1.14 -void gtk_gui_update( void );
    1.15  void gtk_gui_start( void );
    1.16  void gtk_gui_stop( void );
    1.17  void gtk_gui_alloc_resources ( void );
    1.18 @@ -49,7 +48,6 @@
    1.19   * UIManager and action helpers
    1.20   */
    1.21  static GtkUIManager *global_ui_manager;
    1.22 -static GtkAccelGroup *global_accel_group;
    1.23  static GtkActionGroup *global_action_group;
    1.24  
    1.25  /**
    1.26 @@ -437,7 +435,7 @@
    1.27  
    1.28  GdkPixbuf *gdk_pixbuf_new_from_frame_buffer( frame_buffer_t buffer )
    1.29  {
    1.30 -    return gdk_pixbuf_new_from_data( buffer->data, 
    1.31 +    return gdk_pixbuf_new_from_data( (unsigned char *)buffer->data, 
    1.32  				     GDK_COLORSPACE_RGB,
    1.33  				     (buffer->colour_format == COLFMT_BGRA8888),
    1.34  				     8,