cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.2.10.

Browse Source
This commit is contained in:
Joe Marcus Clarke 2003-04-20 04:08:54 +00:00
parent 058f00390b
commit 9d6e55425f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=79335
10 changed files with 13 additions and 496 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/galeon/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= galeon
PORTVERSION= 1.2.9
PORTVERSION= 1.2.10
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -33,7 +33,7 @@ MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.0"
.if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-embedded-devel"
MOZILLA= ${WITH_MOZILLA}
HEADERS_SUFX= -devel
MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="trunk"
MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.4a"
.else
.if ${WITH_MOZILLA}=="mozilla-embedded"
MOZILLA= mozilla-embedded
@ -54,7 +54,7 @@ USE_REINPLACE= yes
CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \
--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \
${MOZ_CONFIGURE_ARGS}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -D_REENTRANT ${PTHREAD_CFLAGS}" \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
MAN1= galeon.1

2
www/galeon/distinfo
View File

@ -1 +1 @@
MD5 (galeon-1.2.9.tar.gz) = c4c1253e2fc9fd3ab04757bc1abe9819
MD5 (galeon-1.2.10.tar.gz) = 4fbcb46e5803eec5a6b5107993302c02

19
www/galeon/files/patch-ab
View File

@ -1,5 +1,5 @@
--- src/galeon.in.orig Thu Dec 27 19:13:42 2001
+++ src/galeon.in Mon Oct 21 23:28:37 2002
--- src/galeon.in.orig Thu Apr 3 15:14:49 2003
+++ src/galeon.in Sat Apr 19 23:38:10 2003
@@ -4,18 +4,14 @@
if test -n "$MOZILLA_FIVE_HOME"; then
@ -26,7 +26,7 @@
else
echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
exit
@@ -27,16 +23,12 @@
@@ -27,11 +23,12 @@
MOZILLA_FIVE_HOME=$MOZILLA_HOME
export MOZILLA_FIVE_HOME
@ -35,14 +35,13 @@
- if [ "`cat /etc/redhat-release`" = "Red Hat Linux release 7.1 (Seawolf)" ]; then
- export LD_ASSUME_KERNEL=2.2.5
- fi
-fi
+MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
+export MOZ_PLUGIN_PATH
if [ -f ./galeon-bin ]; then
exec ./galeon-bin "$@"
else
-exec $dist_bin/galeon-bin "$@"
+exec %%PREFIX%%/bin/galeon-bin "$@"
+
+if [ -f %%FLASHPLAYER%% ]; then
+ LD_PRELOAD=%%FLASHPLAYER%%
+ export LD_PRELOAD
fi
-exec "$dist_bin/galeon-bin" "$@"
+exec %%PREFIX%%/bin/galeon-bin "$@"

9
www/galeon/files/patch-configure
View File

@ -8,12 +8,3 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -12535,7 +12536,7 @@
elif test "$_moz_snap" = "1.3b" ; then
MOZILLA_SNAPSHOT=5
elif test "$_moz_snap" = "trunk" ; then
- MOZILLA_SNAPSHOT=6
+ MOZILLA_SNAPSHOT=7
else
MOZILLA_SNAPSHOT=3
fi

14
www/galeon/files/patch-src_mozilla_ContentHandler.cpp
View File

