Fix warnings, moved prototypes, housekeeping

This commit is contained in:
Ole Loots 2012-08-27 20:14:27 +02:00
parent 02593d170a
commit b806c94c1d
6 changed files with 17 additions and 21 deletions

View File

@ -47,8 +47,6 @@
#include "atari/download.h"
#include "atari/osspec.h"
/*TODO: get filename from core. */
extern struct gui_window * input_window;
static void gui_download_window_destroy( struct gui_download_window * gdw );

View File

@ -958,7 +958,7 @@ static void gui_init(int argc, char** argv)
}
if (nsoption_charp(cookie_file) == NULL ){
nsoption_set_charp(cookie_file, "cookies");
nsoption_set_charp(cookie_file, (char*)"cookies");
}
LOG(("Loading cookies from: %s", nsoption_charp(cookie_file) ));
if( strlen(nsoption_charp(cookie_file)) ){

View File

@ -28,6 +28,7 @@
#include "desktop/gui.h"
#include "desktop/history_global_core.h"
#include "desktop/browser.h"
#include "utils/messages.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"
@ -105,8 +106,7 @@ bool global_history_init( void )
LOG(("Failed to allocate history window"));
return( false );
}
/* TODO: load history strings from messages */
WindSetStr( gl_history.window, WF_NAME, (char*)"History" );
WindSetStr(gl_history.window, WF_NAME, messages_get("GlobalHistory"));
//WindSetPtr( gl_history.window, WF_TOOLBAR, tree, evnt_history_toolbar );
EvntAttach( gl_history.window, WM_CLOSED, evnt_history_close );
EvntAttach( gl_history.window, WM_XBUTTON,evnt_history_mbutton );

View File

@ -103,8 +103,7 @@ void hotlist_init(void)
LOG(("Failed to allocate Hotlist"));
return;
}
/* TODO: load hotlist strings from messages */
WindSetStr( hl.window, WF_NAME, (char*)"Hotlist" );
WindSetStr( hl.window, WF_NAME, (char*)messages_get("Hotlist") );
WindSetPtr( hl.window, WF_TOOLBAR, tree, evnt_hl_toolbar );
EvntAttach( hl.window, WM_CLOSED, evnt_hl_close );
EvntAttach( hl.window, WM_XBUTTON,evnt_hl_mbutton );

View File

@ -69,13 +69,6 @@ static void snapshot_suspend(void);
/* destroy memory used by screenshot */
static void snapshot_destroy(void);
/* convert an bgra color to vdi1000 color */
void rgb_to_vdi1000( unsigned char * in, unsigned short * out );
/* convert an rgb color to an index into the web palette */
short rgb_to_666_index(unsigned char r, unsigned char g, unsigned char b);
#ifdef WITH_8BPP_SUPPORT
static unsigned short sys_pal[256][3]; /*RGB*/
static unsigned short pal[256][3]; /*RGB*/

View File

@ -122,6 +122,12 @@ bool plot_copy_rect(GRECT src, GRECT dst);
/* convert an vdi color to bgra */
void vdi1000_to_rgb( unsigned short * in, unsigned char * out );
/* convert an bgra color to vdi1000 color */
void rgb_to_vdi1000( unsigned char * in, unsigned short * out );
/* convert an rgb color to an index into the web palette */
short rgb_to_666_index(unsigned char r, unsigned char g, unsigned char b);
/* assign vdi line style to dst ( netsurf type ) */
#define NSLT2VDI(dst, src) \
dst = 0;\