Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 06:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge. a=blocker (618101).

Browse Source
This commit is contained in:
Asaf Romano (Mano) 2011-01-20 23:30:22 +02:00
commit a3b643807d
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
browser/themes/gnomestripe/browser/browser.css
View File

@ -1120,14 +1120,6 @@ toolbar[iconsize="small"] #feed-button {
min-width: 280px;
}
/* Invalid form popup */
#invalid-form-popup {
-moz-appearance: none;
background-color: #fffcd6;
border: 1px solid #dad8b6;
font-weight: bold;
}
/* Notification popup */
#notification-popup {
min-width: 280px;

6
toolkit/components/places/src/Makefile.in
View File

@ -82,6 +82,12 @@ EXTRA_DSO_LDOPTS += \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
ifndef MOZ_ENABLE_LIBXUL
EXTRA_DSO_LDOPTS += \
$(MOZ_JS_LIBS) \
$(NULL)
endif
LOCAL_INCLUDES += -I$(srcdir)/../../build
# This is the default value. Must be in sync with the one defined in SQLite.

21
toolkit/components/places/src/PlaceInfo.cpp
View File

@ -38,7 +38,8 @@
#include "PlaceInfo.h"
#include "VisitInfo.h"
#include "nsIURI.h"
#include "nsContentUtils.h"
#include "nsServiceManagerUtils.h"
#include "nsIXPConnect.h"
namespace mozilla {
namespace places {
@ -112,13 +113,23 @@ PlaceInfo::GetVisits(JSContext* aContext,
JSObject* global = JS_GetGlobalForScopeChain(aContext);
NS_ENSURE_TRUE(global, NS_ERROR_UNEXPECTED);
static NS_DEFINE_CID(kXPConnectCID, NS_XPCONNECT_CID);
nsresult rv;
nsCOMPtr<nsIXPConnect> xpc(do_GetService(kXPConnectCID, &rv));
NS_ENSURE_SUCCESS(rv, rv);
for (VisitsArray::size_type idx = 0; idx < mVisits.Length(); idx++) {
jsval wrappedVisit;
nsresult rv = nsContentUtils::WrapNative(aContext, global, mVisits[idx],
&NS_GET_IID(mozIVisitInfo),
&wrappedVisit);
nsCOMPtr<nsIXPConnectJSObjectHolder> wrapper;
rv = xpc->WrapNative(aContext, global, mVisits[idx],
NS_GET_IID(mozIVisitInfo),
getter_AddRefs(wrapper));
NS_ENSURE_SUCCESS(rv, rv);
JSObject* jsobj;
rv = wrapper->GetJSObject(&jsobj);
NS_ENSURE_SUCCESS(rv, rv);
jsval wrappedVisit = OBJECT_TO_JSVAL(jsobj);
JSBool rc = JS_SetElement(aContext, visits, idx, &wrappedVisit);
NS_ENSURE_TRUE(rc, NS_ERROR_UNEXPECTED);
}