Add changes from Michael O'Reilly <michael@metal.iinet.net.au> which

initialize RDF and point the RDF progress info at a dummy frame.


git-svn-id: svn://10.0.0.236/trunk@10943 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
blizzard%appliedtheory.com
1998-09-24 20:28:56 +00:00
parent 01045ca981
commit 4cbd36c8b5
3 changed files with 34 additions and 4 deletions

View File

@@ -2,6 +2,7 @@
#include "xpgetstr.h"
#include <signal.h>
#include <pwd.h>
#ifdef NSPR20
#include "private/prpriv.h" /* for PR_NewNamedMonitor */

View File

@@ -24,8 +24,16 @@
#include "xp_core.h"
#include "structs.h"
#include "ntypes.h"
#include "g-browser-frame.h"
MWContext*
FE_GetRDFContext()
{
MozBrowserFrame * frame;
frame = moz_browser_frame_create();
moz_frame_show(MOZ_FRAME(frame));
printf("FE_GetRDFContext (done?)\n");
return moz_frame_get_context(MOZ_FRAME(frame));
}

View File

@@ -25,10 +25,12 @@
#include "net.h"
#include "plevent.h"
#include "xp.h"
#include "rdf.h"
#include "g-browser-frame.h"
extern char *fe_home_dir;
extern char *fe_config_dir;
gint gnomefe_depth;
GdkVisual *gnomefe_visual;
@@ -135,6 +137,10 @@ main(int argc,
*slash = '\0';
}
/* Hmm. XFE claims InitNetLib needs to happen before pref init */
/* The unit for tcp buffer size is changed from kbytes to bytes */
NET_InitNetLib (8192, 50);
{
char buf [1024];
PR_snprintf (buf, sizeof (buf), "%s/%s", fe_home_dir,
@@ -164,17 +170,32 @@ main(int argc,
GH_InitGlobalHistory();
/* The unit for tcp buffer size is changed from kbytes to bytes */
NET_InitNetLib (8192, 50);
IL_Init();
LM_InitMocha ();
NPL_Init();
initial_frame = moz_browser_frame_create();
moz_frame_show(MOZ_FRAME(initial_frame));
/* Initialize RDF */
{
RDF_InitParamsStruct rdf_params = {0, };
rdf_params.profileURL =
XP_PlatformFileToURL(fe_config_dir);
rdf_params.bookmarksURL =
XP_PlatformFileToURL(fe_GetConfigDirFilename("bookmarks.html"));
rdf_params.globalHistoryURL =
XP_PlatformFileToURL(fe_GetConfigDirFilename("history.db"));
RDF_Init(&rdf_params);
XP_FREEIF(rdf_params.profileURL);
XP_FREEIF(rdf_params.bookmarksURL);
XP_FREEIF(rdf_params.globalHistoryURL);
}
NPL_Init();
if(argc > 1)
url = NET_CreateURLStruct(argv[1], NET_NORMAL_RELOAD);
else