3:03 p.m.
On Tue, 2009-08-04 at 06:32 +0000, netsurf(a)semichrome.net wrote:
Modified: branches/MarkieB/gtkmain/content/fetchcache.c
URL:
http://source.netsurf-browser.org/branches/MarkieB/gtkmain/content/fetchc...
==============================================================================
--- branches/MarkieB/gtkmain/content/fetchcache.c (original)
+++ branches/MarkieB/gtkmain/content/fetchcache.c Tue Aug 4 01:32:27 2009
@@ -506,6 +506,7 @@
msg_data);
} else {
content_reset(c);
+ printf("fetchcache_callback\n");
fetchcache_error_page(c, data);
}
break;
This change looks spurious. Please revert it.
Modified: branches/MarkieB/gtkmain/desktop/save_complete.c
URL:
http://source.netsurf-browser.org/branches/MarkieB/gtkmain/desktop/save_c...
==============================================================================
--- branches/MarkieB/gtkmain/desktop/save_complete.c (original)
+++ branches/MarkieB/gtkmain/desktop/save_complete.c Tue Aug 4 01:32:27 2009
@@ -709,22 +721,27 @@
* Create the inventory file listing original URLs.
*/
-bool save_complete_inventory(const char *path)
-{
- char spath[256];
+bool save_complete_inventory(const char *path,
+ struct save_complete_entry *list)
+{
+ char urlpath[256];
FILE *fp;
- char *pathstring;
-
- pathstring = strdup("%s/Inventory");
- if (!pathstring) {
+ char *urlstring, *pathstring;
+
+ urlstring = strdup("file://%s/Inventory");
+ if (urlstring == NULL) {
warn_user("NoMemory", 0);
return false;
}
- pathstring[2] = pathsep;
- snprintf(spath, sizeof spath, pathstring, path);
+ snprintf(urlpath, sizeof urlpath, urlstring, path);
+ free(urlstring);
This seems overly complex. This is better:
snprintf(urlpath, sizeof urlpath, "file://%s/Inventory", path);
Are you certain that path always begins with a '/'?
J.
7:38 p.m.
New subject: r9034 MarkieB - in /branches/MarkieB/gtkmain: content/fetchcache.c desktop/save_complete.c
On Tue, 11 Aug 2009 14:03:41 +0100, John-Mark Bell wrote:
snprintf(urlpath, sizeof urlpath, "file://%s/Inventory",
path);
Are you certain that path always begins with a '/'?
Whether it does or not is irrelevant, as NetSurf always ensures there
are three slashes after file: (I had to write my own file: handler for
the Amiga port because of this)
Regards
Chris
7:42 p.m.
New subject: r9034 MarkieB - in /branches/MarkieB/gtkmain: content/fetchcache.c desktop/save_complete.c
On Tue, 2009-08-11 at 18:38 +0100, Chris Young wrote:
On Tue, 11 Aug 2009 14:03:41 +0100, John-Mark Bell wrote:
> snprintf(urlpath, sizeof urlpath, "file://%s/Inventory", path);
>
> Are you certain that path always begins with a '/'?
Whether it does or not is irrelevant, as NetSurf always ensures there
are three slashes after file: (I had to write my own file: handler for
the Amiga port because of this)
It's entirely relevant; this URL is never fetched. It is simply used as
a mechanism for getting the platform-specific file path of the Inventory
file.
J.
1:13 p.m.
New subject: r9034 MarkieB - in /branches/MarkieB/gtkmain: content/fetchcache.c desktop/save_complete.c
John-Mark Bell wrote:
On Tue, 2009-08-11 at 18:38 +0100, Chris Young wrote:
> On Tue, 11 Aug 2009 14:03:41 +0100, John-Mark Bell wrote:
>
>> snprintf(urlpath, sizeof urlpath, "file://%s/Inventory", path);
>>
>> Are you certain that path always begins with a '/'?
>>
> Whether it does or not is irrelevant, as NetSurf always ensures there
> are three slashes after file: (I had to write my own file: handler for
> the Amiga port because of this)
>
It's entirely relevant; this URL is never fetched. It is simply used as
a mechanism for getting the platform-specific file path of the Inventory
file.
J.
Now the revised code adds a '/' unless there is one already; I hope
that's relatively standard - ie keeps everyone happy :-)
Chris, when you've got 10 minutes spare, the Amiga search code in
gtkmain branch has now changed, it should really be checked for a
compile at the very least;
For the longer term, I was looking at alternative ways to compile for
Amiga I see there's Aros, is that a worthwhile environment to organise
for testing NetSurf in Amiga?
Best regards
Mark
http://www.halloit.com
Key ID 046B65CF
7:54 p.m.
New subject: r9034 MarkieB - in /branches/MarkieB/gtkmain: content/fetchcache.c desktop/save_complete.c
On Thu, 13 Aug 2009 13:13:13 +0200, Mark wrote:
Chris, when you've got 10 minutes spare, the Amiga search code
in
gtkmain branch has now changed, it should really be checked for a
compile at the very least;
It has knocked something else out:
amiga/fetch_file.c: In function 'ami_fetch_file_send_callback':
amiga/fetch_file.c:222: error: too few arguments to function
'fetch_send_callback'
I saw errors for amiga/search.c on the way up the screen, but can't
scroll back now to find out what they were :(
For the longer term, I was looking at alternative ways to compile
for
Amiga I see there's Aros, is that a worthwhile environment to organise
for testing NetSurf in Amiga?
It won't work (or compile for) AROS, as that is designed to be
API-compatible with AmigaOS 3.1 (I think) and I use new AmigaOS
4.0 calls in several places.
If you want to modify it to work on AmigaOS 3.1 and AROS, that's a
completely new project :) AmigaOS 3.9 compatibility should be
obtainable without too many changes, but again that's extra work (but
has the advantage of being able to be compiled and tested within UAE)
The only option is to compile within OS4, or to set up a cross-compile
environment in Linux.
Regards
Chris
8:10 p.m.
New subject: r9034 MarkieB - in /branches/MarkieB/gtkmain: content/fetchcache.c desktop/save_complete.c
Chris Young wrote:
It has knocked something else out:
amiga/fetch_file.c: In function 'ami_fetch_file_send_callback':
amiga/fetch_file.c:222: error: too few arguments to function
'fetch_send_callback'
hopefully resolved in r9259
I saw errors for amiga/search.c on the way up the screen, but
can't
scroll back now to find out what they were :(
> For the longer term, I was looking at alternative ways to compile for
> Amiga I see there's Aros, is that a worthwhile environment to organise
> for testing NetSurf in Amiga?
>
It won't work (or compile for) AROS, as that is designed to be
API-compatible with AmigaOS 3.1 (I think) and I use new AmigaOS
4.0 calls in several places.
that was my thinking as I noticed the 3.1 version number
If you want to modify it to work on AmigaOS 3.1 and AROS, that's
a
completely new project :)
HaHa :) I'll say windows + gtk should keep me happy
for now :D
The only option is to compile within OS4, or to set up a
cross-compile
environment in Linux.
the cross-compile I'll try to look into in more detail now I've
successfully cross-compiled the libs for windows
Regards
Chris
Best regards
Mark
8:20 p.m.
New subject: r9034 MarkieB - in /branches/MarkieB/gtkmain: content/fetchcache.c desktop/save_complete.c
On Thu, 13 Aug 2009 20:10:53 +0200, Mark wrote:
Chris Young wrote:
> It has knocked something else out:
>
> amiga/fetch_file.c: In function 'ami_fetch_file_send_callback':
> amiga/fetch_file.c:222: error: too few arguments to function
'fetch_send_callback'
>
hopefully resolved in r9259
Yes, ta. Here are the other errors then:
COMPILE: amiga/search.c
amiga/search.c: In function 'ami_search_close':
amiga/search.c:187: error: 'struct gui_window' has no member named 'bw'
amiga/search.c:188: error: 'struct gui_window' has no member named 'bw'
amiga/search.c: In function 'ami_search_event':
amiga/search.c:215: warning: implicit declaration of function 'ami_search_flags'
amiga/search.c:218: warning: implicit declaration of function 'ami_search_string'
amiga/search.c:218: warning: passing argument 3 of 'search_step' makes pointer
from integer without a cast
amiga/search.c:227: warning: passing argument 3 of 'search_step' makes pointer
from integer without a cast
amiga/search.c: At top level:
amiga/search.c:292: error: conflicting types for 'ami_search_string'
amiga/search.c:218: error: previous implicit declaration of 'ami_search_string'
was here
amiga/search.c:309: error: conflicting types for 'gui_search_add_recent'
./desktop/search.h:60: error: previous declaration of 'gui_search_add_recent' was
here
amiga/search.c:340: error: conflicting types for 'ami_search_flags'
amiga/search.c:215: error: previous implicit declaration of 'ami_search_flags' was
here
gmake: *** [build-amiga-amiga/amiga_search.o] Error 1
187/188 probably just need a shared-> in front of bw.
> If you want to modify it to work on AmigaOS 3.1 and AROS,
that's a
> completely new project :)
HaHa :) I'll say windows + gtk should keep me happy for now :D
I should think so, yes!
> The only option is to compile within OS4, or to set up a
cross-compile
> environment in Linux.
>
the cross-compile I'll try to look into in more detail now I've
successfully cross-compiled the libs for windows
It shouldn't be too much hassle hopefully. There is a small ARexx
script (version.rexx) which will need re-writing in something else, it
creates a small file defining some additional version strings.
If you need any help please let me know. I've not tried
cross-compiling, but I might recognise certain compilation errors.
Regards
Chris
8:33 p.m.
New subject: r9034 MarkieB - in /branches/MarkieB/gtkmain: content/fetchcache.c desktop/save_complete.c
Chris Young wrote:
On Thu, 13 Aug 2009 20:10:53 +0200, Mark wrote:
It shouldn't be too much hassle hopefully. There is a small ARexx
script (version.rexx) which will need re-writing in something else, it
creates a small file defining some additional version strings.
If you need any help please let me know. I've not tried
cross-compiling, but I might recognise certain compilation errors.
Regards
Chris
sounds encouraging, I promise to at least try :-)
hopefully the search compile errors have now been addressed in r9260
Best regards
Mark
9:18 p.m.
New subject: r9034 MarkieB - in /branches/MarkieB/gtkmain: content/fetchcache.c desktop/save_complete.c
On Thu, 13 Aug 2009 20:33:36 +0200, Mark wrote:
sounds encouraging, I promise to at least try :-)
Cool.
hopefully the search compile errors have now been addressed in r9260
Yes, all compiling and working fine as far as I can tell.
Regards
Chris
6:32 p.m.
New subject: r9034 MarkieB - in /branches/MarkieB/gtkmain: content/fetchcache.c desktop/save_complete.c
On 13 Aug 2009, Chris Young wrote:
> For the longer term, I was looking at alternative ways to
compile for
> Amiga I see there's Aros, is that a worthwhile environment to organise
> for testing NetSurf in Amiga?
It won't work (or compile for) AROS, as that is designed to be
API-compatible with AmigaOS 3.1 (I think) and I use new AmigaOS
4.0 calls in several places.
If you want to modify it to work on AmigaOS 3.1 and AROS, that's a
completely new project :) AmigaOS 3.9 compatibility should be
obtainable without too many changes, but again that's extra work (but
has the advantage of being able to be compiled and tested within UAE)
The easiest way would be adapting my MorphOS port which uses MUI backend
and is compatible with AmigaOS 3.0 and AROS. Only if I had more time I
could finish soon but there are few MUI4 features not available in OS3 or
AROS yet.
But then it would not help with the OS4 port at all.
Ilkka
7:16 p.m.
New subject: r9034 MarkieB - in /branches/MarkieB/gtkmain: content/fetchcache.c desktop/save_complete.c
Hello
On 31.08.09, you wrote:
On 13 Aug 2009, Chris Young wrote:
>> For the longer term, I was looking at alternative ways to compile for
>> Amiga I see there's Aros, is that a worthwhile environment to organise
>> for testing NetSurf in Amiga?
>
> It won't work (or compile for) AROS, as that is designed to be
> API-compatible with AmigaOS 3.1 (I think) and I use new AmigaOS
> 4.0 calls in several places.
>
> If you want to modify it to work on AmigaOS 3.1 and AROS, that's a
> completely new project :) AmigaOS 3.9 compatibility should be
> obtainable without too many changes, but again that's extra work (but
> has the advantage of being able to be compiled and tested within UAE)
The easiest way would be adapting my MorphOS port which uses MUI backend
and is compatible with AmigaOS 3.0 and AROS. Only if I had more time I
Have you change your code to work with the newest netsurf changes ?
I am not sure if the changes are finished, but Artur have compile the SDL
netsurf it work stable (in 32 bit only)and little faster.
could finish soon but there are few MUI4 features not available in
OS3 or
AROS yet.
But then it would not help with the OS4 port at all.
Yes because OS4 use Reaction GUI the OS4 Port is only usable on OS4.
MUI have lots more features than Reaction and so MUI is much more popular,
but seem not furtherdevelop for OS4.
On AROS there is no reaction GUI Implementation.AOS 68k 3.9/4.0 Reaction
have no tab Gadget class.only AOS4.1 have this.
But whats AROS and AOS 68k have is the gtk+ to MUI wrapper.See also the
screenshots.
http://sourceforge.net/projects/gtk-mui/
see also the screenshots.the demos are old, but many checkin was before 3
months, so there is activity here.
maybe its worth a look and maybe usefull on riscos to wrap gtk+ to the
native Riscos GUI and so have only 1 netsurf Version that look as if this
is program with native GUI when there is less time to maintain a seperate
risc os Port
I plan to compile netsurf with that wrapper to see what and how it
work.because the sdl version very important features as scrolling and
better text box, i look in fltk code what to fix, but it seem lots work and
code add need.
Ilkka
Regards
12:04 a.m.
New subject: r9034 MarkieB - in /branches/MarkieB/gtkmain: content/fetchcache.c desktop/save_complete.c
On Mon, 31 Aug 2009 19:16:09 +0200, Bernd Roesch wrote:
Yes because OS4 use Reaction GUI the OS4 Port is only usable on OS4.
MUI have lots more features than Reaction and so MUI is much more popular,
but seem not furtherdevelop for OS4.
I don't want to get into MUI vs Reaction here, that's a matter of
opinion. Reaction is the official GUI toolkit for OS4 and has
everything I need for NetSurf. If somebody starts making me develop
for MUI I'll drop it.
AOS 68k 3.9/4.0 Reaction
have no tab Gadget class.only AOS4.1 have this.
That's nonsense. I'm using clicktab.gadget within NetSurf and it is
working perfectly well under OS4.0. In fact I don't understand why
Joerg couldn't use it in OWB under 4.0, the Autodoc for v53 says it
has been updated to allow dynamic updating of nodes but as far as I
can see, this just means you don't need to do a manual
RethinkLayout(). Which reminds me, I need to remove that for 4.1
users as it's a bit flickery with compositing off.
clicktab.gadget has been present since at least ClassAct v2 and exists
in OS3.5 and 3.9.
maybe its worth a look and maybe usefull on riscos to wrap gtk+ to
the
native Riscos GUI and so have only 1 netsurf Version that look as if this
is program with native GUI when there is less time to maintain a seperate
risc os Port
I think it's better to have custom code for each platform where
possible so any additional GUI features can be utilised. Otherwise
you are playing to the lowest common denominator all the time.
I plan to compile netsurf with that wrapper to see what and how it
work.
I'd be interested to see this.
Regards
Chris
5203
days inactive
5223
days old
netsurf-dev@netsurf-browser.org
11 comments
5 participants
participants (5)
-
Bernd Roesch -
Chris Young -
Ilkka Lehtoranta -
John-Mark Bell -
Mark