Author: jmb Date: Tue Oct 5 14:14:46 2010 New Revision: 10865 URL: http://source.netsurf-browser.org?rev=10865&view=rev Log: Merge treeview-redux to trunk Added: trunk/netsurf/!NetSurf/Resources/Icons/ - copied from r10864, branches/jmb/treeview-redux/!NetSurf/Resources/Icons/ trunk/netsurf/amiga/resources/Themes/Default/content.png - copied unchanged from r10864, branches/jmb/treeview-redux/amiga/resources/Themes/Default/content.png trunk/netsurf/amiga/resources/Themes/Default/directory.png - copied unchanged from r10864, branches/jmb/treeview-redux/amiga/resources/Themes/Default/directory.png trunk/netsurf/amiga/sslcert.h - copied unchanged from r10864, branches/jmb/treeview-redux/amiga/sslcert.h trunk/netsurf/desktop/cookies.c - copied unchanged from r10864, branches/jmb/treeview-redux/desktop/cookies.c trunk/netsurf/desktop/history_global_core.c - copied unchanged from r10864, branches/jmb/treeview-redux/desktop/history_global_core.c trunk/netsurf/desktop/history_global_core.h - copied unchanged from r10864, branches/jmb/treeview-redux/desktop/history_global_core.h trunk/netsurf/desktop/hotlist.c - copied unchanged from r10864, branches/jmb/treeview-redux/desktop/hotlist.c trunk/netsurf/desktop/hotlist.h - copied unchanged from r10864, branches/jmb/treeview-redux/desktop/hotlist.h trunk/netsurf/desktop/sslcert.c - copied unchanged from r10864, branches/jmb/treeview-redux/desktop/sslcert.c trunk/netsurf/desktop/sslcert.h - copied unchanged from r10864, branches/jmb/treeview-redux/desktop/sslcert.h trunk/netsurf/desktop/tree_url_node.c - copied unchanged from r10864, branches/jmb/treeview-redux/desktop/tree_url_node.c trunk/netsurf/desktop/tree_url_node.h - copied unchanged from r10864, branches/jmb/treeview-redux/desktop/tree_url_node.h trunk/netsurf/gtk/gtk_cookies.c - copied unchanged from r10864, branches/jmb/treeview-redux/gtk/gtk_cookies.c trunk/netsurf/gtk/gtk_cookies.h - copied unchanged from r10864, branches/jmb/treeview-redux/gtk/gtk_cookies.h trunk/netsurf/gtk/gtk_hotlist.c - copied unchanged from r10864, branches/jmb/treeview-redux/gtk/gtk_hotlist.c trunk/netsurf/gtk/gtk_hotlist.h - copied unchanged from r10864, branches/jmb/treeview-redux/gtk/gtk_hotlist.h trunk/netsurf/gtk/gtk_treeview.h - copied unchanged from r10864, branches/jmb/treeview-redux/gtk/gtk_treeview.h trunk/netsurf/gtk/res/cookies.glade - copied unchanged from r10864, branches/jmb/treeview-redux/gtk/res/cookies.glade trunk/netsurf/gtk/res/hotlist.glade - copied unchanged from r10864, branches/jmb/treeview-redux/gtk/res/hotlist.glade trunk/netsurf/gtk/res/icons - copied unchanged from r10864, branches/jmb/treeview-redux/gtk/res/icons trunk/netsurf/riscos/hotlist.h - copied unchanged from r10864, branches/jmb/treeview-redux/riscos/hotlist.h trunk/netsurf/riscos/sslcert.h - copied unchanged from r10864, branches/jmb/treeview-redux/riscos/sslcert.h trunk/netsurf/riscos/url_suggest.c - copied unchanged from r10864, branches/jmb/treeview-redux/riscos/url_suggest.c trunk/netsurf/riscos/url_suggest.h - copied unchanged from r10864, branches/jmb/treeview-redux/riscos/url_suggest.h Removed: trunk/netsurf/beos/beos_history.cpp trunk/netsurf/beos/beos_history.h trunk/netsurf/framebuffer/history.c trunk/netsurf/framebuffer/hotlist.c trunk/netsurf/windows/history.c trunk/netsurf/windows/hotlist.c Modified: trunk/netsurf/!NetSurf/Resources/de/Messages trunk/netsurf/!NetSurf/Resources/en/Messages trunk/netsurf/!NetSurf/Resources/fr/Messages trunk/netsurf/!NetSurf/Resources/it/Messages trunk/netsurf/!NetSurf/Resources/nl/Messages trunk/netsurf/Makefile.sources trunk/netsurf/amiga/cookies.c trunk/netsurf/amiga/cookies.h trunk/netsurf/amiga/gui.c trunk/netsurf/amiga/gui.h trunk/netsurf/amiga/history.c trunk/netsurf/amiga/history.h trunk/netsurf/amiga/hotlist.c trunk/netsurf/amiga/hotlist.h trunk/netsurf/amiga/menu.c trunk/netsurf/amiga/menu.h trunk/netsurf/amiga/object.c trunk/netsurf/amiga/object.h trunk/netsurf/amiga/options.h trunk/netsurf/amiga/plotters.c trunk/netsurf/amiga/resources/Themes/AISS/Theme trunk/netsurf/amiga/resources/Themes/Default/Theme trunk/netsurf/amiga/sslcert.c trunk/netsurf/amiga/theme.c trunk/netsurf/amiga/theme.h trunk/netsurf/amiga/tree.c trunk/netsurf/amiga/tree.h trunk/netsurf/beos/beos_bitmap.cpp trunk/netsurf/beos/beos_gui.cpp trunk/netsurf/beos/beos_scaffolding.cpp trunk/netsurf/beos/beos_treeview.cpp trunk/netsurf/content/urldb.c trunk/netsurf/content/urldb.h trunk/netsurf/desktop/browser.c trunk/netsurf/desktop/cookies.h trunk/netsurf/desktop/options.c trunk/netsurf/desktop/options.h trunk/netsurf/desktop/tree.c trunk/netsurf/desktop/tree.h trunk/netsurf/framebuffer/misc.c trunk/netsurf/framebuffer/tree.c trunk/netsurf/gtk/gtk_gui.c trunk/netsurf/gtk/gtk_history.c trunk/netsurf/gtk/gtk_history.h trunk/netsurf/gtk/gtk_menu.c trunk/netsurf/gtk/gtk_menu.h trunk/netsurf/gtk/gtk_plotters.c trunk/netsurf/gtk/gtk_scaffolding.c trunk/netsurf/gtk/gtk_scaffolding.h trunk/netsurf/gtk/gtk_theme.c trunk/netsurf/gtk/gtk_toolbar.c trunk/netsurf/gtk/gtk_toolbar.h trunk/netsurf/gtk/gtk_treeview.c trunk/netsurf/gtk/gtk_window.c trunk/netsurf/gtk/options.h trunk/netsurf/gtk/res/history.glade trunk/netsurf/gtk/res/ssl.glade trunk/netsurf/riscos/configure/con_home.c trunk/netsurf/riscos/cookies.c trunk/netsurf/riscos/cookies.h trunk/netsurf/riscos/dialog.c trunk/netsurf/riscos/global_history.c trunk/netsurf/riscos/global_history.h trunk/netsurf/riscos/gui.c trunk/netsurf/riscos/gui.h trunk/netsurf/riscos/help.c trunk/netsurf/riscos/hotlist.c trunk/netsurf/riscos/menus.c trunk/netsurf/riscos/menus.h trunk/netsurf/riscos/save.c trunk/netsurf/riscos/sslcert.c trunk/netsurf/riscos/textselection.c trunk/netsurf/riscos/theme.c trunk/netsurf/riscos/treeview.c trunk/netsurf/riscos/treeview.h trunk/netsurf/riscos/url_complete.c trunk/netsurf/riscos/wimp_event.c trunk/netsurf/riscos/wimp_event.h trunk/netsurf/riscos/window.c trunk/netsurf/utils/messages.c trunk/netsurf/utils/messages.h trunk/netsurf/windows/tree.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/netsurf/!NetSurf/Resources/de/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/de/M... Modified: trunk/netsurf/!NetSurf/Resources/en/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/en/M... Modified: trunk/netsurf/!NetSurf/Resources/fr/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/fr/M... Modified: trunk/netsurf/!NetSurf/Resources/it/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/it/M... Modified: trunk/netsurf/!NetSurf/Resources/nl/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/nl/M... Modified: trunk/netsurf/Makefile.sources URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile.sources?rev=1086... Modified: trunk/netsurf/amiga/cookies.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/cookies.c?rev=10865... Modified: trunk/netsurf/amiga/cookies.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/cookies.h?rev=10865... Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=10865&... Modified: trunk/netsurf/amiga/gui.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.h?rev=10865&... Modified: trunk/netsurf/amiga/history.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/history.c?rev=10865... Modified: trunk/netsurf/amiga/history.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/history.h?rev=10865... Modified: trunk/netsurf/amiga/hotlist.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/hotlist.c?rev=10865... Modified: trunk/netsurf/amiga/hotlist.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/hotlist.h?rev=10865... Modified: trunk/netsurf/amiga/menu.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/menu.c?rev=10865&am... Modified: trunk/netsurf/amiga/menu.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/menu.h?rev=10865&am... Modified: trunk/netsurf/amiga/object.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/object.c?rev=10865&... Modified: trunk/netsurf/amiga/object.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/object.h?rev=10865&... Modified: trunk/netsurf/amiga/options.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/options.h?rev=10865... Modified: trunk/netsurf/amiga/plotters.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/plotters.c?rev=1086... Modified: trunk/netsurf/amiga/resources/Themes/AISS/Theme URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/resources/Themes/AI... Modified: trunk/netsurf/amiga/resources/Themes/Default/Theme URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/resources/Themes/De... Modified: trunk/netsurf/amiga/sslcert.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/sslcert.c?rev=10865... Modified: trunk/netsurf/amiga/theme.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/theme.c?rev=10865&a... Modified: trunk/netsurf/amiga/theme.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/theme.h?rev=10865&a... Modified: trunk/netsurf/amiga/tree.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/tree.c?rev=10865&am... Modified: trunk/netsurf/amiga/tree.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/tree.h?rev=10865&am... Modified: trunk/netsurf/beos/beos_bitmap.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_bitmap.cpp?rev=... Modified: trunk/netsurf/beos/beos_gui.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_gui.cpp?rev=108... Removed: trunk/netsurf/beos/beos_history.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_history.cpp?rev... Removed: trunk/netsurf/beos/beos_history.h URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_history.h?rev=1... Modified: trunk/netsurf/beos/beos_scaffolding.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_scaffolding.cpp... Modified: trunk/netsurf/beos/beos_treeview.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_treeview.cpp?re... Modified: trunk/netsurf/content/urldb.c URL: http://source.netsurf-browser.org/trunk/netsurf/content/urldb.c?rev=10865... Modified: trunk/netsurf/content/urldb.h URL: http://source.netsurf-browser.org/trunk/netsurf/content/urldb.h?rev=10865... Modified: trunk/netsurf/desktop/browser.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=108... Modified: trunk/netsurf/desktop/cookies.h URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/cookies.h?rev=108... Modified: trunk/netsurf/desktop/options.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/options.c?rev=108... Modified: trunk/netsurf/desktop/options.h URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/options.h?rev=108... Modified: trunk/netsurf/desktop/tree.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.c?rev=10865&... Modified: trunk/netsurf/desktop/tree.h URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.h?rev=10865&... Removed: trunk/netsurf/framebuffer/history.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/history.c?rev... Removed: trunk/netsurf/framebuffer/hotlist.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/hotlist.c?rev... Modified: trunk/netsurf/framebuffer/misc.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/misc.c?rev=10... Modified: trunk/netsurf/framebuffer/tree.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/tree.c?rev=10... Modified: trunk/netsurf/gtk/gtk_gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_gui.c?rev=10865&a... Modified: trunk/netsurf/gtk/gtk_history.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_history.c?rev=108... Modified: trunk/netsurf/gtk/gtk_history.h URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_history.h?rev=108... Modified: trunk/netsurf/gtk/gtk_menu.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_menu.c?rev=10865&... Modified: trunk/netsurf/gtk/gtk_menu.h URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_menu.h?rev=10865&... Modified: trunk/netsurf/gtk/gtk_plotters.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_plotters.c?rev=10... Modified: trunk/netsurf/gtk/gtk_scaffolding.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_scaffolding.c?rev... Modified: trunk/netsurf/gtk/gtk_scaffolding.h URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_scaffolding.h?rev... Modified: trunk/netsurf/gtk/gtk_theme.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_theme.c?rev=10865... Modified: trunk/netsurf/gtk/gtk_toolbar.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_toolbar.c?rev=108... Modified: trunk/netsurf/gtk/gtk_toolbar.h URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_toolbar.h?rev=108... Modified: trunk/netsurf/gtk/gtk_treeview.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_treeview.c?rev=10... Modified: trunk/netsurf/gtk/gtk_window.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_window.c?rev=1086... Modified: trunk/netsurf/gtk/options.h URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/options.h?rev=10865&a... Modified: trunk/netsurf/gtk/res/history.glade URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/history.glade?rev... Modified: trunk/netsurf/gtk/res/ssl.glade URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/ssl.glade?rev=108... Modified: trunk/netsurf/riscos/configure/con_home.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/configure/con_home... Modified: trunk/netsurf/riscos/cookies.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/cookies.c?rev=1086... Modified: trunk/netsurf/riscos/cookies.h URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/cookies.h?rev=1086... Modified: trunk/netsurf/riscos/dialog.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/dialog.c?rev=10865... Modified: trunk/netsurf/riscos/global_history.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/global_history.c?r... Modified: trunk/netsurf/riscos/global_history.h URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/global_history.h?r... Modified: trunk/netsurf/riscos/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/gui.c?rev=10865&am... Modified: trunk/netsurf/riscos/gui.h URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/gui.h?rev=10865&am... Modified: trunk/netsurf/riscos/help.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/help.c?rev=10865&a... Modified: trunk/netsurf/riscos/hotlist.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/hotlist.c?rev=1086... Modified: trunk/netsurf/riscos/menus.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/menus.c?rev=10865&... Modified: trunk/netsurf/riscos/menus.h URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/menus.h?rev=10865&... Modified: trunk/netsurf/riscos/save.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/save.c?rev=10865&a... Modified: trunk/netsurf/riscos/sslcert.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/sslcert.c?rev=1086... Modified: trunk/netsurf/riscos/textselection.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/textselection.c?re... Modified: trunk/netsurf/riscos/theme.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/theme.c?rev=10865&... Modified: trunk/netsurf/riscos/treeview.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/treeview.c?rev=108... Modified: trunk/netsurf/riscos/treeview.h URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/treeview.h?rev=108... Modified: trunk/netsurf/riscos/url_complete.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/url_complete.c?rev... Modified: trunk/netsurf/riscos/wimp_event.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/wimp_event.c?rev=1... Modified: trunk/netsurf/riscos/wimp_event.h URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/wimp_event.h?rev=1... Modified: trunk/netsurf/riscos/window.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/window.c?rev=10865... Modified: trunk/netsurf/utils/messages.c URL: http://source.netsurf-browser.org/trunk/netsurf/utils/messages.c?rev=1086... Modified: trunk/netsurf/utils/messages.h URL: http://source.netsurf-browser.org/trunk/netsurf/utils/messages.h?rev=1086... Removed: trunk/netsurf/windows/history.c URL: http://source.netsurf-browser.org/trunk/netsurf/windows/history.c?rev=108... Removed: trunk/netsurf/windows/hotlist.c URL: http://source.netsurf-browser.org/trunk/netsurf/windows/hotlist.c?rev=108... Modified: trunk/netsurf/windows/tree.c URL: http://source.netsurf-browser.org/trunk/netsurf/windows/tree.c?rev=10865&...