Imported Debian patch 4.0.5-6~numeezy
This commit is contained in:
committed by
Mario Fetka
parent
c44de33144
commit
10dfc9587b
@@ -1,7 +1,7 @@
|
||||
# Makefile.in generated by automake 1.15 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.14.1 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@@ -15,17 +15,7 @@
|
||||
@SET_MAKE@
|
||||
|
||||
VPATH = @srcdir@
|
||||
am__is_gnu_make = { \
|
||||
if test -z '$(MAKELEVEL)'; then \
|
||||
false; \
|
||||
elif test -n '$(MAKE_HOST)'; then \
|
||||
true; \
|
||||
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
|
||||
true; \
|
||||
else \
|
||||
false; \
|
||||
fi; \
|
||||
}
|
||||
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
|
||||
am__make_running_with_option = \
|
||||
case $${target_option-} in \
|
||||
?) ;; \
|
||||
@@ -87,12 +77,12 @@ NORMAL_UNINSTALL = :
|
||||
PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
subdir = ffextension/chrome/content
|
||||
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/../version.m4 \
|
||||
$(top_srcdir)/configure.ac
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
|
||||
mkinstalldirs = $(install_sh) -d
|
||||
CONFIG_HEADER = $(top_builddir)/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
@@ -146,7 +136,6 @@ am__uninstall_files_from_dir = { \
|
||||
am__installdirs = "$(DESTDIR)$(appdir)"
|
||||
DATA = $(app_DATA)
|
||||
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
|
||||
am__DIST_COMMON = $(srcdir)/Makefile.in
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
@@ -264,6 +253,7 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign ffextension/chrome/content/Makefile'; \
|
||||
$(am__cd) $(top_srcdir) && \
|
||||
$(AUTOMAKE) --foreign ffextension/chrome/content/Makefile
|
||||
.PRECIOUS: Makefile
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
@case '$?' in \
|
||||
*config.status*) \
|
||||
@@ -457,8 +447,6 @@ uninstall-am: uninstall-appDATA
|
||||
pdf-am ps ps-am tags-am uninstall uninstall-am \
|
||||
uninstall-appDATA
|
||||
|
||||
.PRECIOUS: Makefile
|
||||
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
|
||||
@@ -42,8 +42,7 @@ var kerberosauth = {
|
||||
referer: '2',
|
||||
native_gss_lib: 'true',
|
||||
trusted_uris: '',
|
||||
allow_proxies: 'true',
|
||||
append: ['trusted_uris']
|
||||
allow_proxies: 'true'
|
||||
}
|
||||
},
|
||||
|
||||
@@ -126,25 +125,14 @@ var kerberosauth = {
|
||||
var self = this;
|
||||
|
||||
var prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch);
|
||||
var append_opts = options.append || [];
|
||||
|
||||
for (var opt in options) {
|
||||
|
||||
if (!self.config_options[opt]) continue;
|
||||
|
||||
var name = self.config_options[opt][0];
|
||||
var type = self.config_options[opt][1];
|
||||
var value = options[opt];
|
||||
|
||||
if (type === 'str') {
|
||||
if (value && append_opts.indexOf(opt) > -1) {
|
||||
var current = prefs.getCharPref(name) || '';
|
||||
if (this.str_contains(current, value)) {
|
||||
continue;
|
||||
} else if (current) {
|
||||
value = current + ', ' + value;
|
||||
}
|
||||
}
|
||||
prefs.setCharPref(name, value);
|
||||
} else if (type ==='int') {
|
||||
prefs.setIntPref(name, Number(value));
|
||||
@@ -154,16 +142,6 @@ var kerberosauth = {
|
||||
}
|
||||
},
|
||||
|
||||
str_contains: function(str, value) {
|
||||
|
||||
if (!str) return false;
|
||||
var vals = str.split(',');
|
||||
for (var i=0, l=vals.length; i<l; i++) {
|
||||
if (vals[i].trim() === value) return true;
|
||||
}
|
||||
return false;
|
||||
},
|
||||
|
||||
prompt: function(conf, options) {
|
||||
var strs = Cc["@mozilla.org/intl/stringbundle;1"].
|
||||
getService(Ci.nsIStringBundleService).
|
||||
|
||||
Reference in New Issue
Block a user