@ -1,14 +0,0 @@
--- src/mozilla/ContentHandler.cpp.orig Sat Apr 12 16:37:06 2003
+++ src/mozilla/ContentHandler.cpp Sat Apr 12 16:38:54 2003
@@ -364,9 +364,9 @@
nsCOMPtr<nsIFilePicker> aFilePicker =
do_CreateInstance (G_FILEPICKER_CONTRACTID);
- NS_NAMED_LITERAL_STRING (title, _("Select the destination filename"));
+ NS_NAMED_LITERAL_CSTRING (title, _("Select the destination filename"));
- aFilePicker->Init (aWindowInternal, title.get(),
+ aFilePicker->Init (aWindowInternal, PromiseFlatString(NS_ConvertUTF8toUCS2(title)).get(),
nsIFilePicker::modeSave);
aFilePicker->SetDefaultString (aDefaultFile);
aFilePicker->SetDisplayDirectory (saveDir);

74
www/galeon/files/patch-src_mozilla_GaleonWrapper.cpp
View File

@ -1,74 +0,0 @@
--- src/mozilla/GaleonWrapper.cpp.orig Mon Apr 7 23:44:37 2003
+++ src/mozilla/GaleonWrapper.cpp Mon Apr 7 23:44:44 2003
@@ -739,16 +739,24 @@
nsCOMPtr<nsIDOMDocument> aDOMDocument;
- result = GetDOMDocument (getter_AddRefs(aDOMDocument));
+ result = GetDOMDocument(getter_AddRefs(aDOMDocument));
if (NS_FAILED(result) || !aDOMDocument) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDocument> doc = do_QueryInterface(aDOMDocument);
- if(!doc) return NS_ERROR_FAILURE;
+ if (!doc) return NS_ERROR_FAILURE;
+
+#if MOZILLA_SNAPSHOT > 6
+ nsString docTitle;
+ result = doc->GetDocumentTitle(docTitle);
+ if (NS_FAILED(result)) return NS_ERROR_FAILURE;
+ *title = mozilla_unicode_to_locale(docTitle.get());
+#else
const nsString* t;
t = doc->GetDocumentTitle();
- *title = mozilla_unicode_to_locale (t->get());
+ *title = mozilla_unicode_to_locale(t->get());
+#endif
return NS_OK;
}
@@ -815,30 +823,35 @@
}
-nsresult GaleonWrapper::SetSitePermission (gboolean block, PRInt32 type)
+nsresult GaleonWrapper::SetSitePermission (PRBool allow, PRUint32 type)
{
nsresult result;
nsCOMPtr<nsIDOMDocument> DOMDocument;
- result = GetDOMDocument (getter_AddRefs(DOMDocument));
+ result = GetDOMDocument(getter_AddRefs(DOMDocument));
if (NS_FAILED(result) || !DOMDocument) return NS_ERROR_FAILURE;
- nsCOMPtr<nsIDocument> doc = do_QueryInterface (DOMDocument);
+ nsCOMPtr<nsIDocument> doc = do_QueryInterface(DOMDocument);
if (!doc) return NS_ERROR_FAILURE;
nsCOMPtr<nsIURI> uri;
doc->GetDocumentURL(getter_AddRefs(uri));
nsCAutoString url;
- uri->GetSpec (url);
+ uri->GetSpec(url);
nsCOMPtr<nsIPermissionManager> permissionManager =
- do_CreateInstance (NS_PERMISSIONMANAGER_CONTRACTID);
+ do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
-#if MOZILLA_SNAPSHOT > 2
- result = permissionManager->Add (url, block ? PR_TRUE : PR_FALSE, type);
+#if MOZILLA_SNAPSHOT > 6
+ result = permissionManager->Add(uri, type,
+ allow ?
+ static_cast<PRUint32>(nsIPermissionManager::ALLOW_ACTION) :
+ static_cast<PRUint32>(nsIPermissionManager::DENY_ACTION));
+#elif MOZILLA_SNAPSHOT > 2
+ result = permissionManager->Add (url, allow, type);
#else
- result = permissionManager->Add (url.get(), block ? PR_TRUE : PR_FALSE, type);
+ result = permissionManager->Add (url.get(), allow, type);
#endif
return result;

11
www/galeon/files/patch-src_mozilla_GaleonWrapper.h
View File

@ -1,11 +0,0 @@
--- src/mozilla/GaleonWrapper.h.orig Mon Apr 7 23:45:09 2003
+++ src/mozilla/GaleonWrapper.h Mon Apr 7 23:45:14 2003
@@ -80,7 +80,7 @@
nsresult GoToHistoryIndex (PRInt16 index);
- nsresult SetSitePermission( PRBool permission, PRInt32 type );
+ nsresult SetSitePermission( PRBool permission, PRUint32 type );
nsresult ForceCharacterSet (char *charset);

11
www/galeon/files/patch-src_mozilla_Makefile.in
View File

@ -1,11 +0,0 @@
--- src/mozilla/Makefile.in.orig Mon Apr 7 23:35:27 2003
+++ src/mozilla/Makefile.in Mon Apr 7 23:35:37 2003
@@ -277,7 +277,7 @@
$(GALEON_DEPENDENCY_CFLAGS) \
-DLIB_DIR=\"$(pkglibdir)\" \
-DSHARE_DIR=\"$(pkgdatadir)\" \
- -DNEW_H=\<new\>
+ -include $(MOZILLA_INCLUDE_ROOT)/mozilla-config.h
libgaleon_xpcom_la_LIBADD = $(GALEON_XPCOM_DEPENDENCY_LIBS) \

338
www/galeon/files/patch-src_mozilla_mozilla.cpp
View File

@ -1,338 +0,0 @@
--- src/mozilla/mozilla.cpp.orig Sat Feb 15 14:19:59 2003
+++ src/mozilla/mozilla.cpp Thu Apr 10 13:01:20 2003
@@ -1041,17 +1041,17 @@
* mozilla_list_cookies: get a list of all saved cookies
*/
extern "C" GList *
-mozilla_list_cookies (void)
+mozilla_list_cookies(void)
{
GList *cookies = NULL;
nsresult result;
nsCOMPtr<nsICookieManager> cookieManager =
- do_CreateInstance (NS_COOKIEMANAGER_CONTRACTID);
+ do_GetService(NS_COOKIEMANAGER_CONTRACTID);
nsCOMPtr<nsISimpleEnumerator> cookieEnumerator;
result =
- cookieManager->GetEnumerator (getter_AddRefs(cookieEnumerator));
- g_return_val_if_fail (NS_SUCCEEDED(result), NULL);
+ cookieManager->GetEnumerator(getter_AddRefs(cookieEnumerator));
+ g_return_val_if_fail(NS_SUCCEEDED(result), NULL);
PRBool enumResult;
for (cookieEnumerator->HasMoreElements(&enumResult) ;
enumResult == PR_TRUE ;
@@ -1060,39 +1060,39 @@
Cookie *c;
nsCOMPtr<nsICookie> nsCookie;
- result = cookieEnumerator->GetNext (getter_AddRefs(nsCookie));
- g_return_val_if_fail (NS_SUCCEEDED(result), NULL);
+ result = cookieEnumerator->GetNext(getter_AddRefs(nsCookie));
+ g_return_val_if_fail(NS_SUCCEEDED(result), NULL);
- c = g_new0 (Cookie, 1);
+ c = g_new0(Cookie, 1);
nsCAutoString transfer;
- nsCookie->GetHost (transfer);
- c->base.domain = g_strdup (transfer.get());
- nsCookie->GetName (transfer);
- c->name = g_strdup (transfer.get());
- nsCookie->GetValue (transfer);
- c->value = g_strdup (transfer.get());
- nsCookie->GetPath (transfer);
- c->path = g_strdup (transfer.get());
+ nsCookie->GetHost(transfer);
+ c->base.domain = g_strdup(transfer.get());
+ nsCookie->GetName(transfer);
+ c->name = g_strdup(transfer.get());
+ nsCookie->GetValue(transfer);
+ c->value = g_strdup(transfer.get());
+ nsCookie->GetPath(transfer);
+ c->path = g_strdup(transfer.get());
PRBool isSecure;
- nsCookie->GetIsSecure (&isSecure);
+ nsCookie->GetIsSecure(&isSecure);
if (isSecure == PR_TRUE)
- c->secure = g_strdup (_("Yes"));
+ c->secure = g_strdup(_("Yes"));
else
- c->secure = g_strdup (_("No"));
+ c->secure = g_strdup(_("No"));
PRUint64 dateTime;
- nsCookie->GetExpires (&dateTime);
+ nsCookie->GetExpires(&dateTime);
if(dateTime == 0)
- c->expire = g_strdup (_("End of current session"));
+ c->expire = g_strdup(_("End of current session"));
else
- c->expire = g_strdup_printf ("%s",ctime((time_t*)&dateTime));
+ c->expire = g_strdup_printf("%s",ctime((time_t*)&dateTime));
- cookies = g_list_prepend (cookies, c);
+ cookies = g_list_prepend(cookies, c);
}
- cookies = g_list_reverse (cookies);
+ cookies = g_list_reverse(cookies);
return cookies;
}
@@ -1102,16 +1102,20 @@
*/
extern "C" GList *
+#if MOZILLA_SNAPSHOT > 6
+mozilla_get_permissions (guint type)
+#else
mozilla_get_permissions (int type)
+#endif
{
GList *permissions = NULL;
nsresult result;
nsCOMPtr<nsIPermissionManager> permissionManager =
- do_CreateInstance (NS_PERMISSIONMANAGER_CONTRACTID);
+ do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
nsCOMPtr<nsISimpleEnumerator> permissionEnumerator;
result = permissionManager->
- GetEnumerator (getter_AddRefs(permissionEnumerator));
- g_return_val_if_fail (NS_SUCCEEDED(result), NULL);
+ GetEnumerator(getter_AddRefs(permissionEnumerator));
+ g_return_val_if_fail(NS_SUCCEEDED(result), NULL);
PRBool enumResult;
for (permissionEnumerator->HasMoreElements(&enumResult) ;
enumResult == PR_TRUE ;
@@ -1119,32 +1123,50 @@
{
nsCOMPtr<nsIPermission> nsPermission;
result = permissionEnumerator->
- GetNext (getter_AddRefs(nsPermission));
- g_return_val_if_fail (NS_SUCCEEDED(result), NULL);
+ GetNext(getter_AddRefs(nsPermission));
+ g_return_val_if_fail(NS_SUCCEEDED(result), NULL);
+#if MOZILLA_SNAPSHOT > 6
+ PRUint32 cType;
+#else
PRInt32 cType;
- nsPermission->GetType (&cType);
+#endif
+ nsPermission->GetType(&cType);
if (cType == type)
{
- BlockedHost *b = g_new0 (BlockedHost, 1);
- gchar *tmp = NULL;
+ BlockedHost *b = g_new0(BlockedHost, 1);
- nsPermission->GetHost (&tmp);
- b->domain = g_strdup (tmp);
- nsMemory::Free (tmp);
+#if MOZILLA_SNAPSHOT > 6
+ nsCString host;
+ nsPermission->GetHost(host);
+ b->domain = g_strdup(host.get());
+
+ PRUint32 cap;
+ nsPermission->GetCapability(&cap);
+ if (cap == nsIPermissionManager::ALLOW_ACTION)
+ b->type = g_strdup(_("Allowed"));
+ else if (cap == nsIPermissionManager::DENY_ACTION)
+ b->type = g_strdup(_("Blocked"));
+ else
+ b->type = g_strdup(_("Unknown"));
+#else
+ nsXPIDLCString host;
+ nsPermission->GetHost(getter_Copies(host));
+ b->domain = g_strdup(host.get());
PRBool cap;
- nsPermission->GetCapability (&cap);
- if (cap == PR_TRUE)
- b->type = g_strdup (_("Allowed"));
- else
- b->type = g_strdup (_("Blocked"));
+ nsPermission->GetCapability(&cap);
+ if (cap == PR_TRUE)
+ b->type = g_strdup(_("Allowed"));
+ else
+ b->type = g_strdup(_("Blocked"));
+#endif
- permissions = g_list_prepend (permissions, b);
+ permissions = g_list_prepend(permissions, b);
}
}
- permissions = g_list_reverse (permissions);
+ permissions = g_list_reverse(permissions);
return permissions;
};
@@ -1152,16 +1174,25 @@
* mozilla_set_url_permission: change permissions for a URL
*/
extern "C" void
-mozilla_set_url_permission (const char *imgURL, gint type, gboolean allow)
+mozilla_set_url_permission(const char *imgURL, guint type, gboolean allow)
{
nsCOMPtr<nsIPermissionManager> permissionManager =
- do_CreateInstance (NS_PERMISSIONMANAGER_CONTRACTID);
+ do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
-#if MOZILLA_SNAPSHOT > 2
- permissionManager->Add (nsDependentCString(imgURL),
- allow ? PR_TRUE : PR_FALSE, type);
+#if MOZILLA_SNAPSHOT > 6
+ nsCOMPtr<nsIURI> url;
+ nsresult result = NS_NewURI(getter_AddRefs(url), nsDependentCString(imgURL));
+ if(NS_FAILED(result) || !url) return;
+
+ permissionManager->Add(url, type,
+ allow ?
+ static_cast<PRUint32>(nsIPermissionManager::ALLOW_ACTION) :
+ static_cast<PRUint32>(nsIPermissionManager::DENY_ACTION));
+#elif MOZILLA_SNAPSHOT > 2
+ permissionManager->Add(nsDependentCString(imgURL),
+ allow ? PR_TRUE : PR_FALSE, type);
#else
- permissionManager->Add (imgURL, allow ? PR_TRUE : PR_FALSE, type);
+ permissionManager->Add(imgURL, allow ? PR_TRUE : PR_FALSE, type);
#endif
}
@@ -1172,10 +1203,10 @@
*/
extern "C" void
-mozilla_set_permission (GaleonEmbed *embed, gboolean permit, int type)
+mozilla_set_permission(GaleonEmbed *embed, gboolean allow, guint type)
{
GALEON_WRAPPER(wrapper)
- wrapper->SetSitePermission (permit ? PR_TRUE : PR_FALSE, type);
+ wrapper->SetSitePermission(allow ? PR_TRUE : PR_FALSE, type);
}
/**
@@ -1188,17 +1219,17 @@
{
nsresult result;
nsCOMPtr<nsICookieManager> cookieManager =
- do_CreateInstance (NS_COOKIEMANAGER_CONTRACTID);
+ do_GetService(NS_COOKIEMANAGER_CONTRACTID);
for (GList *cookies = g_list_first(gone) ; cookies!=NULL ;
cookies = g_list_next(cookies))
{
Cookie *c = (Cookie *)cookies->data;
- result = cookieManager->Remove (NS_LITERAL_CSTRING(c->base.domain),
- NS_LITERAL_CSTRING(c->name),
- NS_LITERAL_CSTRING(c->path),
- block ? PR_TRUE : PR_FALSE);
+ result = cookieManager->Remove(nsDependentCString(c->base.domain),
+ nsDependentCString(c->name),
+ nsDependentCString(c->path),
+ block ? PR_TRUE : PR_FALSE);
if (NS_FAILED(result)) return FALSE;
};
return TRUE;
@@ -1210,21 +1241,21 @@
* @type: type of permissions ( cookies or images )
*/
extern "C" gboolean
-mozilla_remove_permissions (GList *gone, int type)
+mozilla_remove_permissions (GList *gone, guint type)
{
nsresult result;
nsCOMPtr<nsIPermissionManager> permissionManager =
- do_CreateInstance (NS_PERMISSIONMANAGER_CONTRACTID);
+ do_GetService(NS_PERMISSIONMANAGER_CONTRACTID);
for (GList *permissions = g_list_first(gone) ; permissions != NULL;
permissions = g_list_next(permissions))
{
BlockedHost *b = (BlockedHost *)permissions->data;
#if MOZILLA_SNAPSHOT > 2
- result = permissionManager->Remove (nsDependentCString(b->domain),
- type);
+ result = permissionManager->Remove(nsDependentCString(b->domain),
+ type);
#else
- result = permissionManager->Remove (b->domain,type);
+ result = permissionManager->Remove(b->domain,type);
#endif
if (NS_FAILED(result)) return FALSE;
};
@@ -1374,7 +1405,7 @@
nsresult result = NS_ERROR_FAILURE;
nsCOMPtr<nsIPasswordManager> passwordManager =
- do_CreateInstance (NS_PASSWORDMANAGER_CONTRACTID);
+ do_GetService(NS_PASSWORDMANAGER_CONTRACTID);
nsCOMPtr<nsISimpleEnumerator> passwordEnumerator;
if (type == PASSWORD_PASSWORD)
result = passwordManager->GetEnumerator
@@ -1392,24 +1423,24 @@
nsCOMPtr<nsIPassword> nsPassword;
result = passwordEnumerator->GetNext
(getter_AddRefs(nsPassword));
- g_return_val_if_fail (NS_SUCCEEDED(result), NULL);
+ g_return_val_if_fail(NS_SUCCEEDED(result), NULL);
- Password *p = g_new0 (Password, 1);
+ Password *p = g_new0(Password, 1);
nsCAutoString transfer;
- nsPassword->GetHost (transfer);
- p->host = g_strdup (transfer.get());
+ nsPassword->GetHost(transfer);
+ p->host = g_strdup(transfer.get());
if (type == PASSWORD_PASSWORD)
{
nsAutoString unicodeName;
- nsPassword->GetUser (unicodeName);
- p->username = mozilla_unicode_to_locale (unicodeName.get());
+ nsPassword->GetUser(unicodeName);
+ p->username = mozilla_unicode_to_locale(unicodeName.get());
}
- passwords = g_list_prepend (passwords, p);
+ passwords = g_list_prepend(passwords, p);
}
- passwords = g_list_reverse (passwords);
+ passwords = g_list_reverse(passwords);
return passwords;
}
@@ -1423,7 +1454,7 @@
{
nsresult result = NS_ERROR_FAILURE;
nsCOMPtr<nsIPasswordManager> passwordManager =
- do_CreateInstance (NS_PASSWORDMANAGER_CONTRACTID);
+ do_GetService(NS_PASSWORDMANAGER_CONTRACTID);
for (GList *passwords = g_list_first(gone) ; passwords!=NULL ;
passwords = g_list_next(passwords))
@@ -1435,14 +1466,14 @@
(p->username);
nsDependentString unicodeString(unicodeName);
- result = passwordManager->RemoveUser (NS_LITERAL_CSTRING(p->host),
- unicodeString);
- g_free (unicodeName);
+ result = passwordManager->RemoveUser(nsDependentCString(p->host),
+ unicodeString);
+ g_free(unicodeName);
}
else if (type == PASSWORD_REJECT)
{
result = passwordManager->RemoveReject
- (NS_LITERAL_CSTRING(p->host));
+ (nsDependentCString(p->host));
};
if (NS_FAILED(result)) return FALSE;

25
www/galeon/files/patch-src_mozilla_mozilla.h
View File

@ -1,25 +0,0 @@
--- src/mozilla/mozilla.h.orig Fri Oct 25 20:43:51 2002
+++ src/mozilla/mozilla.h Thu Apr 10 13:02:14 2003
@@ -256,14 +256,18 @@
char *force_character_set);
/* Cookies manager */
-void mozilla_set_url_permission (const gchar *imgURL, gint type,
+void mozilla_set_url_permission (const gchar *imgURL, guint type,
gboolean allow);
GList *mozilla_list_cookies (void);
-void mozilla_set_permission (GaleonEmbed *embed, gboolean permit,
- int type);
+void mozilla_set_permission (GaleonEmbed *embed, gboolean allow,
+ guint type);
+#if MOZILLA_SNAPSHOT > 6
+GList *mozilla_get_permissions (guint type);
+#else
GList *mozilla_get_permissions (int type);
+#endif
gboolean mozilla_remove_cookies (GList *gone, gboolean block);
-gboolean mozilla_remove_permissions (GList *gone, int type);
+gboolean mozilla_remove_permissions (GList *gone, guint type);
/* Password Manager */
GList *mozilla_list_passwords (PasswordType type);