Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/13326b27164c81d17844f... ...commit http://git.netsurf-browser.org/netsurf.git/commit/13326b27164c81d17844f81... ...tree http://git.netsurf-browser.org/netsurf.git/tree/13326b27164c81d17844f81e6... The branch, master has been updated via 13326b27164c81d17844f81e61a3c599018073b5 (commit) from 6e5e741d531ef73249d7319491d770707730626b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=13326b27164c81d1784... commit 13326b27164c81d17844f81e61a3c599018073b5 Author: Michael Drake <tlsa(a)netsurf-browser.org&gt; Commit: Michael Drake <tlsa(a)netsurf-browser.org&gt; Namespace the atari global history functions. diff --git a/atari/deskmenu.c b/atari/deskmenu.c index 4300498..113998c 100644 --- a/atari/deskmenu.c +++ b/atari/deskmenu.c @@ -459,7 +459,7 @@ static void __CDECL menu_lhistory(short item, short title, void *data) static void __CDECL menu_ghistory(short item, short title, void *data) { LOG(("%s", __FUNCTION__)); - global_history_open(); + atari_global_history_open(); } static void __CDECL menu_add_bookmark(short item, short title, void *data) diff --git a/atari/gui.c b/atari/gui.c index 6b54274..5b0df84 100644 --- a/atari/gui.c +++ b/atari/gui.c @@ -810,7 +810,7 @@ void gui_quit(void) gw = tmp; } - global_history_destroy(); + atari_global_history_destroy(); hotlist_destroy(); toolbar_exit(); @@ -1021,7 +1021,7 @@ static void gui_init2(int argc, char** argv) menu_register( _AESapid, (char*)" NetSurf "); } gemtk_wm_init(); - global_history_init(); + atari_global_history_init(); hotlist_init(); toolbar_init(); } diff --git a/atari/history.c b/atari/history.c index 49e24ce..a33f7f0 100755 --- a/atari/history.c +++ b/atari/history.c @@ -48,9 +48,9 @@ extern GRECT desk_area; struct s_atari_global_history gl_history; -void global_history_open( void ) +void atari_global_history_open( void ) { - global_history_init(); + atari_global_history_init(); if (gl_history.init == false ) { return; } @@ -89,7 +89,7 @@ static short handle_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8]) switch (msg[0]) { case WM_CLOSED: - global_history_close(); + atari_global_history_close(); break; default: break; @@ -100,7 +100,7 @@ static short handle_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8]) // ObjcChange( OC_TOOLBAR, win, buff[4], ~SELECTED, OC_MSG ); } -bool global_history_init( void ) +bool atari_global_history_init( void ) { if( gl_history.init == false ) { @@ -136,7 +136,7 @@ bool global_history_init( void ) } -void global_history_destroy( void ) +void atari_global_history_destroy( void ) { if( gl_history.init == false ) { @@ -145,7 +145,7 @@ void global_history_destroy( void ) if( gl_history.window != NULL ) { history_global_cleanup(); if( gl_history.open ) - global_history_close(); + atari_global_history_close(); wind_delete(gemtk_wm_get_handle(gl_history.window)); gemtk_wm_remove(gl_history.window); gl_history.window = NULL; @@ -155,7 +155,7 @@ void global_history_destroy( void ) LOG(("done")); } -void global_history_redraw( void ) +void atari_global_history_redraw( void ) { atari_treeview_redraw( gl_history.tv ); } diff --git a/atari/history.h b/atari/history.h index 6185e2a..d94e188 100755 --- a/atari/history.h +++ b/atari/history.h @@ -33,12 +33,12 @@ struct s_atari_global_history { extern struct s_atari_global_history gl_history; -bool global_history_init( void ); -void global_history_destroy( void ); -void global_history_open( void ); -void global_history_close( void ); +bool atari_global_history_init( void ); +void atari_global_history_destroy( void ); +void atari_global_history_open( void ); +void atari_global_history_close( void ); -void global_history_redraw( void ); +void atari_global_history_redraw( void ); ----------------------------------------------------------------------- Summary of changes: atari/deskmenu.c | 2 +- atari/gui.c | 4 ++-- atari/history.c | 14 +++++++------- atari/history.h | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/atari/deskmenu.c b/atari/deskmenu.c index 4300498..113998c 100644 --- a/atari/deskmenu.c +++ b/atari/deskmenu.c @@ -459,7 +459,7 @@ static void __CDECL menu_lhistory(short item, short title, void *data) static void __CDECL menu_ghistory(short item, short title, void *data) { LOG(("%s", __FUNCTION__)); - global_history_open(); + atari_global_history_open(); } static void __CDECL menu_add_bookmark(short item, short title, void *data) diff --git a/atari/gui.c b/atari/gui.c index 6b54274..5b0df84 100644 --- a/atari/gui.c +++ b/atari/gui.c @@ -810,7 +810,7 @@ void gui_quit(void) gw = tmp; } - global_history_destroy(); + atari_global_history_destroy(); hotlist_destroy(); toolbar_exit(); @@ -1021,7 +1021,7 @@ static void gui_init2(int argc, char** argv) menu_register( _AESapid, (char*)" NetSurf "); } gemtk_wm_init(); - global_history_init(); + atari_global_history_init(); hotlist_init(); toolbar_init(); } diff --git a/atari/history.c b/atari/history.c index 49e24ce..a33f7f0 100755 --- a/atari/history.c +++ b/atari/history.c @@ -48,9 +48,9 @@ extern GRECT desk_area; struct s_atari_global_history gl_history; -void global_history_open( void ) +void atari_global_history_open( void ) { - global_history_init(); + atari_global_history_init(); if (gl_history.init == false ) { return; } @@ -89,7 +89,7 @@ static short handle_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8]) switch (msg[0]) { case WM_CLOSED: - global_history_close(); + atari_global_history_close(); break; default: break; @@ -100,7 +100,7 @@ static short handle_event(GUIWIN *win, EVMULT_OUT *ev_out, short msg[8]) // ObjcChange( OC_TOOLBAR, win, buff[4], ~SELECTED, OC_MSG ); } -bool global_history_init( void ) +bool atari_global_history_init( void ) { if( gl_history.init == false ) { @@ -136,7 +136,7 @@ bool global_history_init( void ) } -void global_history_destroy( void ) +void atari_global_history_destroy( void ) { if( gl_history.init == false ) { @@ -145,7 +145,7 @@ void global_history_destroy( void ) if( gl_history.window != NULL ) { history_global_cleanup(); if( gl_history.open ) - global_history_close(); + atari_global_history_close(); wind_delete(gemtk_wm_get_handle(gl_history.window)); gemtk_wm_remove(gl_history.window); gl_history.window = NULL; @@ -155,7 +155,7 @@ void global_history_destroy( void ) LOG(("done")); } -void global_history_redraw( void ) +void atari_global_history_redraw( void ) { atari_treeview_redraw( gl_history.tv ); } diff --git a/atari/history.h b/atari/history.h index 6185e2a..d94e188 100755 --- a/atari/history.h +++ b/atari/history.h @@ -33,12 +33,12 @@ struct s_atari_global_history { extern struct s_atari_global_history gl_history; -bool global_history_init( void ); -void global_history_destroy( void ); -void global_history_open( void ); -void global_history_close( void ); +bool atari_global_history_init( void ); +void atari_global_history_destroy( void ); +void atari_global_history_open( void ); +void atari_global_history_close( void ); -void global_history_redraw( void ); +void atari_global_history_redraw( void ); -- NetSurf Browser