зеркало из https://github.com/mozilla/pjs.git
Back out some changes. Accidentally check 'em in.
This commit is contained in:
Родитель
8619b1a40b
Коммит
e1641e6e04
|
@ -471,8 +471,7 @@ XFE_RDFTreeView::notify(HT_Resource n, HT_Event whatHappened)
|
|||
D(debugEvent(n, whatHappened,"RTV"););
|
||||
switch (whatHappened) {
|
||||
case HT_EVENT_NODE_ADDED:
|
||||
updateRoot();
|
||||
// add_row(n);
|
||||
add_row(n);
|
||||
break;
|
||||
case HT_EVENT_NODE_DELETED_NODATA:
|
||||
{
|
||||
|
@ -647,7 +646,8 @@ XFE_RDFTreeView::add_row(int row)
|
|||
}
|
||||
|
||||
void
|
||||
XFE_RDFTreeView::add_row(HT_Resource node)
|
||||
XFE_RDFTreeView::add_row
|
||||
(HT_Resource node)
|
||||
{
|
||||
//HT_Resource node = GetNthItem (_ht_view, row);
|
||||
int row = HT_GetNodeIndex(_ht_view, node);
|
||||
|
@ -749,7 +749,6 @@ XFE_RDFTreeView::add_row(HT_Resource node)
|
|||
break;
|
||||
}
|
||||
/*D(fprintf(stderr,"Node data (%d, %d) = '%s'\n",row,ii,buffer););*/
|
||||
// ii is getting set to 1 here !!!!!!
|
||||
XmLGridSetStringsPos(_tree,
|
||||
XmCONTENT, row,
|
||||
XmCONTENT, ii,
|
||||
|
|
|
@ -494,27 +494,22 @@ fe_GetURL (MWContext *context, URL_Struct *url, Boolean skip_get_url)
|
|||
fe_SetURLString (context, url);
|
||||
}
|
||||
|
||||
if (url->history_num == 0) {
|
||||
/* Create URL from prev history entry to preserve security, etc. */
|
||||
urlcp = SHIST_CreateURLStructFromHistoryEntry(context, he);
|
||||
|
||||
/* Swap addresses. */
|
||||
temp = url->address;
|
||||
url->address = urlcp->address;
|
||||
urlcp->address = temp;
|
||||
|
||||
/* set history_num correctly */
|
||||
/*urlcp->history_num = url->history_num;*/
|
||||
|
||||
/* Free old URL, and reassign. */
|
||||
NET_FreeURLStruct(url);
|
||||
url = urlcp;
|
||||
/* Create URL from prev history entry to preserve security, etc. */
|
||||
urlcp = SHIST_CreateURLStructFromHistoryEntry(context, he);
|
||||
|
||||
/*fe_RefreshAllAnchors ();*/
|
||||
SHIST_AddDocument(context, SHIST_CreateHistoryEntry(url,he->title));
|
||||
} else {
|
||||
SHIST_SetCurrent(&context->hist, url->history_num);
|
||||
}
|
||||
/* Swap addresses. */
|
||||
temp = url->address;
|
||||
url->address = urlcp->address;
|
||||
urlcp->address = temp;
|
||||
|
||||
/* set history_num correctly */
|
||||
urlcp->history_num = url->history_num;
|
||||
|
||||
/* Free old URL, and reassign. */
|
||||
NET_FreeURLStruct(url);
|
||||
url = urlcp;
|
||||
NET_FreeURLStruct (url);
|
||||
fe_RefreshAllAnchors ();
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
|
|
Загрузка…
Ссылка в новой задаче