зеркало из https://github.com/mozilla/gecko-dev.git
fix for #8249 to get card pane to work on linux.
I had to remove NO_GET_XPT=1 line from Makefile.in.
This was causing the following error at run time:
JavaScript error: uncaught exception: Could not convert JavaScript argument (NULL value can not be used for a C++ reference type) arg 0 [nsIRDFResource.QueryInterface, {file: file:////builds/sspitzer/MOZILLA/06.16.1999/04.30/mozilla/dist/bin/chrome/addressbook/content/default/resultPane.xul, line: 160}]
This commit is contained in:
sspitzer%netscape.com
Родитель
19db4eb6e6
Коммит
fd2b71c697
|
|
@ -16,10 +16,3 @@
|
|||
# This is a list of local files which get copied to the mozilla:dist:mailnews directory
|
||||
#
|
||||
|
||||
#[installed by xpidl] nsIAbBase.h
|
||||
#[installed by xpidl] nsIAbListener.h
|
||||
#[installed by xpidl] nsIAbDirectory.h
|
||||
#[installed by xpidl] nsIAbCard.h
|
||||
#[installed by xpidl] nsIAddrDBListener.h
|
||||
#[installed by xpidl] nsIAddrDBAnnouncer.h
|
||||
#[installed by xpidl] nsIAddrDatabase.h
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ srcdir = @srcdir@
|
|||
MODULE = addrbook
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
NO_GEN_XPT=1
|
||||
XPIDLSRCS = \
|
||||
nsIAbBase.idl \
|
||||
nsIAbListener.idl \
|
||||
|
|
@ -34,10 +33,6 @@ XPIDLSRCS = \
|
|||
$(NULL)
|
||||
|
||||
EXPORTS = \
|
||||
nsIAbBase.h \
|
||||
nsIAbListener.h \
|
||||
nsIAbDirectory.h \
|
||||
nsIAbCard.h \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
|
|
|||
|
|
@ -1,65 +0,0 @@
|
|||
/*
|
||||
* DO NOT EDIT. THIS FILE IS GENERATED FROM nsIAbBase.idl
|
||||
*/
|
||||
|
||||
#ifndef __gen_nsIAbBase_h__
|
||||
#define __gen_nsIAbBase_h__
|
||||
|
||||
#include "nsISupports.h" /* interface nsISupports */
|
||||
#include "nsICollection.h" /* interface nsICollection */
|
||||
#include "nsIEnumerator.h" /* interface nsIEnumerator */
|
||||
#include "nsIAbListener.h" /* interface nsIAbListener */
|
||||
|
||||
#ifdef XPIDL_JS_STUBS
|
||||
#include "jsapi.h"
|
||||
#endif
|
||||
class nsIAbListener; /* forward decl */
|
||||
|
||||
/* starting interface: nsIAbBase */
|
||||
|
||||
/* {013DD009-F73B-11d2-A2DA-001083003D0C} */
|
||||
#define NS_IABBASE_IID_STR "013DD009-F73B-11d2-A2DA-001083003D0C"
|
||||
#define NS_IABBASE_IID \
|
||||
{0x013DD009, 0xF73B, 0x11d2, \
|
||||
{ 0xA2, 0xDA, 0x00, 0x10, 0x83, 0x00, 0x3D, 0x0C }}
|
||||
|
||||
class nsIAbBase : public nsICollection {
|
||||
public:
|
||||
NS_DEFINE_STATIC_IID_ACCESSOR(NS_IABBASE_IID)
|
||||
|
||||
/* readonly attribute string URI; */
|
||||
NS_IMETHOD GetURI(char * *aURI) = 0;
|
||||
|
||||
/* attribute string name; */
|
||||
NS_IMETHOD GetName(char * *aName) = 0;
|
||||
NS_IMETHOD SetName(char * aName) = 0;
|
||||
|
||||
/* nsISupports GetChildNamed (in string name); */
|
||||
NS_IMETHOD GetChildNamed(const char *name, nsISupports **_retval) = 0;
|
||||
|
||||
/* attribute nsIAbBase parent; */
|
||||
NS_IMETHOD GetParent(nsIAbBase * *aParent) = 0;
|
||||
NS_IMETHOD SetParent(nsIAbBase * aParent) = 0;
|
||||
|
||||
/* nsIEnumerator GetChildNodes (); */
|
||||
NS_IMETHOD GetChildNodes(nsIEnumerator **_retval) = 0;
|
||||
|
||||
/* void AddAddrBookListener (in nsIAbListener listener); */
|
||||
NS_IMETHOD AddAddrBookListener(nsIAbListener *listener) = 0;
|
||||
|
||||
/* void RemoveAddrBookListener (in nsIAbListener listener); */
|
||||
NS_IMETHOD RemoveAddrBookListener(nsIAbListener *listener) = 0;
|
||||
|
||||
/* void AddUnique (in nsISupports element); */
|
||||
NS_IMETHOD AddUnique(nsISupports *element) = 0;
|
||||
|
||||
/* void ReplaceElement (in nsISupports element, in nsISupports newElement); */
|
||||
NS_IMETHOD ReplaceElement(nsISupports *element, nsISupports *newElement) = 0;
|
||||
|
||||
#ifdef XPIDL_JS_STUBS
|
||||
static NS_EXPORT_(JSObject *) InitJSClass(JSContext *cx);
|
||||
static NS_EXPORT_(JSObject *) GetJSObject(JSContext *cx, nsIAbBase *priv);
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif /* __gen_nsIAbBase_h__ */
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
/*
|
||||
* DO NOT EDIT. THIS FILE IS GENERATED FROM nsIAbCard.idl
|
||||
*/
|
||||
|
||||
#ifndef __gen_nsIAbCard_h__
|
||||
#define __gen_nsIAbCard_h__
|
||||
|
||||
#include "nsISupports.h" /* interface nsISupports */
|
||||
#include "nsIAbBase.h" /* interface nsIAbBase */
|
||||
#include "nsICollection.h" /* interface nsICollection */
|
||||
#include "nsIEnumerator.h" /* interface nsIEnumerator */
|
||||
#include "nsIAbListener.h" /* interface nsIAbListener */
|
||||
|
||||
#ifdef XPIDL_JS_STUBS
|
||||
#include "jsapi.h"
|
||||
#endif
|
||||
|
||||
/* starting interface: nsIAbCard */
|
||||
|
||||
/* {FA5C977F-04C8-11d3-A2EB-001083003D0C} */
|
||||
#define NS_IABCARD_IID_STR "FA5C977F-04C8-11d3-A2EB-001083003D0C"
|
||||
#define NS_IABCARD_IID \
|
||||
{0xFA5C977F, 0x04C8, 0x11d3, \
|
||||
{ 0xA2, 0xEB, 0x00, 0x10, 0x83, 0x00, 0x3D, 0x0C }}
|
||||
|
||||
class nsIAbCard : public nsIAbBase {
|
||||
public:
|
||||
NS_DEFINE_STATIC_IID_ACCESSOR(NS_IABCARD_IID)
|
||||
|
||||
/* attribute string personName; */
|
||||
NS_IMETHOD GetPersonName(char * *aPersonName) = 0;
|
||||
NS_IMETHOD SetPersonName(char * aPersonName) = 0;
|
||||
|
||||
/* attribute string listName; */
|
||||
NS_IMETHOD GetListName(char * *aListName) = 0;
|
||||
NS_IMETHOD SetListName(char * aListName) = 0;
|
||||
|
||||
/* attribute string email; */
|
||||
NS_IMETHOD GetEmail(char * *aEmail) = 0;
|
||||
NS_IMETHOD SetEmail(char * aEmail) = 0;
|
||||
|
||||
/* attribute string workPhone; */
|
||||
NS_IMETHOD GetWorkPhone(char * *aWorkPhone) = 0;
|
||||
NS_IMETHOD SetWorkPhone(char * aWorkPhone) = 0;
|
||||
|
||||
/* attribute string city; */
|
||||
NS_IMETHOD GetCity(char * *aCity) = 0;
|
||||
NS_IMETHOD SetCity(char * aCity) = 0;
|
||||
|
||||
/* attribute string organization; */
|
||||
NS_IMETHOD GetOrganization(char * *aOrganization) = 0;
|
||||
NS_IMETHOD SetOrganization(char * aOrganization) = 0;
|
||||
|
||||
/* attribute string nickname; */
|
||||
NS_IMETHOD GetNickname(char * *aNickname) = 0;
|
||||
NS_IMETHOD SetNickname(char * aNickname) = 0;
|
||||
|
||||
#ifdef XPIDL_JS_STUBS
|
||||
static NS_EXPORT_(JSObject *) InitJSClass(JSContext *cx);
|
||||
static NS_EXPORT_(JSObject *) GetJSObject(JSContext *cx, nsIAbCard *priv);
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif /* __gen_nsIAbCard_h__ */
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
/*
|
||||
* DO NOT EDIT. THIS FILE IS GENERATED FROM nsIAbDirectory.idl
|
||||
*/
|
||||
|
||||
#ifndef __gen_nsIAbDirectory_h__
|
||||
#define __gen_nsIAbDirectory_h__
|
||||
|
||||
#include "nsISupports.h" /* interface nsISupports */
|
||||
#include "nsIAbBase.h" /* interface nsIAbBase */
|
||||
#include "nsICollection.h" /* interface nsICollection */
|
||||
#include "nsIEnumerator.h" /* interface nsIEnumerator */
|
||||
#include "nsIAbCard.h" /* interface nsIAbCard */
|
||||
#include "nsIAbListener.h" /* interface nsIAbListener */
|
||||
|
||||
#ifdef XPIDL_JS_STUBS
|
||||
#include "jsapi.h"
|
||||
#endif
|
||||
|
||||
/* starting interface: nsIAbDirectory */
|
||||
|
||||
/* {1920E485-0709-11d3-A2EC-001083003D0C} */
|
||||
#define NS_IABDIRECTORY_IID_STR "1920E485-0709-11d3-A2EC-001083003D0C"
|
||||
#define NS_IABDIRECTORY_IID \
|
||||
{0x1920E485, 0x0709, 0x11d3, \
|
||||
{ 0xA2, 0xEC, 0x00, 0x10, 0x83, 0x00, 0x3D, 0x0C }}
|
||||
|
||||
class nsIAbDirectory : public nsIAbBase {
|
||||
public:
|
||||
NS_DEFINE_STATIC_IID_ACCESSOR(NS_IABDIRECTORY_IID)
|
||||
|
||||
/* nsIEnumerator GetChildCards (); */
|
||||
NS_IMETHOD GetChildCards(nsIEnumerator **_retval) = 0;
|
||||
|
||||
/* nsIAbCard CreateCardFromDirectory (); */
|
||||
NS_IMETHOD CreateCardFromDirectory(nsIAbCard **_retval) = 0;
|
||||
|
||||
#ifdef XPIDL_JS_STUBS
|
||||
static NS_EXPORT_(JSObject *) InitJSClass(JSContext *cx);
|
||||
static NS_EXPORT_(JSObject *) GetJSObject(JSContext *cx, nsIAbDirectory *priv);
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif /* __gen_nsIAbDirectory_h__ */
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
/*
|
||||
* DO NOT EDIT. THIS FILE IS GENERATED FROM nsIAbListener.idl
|
||||
*/
|
||||
|
||||
#ifndef __gen_nsIAbListener_h__
|
||||
#define __gen_nsIAbListener_h__
|
||||
|
||||
#include "nsISupports.h" /* interface nsISupports */
|
||||
#include "nsIAbBase.h" /* interface nsIAbBase */
|
||||
#include "nsICollection.h" /* interface nsICollection */
|
||||
#include "nsIEnumerator.h" /* interface nsIEnumerator */
|
||||
|
||||
#ifdef XPIDL_JS_STUBS
|
||||
#include "jsapi.h"
|
||||
#endif
|
||||
class nsIAbBase; /* forward decl */
|
||||
|
||||
/* starting interface: nsIAbListener */
|
||||
|
||||
/* {1920E484-0709-11d3-A2EC-001083003D0C} */
|
||||
#define NS_IABLISTENER_IID_STR "1920E484-0709-11d3-A2EC-001083003D0C"
|
||||
#define NS_IABLISTENER_IID \
|
||||
{0x1920E484, 0x0709, 0x11d3, \
|
||||
{ 0xA2, 0xEC, 0x00, 0x10, 0x83, 0x00, 0x3D, 0x0C }}
|
||||
|
||||
class nsIAbListener : public nsISupports {
|
||||
public:
|
||||
NS_DEFINE_STATIC_IID_ACCESSOR(NS_IABLISTENER_IID)
|
||||
|
||||
/* void OnItemAdded (in nsIAbBase parentDir, in nsISupports item); */
|
||||
NS_IMETHOD OnItemAdded(nsIAbBase *parentDir, nsISupports *item) = 0;
|
||||
|
||||
/* void OnItemRemoved (in nsIAbBase parentDir, in nsISupports item); */
|
||||
NS_IMETHOD OnItemRemoved(nsIAbBase *parentDir, nsISupports *item) = 0;
|
||||
|
||||
/* void OnItemPropertyChanged (in nsISupports item, in string property, in string oldValue, in string newValue); */
|
||||
NS_IMETHOD OnItemPropertyChanged(nsISupports *item, const char *property, const char *oldValue, const char *newValue) = 0;
|
||||
|
||||
#ifdef XPIDL_JS_STUBS
|
||||
static NS_EXPORT_(JSObject *) InitJSClass(JSContext *cx);
|
||||
static NS_EXPORT_(JSObject *) GetJSObject(JSContext *cx, nsIAbListener *priv);
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif /* __gen_nsIAbListener_h__ */
|
||||
Загрузка…
Ссылка в новой задаче