parent
d75557a7c0
commit
941a3a85ae
@ -1,4 +1,4 @@
|
||||
DIST hplip-3.13.11-plugin.run 1869042 SHA256 88bc8e388f5bad02aa43b42625433493b95d50275673a77cd183380288a18c7b SHA512 260937a6aa0cf23f774e3a79d09f763fc8928d1afca76a8bfe000f72e0ed24d8ea1b329884d6e2486db6f1ee64c07341ce07a3edd467b0cbc1a512b7b96f183d WHIRLPOOL c3baea9d652b65e8564974d689d54b46922e98b7bb882a5a486daf1f1ad27c0986802a0cdb8789db080d19d1030ace12265a2dcdbabdad6f0502d4583e76ddb0
|
||||
DIST hplip-3.14.1-plugin.run 1869064 SHA256 6caa782649af73ae3ea6c2fd742437f4c79f7f1f4d7f433ac3d9bf378626879b SHA512 c6e83106d6f193e98c596948f1b2a2861e3927c2ed4afd9cec066e3976afc863f4067e4642dd6ff6bc5d7d79e42bfeda2df730e7bb9d779211c06926e0a2d4b3 WHIRLPOOL 51fec49918dcc0fccf1cd501f84ee19ebe5cef5cc0a9361d241a72ce8e37ef14c5ea28471e1a89c47c40fbfc4d3db9325b6ef25bc7e88f46550c574382bf9cd2
|
||||
EBUILD hplip-plugin-3.13.11.ebuild 1481 SHA256 ead3ff5c72c2bb7d8ec43a2e6f2474a6f5aad3c2523a1537c0052203c16696e6 SHA512 871ecc229930b19d56d68e23f236d506003703a2a13fbf4fc585b2957500a3e9baa521cb4e2cf644bba14a80bc23e2fbe305036624e316b11009f02ed2c773ba WHIRLPOOL bef5d9d651ec582825e6dd542d81dcca309d02dff6429c7381db40f4ebee3b2e48ca09dfd2d8e96a1d3601da92c2266aabd0ba72f209dde0f473e75e8435548a
|
||||
DIST hplip-3.14.6-plugin.run 1869049 SHA256 a350e988cf2e3ba57adc9e40d891e3c407e28e96012922d5dbbdf2de24db6ede SHA512 bb6538c9be3b89881813ee7ddfeda73635cb901abd9625138dcd1dae2e169ce5a5b8e98e0c8fe11e86b9eb6254cb0ddebd81ecc55892d38122eaae93b096a662 WHIRLPOOL 1644c3aaea3586ab22e8dc8609867ae440037822eca37932d119a90a29e83bf5cff71d9b28f049768619685bd55fcd729f9800f6d4f3f9f06fde10bfc1ad9c23
|
||||
EBUILD hplip-plugin-3.14.1.ebuild 1461 SHA256 fb8ad100162444ec3aaa3bb9d44a45e06655013d973e670b729823183edcd81a SHA512 f3afe57fd07f37aa12fe8f6ece92d851c4ecd133e762ac579f13ed4d50a30462d4630fed9b99150045ed6f768b0f216c2bb920dc50720e03618822e94d9f72eb WHIRLPOOL 0e425cfcb2fac1feedd458f439c895b6ce1ba323947b69f692fca3a6ba1fe4dc7eec533f4e3cd629bbd1dc2d9e7b3fb0ab5fcea4277387756e0ceaddab30c115
|
||||
EBUILD hplip-plugin-3.14.6.ebuild 1478 SHA256 6b67ad16fd2052de4f44cff1659345b35e4670293fd3c83e537baa02ced13153 SHA512 dc30551bc3ed2981da74668d0df94096bc004d7168f4526901819d7c58575f953b5cfbd299ba470488d23ef0fd24b0b31fde3113af78da0302e1f5ab480daa53 WHIRLPOOL 7d0fb5109efab408f8478a7dceb4125d8e55a1234856f2c3ac22186d9dedf10f4dfa8e3397c96d2f1987d9614a5614fe05464c5bba6103602a85f02e5617d917
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
USE=""
|
||||
|
||||
#EMERGE_DEFAULT_OPTS="--deep"
|
||||
EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --backtrack=15"
|
||||
FEATURES="getbinpkg -news"
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
USE=""
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
~app-office/akonadi-server-1.12.1 amd64 x86
|
||||
~dev-libs/libical-1.0 amd64 x86
|
||||
~dev-python/PyQt4-4.11.1 amd64 x86
|
||||
~dev-python/sip-4.16.2 amd64 x86
|
||||
~kde-misc/baloo-kcmadv-2014.04.27 amd64 x86
|
||||
~media-libs/lcms-2.5 amd64 x86
|
||||
~media-libs/libraw-0.16.0_beta1 amd64 x86
|
||||
~media-libs/tiff-4.0.3 amd64 x86
|
||||
~media-sound/amarok-2.8.0 amd64 x86
|
||||
|
||||
~media-gfx/digikam-4.0.0 amd64 x86
|
||||
~media-plugins/kipi-plugins-4.0.0 amd64 x86
|
||||
|
||||
~media-libs/jasper-1.900.1 amd64 x86
|
||||
|
||||
~media-libs/phonon-4.7.2 amd64 x86
|
||||
~media-libs/phonon-gstreamer-4.7.2 amd64 x86
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
USE=""
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
USE=""
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
USE=""
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
USE=""
|
||||
|
||||
@ -1,213 +0,0 @@
|
||||
diff --git a/wgetpaste b/wgetpaste
|
||||
index 00eea19..7bb9998 100755
|
||||
--- a/wgetpaste
|
||||
+++ b/wgetpaste
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
VERSION="2.17"
|
||||
|
||||
+DEFAULT_SERVICE="calculate"
|
||||
+
|
||||
# don't inherit LANGUAGE from the env
|
||||
unset LANGUAGE
|
||||
|
||||
@@ -14,7 +16,7 @@ E=$'\e'
|
||||
N=$'\n'
|
||||
|
||||
### services
|
||||
-SERVICES="ca codepad dpaste osl pocoo"
|
||||
+SERVICES="ca codepad dpaste osl pocoo calculate"
|
||||
# ca
|
||||
ENGINE_ca=ca
|
||||
URL_ca="http://pastebin.ca/"
|
||||
@@ -35,6 +37,17 @@ URL_osl="http://pastebin.osuosl.org/ pastebin.php"
|
||||
# pocoo
|
||||
ENGINE_pocoo=pocoo
|
||||
URL_pocoo="http://paste.pocoo.org/"
|
||||
+# calculate
|
||||
+ENGINE_calculate=calculate
|
||||
+if [[ "$LANG" =~ 'ru_RU' ]]; then
|
||||
+ URL_calculate="http://pastebin.calculate-linux.ru"
|
||||
+else
|
||||
+ URL_calculate="http://pastebin.calculate-linux.org"
|
||||
+fi
|
||||
+DEFAULT_LANGUAGE_calculate="Text"
|
||||
+DEFAULT_PARENT_calculate=""
|
||||
+DEFAULT_PRIVATE_calculate=0
|
||||
+SIZE_calculate="25000 25%kB"
|
||||
# tinyurl
|
||||
ENGINE_tinyurl=tinyurl
|
||||
URL_tinyurl="http://tinyurl.com/ api-create.php"
|
||||
@@ -49,7 +62,7 @@ LANGUAGE_COUNT_ca=0
|
||||
EXPIRATIONS_ca="Never 5%minutes 10%minutes 15%minutes 30%minutes 45%minutes 1%hour 2%hours \
|
||||
4%hours 8%hours 12%hours 1%day 2%days 3%days 1%week 2%weeks 3%weeks 1%month 2%months \
|
||||
3%months 4%months 5%months 6%months 1%year"
|
||||
-POST_ca="s=Submit+Post name description type expiry % content"
|
||||
+POST_ca="s=Submit+Post name description type expiry % % content"
|
||||
REGEX_URL_ca='s|^.*content="[0-9]*;\(http://[^/]*/[0-9]*\)".*$|\1|p'
|
||||
REGEX_RAW_ca='s|^\(http://[^/]*/\)\([0-9]*\)$|\1raw/\2|'
|
||||
# codepad
|
||||
@@ -64,7 +77,7 @@ LANGUAGE_VALUES_dpaste="% Apache Bash Css Diff DjangoTemplate Haskell JScript Py
|
||||
Ruby Rhtml Sql Xml"
|
||||
EXPIRATIONS_dpaste="30%days 30%days%after%last%view"
|
||||
EXPIRATION_VALUES_dpaste="off on"
|
||||
-POST_dpaste="submit=Paste+it poster title language hold % content"
|
||||
+POST_dpaste="submit=Paste+it poster title language hold % % content"
|
||||
REGEX_RAW_dpaste='s|^\(http://[^/]*/\)[^0-9]*\([0-9]*/\)$|\1\2plain/|'
|
||||
# osl
|
||||
LANGUAGES_osl="Plain%Text ActionScript Ada Apache%Log%File AppleScript Assembly%(NASM) \
|
||||
@@ -78,7 +91,7 @@ javascript lisp lua matlab mpasm mysql nsis objc ocaml oobas oracle8 pascal perl
|
||||
qbasic robots ruby scheme smarty sql tcl vb vbnet visualfoxpro xml"
|
||||
EXPIRATIONS_osl="Never 1%day 1%month"
|
||||
EXPIRATION_VALUES_osl="f d m"
|
||||
-POST_osl="paste=Send poster % format expiry % code2"
|
||||
+POST_osl="paste=Send poster % format expiry % % code2"
|
||||
REGEX_RAW_osl='s|^\(http://[^/]*/\)\([0-9]*\)$|\1pastebin.php?dl=\2|'
|
||||
# pocoo
|
||||
LANGUAGES_pocoo="Apache%Config%(.htaccess) Bash Batch%(.bat) Boo C C# C++ Clojure Creole%Wiki CSS \
|
||||
@@ -93,9 +106,25 @@ dylan erlang rhtml gas gcc-messages html+genshi gettext glsl haskell html ini ir
|
||||
javac-messages js jsp lighttpd literate-haskell llvm lua html+mako matlab matlabsession minid multi \
|
||||
html+myghty mysql nasm nginx objectpascal ocaml perl html+php php povray python pycon pytb rst ruby \
|
||||
scala scheme smalltalk smarty sourceslist sql squidconf tex text diff vim xml xslt yaml"
|
||||
-POST_pocoo="submit=Paste! % % language % % code"
|
||||
+POST_pocoo="submit=paste! % % language % % % code"
|
||||
REGEX_RAW_pocoo='s|^\(http://[^/]*/\)show\(/[0-9]*/\)$|\1raw\2|'
|
||||
|
||||
+# calculate
|
||||
+LANGUAGES_calculate="Apache Bash Batch Boo C C# C++ Clojure Creole_Wiki CSS \
|
||||
+CSV D Debian_control-files Django_Jinja_Templates Dylan Erlang eRuby_rhtml GAS GCC_Messages \
|
||||
+Genshi_Templates Gettext_catalogs GL_Shader_language Haskell HTML INI_File Interactive_Ruby IO \
|
||||
+IRC_Logs Java javac_Messages JavaScript JSP Lighttpd Literate_Haskell LLVM Lua Mako_Templates Matlab \
|
||||
+Matlab_Session MiniD Multi-File Myghty_Templates MySQL Nasm Nginx Object-Pascal OCaml Perl PHP \
|
||||
+PHP_(inline) Povray Python Python_Console_Sessions Python_Tracebacks reStructuredText Ruby Scala \
|
||||
+Scheme Smalltalk Smarty sources.list SQL SquidConf TeX_LaTeX Text Unified_Diff Vim XML XSLT YAML"
|
||||
+LANGUAGE_VALUES_calculate="apache bash bat boo c csharp cpp clojure creole css csv d control html+django \
|
||||
+dylan erlang rhtml gas gcc-messages html+genshi gettext glsl haskell html ini irb io irc java \
|
||||
+javac-messages js jsp lighttpd literate-haskell llvm lua html+mako matlab matlabsession minid multi \
|
||||
+html+myghty mysql nasm nginx objectpascal ocaml perl html+php php povray python pycon pytb rst ruby \
|
||||
+scala scheme smalltalk smarty sourceslist sql squidconf tex text diff vim xml xslt yaml"
|
||||
+POST_calculate="submit=paste! % % language % parent private text"
|
||||
+REGEX_RAW_calculate='s|^\(http://[^/]*/\)show\(/[0-9]*/\)$|\1raw\2|'
|
||||
+
|
||||
### errors
|
||||
die() {
|
||||
echo "$@" >&2
|
||||
@@ -283,6 +312,9 @@ Options:
|
||||
-s, --service SERVICE set service to use (defaults to "$DEFAULT_SERVICE")
|
||||
-e, --expiration EXPIRATION set when it should expire (defaults to "$DEFAULT_EXPIRATION")
|
||||
|
||||
+ -p, --parent PARENT set parent paste (defaults to "$DEFAULT_PARENT", make use id paste) (Calculate pastebin option)
|
||||
+ -P, --private PRIVATE set private status (defaults to "$DEFAULT_PRIVATE") (Calculate pastebin option)
|
||||
+
|
||||
-S, --list-services list supported pastebin services
|
||||
-L, --list-languages list languages supported by the specified service
|
||||
-E, --list-expiration list expiration setting supported by the specified service
|
||||
@@ -370,6 +402,18 @@ showlanguages() {
|
||||
done | sort
|
||||
}
|
||||
|
||||
+showprivate() {
|
||||
+ local p priv d
|
||||
+ priv=PRIVATE_$ENGINE
|
||||
+ [[ -n $COMPLETIONS ]] && printlist ${!priv} | sort && exit 0
|
||||
+ echo "Private supported by $(getrecipient) (case sensitive):"
|
||||
+ [[ -z ${!priv} ]] && echo "$N\"$ENGINE\" has no support for setting language." >&2 && exit 1
|
||||
+ for p in ${!priv}; do
|
||||
+ [[ ${p//\%/ } = $DEFAULT_PRIVATE ]] && d="*" || d=" "
|
||||
+ echo " $d${p//\%/ }"
|
||||
+ done | sort
|
||||
+}
|
||||
+
|
||||
showexpirations() {
|
||||
local e expiration info d
|
||||
expiration=EXPIRATIONS_$ENGINE
|
||||
@@ -422,7 +466,7 @@ postdata() {
|
||||
local post nr extra f
|
||||
post=POST_$ENGINE
|
||||
nr=${!post//[^ ]}
|
||||
- [[ 6 = ${#nr} ]] || die "\"${SERVICE}\" is not supported by ${FUNCNAME}()."
|
||||
+ [[ 7 = ${#nr} ]] || die "\"${SERVICE}\" is not supported by ${FUNCNAME}()."
|
||||
extra=${!post%% *}
|
||||
[[ '%' = $extra ]] || echo -n "$extra&"
|
||||
e() {
|
||||
@@ -435,7 +479,7 @@ postdata() {
|
||||
post=${post#$f }
|
||||
done
|
||||
}
|
||||
- e "${!post#$extra }" NICK DESCRIPTION LANGUAGE EXPIRATION CVT_TABS INPUT
|
||||
+ e "${!post#$extra }" NICK DESCRIPTION LANGUAGE EXPIRATION PARENT PRIVATE INPUT
|
||||
}
|
||||
|
||||
# get url from response from server
|
||||
@@ -530,6 +574,16 @@ while [[ -n $1 ]]; do
|
||||
LANGUAGESET=0
|
||||
LANGUAGE="$2"
|
||||
;;
|
||||
+ -p | --parent )
|
||||
+ requiredarg "$@"
|
||||
+ PARENTSET=0
|
||||
+ PARENT="$2"
|
||||
+ ;;
|
||||
+ -P | --private )
|
||||
+ requiredarg "$@"
|
||||
+ PRIVATESET=0
|
||||
+ PRIVATE="$2"
|
||||
+ ;;
|
||||
-L | --list-languages )
|
||||
LISTLANGUAGES=0
|
||||
;;
|
||||
@@ -610,12 +664,16 @@ load_configs
|
||||
DEFAULT_NICK=${DEFAULT_NICK:-$(whoami)} || die "whoami failed"
|
||||
DEFAULT_SERVICE=${DEFAULT_SERVICE:-pocoo}
|
||||
DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE:-Plain Text}
|
||||
+DEFAULT_PARENT=${DEFAULT_PARENT:-''}
|
||||
+DEFAULT_PRIVATE=${DEFAULT_PRIVATE:-0}
|
||||
DEFAULT_EXPIRATION=${DEFAULT_EXPIRATION:-1 month}
|
||||
SERVICE=${SERVICE:-${DEFAULT_SERVICE}}
|
||||
ENGINE=ENGINE_$SERVICE
|
||||
ENGINE="${!ENGINE}"
|
||||
default="DEFAULT_NICK_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_NICK=${!default}
|
||||
default="DEFAULT_LANGUAGE_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_LANGUAGE=${!default}
|
||||
+default="DEFAULT_PARENT_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_PARENT=${!default}
|
||||
+default="DEFAULT_PRIVATE_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_PRIVATE=${!default}
|
||||
default="DEFAULT_EXPIRATION_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_EXPIRATION=${!default}
|
||||
NICK=${NICK:-$(escape "${DEFAULT_NICK}")}
|
||||
[[ -z $SOURCE ]] && SOURCE="stdin" && FILES[${#FILES[*]}]="/dev/stdin"
|
||||
@@ -629,7 +687,7 @@ INFO_ARGS=${INFO_ARGS:-"--ignore-default-opts"}
|
||||
# show listings if requested
|
||||
[[ $USAGE ]] && usage && exit 0
|
||||
[[ $SHOWSERVICES ]] && showservices && exit 0
|
||||
-[[ $LISTLANGUAGES ]] && showlanguages && exit 0
|
||||
+[[ $LISTLANGUAGES ]] && showlanguages && exit 0
|
||||
[[ $LISTEXPIRATION ]] && showexpirations && exit 0
|
||||
|
||||
# language and expiration need to be verified before they are escaped but after service and defaults
|
||||
@@ -637,6 +695,10 @@ INFO_ARGS=${INFO_ARGS:-"--ignore-default-opts"}
|
||||
LANGUAGE=${LANGUAGE:-${DEFAULT_LANGUAGE}}
|
||||
verifylanguage
|
||||
LANGUAGE=$(escape "$LANGUAGE")
|
||||
+PARENT=${PARENT:-${DEFAULT_PARENT}}
|
||||
+PARENT=$(escape "$PARENT")
|
||||
+PRIVATE=${PRIVATE:-${DEFAULT_PRIVATE}}
|
||||
+PRIVATE=$(escape "$PRIVATE")
|
||||
EXPIRATION=${EXPIRATION:-${DEFAULT_EXPIRATION}}
|
||||
verifyexpiration
|
||||
EXPIRATION=$(escape "$EXPIRATION")
|
||||
@@ -771,6 +833,7 @@ else
|
||||
[[ -f $TMPF ]] || TMPF=$(mktemp /tmp/wgetpaste.XXXXXX)
|
||||
if [[ -f $TMPF ]]; then
|
||||
postdata > "$TMPF" || die "Failed to write to temporary file: \"$TMPF\"."
|
||||
+ [[ $LANG =~ ru_RU ]] && enconv $TMPF
|
||||
WGETARGS="--post-file=$TMPF"
|
||||
else
|
||||
# fall back to using --post-data if the temporary file could not be created
|
||||
@@ -785,8 +848,7 @@ else
|
||||
else
|
||||
OUTPUT=$(LC_ALL=C wget -O /dev/null $WGETARGS $RECIPIENT 2>&1)
|
||||
fi
|
||||
-
|
||||
- # clean temporary file if it was created
|
||||
+ #clean temporary file if it was created
|
||||
if [[ -f $TMPF ]]; then
|
||||
if [[ $DEBUG ]]; then
|
||||
echo "Left temporary file: \"$TMPF\" alone for debugging purposes."
|
||||
@ -1,188 +0,0 @@
|
||||
diff -urN a/wgetpaste b/wgetpaste
|
||||
--- a/wgetpaste 2012-04-29 22:53:57.000000000 +0400
|
||||
+++ b/wgetpaste 2012-06-29 11:54:25.289662492 +0400
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
VERSION="2.19"
|
||||
|
||||
+DEFAULT_SERVICE="calculate"
|
||||
+
|
||||
# don't inherit LANGUAGE from the env
|
||||
unset LANGUAGE
|
||||
|
||||
@@ -14,7 +16,7 @@
|
||||
N=$'\n'
|
||||
|
||||
### services
|
||||
-SERVICES="ca codepad gists dpaste osl"
|
||||
+SERVICES="ca codepad gists dpaste osl calculate"
|
||||
# ca
|
||||
ENGINE_ca=ca
|
||||
URL_ca="http://pastebin.ca/"
|
||||
@@ -39,6 +41,17 @@
|
||||
ENGINE_tinyurl=tinyurl
|
||||
URL_tinyurl="http://tinyurl.com/ api-create.php"
|
||||
REGEX_RAW_tinyurl='s|^\(http://[^/]*/\)\([[:alnum:]]*\)$|\1\2|'
|
||||
+# calculate
|
||||
+ENGINE_calculate=calculate
|
||||
+if [[ "$LANG" =~ 'ru_RU' ]]; then
|
||||
+ URL_calculate="http://pastebin.calculate-linux.ru"
|
||||
+else
|
||||
+ URL_calculate="http://pastebin.calculate-linux.org"
|
||||
+fi
|
||||
+DEFAULT_LANGUAGE_calculate="Text"
|
||||
+DEFAULT_PARENT_calculate=""
|
||||
+DEFAULT_PRIVATE_calculate=0
|
||||
+SIZE_calculate="25000 25%kB"
|
||||
|
||||
### engines
|
||||
# ca
|
||||
@@ -49,12 +62,12 @@
|
||||
EXPIRATIONS_ca="Never 5%minutes 10%minutes 15%minutes 30%minutes 45%minutes 1%hour 2%hours \
|
||||
4%hours 8%hours 12%hours 1%day 2%days 3%days 1%week 2%weeks 3%weeks 1%month 2%months \
|
||||
3%months 4%months 5%months 6%months 1%year"
|
||||
-POST_ca="s=Submit+Post name description type expiry % content"
|
||||
+POST_ca="s=Submit+Post name description type expiry % % % content"
|
||||
REGEX_URL_ca='s|^.*content="[0-9]*;\(http://[^/]*/[0-9]*\)".*$|\1|p'
|
||||
REGEX_RAW_ca='s|^\(http://[^/]*/\)\([0-9]*\)$|\1raw/\2|'
|
||||
# codepad
|
||||
LANGUAGES_codepad="C C++ D Haskell Lua OCaml PHP Perl Plain%Text Python Ruby Scheme Tcl"
|
||||
-POST_codepad="submit % % lang % % code"
|
||||
+POST_codepad="submit % % lang % % % % code"
|
||||
REGEX_URL_codepad='s|^--.*\(http://codepad.org/[^ ]\+\)|\1|p'
|
||||
REGEX_RAW_codepad='s|^\(http://[^/]*/\)\([[:alnum:]]*\)$|\1\2/raw.rb|'
|
||||
# dpaste
|
||||
@@ -64,7 +77,7 @@
|
||||
Ruby Rhtml Sql Xml"
|
||||
EXPIRATIONS_dpaste="30%days 30%days%after%last%view"
|
||||
EXPIRATION_VALUES_dpaste="off on"
|
||||
-POST_dpaste="submit=Paste+it poster title language hold % content"
|
||||
+POST_dpaste="submit=Paste+it poster title language hold % % % content"
|
||||
REGEX_RAW_dpaste='s|^\(http://[^/]*/\)[^0-9]*\([0-9]*/\)$|\1\2plain/|'
|
||||
# gists
|
||||
LANGUAGES_gists="ActionScript Ada Apex AppleScript Arc Arduino ASP Assembly
|
||||
@@ -112,8 +125,23 @@
|
||||
qbasic robots ruby scheme smarty sql tcl vb vbnet visualfoxpro xml"
|
||||
EXPIRATIONS_osl="Never 1%day 1%month"
|
||||
EXPIRATION_VALUES_osl="f d m"
|
||||
-POST_osl="paste=Send poster % format expiry % code2"
|
||||
+POST_osl="paste=Send poster % format expiry % % % code2"
|
||||
REGEX_RAW_osl='s|^\(http://[^/]*/\)\([0-9]*\)$|\1pastebin.php?dl=\2|'
|
||||
+# calculate
|
||||
+LANGUAGES_calculate="Apache Bash Batch Boo C C# C++ Clojure Creole_Wiki CSS \
|
||||
+CSV D Debian_control-files Django_Jinja_Templates Dylan Erlang eRuby_rhtml GAS GCC_Messages \
|
||||
+Genshi_Templates Gettext_catalogs GL_Shader_language Haskell HTML INI_File Interactive_Ruby IO \
|
||||
+IRC_Logs Java javac_Messages JavaScript JSP Lighttpd Literate_Haskell LLVM Lua Mako_Templates Matlab \
|
||||
+Matlab_Session MiniD Multi-File Myghty_Templates MySQL Nasm Nginx Object-Pascal OCaml Perl PHP \
|
||||
+PHP_(inline) Povray Python Python_Console_Sessions Python_Tracebacks reStructuredText Ruby Scala \
|
||||
+Scheme Smalltalk Smarty sources.list SQL SquidConf TeX_LaTeX Text Unified_Diff Vim XML XSLT YAML"
|
||||
+LANGUAGE_VALUES_calculate="apache bash bat boo c csharp cpp clojure creole css csv d control html+django \
|
||||
+dylan erlang rhtml gas gcc-messages html+genshi gettext glsl haskell html ini irb io irc java \
|
||||
+javac-messages js jsp lighttpd literate-haskell llvm lua html+mako matlab matlabsession minid multi \
|
||||
+html+myghty mysql nasm nginx objectpascal ocaml perl html+php php povray python pycon pytb rst ruby \
|
||||
+scala scheme smalltalk smarty sourceslist sql squidconf tex text diff vim xml xslt yaml"
|
||||
+POST_calculate="submit=paste! % % language % parent private % text"
|
||||
+REGEX_RAW_calculate='s|^\(http://[^/]*/\)show\(/[0-9]*/\)$|\1raw\2|'
|
||||
|
||||
### errors
|
||||
die() {
|
||||
@@ -302,6 +330,9 @@
|
||||
-s, --service SERVICE set service to use (defaults to "$DEFAULT_SERVICE")
|
||||
-e, --expiration EXPIRATION set when it should expire (defaults to "$DEFAULT_EXPIRATION")
|
||||
|
||||
+ -p, --parent PARENT set parent paste (defaults to "$DEFAULT_PARENT", make use id paste) (Calculate pastebin option)
|
||||
+ -P, --private PRIVATE set private status (defaults to "$DEFAULT_PRIVATE") (Calculate pastebin option)
|
||||
+
|
||||
-S, --list-services list supported pastebin services
|
||||
-L, --list-languages list languages supported by the specified service
|
||||
-E, --list-expiration list expiration setting supported by the specified service
|
||||
@@ -389,6 +420,18 @@
|
||||
done | sort
|
||||
}
|
||||
|
||||
+showprivate() {
|
||||
+ local p priv d
|
||||
+ priv=PRIVATE_$ENGINE
|
||||
+ [[ -n $COMPLETIONS ]] && printlist ${!priv} | sort && exit 0
|
||||
+ echo "Private supported by $(getrecipient) (case sensitive):"
|
||||
+ [[ -z ${!priv} ]] && echo "$N\"$ENGINE\" has no support for setting language." >&2 && exit 1
|
||||
+ for p in ${!priv}; do
|
||||
+ [[ ${p//\%/ } = $DEFAULT_PRIVATE ]] && d="*" || d=" "
|
||||
+ echo " $d${p//\%/ }"
|
||||
+ done | sort
|
||||
+}
|
||||
+
|
||||
showexpirations() {
|
||||
local e expiration info d
|
||||
expiration=EXPIRATIONS_$ENGINE
|
||||
@@ -442,7 +485,7 @@
|
||||
post=POST_$ENGINE
|
||||
if [[ -n ${!post} ]]; then
|
||||
nr=${!post//[^ ]}
|
||||
- [[ 6 = ${#nr} ]] || die "\"${SERVICE}\" is not supported by ${FUNCNAME}()."
|
||||
+ [[ 8 = ${#nr} ]] || die "\"${SERVICE}\" is not supported by ${FUNCNAME}()."
|
||||
extra=${!post%% *}
|
||||
[[ '%' = $extra ]] || echo -n "$extra&"
|
||||
e() {
|
||||
@@ -455,7 +498,7 @@
|
||||
post=${post#$f }
|
||||
done
|
||||
}
|
||||
- e "${!post#$extra }" NICK DESCRIPTION LANGUAGE EXPIRATION CVT_TABS INPUT
|
||||
+ e "${!post#$extra }" NICK DESCRIPTION LANGUAGE EXPIRATION PARENT PRIVATE CVT_TABS INPUT
|
||||
elif [[ function == $(type -t json_$ENGINE) ]]; then
|
||||
json_$ENGINE "$DESCRIPTION" "$LANGUAGE" "$INPUT"
|
||||
else
|
||||
@@ -555,6 +598,16 @@
|
||||
LANGUAGESET=0
|
||||
LANGUAGE="$2"
|
||||
;;
|
||||
+ -p | --parent )
|
||||
+ requiredarg "$@"
|
||||
+ PARENTSET=0
|
||||
+ PARENT="$2"
|
||||
+ ;;
|
||||
+ -P | --private )
|
||||
+ requiredarg "$@"
|
||||
+ PRIVATESET=0
|
||||
+ PRIVATE="$2"
|
||||
+ ;;
|
||||
-L | --list-languages )
|
||||
LISTLANGUAGES=0
|
||||
;;
|
||||
@@ -635,12 +688,16 @@
|
||||
DEFAULT_NICK=${DEFAULT_NICK:-$(whoami)} || die "whoami failed"
|
||||
DEFAULT_SERVICE=${DEFAULT_SERVICE:-gists}
|
||||
DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE:-Plain Text}
|
||||
+DEFAULT_PARENT=${DEFAULT_PARENT:-''}
|
||||
+DEFAULT_PRIVATE=${DEFAULT_PRIVATE:-0}
|
||||
DEFAULT_EXPIRATION=${DEFAULT_EXPIRATION:-1 month}
|
||||
SERVICE=${SERVICE:-${DEFAULT_SERVICE}}
|
||||
ENGINE=ENGINE_$SERVICE
|
||||
ENGINE="${!ENGINE}"
|
||||
default="DEFAULT_NICK_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_NICK=${!default}
|
||||
default="DEFAULT_LANGUAGE_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_LANGUAGE=${!default}
|
||||
+default="DEFAULT_PARENT_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_PARENT=${!default}
|
||||
+default="DEFAULT_PRIVATE_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_PRIVATE=${!default}
|
||||
default="DEFAULT_EXPIRATION_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_EXPIRATION=${!default}
|
||||
NICK=${NICK:-$(escape "${DEFAULT_NICK}")}
|
||||
[[ -z $SOURCE ]] && SOURCE="stdin"
|
||||
@@ -662,6 +719,10 @@
|
||||
LANGUAGE=${LANGUAGE:-${DEFAULT_LANGUAGE}}
|
||||
verifylanguage
|
||||
LANGUAGE=$(escape "$LANGUAGE")
|
||||
+PARENT=${PARENT:-${DEFAULT_PARENT}}
|
||||
+PARENT=$(escape "$PARENT")
|
||||
+PRIVATE=${PRIVATE:-${DEFAULT_PRIVATE}}
|
||||
+PRIVATE=$(escape "$PRIVATE")
|
||||
EXPIRATION=${EXPIRATION:-${DEFAULT_EXPIRATION}}
|
||||
verifyexpiration
|
||||
EXPIRATION=$(escape "$EXPIRATION")
|
||||
@@ -811,6 +872,7 @@
|
||||
[[ -f $TMPF ]] || TMPF=$(mktemp /tmp/wgetpaste.XXXXXX)
|
||||
if [[ -f $TMPF ]]; then
|
||||
postdata > "$TMPF" || die "Failed to write to temporary file: \"$TMPF\"."
|
||||
+ [[ $LANG =~ ru_RU ]] && enconv $TMPF
|
||||
WGETARGS="--post-file=$TMPF"
|
||||
else
|
||||
# fall back to using --post-data if the temporary file could not be created
|
||||
@ -1,189 +0,0 @@
|
||||
diff -urN a/wgetpaste b/wgetpaste
|
||||
--- a/wgetpaste 2012-05-05 23:15:32.000000000 +0400
|
||||
+++ b/wgetpaste 2012-06-29 12:14:53.482724926 +0400
|
||||
@@ -6,6 +6,8 @@
|
||||
|
||||
VERSION="2.20"
|
||||
|
||||
+DEFAULT_SERVICE="calculate"
|
||||
+
|
||||
# don't inherit LANGUAGE from the env
|
||||
unset LANGUAGE
|
||||
|
||||
@@ -14,7 +16,7 @@
|
||||
N=$'\n'
|
||||
|
||||
### services
|
||||
-SERVICES="ca codepad dpaste gists poundpython"
|
||||
+SERVICES="ca codepad dpaste gists poundpython calculate"
|
||||
# ca
|
||||
ENGINE_ca=ca
|
||||
URL_ca="http://pastebin.ca/"
|
||||
@@ -39,6 +41,17 @@
|
||||
ENGINE_tinyurl=tinyurl
|
||||
URL_tinyurl="http://tinyurl.com/ api-create.php"
|
||||
REGEX_RAW_tinyurl='s|^\(http://[^/]*/\)\([[:alnum:]]*\)$|\1\2|'
|
||||
+# calculate
|
||||
+ENGINE_calculate=calculate
|
||||
+if [[ "$LANG" =~ 'ru_RU' ]]; then
|
||||
+ URL_calculate="http://pastebin.calculate-linux.ru"
|
||||
+else
|
||||
+ URL_calculate="http://pastebin.calculate-linux.org"
|
||||
+fi
|
||||
+DEFAULT_LANGUAGE_calculate="Text"
|
||||
+DEFAULT_PARENT_calculate=""
|
||||
+DEFAULT_PRIVATE_calculate=0
|
||||
+SIZE_calculate="25000 25%kB"
|
||||
|
||||
### engines
|
||||
# ca
|
||||
@@ -49,12 +62,12 @@
|
||||
EXPIRATIONS_ca="Never 5%minutes 10%minutes 15%minutes 30%minutes 45%minutes 1%hour 2%hours \
|
||||
4%hours 8%hours 12%hours 1%day 2%days 3%days 1%week 2%weeks 3%weeks 1%month 2%months \
|
||||
3%months 4%months 5%months 6%months 1%year"
|
||||
-POST_ca="s=Submit+Post name description type expiry % content"
|
||||
+POST_ca="s=Submit+Post name description type expiry % % % content"
|
||||
REGEX_URL_ca='s|^.*content="[0-9]*;\(http://[^/]*/[0-9]*\)".*$|\1|p'
|
||||
REGEX_RAW_ca='s|^\(http://[^/]*/\)\([0-9]*\)$|\1raw/\2|'
|
||||
# codepad
|
||||
LANGUAGES_codepad="C C++ D Haskell Lua OCaml PHP Perl Plain%Text Python Ruby Scheme Tcl"
|
||||
-POST_codepad="submit % % lang % % code"
|
||||
+POST_codepad="submit % % lang % % % % code"
|
||||
REGEX_URL_codepad='s|^--.*\(http://codepad.org/[^ ]\+\)|\1|p'
|
||||
REGEX_RAW_codepad='s|^\(http://[^/]*/\)\([[:alnum:]]*\)$|\1\2/raw.rb|'
|
||||
# dpaste
|
||||
@@ -64,7 +77,7 @@
|
||||
Ruby Rhtml Sql Xml"
|
||||
EXPIRATIONS_dpaste="30%days 30%days%after%last%view"
|
||||
EXPIRATION_VALUES_dpaste="off on"
|
||||
-POST_dpaste="submit=Paste+it poster title language hold % content"
|
||||
+POST_dpaste="submit=Paste+it poster title language hold % % % content"
|
||||
REGEX_RAW_dpaste='s|^\(http://[^/]*/\)[^0-9]*\([0-9]*/\)$|\1\2plain/|'
|
||||
# gists
|
||||
LANGUAGES_gists="ActionScript Ada Apex AppleScript Arc Arduino ASP Assembly
|
||||
@@ -113,8 +126,24 @@
|
||||
javac-messages js jsp lighttpd literate-haskell llvm lua html+mako matlab matlabsession minid multi \
|
||||
html+myghty mysql nasm nginx objectpascal ocaml perl html+php php povray python pycon pytb rst ruby \
|
||||
scala scheme smalltalk smarty sourceslist sql squidconf tex text diff vim xml xslt yaml"
|
||||
-POST_lodgeit="submit=Paste! % % language % % code"
|
||||
+POST_lodgeit="submit=Paste! % % language % % % % code"
|
||||
REGEX_RAW_lodgeit='s|^\(http://[^/]*/\)show\(/[0-9]*/\)$|\1raw\2|'
|
||||
+# calculate
|
||||
+LANGUAGES_calculate="Apache Bash Batch Boo C C# C++ Clojure Creole_Wiki CSS \
|
||||
+CSV D Debian_control-files Django_Jinja_Templates Dylan Erlang eRuby_rhtml GAS GCC_Messages \
|
||||
+Genshi_Templates Gettext_catalogs GL_Shader_language Haskell HTML INI_File Interactive_Ruby IO \
|
||||
+IRC_Logs Java javac_Messages JavaScript JSP Lighttpd Literate_Haskell LLVM Lua Mako_Templates Matlab \
|
||||
+Matlab_Session MiniD Multi-File Myghty_Templates MySQL Nasm Nginx Object-Pascal OCaml Perl PHP \
|
||||
+PHP_(inline) Povray Python Python_Console_Sessions Python_Tracebacks reStructuredText Ruby Scala \
|
||||
+Scheme Smalltalk Smarty sources.list SQL SquidConf TeX_LaTeX Text Unified_Diff Vim XML XSLT YAML"
|
||||
+LANGUAGE_VALUES_calculate="apache bash bat boo c csharp cpp clojure creole css csv d control html+django \
|
||||
+dylan erlang rhtml gas gcc-messages html+genshi gettext glsl haskell html ini irb io irc java \
|
||||
+javac-messages js jsp lighttpd literate-haskell llvm lua html+mako matlab matlabsession minid multi \
|
||||
+html+myghty mysql nasm nginx objectpascal ocaml perl html+php php povray python pycon pytb rst ruby \
|
||||
+scala scheme smalltalk smarty sourceslist sql squidconf tex text diff vim xml xslt yaml"
|
||||
+POST_calculate="submit=paste! % % language % parent private % text"
|
||||
+REGEX_RAW_calculate='s|^\(http://[^/]*/\)show\(/[0-9]*/\)$|\1raw\2|'
|
||||
+
|
||||
|
||||
### errors
|
||||
die() {
|
||||
@@ -303,6 +332,9 @@
|
||||
-s, --service SERVICE set service to use (defaults to "$DEFAULT_SERVICE")
|
||||
-e, --expiration EXPIRATION set when it should expire (defaults to "$DEFAULT_EXPIRATION")
|
||||
|
||||
+ -p, --parent PARENT set parent paste (defaults to "$DEFAULT_PARENT", make use id paste) (Calculate pastebin option)
|
||||
+ -P, --private PRIVATE set private status (defaults to "$DEFAULT_PRIVATE") (Calculate pastebin option)
|
||||
+
|
||||
-S, --list-services list supported pastebin services
|
||||
-L, --list-languages list languages supported by the specified service
|
||||
-E, --list-expiration list expiration setting supported by the specified service
|
||||
@@ -390,6 +422,18 @@
|
||||
done | sort
|
||||
}
|
||||
|
||||
+showprivate() {
|
||||
+ local p priv d
|
||||
+ priv=PRIVATE_$ENGINE
|
||||
+ [[ -n $COMPLETIONS ]] && printlist ${!priv} | sort && exit 0
|
||||
+ echo "Private supported by $(getrecipient) (case sensitive):"
|
||||
+ [[ -z ${!priv} ]] && echo "$N\"$ENGINE\" has no support for setting language." >&2 && exit 1
|
||||
+ for p in ${!priv}; do
|
||||
+ [[ ${p//\%/ } = $DEFAULT_PRIVATE ]] && d="*" || d=" "
|
||||
+ echo " $d${p//\%/ }"
|
||||
+ done | sort
|
||||
+}
|
||||
+
|
||||
showexpirations() {
|
||||
local e expiration info d
|
||||
expiration=EXPIRATIONS_$ENGINE
|
||||
@@ -443,7 +487,7 @@
|
||||
post=POST_$ENGINE
|
||||
if [[ -n ${!post} ]]; then
|
||||
nr=${!post//[^ ]}
|
||||
- [[ 6 = ${#nr} ]] || die "\"${SERVICE}\" is not supported by ${FUNCNAME}()."
|
||||
+ [[ 8 = ${#nr} ]] || die "\"${SERVICE}\" is not supported by ${FUNCNAME}()."
|
||||
extra=${!post%% *}
|
||||
[[ '%' = $extra ]] || echo -n "$extra&"
|
||||
e() {
|
||||
@@ -456,7 +500,7 @@
|
||||
post=${post#$f }
|
||||
done
|
||||
}
|
||||
- e "${!post#$extra }" NICK DESCRIPTION LANGUAGE EXPIRATION CVT_TABS INPUT
|
||||
+ e "${!post#$extra }" NICK DESCRIPTION LANGUAGE EXPIRATION PARENT PRIVATE CVT_TABS INPUT
|
||||
elif [[ function == $(type -t json_$ENGINE) ]]; then
|
||||
json_$ENGINE "$DESCRIPTION" "$LANGUAGE" "$INPUT"
|
||||
else
|
||||
@@ -559,6 +603,16 @@
|
||||
-L | --list-languages )
|
||||
LISTLANGUAGES=0
|
||||
;;
|
||||
+ -p | --parent )
|
||||
+ requiredarg "$@"
|
||||
+ PARENTSET=0
|
||||
+ PARENT="$2"
|
||||
+ ;;
|
||||
+ -P | --private )
|
||||
+ requiredarg "$@"
|
||||
+ PRIVATESET=0
|
||||
+ PRIVATE="$2"
|
||||
+ ;;
|
||||
-n | --nick )
|
||||
requiredarg "$@"
|
||||
NICK=$(escape "$2")
|
||||
@@ -636,12 +690,16 @@
|
||||
DEFAULT_NICK=${DEFAULT_NICK:-$(whoami)} || die "whoami failed"
|
||||
DEFAULT_SERVICE=${DEFAULT_SERVICE:-gists}
|
||||
DEFAULT_LANGUAGE=${DEFAULT_LANGUAGE:-Plain Text}
|
||||
+DEFAULT_PARENT=${DEFAULT_PARENT:-''}
|
||||
+DEFAULT_PRIVATE=${DEFAULT_PRIVATE:-0}
|
||||
DEFAULT_EXPIRATION=${DEFAULT_EXPIRATION:-1 month}
|
||||
SERVICE=${SERVICE:-${DEFAULT_SERVICE}}
|
||||
ENGINE=ENGINE_$SERVICE
|
||||
ENGINE="${!ENGINE}"
|
||||
default="DEFAULT_NICK_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_NICK=${!default}
|
||||
default="DEFAULT_LANGUAGE_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_LANGUAGE=${!default}
|
||||
+default="DEFAULT_PARENT_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_PARENT=${!default}
|
||||
+default="DEFAULT_PRIVATE_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_PRIVATE=${!default}
|
||||
default="DEFAULT_EXPIRATION_$SERVICE" && [[ -n ${!default} ]] && DEFAULT_EXPIRATION=${!default}
|
||||
NICK=${NICK:-$(escape "${DEFAULT_NICK}")}
|
||||
[[ -z $SOURCE ]] && SOURCE="stdin"
|
||||
@@ -663,6 +721,10 @@
|
||||
LANGUAGE=${LANGUAGE:-${DEFAULT_LANGUAGE}}
|
||||
verifylanguage
|
||||
LANGUAGE=$(escape "$LANGUAGE")
|
||||
+PARENT=${PARENT:-${DEFAULT_PARENT}}
|
||||
+PARENT=$(escape "$PARENT")
|
||||
+PRIVATE=${PRIVATE:-${DEFAULT_PRIVATE}}
|
||||
+PRIVATE=$(escape "$PRIVATE")
|
||||
EXPIRATION=${EXPIRATION:-${DEFAULT_EXPIRATION}}
|
||||
verifyexpiration
|
||||
EXPIRATION=$(escape "$EXPIRATION")
|
||||
@@ -812,6 +874,7 @@
|
||||
[[ -f $TMPF ]] || TMPF=$(mktemp /tmp/wgetpaste.XXXXXX)
|
||||
if [[ -f $TMPF ]]; then
|
||||
postdata > "$TMPF" || die "Failed to write to temporary file: \"$TMPF\"."
|
||||
+ [[ $LANG =~ ru_RU ]] && enconv $TMPF
|
||||
WGETARGS="--post-file=$TMPF"
|
||||
else
|
||||
# fall back to using --post-data if the temporary file could not be created
|
||||
@ -1,9 +0,0 @@
|
||||
if [[ ${EBUILD_PHASE} == setup ]]
|
||||
then
|
||||
ln -sf /usr/lib/portage/bin/ebuild-helpers/dodir /bin/dodir
|
||||
fi
|
||||
|
||||
if [[ ${EBUILD_PHASE} == postinst ]]
|
||||
then
|
||||
rm /bin/dodir
|
||||
fi
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/twitter.py b/twitter.py
|
||||
index 5e58582..c411241 100755
|
||||
--- a/twitter.py
|
||||
+++ b/twitter.py
|
||||
@@ -65,7 +65,7 @@ except ImportError:
|
||||
import oauth2 as oauth
|
||||
|
||||
|
||||
-CHARACTER_LIMIT = 140
|
||||
+CHARACTER_LIMIT = 300
|
||||
|
||||
# A singleton representing a lazily instantiated FileCache.
|
||||
DEFAULT_CACHE = object()
|
||||
@ -1,93 +0,0 @@
|
||||
diff --git a/gui/gdmuser.c b/gui/gdmuser.c
|
||||
index 2dff3f6..27a169f 100644
|
||||
--- a/gui/gdmuser.c
|
||||
+++ b/gui/gdmuser.c
|
||||
@@ -232,13 +232,32 @@ gdm_sort_func (gpointer d1, gpointer d2)
|
||||
{
|
||||
GdmUser *a = d1;
|
||||
GdmUser *b = d2;
|
||||
+ char *astr;
|
||||
+ char *bstr;
|
||||
|
||||
if (!d1 || !d2)
|
||||
return (0);
|
||||
|
||||
- return (strcmp (a->login, b->login));
|
||||
+ astr = (a->gecos && strcmp(a->gecos, "") != 0 ) ? a->gecos : a->login;
|
||||
+ bstr = (b->gecos && strcmp(b->gecos, "") != 0 ) ? b->gecos : b->login;
|
||||
+ if(astr == a->gecos && bstr == b->gecos && !strcmp(astr,bstr)) {
|
||||
+ return (strcmp (a->login, b->login));
|
||||
+ }
|
||||
+
|
||||
+ return (strcmp (astr, bstr));
|
||||
}
|
||||
|
||||
+static gint
|
||||
+gdm_sort_login_func (gpointer d1, gpointer d2)
|
||||
+{
|
||||
+ GdmUser *a = d1;
|
||||
+ GdmUser *b = d2;
|
||||
+
|
||||
+ if (!d1 || !d2)
|
||||
+ return (0);
|
||||
+
|
||||
+ return (strcmp (a->login, b->login));
|
||||
+}
|
||||
|
||||
static gboolean
|
||||
setup_user (struct passwd *pwent,
|
||||
@@ -267,7 +286,7 @@ setup_user (struct passwd *pwent,
|
||||
defface, read_faces);
|
||||
|
||||
if ((user) &&
|
||||
- (! g_list_find_custom (*users, user, (GCompareFunc) gdm_sort_func))) {
|
||||
+ (! g_list_find_custom (*users, user, (GCompareFunc) gdm_sort_login_func))) {
|
||||
cnt++;
|
||||
*users = g_list_insert_sorted (*users, user,
|
||||
(GCompareFunc) gdm_sort_func);
|
||||
diff --git a/gui/greeter/greeter_item_ulist.c b/gui/greeter/greeter_item_ulist.c
|
||||
index 574a10b..d9f2628 100644
|
||||
--- a/gui/greeter/greeter_item_ulist.c
|
||||
+++ b/gui/greeter/greeter_item_ulist.c
|
||||
@@ -187,14 +187,23 @@ greeter_populate_user_list (GtkTreeModel *tm)
|
||||
GdmUser *usr = li->data;
|
||||
GtkTreeIter iter = {0};
|
||||
char *label;
|
||||
+ char *gecos;
|
||||
+ char *login;
|
||||
char *name;
|
||||
gboolean active;
|
||||
|
||||
+ login = gdm_common_text_to_escaped_utf8 (usr->login);
|
||||
+
|
||||
if (usr->gecos && strcmp (usr->gecos, "") != 0) {
|
||||
- name = gdm_common_text_to_escaped_utf8 (usr->gecos);
|
||||
- } else {
|
||||
- name = gdm_common_text_to_escaped_utf8 (usr->login);
|
||||
+ gecos = gdm_common_text_to_escaped_utf8 (usr->gecos);
|
||||
+ name = g_strdup_printf ("%s\n%s",gecos,login);
|
||||
+ g_free (gecos);
|
||||
}
|
||||
+ else {
|
||||
+ name = g_strdup (login);
|
||||
+ }
|
||||
+
|
||||
+ g_free (login);
|
||||
|
||||
if (g_hash_table_lookup (displays_hash, usr->login))
|
||||
active = TRUE;
|
||||
@@ -202,12 +211,11 @@ greeter_populate_user_list (GtkTreeModel *tm)
|
||||
active = FALSE;
|
||||
|
||||
if (active) {
|
||||
- label = g_strdup_printf ("<b>%s</b>\n <i><small>%s</small></i>",
|
||||
+ label = g_strdup_printf ("%s <i><small>%s</small></i>",
|
||||
name,
|
||||
_("Already logged in"));
|
||||
} else {
|
||||
- label = g_strdup_printf ("<b>%s</b>\n",
|
||||
- name);
|
||||
+ label = g_strdup (name);
|
||||
}
|
||||
|
||||
g_free (name);
|
||||
@ -1,18 +0,0 @@
|
||||
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
|
||||
index 332e71b..ea4af46 100644
|
||||
--- a/daemon/gdm-session.c
|
||||
+++ b/daemon/gdm-session.c
|
||||
@@ -520,6 +520,13 @@ get_fallback_session_name (GdmSession *self)
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
+ name = g_strdup ("cinnamon");
|
||||
+ if (get_session_command_for_name (name, NULL)) {
|
||||
+ g_free (self->priv->fallback_session_name);
|
||||
+ self->priv->fallback_session_name = name;
|
||||
+ goto out;
|
||||
+ }
|
||||
+ g_free (name);
|
||||
|
||||
name = g_strdup ("gnome");
|
||||
if (get_session_command_for_name (name, NULL)) {
|
||||
@ -1,103 +0,0 @@
|
||||
diff --git a/gnome-panel/panel-action-button.c b/gnome-panel/panel-action-button.c
|
||||
index ad8e64a..3f0c044 100644
|
||||
--- a/gnome-panel/panel-action-button.c
|
||||
+++ b/gnome-panel/panel-action-button.c
|
||||
@@ -194,7 +194,7 @@ panel_action_shutdown_reboot_is_disabled (void)
|
||||
{
|
||||
PanelSessionManager *manager;
|
||||
|
||||
- if (panel_lockdown_get_disable_log_out())
|
||||
+ if (panel_lockdown_get_disable_shutdown())
|
||||
return TRUE;
|
||||
|
||||
manager = panel_session_manager_get ();
|
||||
diff --git a/gnome-panel/panel-lockdown.c b/gnome-panel/panel-lockdown.c
|
||||
index 5b63ed2..3fd0e0f 100644
|
||||
--- a/gnome-panel/panel-lockdown.c
|
||||
+++ b/gnome-panel/panel-lockdown.c
|
||||
@@ -29,12 +29,13 @@
|
||||
#include <string.h>
|
||||
#include "panel-gconf.h"
|
||||
|
||||
-#define N_LISTENERS 6
|
||||
+#define N_LISTENERS 7
|
||||
|
||||
#define PANEL_GLOBAL_LOCKDOWN_DIR "/apps/panel/global"
|
||||
#define DESKTOP_GNOME_LOCKDOWN_DIR "/desktop/gnome/lockdown"
|
||||
#define PANEL_GLOBAL_LOCKED_DOWN_KEY PANEL_GLOBAL_LOCKDOWN_DIR "/locked_down"
|
||||
#define DISABLE_COMMAND_LINE_KEY DESKTOP_GNOME_LOCKDOWN_DIR "/disable_command_line"
|
||||
+#define DISABLE_SHUTDOWN_KEY DESKTOP_GNOME_LOCKDOWN_DIR "/disable_shutdown"
|
||||
#define DISABLE_LOCK_SCREEN_KEY DESKTOP_GNOME_LOCKDOWN_DIR "/disable_lock_screen"
|
||||
#define DISABLE_LOG_OUT_KEY PANEL_GLOBAL_LOCKDOWN_DIR "/disable_log_out"
|
||||
#define DISABLE_FORCE_QUIT_KEY PANEL_GLOBAL_LOCKDOWN_DIR "/disable_force_quit"
|
||||
@@ -45,6 +46,7 @@ typedef struct {
|
||||
|
||||
guint locked_down : 1;
|
||||
guint disable_command_line : 1;
|
||||
+ guint disable_shutdown : 1;
|
||||
guint disable_lock_screen : 1;
|
||||
guint disable_log_out : 1;
|
||||
guint disable_force_quit : 1;
|
||||
@@ -83,6 +85,20 @@ locked_down_notify (GConfClient *client,
|
||||
}
|
||||
|
||||
static void
|
||||
+disable_shutdown_notify (GConfClient *client,
|
||||
+ guint cnxn_id,
|
||||
+ GConfEntry *entry,
|
||||
+ PanelLockdown *lockdown)
|
||||
+{
|
||||
+ if (!entry->value || entry->value->type != GCONF_VALUE_BOOL)
|
||||
+ return;
|
||||
+
|
||||
+ lockdown->disable_shutdown = gconf_value_get_bool (entry->value);
|
||||
+
|
||||
+ panel_lockdown_invoke_closures (lockdown);
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
disable_command_line_notify (GConfClient *client,
|
||||
guint cnxn_id,
|
||||
GConfEntry *entry,
|
||||
@@ -246,6 +262,14 @@ panel_lockdown_init (void)
|
||||
DISABLE_COMMAND_LINE_KEY,
|
||||
(GConfClientNotifyFunc) disable_command_line_notify,
|
||||
i++);
|
||||
+
|
||||
+ panel_lockdown.disable_shutdown =
|
||||
+ panel_lockdown_load_bool (&panel_lockdown,
|
||||
+ client,
|
||||
+ DISABLE_SHUTDOWN_KEY,
|
||||
+ (GConfClientNotifyFunc) disable_shutdown_notify,
|
||||
+ i++);
|
||||
+
|
||||
|
||||
panel_lockdown.disable_lock_screen =
|
||||
panel_lockdown_load_bool (&panel_lockdown,
|
||||
@@ -334,6 +358,14 @@ panel_lockdown_get_disable_command_line (void)
|
||||
}
|
||||
|
||||
gboolean
|
||||
+panel_lockdown_get_disable_shutdown (void)
|
||||
+{
|
||||
+ g_assert (panel_lockdown.initialized != FALSE);
|
||||
+
|
||||
+ return panel_lockdown.disable_shutdown;
|
||||
+}
|
||||
+
|
||||
+gboolean
|
||||
panel_lockdown_get_disable_lock_screen (void)
|
||||
{
|
||||
g_assert (panel_lockdown.initialized != FALSE);
|
||||
diff --git a/gnome-panel/panel-lockdown.h b/gnome-panel/panel-lockdown.h
|
||||
index 8c843b1..e67bc53 100644
|
||||
--- a/gnome-panel/panel-lockdown.h
|
||||
+++ b/gnome-panel/panel-lockdown.h
|
||||
@@ -35,6 +35,7 @@ void panel_lockdown_finalize (void);
|
||||
|
||||
gboolean panel_lockdown_get_locked_down (void);
|
||||
gboolean panel_lockdown_get_disable_command_line (void);
|
||||
+gboolean panel_lockdown_get_disable_shutdown (void);
|
||||
gboolean panel_lockdown_get_disable_lock_screen (void);
|
||||
gboolean panel_lockdown_get_disable_log_out (void);
|
||||
gboolean panel_lockdown_get_disable_force_quit (void);
|
||||
@ -1,48 +0,0 @@
|
||||
diff --git a/.local/share/gnome-shell/extensions/Applications_Menu@rmy.pobox.com/extension.js b/.local/share/gnome-shell/extensions/Applications_Menu@rmy.pobox.com/extension.js
|
||||
index 381f4fb..c65b66a 100644
|
||||
--- a/.local/share/gnome-shell/extensions/Applications_Menu@rmy.pobox.com/extension.js
|
||||
+++ b/.local/share/gnome-shell/extensions/Applications_Menu@rmy.pobox.com/extension.js
|
||||
@@ -338,17 +338,21 @@ ApplicationsMenuButton.prototype = {
|
||||
_loadCategory: function(dir, appList) {
|
||||
var iter = dir.iter();
|
||||
var nextType;
|
||||
+ var nonEmpty = false;
|
||||
while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
|
||||
if (nextType == GMenu.TreeItemType.ENTRY) {
|
||||
var entry = iter.get_entry();
|
||||
var app = this._appSystem.lookup_app_by_tree_entry(entry);
|
||||
- if (!entry.get_app_info().get_nodisplay())
|
||||
+ if (!entry.get_app_info().get_nodisplay()) {
|
||||
appList.push(app);
|
||||
+ nonEmpty = true;
|
||||
+ }
|
||||
} else if (nextType == GMenu.TreeItemType.DIRECTORY) {
|
||||
if (!dir.get_is_nodisplay())
|
||||
- this._loadCategory(iter.get_directory(), appList);
|
||||
+ nonEmpty = nonEmpty || this._loadCategory(iter.get_directory(), appList);
|
||||
}
|
||||
}
|
||||
+ return nonEmpty;
|
||||
},
|
||||
|
||||
_buildSections: function() {
|
||||
@@ -358,7 +362,6 @@ ApplicationsMenuButton.prototype = {
|
||||
|
||||
var iter = root.iter();
|
||||
var nextType;
|
||||
- var i = 0;
|
||||
|
||||
var sections = [];
|
||||
while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
|
||||
@@ -367,10 +370,9 @@ ApplicationsMenuButton.prototype = {
|
||||
if (dir.get_is_nodisplay())
|
||||
continue;
|
||||
var appList = [];
|
||||
- this._loadCategory(dir, appList);
|
||||
+ if(this._loadCategory(dir, appList))
|
||||
sections.push({ name: dir.get_name(),
|
||||
apps: appList });
|
||||
- i++;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
diff --git a/src/connection-editor/nm-connection-editor.c b/src/connection-editor/nm-connection-editor.c
|
||||
index c054642..ae3aeca 100644
|
||||
--- a/src/connection-editor/nm-connection-editor.c
|
||||
+++ b/src/connection-editor/nm-connection-editor.c
|
||||
@@ -164,10 +164,10 @@ update_sensitivity (NMConnectionEditor *editor)
|
||||
*/
|
||||
if ( !nm_setting_connection_get_read_only (s_con)
|
||||
&& editor_is_initialized (editor)) {
|
||||
- if (editor->system_settings_can_modify) {
|
||||
+ //if (editor->system_settings_can_modify) {
|
||||
actionable = ce_polkit_button_get_actionable (CE_POLKIT_BUTTON (editor->ok_button));
|
||||
authorized = ce_polkit_button_get_authorized (CE_POLKIT_BUTTON (editor->ok_button));
|
||||
- }
|
||||
+ //}
|
||||
|
||||
if (editor->orig_scope == NM_CONNECTION_SCOPE_SYSTEM) {
|
||||
/* If the user cannot ever be authorized to change system connections, and
|
||||
@ -1,19 +0,0 @@
|
||||
--- kdelibs-4.3.1.orig/kdecore/services/kfoldermimetype.cpp
|
||||
+++ kdelibs-4.3.1/kdecore/services/kfoldermimetype.cpp
|
||||
@@ -77,11 +77,11 @@ QString KFolderMimeTypePrivate::iconName( const KUrl& _url ) const
|
||||
// There are also other directories with 0 size, such as /proc, that may
|
||||
// be mounted, but those are unlikely to contain .directory (and checking
|
||||
// this would require KMountPoint from kio).
|
||||
- KDE_struct_stat buff;
|
||||
- if (KDE_stat( QFile::encodeName( _url.toLocalFile()), &buff ) == 0
|
||||
- && S_ISDIR( buff.st_mode ) && buff.st_size == 0 ) {
|
||||
- return KMimeTypePrivate::iconName( _url );
|
||||
- }
|
||||
+ //KDE_struct_stat buff;
|
||||
+ //if (KDE_stat( QFile::encodeName( _url.toLocalFile()), &buff ) == 0
|
||||
+ // && S_ISDIR( buff.st_mode ) && buff.st_size == 0 ) {
|
||||
+ // return KMimeTypePrivate::iconName( _url );
|
||||
+ //}
|
||||
|
||||
KUrl u( _url );
|
||||
u.addPath( ".directory" );
|
||||
@ -1,17 +0,0 @@
|
||||
diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp
|
||||
index ef54230..af3ef94 100644
|
||||
--- a/kdeui/icons/kiconloader.cpp
|
||||
+++ b/kdeui/icons/kiconloader.cpp
|
||||
@@ -1041,6 +1041,10 @@ K3Icon KIconLoaderPrivate::findMatchingIcon(const QString& name, int size) const
|
||||
}
|
||||
#endif
|
||||
if (genericFallback)
|
||||
+ {
|
||||
+ // restore genericFallback flag
|
||||
+ genericFallback = name.endsWith(QLatin1String("-x-generic"));
|
||||
// we already tested the base name
|
||||
break;
|
||||
+ }
|
||||
|
||||
int rindex = currentName.lastIndexOf('-');
|
||||
if (rindex > 1) { // > 1 so that we don't split x-content or x-epoc
|
||||
@ -1,12 +0,0 @@
|
||||
diff -uNr kdebase-workspace-4.2.0.old/kdm/kfrontend/kgapp.cpp kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.cpp
|
||||
--- kdebase-workspace-4.2.0.old/kdm/kfrontend/kgapp.cpp 2008-09-18 00:54:59.000000000 +0400
|
||||
+++ kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.cpp 2009-02-12 15:50:05.000000000 +0300
|
||||
@@ -377,6 +377,8 @@
|
||||
setCursor( dpy, app.desktop()->winId(), XC_left_ptr );
|
||||
|
||||
int rslt = ex_exit;
|
||||
+ app.setStyle( _GUIStyle );
|
||||
+ app.setFont( *_normalFont );
|
||||
for (;;) {
|
||||
int cmd = gRecvInt();
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/kopete/plugins/history/historylogger.cpp b/kopete/plugins/history/historylogger.cpp
|
||||
index bf1d3ec..dc95afa 100644
|
||||
--- a/kopete/plugins/history/historylogger.cpp
|
||||
+++ b/kopete/plugins/history/historylogger.cpp
|
||||
@@ -298,7 +298,7 @@ void HistoryLogger::appendMessage( const Kopete::Message &msg , const Kopete::Co
|
||||
if ( msg.format() != Qt::PlainText )
|
||||
msgNode = doc.createTextNode( msg.escapedBody() );
|
||||
else
|
||||
- msgNode = doc.createTextNode( Qt::escape(msg.plainBody()) );
|
||||
+ msgNode = doc.createTextNode( msg.plainBody() );
|
||||
|
||||
docElem.appendChild( msgElem );
|
||||
msgElem.appendChild( msgNode );
|
||||
@ -1,25 +0,0 @@
|
||||
diff -Naur a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c
|
||||
--- a/app/config/gimpguiconfig.c 2012-03-12 23:18:06.000000000 +0400
|
||||
+++ b/app/config/gimpguiconfig.c 2012-05-18 12:47:30.000000000 +0400
|
||||
@@ -197,7 +197,7 @@
|
||||
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_TOOLBOX_WILBER,
|
||||
"toolbox-wilber",
|
||||
TOOLBOX_WILBER_BLURB,
|
||||
- TRUE,
|
||||
+ FALSE,
|
||||
GIMP_PARAM_STATIC_STRINGS);
|
||||
path = gimp_config_build_data_path ("themes");
|
||||
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_THEME_PATH,
|
||||
diff -Naur a/app/widgets/gimpcairo-wilber.c b/app/widgets/gimpcairo-wilber.c
|
||||
--- a/app/widgets/gimpcairo-wilber.c 2012-03-12 23:18:07.000000000 +0400
|
||||
+++ b/app/widgets/gimpcairo-wilber.c 2012-05-18 12:47:12.000000000 +0400
|
||||
@@ -37,8 +37,7 @@
|
||||
* It works best if you combine all paths into one. Inkscape has a
|
||||
* function to do that.
|
||||
*/
|
||||
-static const gchar wilber_path[] =
|
||||
- "M 509.72445,438.68864 C 501.47706,469.77945 464.95038,491.54566 431.85915,497.74874 C 438.5216,503.01688 442.87782,511.227 442.87782,520.37375 C 442.87783,536.24746 429.95607,549.0223 414.08235,549.0223 C 398.20863,549.0223 385.28688,536.24746 385.28688,520.37375 C 385.28688,511.52403 389.27666,503.61286 395.57098,498.3364 C 359.36952,495.90384 343.70976,463.95812 343.70975,463.95814 L 342.68134,509.64891 C 342.68134,514.35021 342.08391,519.96098 340.18378,528.3072 C 339.84664,527.80364 339.51399,527.33515 339.15537,526.83804 C 330.25511,514.5011 317.25269,507.81431 306.39317,508.76741 C 302.77334,509.08511 299.47017,510.33348 296.54982,512.4403 C 284.86847,520.86757 284.97665,540.94721 296.84366,557.3965 C 306.96274,571.42287 322.32232,578.25612 333.8664,574.73254 C 391.94635,615.17624 532.16931,642.41915 509.72445,438.68864 z M 363.24953,501.1278 C 373.83202,501.12778 382.49549,509.79127 382.49549,520.37375 C 382.49549,530.95624 373.83201,539.47279 363.24953,539.47279 C 352.66706,539.47279 344.1505,530.95624 344.1505,520.37375 C 344.15049,509.79129 352.66706,501.1278 363.24953,501.1278 z M 305.80551,516.1132 C 311.68466,516.11318 316.38344,521.83985 316.38344,528.89486 C 316.38345,535.94982 311.68467,541.67652 305.80551,541.67652 C 299.92636,541.67652 295.08067,535.94987 295.08067,528.89486 C 295.08065,521.83985 299.92636,516.1132 305.80551,516.1132 z M 440.821,552.54828 C 440.821,552.54828 448.7504,554.02388 453.8965,559.45332 C 457.41881,563.16951 457.75208,569.15506 456.98172,577.37703 C 456.21143,573.8833 454.89571,571.76659 453.8965,569.29666 C 443.01388,582.47662 413.42981,583.08929 376.0312,569.88433 C 416.63248,578.00493 437.38806,570.56014 449.48903,561.2163 C 446.29383,557.08917 440.821,552.54828 440.821,552.54828 z M 434.64723,524.59684 C 434.64723,532.23974 428.44429,538.44268 420.80139,538.44268 C 413.15849,538.44268 406.95555,532.23974 406.95555,524.59684 C 406.95555,516.95394 413.15849,510.751 420.80139,510.751 C 428.44429,510.751 434.64723,516.95394 434.64723,524.59684 z M 378.00043,522.99931 C 378.00043,527.70264 374.18324,531.51984 369.47991,531.51984 C 364.77658,531.51984 360.95939,527.70264 360.95939,522.99931 C 360.95939,518.29599 364.77658,514.47879 369.47991,514.47879 C 374.18324,514.47879 378.00043,518.29599 378.00043,522.99931 z ";
|
||||
+static const gchar wilber_path[] = "";
|
||||
|
||||
static cairo_path_t *wilber_cairo_path = NULL;
|
||||
static gdouble wilber_x1, wilber_y1;
|
||||
@ -1,27 +0,0 @@
|
||||
diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c
|
||||
index a1fc464..223762c 100644
|
||||
--- a/app/config/gimpguiconfig.c
|
||||
+++ b/app/config/gimpguiconfig.c
|
||||
@@ -197,7 +197,7 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass)
|
||||
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_TOOLBOX_WILBER,
|
||||
"toolbox-wilber",
|
||||
TOOLBOX_WILBER_BLURB,
|
||||
- TRUE,
|
||||
+ FALSE,
|
||||
GIMP_PARAM_STATIC_STRINGS);
|
||||
path = gimp_config_build_data_path ("themes");
|
||||
GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_THEME_PATH,
|
||||
diff --git a/app/widgets/gimpcairo-wilber.c b/app/widgets/gimpcairo-wilber.c
|
||||
index 62fe06f..d991adb 100644
|
||||
--- a/app/widgets/gimpcairo-wilber.c
|
||||
+++ b/app/widgets/gimpcairo-wilber.c
|
||||
@@ -37,8 +37,7 @@
|
||||
* It works best if you combine all paths into one. Inkscape has a
|
||||
* function to do that.
|
||||
*/
|
||||
-static const gchar wilber_path[] =
|
||||
- "M 509.72445,438.68864 C 501.47706,469.77945 464.95038,491.54566 431.85915,497.74874 C 438.5216,503.01688 442.87782,511.227 442.87782,520.37375 C 442.87783,536.24746 429.95607,549.0223 414.08235,549.0223 C 398.20863,549.0223 385.28688,536.24746 385.28688,520.37375 C 385.28688,511.52403 389.27666,503.61286 395.57098,498.3364 C 359.36952,495.90384 343.70976,463.95812 343.70975,463.95814 L 342.68134,509.64891 C 342.68134,514.35021 342.08391,519.96098 340.18378,528.3072 C 339.84664,527.80364 339.51399,527.33515 339.15537,526.83804 C 330.25511,514.5011 317.25269,507.81431 306.39317,508.76741 C 302.77334,509.08511 299.47017,510.33348 296.54982,512.4403 C 284.86847,520.86757 284.97665,540.94721 296.84366,557.3965 C 306.96274,571.42287 322.32232,578.25612 333.8664,574.73254 C 391.94635,615.17624 532.16931,642.41915 509.72445,438.68864 z M 363.24953,501.1278 C 373.83202,501.12778 382.49549,509.79127 382.49549,520.37375 C 382.49549,530.95624 373.83201,539.47279 363.24953,539.47279 C 352.66706,539.47279 344.1505,530.95624 344.1505,520.37375 C 344.15049,509.79129 352.66706,501.1278 363.24953,501.1278 z M 305.80551,516.1132 C 311.68466,516.11318 316.38344,521.83985 316.38344,528.89486 C 316.38345,535.94982 311.68467,541.67652 305.80551,541.67652 C 299.92636,541.67652 295.08067,535.94987 295.08067,528.89486 C 295.08065,521.83985 299.92636,516.1132 305.80551,516.1132 z M 440.821,552.54828 C 440.821,552.54828 448.7504,554.02388 453.8965,559.45332 C 457.41881,563.16951 457.75208,569.15506 456.98172,577.37703 C 456.21143,573.8833 454.89571,571.76659 453.8965,569.29666 C 443.01388,582.47662 413.42981,583.08929 376.0312,569.88433 C 416.63248,578.00493 437.38806,570.56014 449.48903,561.2163 C 446.29383,557.08917 440.821,552.54828 440.821,552.54828 z M 434.64723,524.59684 C 434.64723,532.23974 428.44429,538.44268 420.80139,538.44268 C 413.15849,538.44268 406.95555,532.23974 406.95555,524.59684 C 406.95555,516.95394 413.15849,510.751 420.80139,510.751 C 428.44429,510.751 434.64723,516.95394 434.64723,524.59684 z M 378.00043,522.99931 C 378.00043,527.70264 374.18324,531.51984 369.47991,531.51984 C 364.77658,531.51984 360.95939,527.70264 360.95939,522.99931 C 360.95939,518.29599 364.77658,514.47879 369.47991,514.47879 C 374.18324,514.47879 378.00043,518.29599 378.00043,522.99931 z ";
|
||||
+static const gchar wilber_path[] = "";
|
||||
|
||||
static cairo_path_t *wilber_cairo_path = NULL;
|
||||
static gdouble wilber_x1, wilber_y1;
|
||||
@ -1,112 +0,0 @@
|
||||
diff --git a/splashutils-1.5.4.4/docs/theme_format b/splashutils-1.5.4.4/docs/theme_format
|
||||
index 2cc629b..8932583 100644
|
||||
--- a/splashutils-1.5.4.4/docs/theme_format
|
||||
+++ b/splashutils-1.5.4.4/docs/theme_format
|
||||
@@ -91,6 +91,9 @@ that they enclose.
|
||||
* text_y=<n>
|
||||
The y coordinate of the main system message.
|
||||
|
||||
+* text_align [left|middle|right] [top|middle|bottom]
|
||||
+ Text align of the main system message.
|
||||
+
|
||||
* text_size=<n>
|
||||
The size of the font used to render the main system message.
|
||||
|
||||
diff --git a/splashutils-1.5.4.4/src/parse.c b/splashutils-1.5.4.4/src/parse.c
|
||||
index ad7676d..0728419 100644
|
||||
--- a/splashutils-1.5.4.4/src/parse.c
|
||||
+++ b/splashutils-1.5.4.4/src/parse.c
|
||||
@@ -20,7 +20,7 @@
|
||||
struct cfg_opt {
|
||||
char *name;
|
||||
enum {
|
||||
- t_int, t_path, t_box, t_icon, t_rect, t_color, t_fontpath,
|
||||
+ t_int, t_path, t_box, t_icon, t_rect, t_color, t_fontpath, t_align,
|
||||
t_type_open, t_type_close, t_anim, t_text, t_textbox_open, t_textbox_close,
|
||||
} type;
|
||||
void *val;
|
||||
@@ -28,6 +28,7 @@ struct cfg_opt {
|
||||
|
||||
int line = 0;
|
||||
u16 text_x, text_y;
|
||||
+u8 text_align = 0;
|
||||
u16 text_size;
|
||||
color text_color;
|
||||
char *text_font;
|
||||
@@ -147,6 +148,10 @@ struct cfg_opt opts[] =
|
||||
.type = t_fontpath,
|
||||
.val = &text_font },
|
||||
|
||||
+ { .name = "text_align",
|
||||
+ .type = t_align,
|
||||
+ .val = &text_align },
|
||||
+
|
||||
{ .name = "text",
|
||||
.type = t_text,
|
||||
.val = NULL },
|
||||
@@ -216,6 +221,44 @@ static bool skip_nonwhitespace(char **buf, bool req)
|
||||
return true;
|
||||
}
|
||||
|
||||
+static void parse_align(char *t, struct cfg_opt opt)
|
||||
+{
|
||||
+ (*(u8*)opt.val) = 0;
|
||||
+ /* Parse x position */
|
||||
+
|
||||
+ if (!strncmp(t, "left", 4)) {
|
||||
+ (*(u8*)opt.val) |= F_HS_LEFT;
|
||||
+ t += 4;
|
||||
+ } else if (!strncmp(t, "right", 5)) {
|
||||
+ (*(u8*)opt.val) |= F_HS_RIGHT;
|
||||
+ t += 5;
|
||||
+ } else if (!strncmp(t, "middle", 6)) {
|
||||
+ (*(u8*)opt.val) |= F_HS_HMIDDLE;
|
||||
+ t += 6;
|
||||
+ } else {
|
||||
+ parse_error("expected 'left', 'right' or 'middle' instead of '%s'", t);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (!skip_whitespace(&t, true))
|
||||
+ return;
|
||||
+ /* Parse y position */
|
||||
+
|
||||
+ if (!strncmp(t, "top", 3)) {
|
||||
+ (*(u8*)opt.val) |= F_HS_TOP;
|
||||
+ t += 3;
|
||||
+ } else if (!strncmp(t, "bottom", 6)) {
|
||||
+ (*(u8*)opt.val) |= F_HS_BOTTOM;
|
||||
+ t += 6;
|
||||
+ } else if (!strncmp(t, "middle", 6)) {
|
||||
+ (*(u8*)opt.val) |= F_HS_VMIDDLE;
|
||||
+ t += 6;
|
||||
+ } else {
|
||||
+ parse_error("expected 'top', 'bottom' or 'middle' instead of '%s'", t);
|
||||
+ (*(u8*)opt.val) |= F_HS_TOP;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
static void parse_int(char *t, struct cfg_opt opt)
|
||||
{
|
||||
if (*t != '=') {
|
||||
@@ -1115,7 +1160,7 @@ void add_main_msg()
|
||||
return;
|
||||
}
|
||||
|
||||
- ct->hotspot = F_HS_LEFT | F_HS_TOP;
|
||||
+ ct->hotspot = text_align;
|
||||
ct->style = TTF_STYLE_NORMAL;
|
||||
ct->x = text_x;
|
||||
ct->y = text_y;
|
||||
@@ -1245,6 +1290,11 @@ int parse_cfg(char *cfgfile, stheme_t *theme)
|
||||
parse_int(t, opts[i]);
|
||||
break;
|
||||
|
||||
+ case t_align:
|
||||
+ skip_whitespace(&t, false);
|
||||
+ parse_align(t, opts[i]);
|
||||
+ break;
|
||||
+
|
||||
case t_box:
|
||||
{
|
||||
box *tbox = parse_box(t);
|
||||
@ -1,29 +0,0 @@
|
||||
diff --git a/packaging/generic/print-camera-list.c b/packaging/generic/print-camera-list.c
|
||||
index 810c197..0108f9b 100644
|
||||
--- a/packaging/generic/print-camera-list.c
|
||||
+++ b/packaging/generic/print-camera-list.c
|
||||
@@ -414,7 +414,7 @@ udev_parse_params (const func_params_t *params, void **data)
|
||||
"ENV{ID_USB_INTERFACES}==\"*:08*:*\", GOTO=\"libgphoto2_usb_end\"\n"
|
||||
/* shortcut the most common camera driver, ptp class, so we avoid parsing 1000
|
||||
* more rules */
|
||||
- "ENV{ID_USB_INTERFACES}==\"*:060101:*\", ENV{ID_GPHOTO2}=\"1\", ENV{GPHOTO2_DRIVER}=\"PTP\", GOTO=\"libgphoto2_usb_end\"\n\n"
|
||||
+ "ENV{ID_USB_INTERFACES}==\"*:060101:*\", ENV{ID_GPHOTO2}=\"1\", ENV{GPHOTO2_DRIVER}=\"PTP\", "
|
||||
};
|
||||
static const char * const usbcam_strings[] = {
|
||||
/* UDEV_PRE_0_98 */
|
||||
@@ -507,6 +507,15 @@ udev_begin_func (const func_params_t *params, void **data)
|
||||
print_version_comment(stdout, "# ", "\n", NULL, "#\n");
|
||||
printf ("# this file is autogenerated, local changes will be LOST on upgrades\n");
|
||||
printf (pdata->begin_string);
|
||||
+ if (pdata->version==UDEV_136) {
|
||||
+ if (pdata->mode != NULL)
|
||||
+ printf("MODE=\"%s\", ", pdata->mode);
|
||||
+ if (pdata->owner != NULL)
|
||||
+ printf("OWNER=\"%s\", ", pdata->owner);
|
||||
+ if (pdata->group != NULL)
|
||||
+ printf("GROUP=\"%s\", ", pdata->group);
|
||||
+ printf ("GOTO=\"libgphoto2_usb_end\"\n\n");
|
||||
+ }
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
diff --git a/microblogs/twitter/twittereditaccount.cpp b/microblogs/twitter/twittereditaccount.cpp
|
||||
index 5b1c4d2..87744ed 100644
|
||||
--- a/microblogs/twitter/twittereditaccount.cpp
|
||||
+++ b/microblogs/twitter/twittereditaccount.cpp
|
||||
@@ -41,8 +41,8 @@ along with this program; if not, see http://www.gnu.org/licenses/
|
||||
#include <KInputDialog>
|
||||
|
||||
#ifdef OAUTH
|
||||
-const char * twitterConsumerKey = "VyXMf0O7CvciiUQjliYtYg";
|
||||
-const char * twitterConsumerSecret = "uD2HvsOBjzt1Vs6SnouFtuxDeHmvOOVwmn3fBVyCw0";
|
||||
+const char * twitterConsumerKey = "irARiVrv825Fl2oZaYiQA";
|
||||
+const char * twitterConsumerSecret = "qYZa8Dszrow6vry4iwtSm1zTidnW7ii8IQztgXWZY";
|
||||
#endif
|
||||
|
||||
TwitterEditAccountWidget::TwitterEditAccountWidget(TwitterMicroBlog *microblog,
|
||||
@ -1,15 +0,0 @@
|
||||
diff --git a/microblogs/twitter/twittereditaccount.cpp b/microblogs/twitter/twittereditaccount.cpp
|
||||
index efea8d5..9f50534 100644
|
||||
--- a/microblogs/twitter/twittereditaccount.cpp
|
||||
+++ b/microblogs/twitter/twittereditaccount.cpp
|
||||
@@ -40,8 +40,8 @@ along with this program; if not, see http://www.gnu.org/licenses/
|
||||
#include <QCheckBox>
|
||||
#include <KInputDialog>
|
||||
|
||||
-const char * twitterConsumerKey = "VyXMf0O7CvciiUQjliYtYg";
|
||||
-const char * twitterConsumerSecret = "uD2HvsOBjzt1Vs6SnouFtuxDeHmvOOVwmn3fBVyCw0";
|
||||
+const char * twitterConsumerKey = "irARiVrv825Fl2oZaYiQA";
|
||||
+const char * twitterConsumerSecret = "qYZa8Dszrow6vry4iwtSm1zTidnW7ii8IQztgXWZY";
|
||||
|
||||
TwitterEditAccountWidget::TwitterEditAccountWidget(TwitterMicroBlog *microblog,
|
||||
TwitterAccount* account, QWidget* parent)
|
||||
@ -1,265 +0,0 @@
|
||||
diff -uNr ejabberd-2.0.2-beta1.ORIG/src/mod_logxml.erl ejabberd-2.0.2-beta1/src/mod_logxml.erl
|
||||
--- mod_logxml.erl
|
||||
+++ mod_logxml.erl
|
||||
@@ -0,0 +1,261 @@
|
||||
+%%%----------------------------------------------------------------------
|
||||
+%%% File : mod_logxml.erl
|
||||
+%%% Author : Badlop
|
||||
+%%% Purpose : Log XMPP packets to XML file
|
||||
+%%% Created :
|
||||
+%%% Id :
|
||||
+%%%----------------------------------------------------------------------
|
||||
+
|
||||
+-module(mod_logxml).
|
||||
+-author('badlop@ono.com').
|
||||
+
|
||||
+-behaviour(gen_mod).
|
||||
+
|
||||
+-export([start/2, init/7, stop/1,
|
||||
+ send_packet/3, receive_packet/4]).
|
||||
+
|
||||
+-include("ejabberd.hrl").
|
||||
+-include("jlib.hrl").
|
||||
+
|
||||
+-define(PROCNAME, ejabberd_mod_logxml).
|
||||
+
|
||||
+%% -------------------
|
||||
+%% Module control
|
||||
+%% -------------------
|
||||
+
|
||||
+start(Host, Opts) ->
|
||||
+ Logdir = gen_mod:get_opt(logdir, Opts, "/tmp/jabberlogs/"),
|
||||
+
|
||||
+ Rd = gen_mod:get_opt(rotate_days, Opts, 1),
|
||||
+ Rf = case gen_mod:get_opt(rotate_megs, Opts, 10) of
|
||||
+ no -> no;
|
||||
+ Rf1 -> Rf1*1024*1024
|
||||
+ end,
|
||||
+ Rp = case gen_mod:get_opt(rotate_kpackets, Opts, 10) of
|
||||
+ no -> no;
|
||||
+ Rp1 -> Rp1*1000
|
||||
+ end,
|
||||
+ RotateO = {Rd, Rf, Rp},
|
||||
+ CheckRKP = gen_mod:get_opt(check_rotate_kpackets, Opts, 1),
|
||||
+
|
||||
+ Timezone = gen_mod:get_opt(timezone, Opts, local),
|
||||
+
|
||||
+ Orientation = gen_mod:get_opt(orientation, Opts, [send, recv]),
|
||||
+ Stanza = gen_mod:get_opt(stanza, Opts, [iq, message, presence, other]),
|
||||
+ Direction = gen_mod:get_opt(direction, Opts, [internal, vhosts, external]),
|
||||
+ FilterO = {
|
||||
+ {orientation, Orientation},
|
||||
+ {stanza, Stanza},
|
||||
+ {direction, Direction}},
|
||||
+ ShowIP = gen_mod:get_opt(show_ip, Opts, false),
|
||||
+
|
||||
+ ejabberd_hooks:add(user_send_packet, Host, ?MODULE, send_packet, 90),
|
||||
+ ejabberd_hooks:add(user_receive_packet, Host, ?MODULE, receive_packet, 90),
|
||||
+ register(gen_mod:get_module_proc(Host, ?PROCNAME),
|
||||
+ spawn(?MODULE, init, [Host, Logdir, RotateO, CheckRKP,
|
||||
+ Timezone, ShowIP, FilterO])).
|
||||
+
|
||||
+stop(Host) ->
|
||||
+ ejabberd_hooks:delete(user_send_packet, Host, ?MODULE, send_packet, 90),
|
||||
+ ejabberd_hooks:delete(user_receive_packet, Host, ?MODULE, receive_packet, 90),
|
||||
+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
|
||||
+ Proc ! stop,
|
||||
+ {wait, Proc}.
|
||||
+
|
||||
+init(Host, Logdir, RotateO, CheckRKP, Timezone, ShowIP, FilterO) ->
|
||||
+ {IoDevice, Filename, Gregorian_day} = open_file(Logdir, Host, Timezone),
|
||||
+ loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, 0, Gregorian_day,
|
||||
+ Timezone, ShowIP, FilterO).
|
||||
+
|
||||
+%% -------------------
|
||||
+%% Main
|
||||
+%% -------------------
|
||||
+
|
||||
+manage_rotate(Host, IoDevice, Filename, Logdir, RotateO, PacketC,
|
||||
+ Gregorian_day_log, Timezone) ->
|
||||
+ {RO_days, RO_size, RO_packets} = RotateO,
|
||||
+
|
||||
+ Rotate1 = case RO_packets of
|
||||
+ no -> false;
|
||||
+ PacketC -> true;
|
||||
+ _ -> false
|
||||
+ end,
|
||||
+
|
||||
+ Filesize = filelib:file_size(Filename),
|
||||
+ Rotate2 = if
|
||||
+ RO_size == no -> false;
|
||||
+ Filesize >= RO_size -> true;
|
||||
+ true -> false
|
||||
+ end,
|
||||
+
|
||||
+ Gregorian_day_today = get_gregorian_day(),
|
||||
+ Rotate3 = if
|
||||
+ RO_days == no -> false;
|
||||
+ (Gregorian_day_today - Gregorian_day_log) >= RO_days ->
|
||||
+ true;
|
||||
+ true -> false
|
||||
+ end,
|
||||
+
|
||||
+ case lists:any(fun(E) -> E end, [Rotate1, Rotate2, Rotate3]) of
|
||||
+ true ->
|
||||
+ {IoDevice2, Filename2, Gregorian_day2} =
|
||||
+ rotate_log(IoDevice, Logdir, Host, Timezone),
|
||||
+ {IoDevice2, Filename2, Gregorian_day2, 0};
|
||||
+ false ->
|
||||
+ {IoDevice, Filename, Gregorian_day_log, PacketC+1}
|
||||
+ end.
|
||||
+
|
||||
+filter(FilterO, E) ->
|
||||
+ {{orientation, OrientationO},{stanza, StanzaO},{direction, DirectionO}} =
|
||||
+ FilterO,
|
||||
+ {Orientation, From, To, Packet} = E,
|
||||
+
|
||||
+ {xmlelement, Stanza_str, _Attrs, _Els} = Packet,
|
||||
+ Stanza = list_to_atom(Stanza_str),
|
||||
+
|
||||
+ Hosts_all = ejabberd_config:get_global_option(hosts),
|
||||
+ {Host_local, Host_remote} = case Orientation of
|
||||
+ send -> {From#jid.lserver, To#jid.lserver};
|
||||
+ recv -> {To#jid.lserver, From#jid.lserver}
|
||||
+ end,
|
||||
+ Direction = case Host_remote of
|
||||
+ Host_local -> internal;
|
||||
+ _ ->
|
||||
+ case lists:member(Host_remote, Hosts_all) of
|
||||
+ true -> vhosts;
|
||||
+ false -> external
|
||||
+ end
|
||||
+ end,
|
||||
+
|
||||
+ {lists:all(fun(O) -> O end,
|
||||
+ [lists:member(Orientation, OrientationO),
|
||||
+ lists:member(Stanza, StanzaO),
|
||||
+ lists:member(Direction, DirectionO)]),
|
||||
+ {Orientation, Stanza, Direction}}.
|
||||
+
|
||||
+loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC,
|
||||
+ Gregorian_day, Timezone, ShowIP, FilterO) ->
|
||||
+ receive
|
||||
+ {addlog, E} ->
|
||||
+ {IoDevice3, Filename3, Gregorian_day3, PacketC3} =
|
||||
+ case filter(FilterO, E) of
|
||||
+ {true, OSD} ->
|
||||
+ Div = PacketC/CheckRKP,
|
||||
+ {IoDevice2, Filename2, Gregorian_day2, PacketC2} =
|
||||
+ case Div==round(Div) of
|
||||
+ true ->
|
||||
+ manage_rotate(Host, IoDevice, Filename,
|
||||
+ Logdir, RotateO, PacketC,
|
||||
+ Gregorian_day, Timezone);
|
||||
+ false ->
|
||||
+ {IoDevice, Filename, Gregorian_day,
|
||||
+ PacketC+1}
|
||||
+ end,
|
||||
+ add_log(IoDevice2, Timezone, ShowIP, E, OSD),
|
||||
+ {IoDevice2, Filename2, Gregorian_day2, PacketC2};
|
||||
+ _ ->
|
||||
+ {IoDevice, Filename, Gregorian_day, PacketC}
|
||||
+ end,
|
||||
+ loop(Host, IoDevice3, Filename3, Logdir, CheckRKP, RotateO,
|
||||
+ PacketC3, Gregorian_day3, Timezone, ShowIP, FilterO);
|
||||
+ stop ->
|
||||
+ close_file(IoDevice),
|
||||
+ ok;
|
||||
+ _ ->
|
||||
+ loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC,
|
||||
+ Gregorian_day, Timezone, ShowIP, FilterO)
|
||||
+ end.
|
||||
+
|
||||
+send_packet(FromJID, ToJID, P) ->
|
||||
+ Host = FromJID#jid.lserver,
|
||||
+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
|
||||
+ Proc ! {addlog, {send, FromJID, ToJID, P}}.
|
||||
+
|
||||
+receive_packet(_JID, From, To, P) ->
|
||||
+ Host = To#jid.lserver,
|
||||
+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
|
||||
+ Proc ! {addlog, {recv, From, To, P}}.
|
||||
+
|
||||
+add_log(Io, Timezone, ShowIP, {Orientation, From, To, Packet}, _OSD) ->
|
||||
+ %%{Orientation, Stanza, Direction} = OSD,
|
||||
+ LocalJID = case Orientation of
|
||||
+ send -> From;
|
||||
+ recv -> To
|
||||
+ end,
|
||||
+ LocalIPS = case ShowIP of
|
||||
+ true ->
|
||||
+ {UserIP, _Port} = ejabberd_sm:get_user_ip(
|
||||
+ LocalJID#jid.user,
|
||||
+ LocalJID#jid.server,
|
||||
+ LocalJID#jid.resource),
|
||||
+ io_lib:format("lip=\"~s\" ", [inet_parse:ntoa(UserIP)]);
|
||||
+ false -> ""
|
||||
+ end,
|
||||
+ TimestampISO = get_now_iso(Timezone),
|
||||
+ io:fwrite(Io, "<packet or=\"~p\" ljid=\"~s\" ~sts=\"~s\">~s</packet>~n",
|
||||
+ [Orientation, jlib:jid_to_string(LocalJID), LocalIPS,
|
||||
+ TimestampISO, xml:element_to_string(Packet)]).
|
||||
+
|
||||
+%% -------------------
|
||||
+%% File
|
||||
+%% -------------------
|
||||
+
|
||||
+open_file(Logdir, Host, Timezone) ->
|
||||
+ TimeStamp = get_now_iso(Timezone),
|
||||
+ Year = string:substr(TimeStamp, 1, 4),
|
||||
+ Month = string:substr(TimeStamp, 5, 2),
|
||||
+ Day = string:substr(TimeStamp, 7, 2),
|
||||
+ Hour = string:substr(TimeStamp, 10, 2),
|
||||
+ Min = string:substr(TimeStamp, 13, 2),
|
||||
+ Sec = string:substr(TimeStamp, 16, 2),
|
||||
+ S = "-",
|
||||
+ Logname = lists:flatten([Host,S,Year,S,Month,S,Day,S,Hour,S,Min,S,Sec,
|
||||
+ ".xml"]),
|
||||
+ Filename = filename:join([Logdir, Logname]),
|
||||
+
|
||||
+ Gregorian_day = get_gregorian_day(),
|
||||
+
|
||||
+ %% Open file, create if it does not exist, create parent dirs if needed
|
||||
+ case file:read_file_info(Filename) of
|
||||
+ {ok, _} ->
|
||||
+ {ok, IoDevice} = file:open(Filename, [append]);
|
||||
+ {error, enoent} ->
|
||||
+ make_dir_rec(Logdir),
|
||||
+ {ok, IoDevice} = file:open(Filename, [append]),
|
||||
+ io:fwrite(IoDevice, "~s~n", ["<?xml version=\"1.0\"?>"]),
|
||||
+ io:fwrite(IoDevice, "~s~n", ["<?xml-stylesheet href=\"xmpp.xsl\" type=\"text/xsl\"?>"]),
|
||||
+ io:fwrite(IoDevice, "~s~n", ["<log>"])
|
||||
+ end,
|
||||
+ {IoDevice, Filename, Gregorian_day}.
|
||||
+
|
||||
+close_file(IoDevice) ->
|
||||
+ io:fwrite(IoDevice, "~s~n", ["</log>"]),
|
||||
+ file:close(IoDevice).
|
||||
+
|
||||
+rotate_log(IoDevice, Logdir, Host, Timezone) ->
|
||||
+ close_file(IoDevice),
|
||||
+ open_file(Logdir, Host, Timezone).
|
||||
+
|
||||
+make_dir_rec(Dir) ->
|
||||
+ case file:read_file_info(Dir) of
|
||||
+ {ok, _} ->
|
||||
+ ok;
|
||||
+ {error, enoent} ->
|
||||
+ DirS = filename:split(Dir),
|
||||
+ DirR = lists:sublist(DirS, length(DirS)-1),
|
||||
+ make_dir_rec(filename:join(DirR)),
|
||||
+ file:make_dir(Dir)
|
||||
+ end.
|
||||
+
|
||||
+%% -------------------
|
||||
+%% Utils
|
||||
+%% -------------------
|
||||
+
|
||||
+get_gregorian_day() -> calendar:date_to_gregorian_days(date()).
|
||||
+
|
||||
+get_now_iso(Timezone) ->
|
||||
+ TimeStamp = case Timezone of
|
||||
+ local -> calendar:now_to_local_time(now());
|
||||
+ universal -> calendar:now_to_universal_time(now())
|
||||
+ end,
|
||||
+ jlib:timestamp_to_iso(TimeStamp).
|
||||
@ -1,14 +0,0 @@
|
||||
diff --git a/src/eldap/eldap_filter.erl b/src/eldap/eldap_filter.erl
|
||||
index 51dac5e..341fba1 100644
|
||||
--- a/src/eldap/eldap_filter.erl
|
||||
+++ b/src/eldap/eldap_filter.erl
|
||||
@@ -171,7 +171,7 @@ do_sub(S, {RegExp, New, Times}, Iter) ->
|
||||
end.
|
||||
|
||||
replace_amps(String) ->
|
||||
- lists:map(
|
||||
+ lists:flatmap(
|
||||
fun($&) -> "\\&";
|
||||
- (Chr) -> Chr
|
||||
+ (Chr) -> [Chr]
|
||||
end, String).
|
||||
@ -1,265 +0,0 @@
|
||||
diff -uNr ejabberd-2.0.2-beta1.ORIG/src/mod_logxml.erl ejabberd-2.0.2-beta1/src/mod_logxml.erl
|
||||
--- mod_logxml.erl
|
||||
+++ mod_logxml.erl
|
||||
@@ -0,0 +1,261 @@
|
||||
+%%%----------------------------------------------------------------------
|
||||
+%%% File : mod_logxml.erl
|
||||
+%%% Author : Badlop
|
||||
+%%% Purpose : Log XMPP packets to XML file
|
||||
+%%% Created :
|
||||
+%%% Id :
|
||||
+%%%----------------------------------------------------------------------
|
||||
+
|
||||
+-module(mod_logxml).
|
||||
+-author('badlop@ono.com').
|
||||
+
|
||||
+-behaviour(gen_mod).
|
||||
+
|
||||
+-export([start/2, init/7, stop/1,
|
||||
+ send_packet/3, receive_packet/4]).
|
||||
+
|
||||
+-include("ejabberd.hrl").
|
||||
+-include("jlib.hrl").
|
||||
+
|
||||
+-define(PROCNAME, ejabberd_mod_logxml).
|
||||
+
|
||||
+%% -------------------
|
||||
+%% Module control
|
||||
+%% -------------------
|
||||
+
|
||||
+start(Host, Opts) ->
|
||||
+ Logdir = gen_mod:get_opt(logdir, Opts, "/tmp/jabberlogs/"),
|
||||
+
|
||||
+ Rd = gen_mod:get_opt(rotate_days, Opts, 1),
|
||||
+ Rf = case gen_mod:get_opt(rotate_megs, Opts, 10) of
|
||||
+ no -> no;
|
||||
+ Rf1 -> Rf1*1024*1024
|
||||
+ end,
|
||||
+ Rp = case gen_mod:get_opt(rotate_kpackets, Opts, 10) of
|
||||
+ no -> no;
|
||||
+ Rp1 -> Rp1*1000
|
||||
+ end,
|
||||
+ RotateO = {Rd, Rf, Rp},
|
||||
+ CheckRKP = gen_mod:get_opt(check_rotate_kpackets, Opts, 1),
|
||||
+
|
||||
+ Timezone = gen_mod:get_opt(timezone, Opts, local),
|
||||
+
|
||||
+ Orientation = gen_mod:get_opt(orientation, Opts, [send, recv]),
|
||||
+ Stanza = gen_mod:get_opt(stanza, Opts, [iq, message, presence, other]),
|
||||
+ Direction = gen_mod:get_opt(direction, Opts, [internal, vhosts, external]),
|
||||
+ FilterO = {
|
||||
+ {orientation, Orientation},
|
||||
+ {stanza, Stanza},
|
||||
+ {direction, Direction}},
|
||||
+ ShowIP = gen_mod:get_opt(show_ip, Opts, false),
|
||||
+
|
||||
+ ejabberd_hooks:add(user_send_packet, Host, ?MODULE, send_packet, 90),
|
||||
+ ejabberd_hooks:add(user_receive_packet, Host, ?MODULE, receive_packet, 90),
|
||||
+ register(gen_mod:get_module_proc(Host, ?PROCNAME),
|
||||
+ spawn(?MODULE, init, [Host, Logdir, RotateO, CheckRKP,
|
||||
+ Timezone, ShowIP, FilterO])).
|
||||
+
|
||||
+stop(Host) ->
|
||||
+ ejabberd_hooks:delete(user_send_packet, Host, ?MODULE, send_packet, 90),
|
||||
+ ejabberd_hooks:delete(user_receive_packet, Host, ?MODULE, receive_packet, 90),
|
||||
+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
|
||||
+ Proc ! stop,
|
||||
+ {wait, Proc}.
|
||||
+
|
||||
+init(Host, Logdir, RotateO, CheckRKP, Timezone, ShowIP, FilterO) ->
|
||||
+ {IoDevice, Filename, Gregorian_day} = open_file(Logdir, Host, Timezone),
|
||||
+ loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, 0, Gregorian_day,
|
||||
+ Timezone, ShowIP, FilterO).
|
||||
+
|
||||
+%% -------------------
|
||||
+%% Main
|
||||
+%% -------------------
|
||||
+
|
||||
+manage_rotate(Host, IoDevice, Filename, Logdir, RotateO, PacketC,
|
||||
+ Gregorian_day_log, Timezone) ->
|
||||
+ {RO_days, RO_size, RO_packets} = RotateO,
|
||||
+
|
||||
+ Rotate1 = case RO_packets of
|
||||
+ no -> false;
|
||||
+ PacketC -> true;
|
||||
+ _ -> false
|
||||
+ end,
|
||||
+
|
||||
+ Filesize = filelib:file_size(Filename),
|
||||
+ Rotate2 = if
|
||||
+ RO_size == no -> false;
|
||||
+ Filesize >= RO_size -> true;
|
||||
+ true -> false
|
||||
+ end,
|
||||
+
|
||||
+ Gregorian_day_today = get_gregorian_day(),
|
||||
+ Rotate3 = if
|
||||
+ RO_days == no -> false;
|
||||
+ (Gregorian_day_today - Gregorian_day_log) >= RO_days ->
|
||||
+ true;
|
||||
+ true -> false
|
||||
+ end,
|
||||
+
|
||||
+ case lists:any(fun(E) -> E end, [Rotate1, Rotate2, Rotate3]) of
|
||||
+ true ->
|
||||
+ {IoDevice2, Filename2, Gregorian_day2} =
|
||||
+ rotate_log(IoDevice, Logdir, Host, Timezone),
|
||||
+ {IoDevice2, Filename2, Gregorian_day2, 0};
|
||||
+ false ->
|
||||
+ {IoDevice, Filename, Gregorian_day_log, PacketC+1}
|
||||
+ end.
|
||||
+
|
||||
+filter(FilterO, E) ->
|
||||
+ {{orientation, OrientationO},{stanza, StanzaO},{direction, DirectionO}} =
|
||||
+ FilterO,
|
||||
+ {Orientation, From, To, Packet} = E,
|
||||
+
|
||||
+ {xmlelement, Stanza_str, _Attrs, _Els} = Packet,
|
||||
+ Stanza = list_to_atom(Stanza_str),
|
||||
+
|
||||
+ Hosts_all = ejabberd_config:get_global_option(hosts),
|
||||
+ {Host_local, Host_remote} = case Orientation of
|
||||
+ send -> {From#jid.lserver, To#jid.lserver};
|
||||
+ recv -> {To#jid.lserver, From#jid.lserver}
|
||||
+ end,
|
||||
+ Direction = case Host_remote of
|
||||
+ Host_local -> internal;
|
||||
+ _ ->
|
||||
+ case lists:member(Host_remote, Hosts_all) of
|
||||
+ true -> vhosts;
|
||||
+ false -> external
|
||||
+ end
|
||||
+ end,
|
||||
+
|
||||
+ {lists:all(fun(O) -> O end,
|
||||
+ [lists:member(Orientation, OrientationO),
|
||||
+ lists:member(Stanza, StanzaO),
|
||||
+ lists:member(Direction, DirectionO)]),
|
||||
+ {Orientation, Stanza, Direction}}.
|
||||
+
|
||||
+loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC,
|
||||
+ Gregorian_day, Timezone, ShowIP, FilterO) ->
|
||||
+ receive
|
||||
+ {addlog, E} ->
|
||||
+ {IoDevice3, Filename3, Gregorian_day3, PacketC3} =
|
||||
+ case filter(FilterO, E) of
|
||||
+ {true, OSD} ->
|
||||
+ Div = PacketC/CheckRKP,
|
||||
+ {IoDevice2, Filename2, Gregorian_day2, PacketC2} =
|
||||
+ case Div==round(Div) of
|
||||
+ true ->
|
||||
+ manage_rotate(Host, IoDevice, Filename,
|
||||
+ Logdir, RotateO, PacketC,
|
||||
+ Gregorian_day, Timezone);
|
||||
+ false ->
|
||||
+ {IoDevice, Filename, Gregorian_day,
|
||||
+ PacketC+1}
|
||||
+ end,
|
||||
+ add_log(IoDevice2, Timezone, ShowIP, E, OSD),
|
||||
+ {IoDevice2, Filename2, Gregorian_day2, PacketC2};
|
||||
+ _ ->
|
||||
+ {IoDevice, Filename, Gregorian_day, PacketC}
|
||||
+ end,
|
||||
+ loop(Host, IoDevice3, Filename3, Logdir, CheckRKP, RotateO,
|
||||
+ PacketC3, Gregorian_day3, Timezone, ShowIP, FilterO);
|
||||
+ stop ->
|
||||
+ close_file(IoDevice),
|
||||
+ ok;
|
||||
+ _ ->
|
||||
+ loop(Host, IoDevice, Filename, Logdir, CheckRKP, RotateO, PacketC,
|
||||
+ Gregorian_day, Timezone, ShowIP, FilterO)
|
||||
+ end.
|
||||
+
|
||||
+send_packet(FromJID, ToJID, P) ->
|
||||
+ Host = FromJID#jid.lserver,
|
||||
+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
|
||||
+ Proc ! {addlog, {send, FromJID, ToJID, P}}.
|
||||
+
|
||||
+receive_packet(_JID, From, To, P) ->
|
||||
+ Host = To#jid.lserver,
|
||||
+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
|
||||
+ Proc ! {addlog, {recv, From, To, P}}.
|
||||
+
|
||||
+add_log(Io, Timezone, ShowIP, {Orientation, From, To, Packet}, _OSD) ->
|
||||
+ %%{Orientation, Stanza, Direction} = OSD,
|
||||
+ LocalJID = case Orientation of
|
||||
+ send -> From;
|
||||
+ recv -> To
|
||||
+ end,
|
||||
+ LocalIPS = case ShowIP of
|
||||
+ true ->
|
||||
+ {UserIP, _Port} = ejabberd_sm:get_user_ip(
|
||||
+ LocalJID#jid.user,
|
||||
+ LocalJID#jid.server,
|
||||
+ LocalJID#jid.resource),
|
||||
+ io_lib:format("lip=\"~s\" ", [inet_parse:ntoa(UserIP)]);
|
||||
+ false -> ""
|
||||
+ end,
|
||||
+ TimestampISO = get_now_iso(Timezone),
|
||||
+ io:fwrite(Io, "<packet or=\"~p\" ljid=\"~s\" ~sts=\"~s\">~s</packet>~n",
|
||||
+ [Orientation, jlib:jid_to_string(LocalJID), LocalIPS,
|
||||
+ TimestampISO, xml:element_to_string(Packet)]).
|
||||
+
|
||||
+%% -------------------
|
||||
+%% File
|
||||
+%% -------------------
|
||||
+
|
||||
+open_file(Logdir, Host, Timezone) ->
|
||||
+ TimeStamp = get_now_iso(Timezone),
|
||||
+ Year = string:substr(TimeStamp, 1, 4),
|
||||
+ Month = string:substr(TimeStamp, 5, 2),
|
||||
+ Day = string:substr(TimeStamp, 7, 2),
|
||||
+ Hour = string:substr(TimeStamp, 10, 2),
|
||||
+ Min = string:substr(TimeStamp, 13, 2),
|
||||
+ Sec = string:substr(TimeStamp, 16, 2),
|
||||
+ S = "-",
|
||||
+ Logname = lists:flatten([Host,S,Year,S,Month,S,Day,S,Hour,S,Min,S,Sec,
|
||||
+ ".xml"]),
|
||||
+ Filename = filename:join([Logdir, Logname]),
|
||||
+
|
||||
+ Gregorian_day = get_gregorian_day(),
|
||||
+
|
||||
+ %% Open file, create if it does not exist, create parent dirs if needed
|
||||
+ case file:read_file_info(Filename) of
|
||||
+ {ok, _} ->
|
||||
+ {ok, IoDevice} = file:open(Filename, [append]);
|
||||
+ {error, enoent} ->
|
||||
+ make_dir_rec(Logdir),
|
||||
+ {ok, IoDevice} = file:open(Filename, [append]),
|
||||
+ io:fwrite(IoDevice, "~s~n", ["<?xml version=\"1.0\"?>"]),
|
||||
+ io:fwrite(IoDevice, "~s~n", ["<?xml-stylesheet href=\"xmpp.xsl\" type=\"text/xsl\"?>"]),
|
||||
+ io:fwrite(IoDevice, "~s~n", ["<log>"])
|
||||
+ end,
|
||||
+ {IoDevice, Filename, Gregorian_day}.
|
||||
+
|
||||
+close_file(IoDevice) ->
|
||||
+ io:fwrite(IoDevice, "~s~n", ["</log>"]),
|
||||
+ file:close(IoDevice).
|
||||
+
|
||||
+rotate_log(IoDevice, Logdir, Host, Timezone) ->
|
||||
+ close_file(IoDevice),
|
||||
+ open_file(Logdir, Host, Timezone).
|
||||
+
|
||||
+make_dir_rec(Dir) ->
|
||||
+ case file:read_file_info(Dir) of
|
||||
+ {ok, _} ->
|
||||
+ ok;
|
||||
+ {error, enoent} ->
|
||||
+ DirS = filename:split(Dir),
|
||||
+ DirR = lists:sublist(DirS, length(DirS)-1),
|
||||
+ make_dir_rec(filename:join(DirR)),
|
||||
+ file:make_dir(Dir)
|
||||
+ end.
|
||||
+
|
||||
+%% -------------------
|
||||
+%% Utils
|
||||
+%% -------------------
|
||||
+
|
||||
+get_gregorian_day() -> calendar:date_to_gregorian_days(date()).
|
||||
+
|
||||
+get_now_iso(Timezone) ->
|
||||
+ TimeStamp = case Timezone of
|
||||
+ local -> calendar:now_to_local_time(now());
|
||||
+ universal -> calendar:now_to_universal_time(now())
|
||||
+ end,
|
||||
+ jlib:timestamp_to_iso(TimeStamp).
|
||||
@ -1,8 +0,0 @@
|
||||
diff --git gwibber/microblog/util/custom.py gwibber/microblog/util/custom.py
|
||||
new file mode 100644
|
||||
index 0000000..cc60f14
|
||||
--- /dev/null
|
||||
+++ gwibber/microblog/util/custom.py
|
||||
@@ -0,0 +1,2 @@
|
||||
+TWITTER_OAUTH_KEY = "vuYyUcgOmNmGAldiX7z2A"
|
||||
+TWITTER_OAUTH_SECRET = "yf4KHlIHwI3sOBsdJj5XDoNUcsoz7SAGRTsDZ2Qlwf8"
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/src/mm-manager.c b/src/mm-manager.c
|
||||
index 1a93170..72af612 100644
|
||||
--- a/src/mm-manager.c
|
||||
+++ b/src/mm-manager.c
|
||||
@@ -96,7 +96,7 @@ load_plugin (const char *path)
|
||||
plugin = (*plugin_create_func) ();
|
||||
if (plugin) {
|
||||
g_object_weak_ref (G_OBJECT (plugin), (GWeakNotify) g_module_close, module);
|
||||
- g_message ("Loaded plugin %s", mm_plugin_get_name (plugin));
|
||||
+ //g_message ("Loaded plugin %s", mm_plugin_get_name (plugin));
|
||||
} else
|
||||
g_warning ("Could not load plugin %s: initialization failed", path);
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/src/nm-policy-hosts.c b/src/nm-policy-hosts.c
|
||||
index 7f9cff8..1d8b493 100644
|
||||
--- a/src/nm-policy-hosts.c
|
||||
+++ b/src/nm-policy-hosts.c
|
||||
@@ -483,6 +483,7 @@ nm_policy_hosts_update_etc_hosts (const char *hostname,
|
||||
const char *ip6_addr,
|
||||
gboolean *out_changed)
|
||||
{
|
||||
+ return TRUE;
|
||||
char *contents = NULL;
|
||||
char **lines = NULL;
|
||||
GError *error = NULL;
|
||||
@ -1,34 +0,0 @@
|
||||
From 1187922adf7f781cb257b5e119d53a403e3d4831 Mon Sep 17 00:00:00 2001
|
||||
From: Dan Williams <dcbw@redhat.com>
|
||||
Date: Fri, 14 Jan 2011 20:02:02 +0000
|
||||
Subject: core: lack of an IPv4 setting indicates DHCP (novell #664640)
|
||||
|
||||
It shouldn't assert.
|
||||
---
|
||||
diff --git a/src/nm-device.c b/src/nm-device.c
|
||||
index b9701a3..fa586ef 100644
|
||||
--- a/src/nm-device.c
|
||||
+++ b/src/nm-device.c
|
||||
@@ -3355,7 +3355,7 @@ dispose (GObject *object)
|
||||
if ( nm_device_interface_can_assume_connections (NM_DEVICE_INTERFACE (self))
|
||||
&& (nm_device_get_state (self) == NM_DEVICE_STATE_ACTIVATED)) {
|
||||
NMConnection *connection;
|
||||
- NMSettingIP4Config *s_ip4;
|
||||
+ NMSettingIP4Config *s_ip4 = NULL;
|
||||
const char *method = NULL;
|
||||
|
||||
/* Only system connections can be left up */
|
||||
@@ -3368,9 +3368,8 @@ dispose (GObject *object)
|
||||
* to check that.
|
||||
*/
|
||||
s_ip4 = (NMSettingIP4Config *) nm_connection_get_setting (connection, NM_TYPE_SETTING_IP4_CONFIG);
|
||||
- g_assert (s_ip4);
|
||||
-
|
||||
- method = nm_setting_ip4_config_get_method (s_ip4);
|
||||
+ if (s_ip4)
|
||||
+ method = nm_setting_ip4_config_get_method (s_ip4);
|
||||
if ( !method
|
||||
|| !strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_AUTO)
|
||||
|| !strcmp (method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL))
|
||||
--
|
||||
cgit v0.8.3-6-g21f6
|
||||
@ -1,34 +0,0 @@
|
||||
diff --git a/BitTorrent/HTTPHandler.py b/BitTorrent/HTTPHandler.py
|
||||
index afabc63..91a745d 100644
|
||||
--- a/BitTorrent/HTTPHandler.py
|
||||
+++ b/BitTorrent/HTTPHandler.py
|
||||
@@ -110,6 +110,8 @@ class HTTPConnector(object):
|
||||
#this is nasty but i'm unsure of a better way at the moment
|
||||
compressed = StringIO()
|
||||
gz = GzipFile(fileobj = compressed, mode = 'wb', compresslevel = 9)
|
||||
+ if type(data) == unicode:
|
||||
+ data = data.encode("utf8")
|
||||
gz.write(data)
|
||||
gz.close()
|
||||
compressed.seek(0,0)
|
||||
@@ -151,6 +153,8 @@ class HTTPConnector(object):
|
||||
r.write(key + ': ' + str(value) + '\r\n')
|
||||
r.write('\r\n')
|
||||
if self.command != 'HEAD':
|
||||
+ if type(data)==unicode:
|
||||
+ data=data.encode("utf8")
|
||||
r.write(data)
|
||||
self.connection.write(r.getvalue())
|
||||
if self.connection.is_flushed():
|
||||
diff --git a/BitTorrent/track.py b/BitTorrent/track.py
|
||||
index ebedb70..4995b9c 100644
|
||||
--- a/BitTorrent/track.py
|
||||
+++ b/BitTorrent/track.py
|
||||
@@ -54,6 +54,7 @@ import threading
|
||||
import traceback
|
||||
|
||||
NOISY = False
|
||||
+_ = lambda x:x
|
||||
|
||||
def quote(x):
|
||||
return urllib.quote(x, safe='')
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/cnijfilter/src/bjfimage.c b/cnijfilter/src/bjfimage.c
|
||||
index 4006f9d..111b4a2 100755
|
||||
--- a/cnijfilter/src/bjfimage.c
|
||||
+++ b/cnijfilter/src/bjfimage.c
|
||||
@@ -1574,7 +1574,7 @@ static short png_image_init( LPBJF_IMAGEINFO lpbjfimage )
|
||||
goto onErr;
|
||||
}
|
||||
|
||||
- if (setjmp (png_p->jmpbuf))
|
||||
+ if (setjmp (png_jmpbuf(png_p)))
|
||||
{
|
||||
png_destroy_read_struct(&png_p, &info_p, (png_infopp)NULL);
|
||||
goto onErr;
|
||||
@ -1,17 +0,0 @@
|
||||
diff --git a/data/rules/56-hpmud_support.rules b/data/rules/56-hpmud_support.rules
|
||||
index c900b85..56434d3 100644
|
||||
--- a/data/rules/56-hpmud_support.rules
|
||||
+++ b/data/rules/56-hpmud_support.rules
|
||||
@@ -7,10 +7,10 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
|
||||
LABEL="pid_test"
|
||||
|
||||
# Check for LaserJet products (0x03f0xx17).
|
||||
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
|
||||
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
|
||||
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", RUN+="/bin/sh -c 'hp_model=%E{ID_MODEL} /usr/bin/hp-mkuri -c &'"
|
||||
# Check for LaserJet products (0x03f0xx2a).
|
||||
-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
|
||||
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", ENV{hp_model}="$sysfs{product}", ENV{hp_test}="yes"
|
||||
ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??2a", RUN+="/bin/sh -c 'hp_model=%E{ID_MODEL} /usr/bin/hp-mkuri -c &'"
|
||||
ENV{hp_test}=="yes", RUN+="bin/sh -c '/usr/bin/hp-mkuri -c &'"
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/include/compat.h b/include/compat.h
|
||||
index fa3234b..9d0c737 100644
|
||||
--- a/include/compat.h
|
||||
+++ b/include/compat.h
|
||||
@@ -37,6 +37,7 @@
|
||||
*/
|
||||
#ifndef _ATH_COMPAT_H_
|
||||
#define _ATH_COMPAT_H_
|
||||
+#define AUTOCONF_INCLUDED
|
||||
|
||||
/* Compatibility with older Linux kernels */
|
||||
#ifdef __KERNEL__
|
||||
@ -1,33 +0,0 @@
|
||||
<pre>
|
||||
--- ./src/palimpsest/gdu-section-drive.c 2010-03-14 22:50:51.000000000 +0300
|
||||
+++ ./src/palimpsest/gdu-section-drive1.c 2011-10-22 04:40:33.000000000 +0400
|
||||
@@ -429,6 +429,10 @@
|
||||
launch_context = NULL;
|
||||
|
||||
app_info = G_APP_INFO (g_desktop_app_info_new ("brasero.desktop"));
|
||||
+ if (app_info == NULL) app_info = G_APP_INFO (g_desktop_app_info_new ("xcdroast.desktop"));
|
||||
+ if (app_info == NULL) app_info = G_APP_INFO (g_desktop_app_info_new ("gnomebaker.desktop"));
|
||||
+ if (app_info == NULL) app_info = G_APP_INFO (g_desktop_app_info_new ("graveman.desktop"));
|
||||
+ if (app_info == NULL) app_info = G_APP_INFO (g_desktop_app_info_new ("xfburn.desktop"));
|
||||
if (app_info == NULL) {
|
||||
/* TODO: Use PackageKit to install Brasero */
|
||||
dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (gdu_shell_get_toplevel (gdu_section_get_shell (GDU_SECTION (section)))),
|
||||
@@ -436,7 +440,7 @@
|
||||
GTK_MESSAGE_ERROR,
|
||||
GTK_BUTTONS_OK,
|
||||
"<b><big><big>%s</big></big></b>\n\n%s",
|
||||
- _("Error launching Brasero"),
|
||||
+ _("Error launching CD/DVD burning program"),
|
||||
_("The application is not installed"));
|
||||
gtk_widget_show_all (dialog);
|
||||
gtk_dialog_run (GTK_DIALOG (dialog));
|
||||
@@ -456,7 +460,7 @@
|
||||
GTK_MESSAGE_ERROR,
|
||||
GTK_BUTTONS_OK,
|
||||
"<b><big><big>%s</big></big></b>\n\n%s",
|
||||
- _("Error launching Brasero"),
|
||||
+ _("Error launching CD/DVD burning program"),
|
||||
error->message);
|
||||
g_error_free (error);
|
||||
gtk_widget_show_all (dialog);
|
||||
</pre>
|
||||
@ -1,15 +0,0 @@
|
||||
diff --git a/src/rc/Makefile b/src/rc/Makefile
|
||||
index 9d33192..4999edf 100644
|
||||
--- a/src/rc/Makefile
|
||||
+++ b/src/rc/Makefile
|
||||
@@ -50,9 +50,7 @@ ${SRCS}: version.h
|
||||
.PHONY: version.h.tmp
|
||||
version.h.tmp:
|
||||
echo "#define VERSION \"${VERSION}${GITVER}\"" >$@
|
||||
- if test -n "${BRANDING}"; then \
|
||||
- echo "#define BRANDING \"${BRANDING}\"" >> $@; \
|
||||
- fi
|
||||
+ echo "#define BRANDING \"Calculate Linux\"" >> $@; \
|
||||
|
||||
version.h: version.h.tmp
|
||||
cmp -s $@.tmp $@ && rm $@.tmp || mv $@.tmp $@
|
||||
@ -1,42 +0,0 @@
|
||||
diff --git linux-boot-prober linux-boot-prober
|
||||
index e32dc84..b522567 100755
|
||||
--- linux-boot-prober
|
||||
+++ linux-boot-prober
|
||||
@@ -33,7 +33,7 @@ if ! grep -q "^$mapped " "$OS_PROBER_TMP/mounted-map"; then
|
||||
else
|
||||
mpoint=$(grep "^$mapped " "$OS_PROBER_TMP/mounted-map" | head -n1 | cut -d " " -f 2)
|
||||
mpoint="$(unescape_mount "$mpoint")"
|
||||
- if [ "$mpoint" != "/target/boot" ] && [ "$mpoint" != "/target" ] && [ "$mpoint" != "/" ]; then
|
||||
+ if [ "$mpoint" != "/target/boot" ] && [ "$mpoint" != "/target" ] && [ "$mpoint" != "/$(echo ${CHROOT_PATH%/} | cut -d/ -f 2-)" ]; then
|
||||
type=$(grep "^$mapped " "$OS_PROBER_TMP/mounted-map" | head -n1 | cut -d " " -f 3)
|
||||
if ! grep -q " $mpoint/boot " "$OS_PROBER_TMP/mounted-map"; then
|
||||
linux_mount_boot "$partition" "$mpoint"
|
||||
diff --git linux-boot-probes/mounted/common/90fallback linux-boot-probes/mounted/common/90fallback
|
||||
index 9ff78e1..9a5cf1a 100755
|
||||
--- linux-boot-probes/mounted/common/90fallback
|
||||
+++ linux-boot-probes/mounted/common/90fallback
|
||||
@@ -34,8 +34,10 @@ for kernpat in /vmlinuz /vmlinux /boot/vmlinuz /boot/vmlinux "/boot/vmlinuz*" \
|
||||
initrdname3=$(echo "$kernfile" | sed "s/vmlinu[zx]/initramfs\*/" | sed 's/$/.img/')
|
||||
# And Gentoo's also
|
||||
initrdname4=$(echo "$kernfile" | sed "s/kernel/initramfs\*/")
|
||||
+ # And Calculate's also
|
||||
+ initrdname5=$(echo "$kernfile" | sed "s/vmlinu[zx]/initramfs\*/" | sed 's/$/-install/')
|
||||
foundinitrd=0
|
||||
- for initrd in $(eval ls "$initrdname" "$initrdname1" "$initrdname2" "$initrdname3" "$initrdname4" 2>/dev/null); do
|
||||
+ for initrd in $(eval ls "$initrdname" "$initrdname1" "$initrdname2" "$initrdname3" "$initrdname4" "$initrdname5" 2>/dev/null); do
|
||||
if [ "$initrd" != "$kernfile" ] && [ -f "$initrd" ] && [ ! -L "$initrd" ]; then
|
||||
initrd=$(echo "$initrd" | sed "s!^$mpoint!!")
|
||||
result "$partition:$kernbootpart::$kernbasefile:$initrd:root=$mappedpartition"
|
||||
diff --git os-prober os-prober
|
||||
index fc4de2c..55dc20b 100755
|
||||
--- os-prober
|
||||
+++ os-prober
|
||||
@@ -147,7 +147,7 @@ for partition in $(partitions); do
|
||||
else
|
||||
mpoint=$(grep "^$mapped " "$OS_PROBER_TMP/mounted-map" | head -n1 | cut -d " " -f 2)
|
||||
mpoint="$(unescape_mount "$mpoint")"
|
||||
- if [ "$mpoint" != "/target/boot" ] && [ "$mpoint" != "/target" ] && [ "$mpoint" != "/" ]; then
|
||||
+ if [ "$mpoint" != "/target/boot" ] && [ "$mpoint" != "/target" ] && [ "$mpoint" != "/$(echo ${CHROOT_PATH%/} | cut -d/ -f 2-)" ]; then
|
||||
type=$(grep "^$mapped " "$OS_PROBER_TMP/mounted-map" | head -n1 | cut -d " " -f 3)
|
||||
for test in /usr/lib/os-probes/mounted/*; do
|
||||
if [ -f "$test" ] && [ -x "$test" ]; then
|
||||
@ -1,18 +0,0 @@
|
||||
diff --git common.sh common.sh
|
||||
index 30e245e..c295a15 100644
|
||||
--- common.sh
|
||||
+++ common.sh
|
||||
@@ -147,12 +147,7 @@ unescape_mount () {
|
||||
}
|
||||
|
||||
ro_partition () {
|
||||
- if type blockdev >/dev/null 2>&1 && \
|
||||
- [ "$(blockdev --getro "$1")" = 0 ] && \
|
||||
- blockdev --setro "$1"; then
|
||||
- cleanup_ro_partitions="${cleanup_ro_partitions:+$cleanup_ro_partitions }$1"
|
||||
- trap cleanup EXIT HUP INT QUIT TERM
|
||||
- fi
|
||||
+ :
|
||||
}
|
||||
|
||||
find_label () {
|
||||
@ -1,2 +0,0 @@
|
||||
# fix SANDBOX_WRITE for emerge
|
||||
SANDBOX_WRITE="${SANDBOX_WRITE}:/etc/mtab:/run/mount/utab"
|
||||
@ -1,27 +0,0 @@
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index 6e0aa82..7e5ddb7 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -5797,6 +5797,14 @@ void ATI_API_CALL KCL_fpu_begin(void)
|
||||
#ifdef CONFIG_X86_64
|
||||
kernel_fpu_begin();
|
||||
#else
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,8)
|
||||
+ struct task_struct *tsk = current;
|
||||
+ preempt_disable();
|
||||
+ if (tsk->thread.has_fpu)
|
||||
+ __save_init_fpu(tsk);
|
||||
+ else
|
||||
+ clts();
|
||||
+#else
|
||||
struct thread_info *cur_task = current_thread_info();
|
||||
preempt_disable();
|
||||
if (cur_task->status & TS_USEDFPU)
|
||||
@@ -5804,6 +5812,7 @@ void ATI_API_CALL KCL_fpu_begin(void)
|
||||
else
|
||||
clts();
|
||||
#endif
|
||||
+#endif
|
||||
}
|
||||
|
||||
/** \brief End of using FPU
|
||||
@ -1,21 +0,0 @@
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index 6e0aa82..7e5ddb7 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -5797,10 +5797,16 @@ void ATI_API_CALL KCL_fpu_begin(void)
|
||||
#ifdef CONFIG_X86_64
|
||||
kernel_fpu_begin();
|
||||
#else
|
||||
+#ifndef TS_USEDFPU
|
||||
+ preempt_disable();
|
||||
+ if (__thread_has_fpu(current))
|
||||
+ __save_init_fpu(current);
|
||||
+#else
|
||||
struct thread_info *cur_task = current_thread_info();
|
||||
preempt_disable();
|
||||
if (cur_task->status & TS_USEDFPU)
|
||||
__save_init_fpu(cur_task->task);
|
||||
+#endif
|
||||
else
|
||||
clts();
|
||||
#endif
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
index 3a5a972..02adb26 100755
|
||||
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
|
||||
@@ -187,6 +187,7 @@
|
||||
#include <linux/gfp.h>
|
||||
#include <linux/swap.h>
|
||||
#include "asm/i387.h"
|
||||
+#include "asm/fpu-internal.h"
|
||||
|
||||
#include "firegl_public.h"
|
||||
#include "kcl_osconfig.h"
|
||||
@ -1,24 +0,0 @@
|
||||
the nvidia drivers are trying to test for version 2.6.6, but fail to take into
|
||||
account the first digit. so 3.7.0+ ends up failing the test.
|
||||
|
||||
https://bugs.gentoo.org/447566
|
||||
|
||||
--- a/usr/src/nv/conftest.sh
|
||||
+++ b/usr/src/nv/conftest.sh
|
||||
@@ -1697,13 +1697,15 @@
|
||||
# kernel older than 2.6.6, that's all we require to
|
||||
# build the module.
|
||||
#
|
||||
+ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
|
||||
PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
|
||||
SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
|
||||
|
||||
- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
|
||||
+ if [ -n "$VERSION" -a $VERSION -ge 3 ] || \
|
||||
+ [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
|
||||
-a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
|
||||
SELECTED_MAKEFILE=Makefile.kbuild
|
||||
RET=0
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
@ -1,47 +0,0 @@
|
||||
diff --git a/usr/src/nv/conftest.sh b/usr/src/nv/conftest.sh
|
||||
index 29012dd..4474130 100644
|
||||
--- a/usr/src/nv/conftest.sh
|
||||
+++ b/usr/src/nv/conftest.sh
|
||||
@@ -20,6 +20,7 @@ ARCH=$3
|
||||
ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
|
||||
SOURCES=$4
|
||||
HEADERS=$SOURCES/include
|
||||
+HEADERSA=$SOURCES/include/uapi
|
||||
OUTPUT=$5
|
||||
XEN_PRESENT=1
|
||||
|
||||
@@ -118,7 +119,7 @@ build_cflags() {
|
||||
fi
|
||||
fi
|
||||
|
||||
- CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
|
||||
+ CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
|
||||
|
||||
test_xen
|
||||
|
||||
@@ -142,10 +143,10 @@ build_cflags() {
|
||||
fi
|
||||
fi
|
||||
|
||||
- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
|
||||
+ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
|
||||
|
||||
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
|
||||
- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
|
||||
+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
|
||||
fi
|
||||
if [ -n "$BUILD_PARAMS" ]; then
|
||||
CFLAGS="$CFLAGS -D$BUILD_PARAMS"
|
||||
diff --git a/usr/src/nv/nv.c b/usr/src/nv/nv.c
|
||||
index 538217e..73c7234 100644
|
||||
--- a/usr/src/nv/nv.c
|
||||
+++ b/usr/src/nv/nv.c
|
||||
@@ -2609,7 +2609,7 @@ int nv_kern_mmap(
|
||||
|
||||
/* prevent the swapper from swapping it out */
|
||||
/* mark the memory i/o so the buffers aren't dumped on core dumps */
|
||||
- vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
|
||||
+ vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
|
||||
}
|
||||
|
||||
NV_VMA_FILE(vma) = file;
|
||||
@ -1,14 +0,0 @@
|
||||
--- a/kernel/nv-acpi.c
|
||||
+++ b/kernel/nv-acpi.c
|
||||
@@ -300,7 +300,11 @@ static int nv_acpi_remove(struct acpi_de
|
||||
if (pNvAcpiObject->notify_handler_installed)
|
||||
{
|
||||
// no status returned for this function
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
|
||||
+ acpi_os_wait_events_complete();
|
||||
+#else
|
||||
acpi_os_wait_events_complete(NULL);
|
||||
+#endif
|
||||
|
||||
// remove event notifier
|
||||
status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event);
|
||||
@ -1,24 +0,0 @@
|
||||
the nvidia drivers are trying to test for version 2.6.6, but fail to take into
|
||||
account the first digit. so 3.7.0+ ends up failing the test.
|
||||
|
||||
https://bugs.gentoo.org/447566
|
||||
|
||||
--- a/kernel/conftest.sh
|
||||
+++ b/kernel/conftest.sh
|
||||
@@ -1697,13 +1697,15 @@
|
||||
# kernel older than 2.6.6, that's all we require to
|
||||
# build the module.
|
||||
#
|
||||
+ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " " -f 3)
|
||||
PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d " " -f 3)
|
||||
SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " " -f 3)
|
||||
|
||||
- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
|
||||
+ if [ -n "$VERSION" -a $VERSION -ge 3 ] || \
|
||||
+ [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
|
||||
-a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
|
||||
SELECTED_MAKEFILE=Makefile.kbuild
|
||||
RET=0
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
@ -1,42 +0,0 @@
|
||||
--- kernel/conftest.sh 2012-10-11 19:18:22.704848496 -0400
|
||||
+++ kernel/conftest.sh 2012-10-12 20:35:55.707213868 -0400
|
||||
@@ -20,6 +20,7 @@
|
||||
ISYSTEM=`$CC -print-file-name=include 2> /dev/null`
|
||||
SOURCES=$4
|
||||
HEADERS=$SOURCES/include
|
||||
+HEADERSA=$SOURCES/include/uapi
|
||||
OUTPUT=$5
|
||||
XEN_PRESENT=1
|
||||
|
||||
@@ -118,7 +119,7 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
- CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
|
||||
+ CFLAGS="$CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
|
||||
|
||||
test_xen
|
||||
|
||||
@@ -146,10 +147,10 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS"
|
||||
+ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS -I$HEADERSA $AUTOCONF_CFLAGS"
|
||||
|
||||
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then
|
||||
- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated"
|
||||
+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$SOURCES/arch/x86/include/uapi -I$OUTPUT/arch/x86/include/generated -I$OUTPUT/arch/x86/include/generated/uapi"
|
||||
elif [ "$ARCH" = "arm" ]; then
|
||||
CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include -I$OUTPUT/arch/arm/include/generated"
|
||||
fi
|
||||
--- kernel/nv-mmap.c 2012-08-08 22:52:53.000000000 -0400
|
||||
+++ kernel/nv-mmap.c 2012-08-14 23:52:41.257235863 -0400
|
||||
@@ -450,7 +450,7 @@
|
||||
NV_PRINT_AT(NV_DBG_MEMINFO, at);
|
||||
nv_vm_list_page_count(&at->page_table[i], pages);
|
||||
|
||||
- vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED);
|
||||
+ vma->vm_flags |= (VM_IO | VM_LOCKED | (VM_DONTEXPAND | VM_DONTDUMP));
|
||||
|
||||
#if defined(VM_DRIVER_PAGES)
|
||||
@ -1,400 +0,0 @@
|
||||
diff --git a/utils/images/logo-180.xpm b/utils/images/logo-180.xpm
|
||||
index a0cea80..98425f4 100644
|
||||
--- a/utils/images/logo-180.xpm
|
||||
+++ b/utils/images/logo-180.xpm
|
||||
@@ -8,200 +8,201 @@
|
||||
*/
|
||||
|
||||
static const char * const logo_180_xpm[] = {
|
||||
-"180 180 16 1",
|
||||
-" c None m None",
|
||||
-") c #FF0000 m #FFFFFF",
|
||||
-", c #FFFFFF m #FFFFFF",
|
||||
-". c #000000 m #000000",
|
||||
-"- c #ED9E00 m #FFFFFF",
|
||||
-"' c #4F3504 m #000000",
|
||||
-"= c #DBDBDB m #000000",
|
||||
-"> c #B0B0B0 m #000000",
|
||||
-"+ c #929292 m #000000",
|
||||
-"; c #797979 m #000000",
|
||||
-"@ c #A30000 m #000000",
|
||||
-"# c #604D28 m #000000",
|
||||
-"$ c #600000 m #000000",
|
||||
-"% c #37332D m #000000",
|
||||
-"& c #2D0C05 m #000000",
|
||||
-"* c #A46E00 m #000000",
|
||||
-" ",
|
||||
-" . ",
|
||||
-" .. ",
|
||||
-" ... ",
|
||||
-" . ... ",
|
||||
-" .. ... ",
|
||||
-" .&..... ",
|
||||
-" &&.... ",
|
||||
-" .@&.... ",
|
||||
-" $)..... ",
|
||||
-" .)@.... ",
|
||||
-" .@)@.... ",
|
||||
-" &))$.... ",
|
||||
-" .)))&... ",
|
||||
-" .@))@&... ",
|
||||
-" $)))@.... ",
|
||||
-" &))))$.... ",
|
||||
-" .)))))&... ",
|
||||
-" @))))@.... ",
|
||||
-" $)))))$&... ",
|
||||
-" .)))))).&.. ",
|
||||
-" .))))))@.... .. ",
|
||||
-" .)))))))&'... .. ... ",
|
||||
-" .@)))))))%'.. . ... ",
|
||||
-" @)))))))$#&.. .. ... ",
|
||||
-" $))))))))&#... .& .... ",
|
||||
-" &))))))))$*%.. &. .... ",
|
||||
-" $))))))))@#*... .$..... ",
|
||||
-" &)))))))))&-'.. .@$..... ",
|
||||
-" $)))))))))&-*.. &)...... ",
|
||||
-" &)))))))))@*-... .@@..... ",
|
||||
-" .)))))))))$*-&.. &)@..... ",
|
||||
-" .)))))))))$**... .@)$..&.. ",
|
||||
-" .)))))))))&-'.. &))$.&'.. ",
|
||||
-" $))))))))$'-... .@))$.*'.. ",
|
||||
-" $)))))))).-'.. $)))&%-... ",
|
||||
-" @)))))))$#-... .))))&*-.. ",
|
||||
-" .@)))))))&-#.. &))))&-*.. ",
|
||||
-" .)))))))$*-... .@))))&--... ",
|
||||
-" ....................................................$)))))))&-*.........&)))))&-*............................................................... ",
|
||||
-" .....................................................@))))))$#-&.........$)))))&--................................................................. ",
|
||||
-" .....................................................&)))))))&-*..........))))))$--.................................................................. ",
|
||||
-" .....................................................@))))))$*-'.........$))))))$*-.................................................................. ",
|
||||
-" .....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,+&))))))).--..;,,,,,,#@))))))@*-..;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=#.... ",
|
||||
-" ....%,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=&)))))))@'-#..=,,,,,=&)))))))$*-..;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,%@)))))))&--&.%,,,,,,+$)))))))@#-..;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,%$)))))))@'-*..+,,,,,,%)))))))))&-%.#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,+$))))))))$*-'.&=,,,,,=&)))))))))&-'.&,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>.)))))))))&--..#,,,,,,;@)))))))))$-#..=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=&@))))))))$*-*..>,,,,,,#@)))))))))$**..>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=%@)))))))))&--'.&,,,,,,=&))))))))))@#-..+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,;$))))))))))%--..;,,,,,,>$)))))))))))%-&.#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=&))))))))))@#--..+,,,,,,;@)))))))))))&-'.%,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>=,,,,,,,%@))))))))))$--#..=,,,,,,%))))))))))))$*#..=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,;.>,&&=,,+$)))))))))))&--'.%,,,,,,,&))))))))))))@'*..>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,=>>>>>>+>>>>+>>>>+&$;#..;>>&)))))))))))@'--..%>>>>>>+&)))))))))))))&-&.%>>>>+>>>>+>>>>+>>>>+>>>>+>>>>+>>>>>>>>>>>>>>=,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,+...................@&.......$)))))))))))@#--..........$)))))))))))))$*#...............................................%>,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,#...................&)........@)))))))))))@*-*..........@)))))))))))))@#*.................................................+,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,+....................@@.......$))))))))))))$*-*..........@))))))))))))))&-&.................................................=,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,=....................&)@.......)))))))))))))$--#..........@))))))))))))))$*#.................................................%,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,>....................@)$......&)))))))))))))$*-*..........)))))))))))))))@'*..................................................,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+....................)).......$)))))))))))))@*-#..........))))))))))))))))&-..................................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...................@)).......@)))))))))))))@#-*..........))))))))))))))))$#'.................................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...................@)@......&)))))))))))))))%-*..........)))))))))))))))))&-.................................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+..................$))$......$)))))))))))))))&--..........)))))))))))))))))$*'................................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+..................@))&......$)))))))))))))))$*-&.........)))))))))))))))))@%-................................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+..................))).......@))))))))))))))))&-#.........))))))))))))))))))&*'...............................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................$))).......@))))))))))))))))$*-.........))))))))))))))))))@'*...............................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................@))@.......))))))))))))))))))&-&........)))))))))))))))))))$*'..............................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................)))@.%.....))))))))))))))))))$#*........@))))))))))))))))))@&-..............................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+................$)))$.*.....)))))))))))))))))))&*&.......$)))))))))))))))))))$*#.............................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+................@)))$'*.....@)))))))))))))))))))&*.......&))))))))))))))))))))&-&............................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...............&))))$**..&%&@)))))))))))))))))))@%#...%&%.))))))))))))))))))))$#*...&%%&%%&%%&%%&%%&%%&%%....................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...............$))))$*-..+,;@))))))))))))))))))))$#%..+,,#@))))))))))))))))))))&-#..%,,,,,,,,,,,,,,,,,,,,=+..................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...............@))))$--..+,+@)))))))))))))))))))))&#...=,=&))))))))))))))))))))).-&..#,,,,,,,,,,,,,,,,,,,,,=.................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...............)))))$*-%.#,>$))))))))))))))))))))))&#...=,'@))))))))))))))))))))@%-%..;,,,,,,,,,,,,,,,,,,,,,#................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+..............$)))))$--&.#,,&))))))))))))))))))))))@&'..%,>$)))))))))))))))))))))$#-...+,,,,,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+..............@)))))@*-#.%,,#@))))))))))))))))))))))@&'..%=%))))))))))))))))))))))&**...>,,,,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+..............@)))))@#-#..,,+$)))))))))))))))))))))))@&%..;+$)))))))))))))))))))))@&--..#,,,,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.............&))))))@#-*..=,=&))))))))))))))))))))))))$'&..;%))))))))))))))))))))))@'-#..>,,,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.............&)))))))&--..+,,'@))))))))))))))))))))))))&#...#$))))))))))))))))))))))&*-..#,,,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.............@)))))))&--..#,,>$)))))))))))))))))))))))))&#....)))))))))))))))))))))))&-#..>,,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.............@)))))))@#-#.&=,,&)))))))))))))))))))))))))@&#...$))))))))))))))))))))))$#-..#,,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.............)))))))))#-*..>,,;@)))))))))))))))))))))))))@''...)))))))))))))))))))))))&-'..,,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+............&)))))))))&--&.#,,=&))))))))))))))))))))))))))&*&..&))))))))))))))))))))))@#*..>,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+............@)))))))))$*-'.&,,,#@))))))))))))))))))))))))))&*...@))))))))))))))))))))))&-..#,,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+............@)))))))))@#-*..>,,=&))))))))))))))))))))))))))$##..$))))))))))))))))))))))@##..=,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+............@))))))))))%--..#,,,%)))))))))))))))))))))))))))&-&..@))))))))))))))))))))))&*..+,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+............)))))))))))$*-#..=,,>&))))))))))))))))))))))))))@#*..$))))))))))))))))))))))$*&.#,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+............))))))))))))&--..#,,,%@))))))))))))))))))))))))))&-&..@)))))))))))))))))))))@''.%,,,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...........$))))))))))))&*-'..=,,+$))))))))))))))))))))))))))@#*..$))))))))))))))))))))))&#..=,,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...........$))))))))))))@'-*..;,,,&)))))))))))))))))))))))))))&-&..))))))))))))))))))))))$#..>,,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...........$)))))))))))))&*-'..=,,+$))))))))))))))))))))))))))$**..$))))))))))))))))))))))&..;,,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...........@)))))))))))))@'-*..;,,,.))))))))))))))))))))))))))@%-...))))))))))))))))))))))&%.%,,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...........@))))))))))))))$*-%..=,,;$))))))))))))))))))))))))))&-'..@)))))))))))))))))))))$&..,,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...........@)))))))))))))))&-*..%,,=&))))))))))))))))))))))))))@'-..$)))))))))))))))))))))@&..>,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...........@)))))))))))))))$#-#..>,,;@))))))))))))))))))))))))))&*&.&))))))))))))))))))))))...;,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...........@))))))))))))))))&*-&.&=,=.)))))))))))))))))))))))))))&&..))))))))))))))))))))))$..%,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...........@))))))))))))))))@&-#..+,,#@)))))))))))))))))))))))))))$.$))))))))))))))))))))))@...=,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...........$)))))))))))))))))$#-%..=,>&)))))))))))))))))))))))))))))))))))))))))))))))))))))...>,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...........$))))))))))))))))))$**..#,,#@))))))))))))))))))))))))))))))))))))))))))))))))))))...+,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...........&))))))))))))))))))@&-'..>,>$))))))))))))))))))))))))))))))))))))))))))))))))))))$..#,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+............)))))))))))))))))))@%-..%,,&))))))))))))))))))))))))))))))))))))))))))))))))))))@..%,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+............@)))))))))))))))))))$##..;,#@)))))))))))))))))))))))))))))))))))))))))))))))))))@...,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+............$))))))))))))))))))))&*&.&=>$))))))))))))))))))))))))))))))))))))))))))))))))))))...=,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.............)))))))))))))))))))))%#..;,&))))))))))))))))))))))))))))))))))))))))))))))))))))&..>,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.............@))))))))))))))))))))$''..=#@)))))))))))))))))))))))))))))))))))))))))))))))))))$..;,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.............&)))))))))))))))))))))&#..#+$)))))))))))))))))))))))))))))))))))))))))))))))))))$..;,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+..............@))))))))))))))))))))@&'..=$)))))))))))))))))))))))))))))))))))))))))))))))))))@..&,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+..............$)))))))))))))))))))))$'..+&)))))))))))))))))))))))))))))))))))))))))))))))))))@...=,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...............))))))))))))))))))))))...#%))))))))))))))))))))))))))))))))))))))))))))))))))))...=,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...............$)))))))))))))))))))))$....))))))))))))))))))))))))))))))))))))))))))))))))))))...+,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+................))))))))))))))))))))))....))))))))))))))))))))))))))))))))))))))))))))))))))))...;,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+................$)))))))))))))))))))))$...@)))))))))))))))))))))))))))))))))))))))))))))))))))&&.#,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................))))))))))))))))))))))&..))))))))))))))))))))))))))))))))))))))))))))))))))))$%.%,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................$))))))))))))))))))))))&&))))))))))))))))))))))))))))))))))))))))))))))))))))$'..,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................&))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))$#..=,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................+$)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))$*..>,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................=%)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))$*..>,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................,+&))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))&-..;,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................,,#@)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))&-%.#,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................,,=&)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))&-'.%,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................,,,;$)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))@'-#.&,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................,,,,&@))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))@*-*..=,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................,,,,>$))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))&--&..=,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................,,,,,#@)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))&-'..#,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................,,,,,=&))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))$**..%,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................,,,,,,>&))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))).*..&=,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................,,,,,,,;$)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))$'...=,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................,,,,,,,,%@)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))).&..;,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................=,,,,,,,=&)))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))$...#,,,,,,,,,,,,,>................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................>,,,,,,,,>&))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))...%,,,,,,,,,,,,,,+................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................;,,,,,,,,,#$))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))&..&=,,,,,,,,,,,,,,%................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+..................+,,,,,,,,,#$))))))))))))))))))))))))))))))))))))))))))))))))))))))))))@...=,,,,,,,,,,,,,,;.................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...................#+>>>>>>>>%@))))))))))))))))))))))))))))))))))))))))))))))))))))))))@...#>>>>>>>>>>>>>+#..................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...............................@)))))))))))))))))))))))))))))))))))))))))))))))))))))))&.....................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+................................@)))))))))))))))))))))))))))))))))))))))))))))))))))))&......................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+................................&@)))))))))))))))))))))))))))))))))))))))))))))))))))$.......................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.................................&@)))))))))))))))))))))))))))))))))))))))))))))))))@........................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+..................................&@)))))))))))))))))))))))))))))))))))))))))))))))$.........................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+...................................&@)))))))))))))))))))))))))))))))))))))))))))))$..........................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+....................................&@)))))))))))))))))))))))))))))))))))))))))))$...........................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+......................................@)))))))))))))))))))))))))))))))))))))))))&............................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.......................................$))))))))))))))))))))))))))))))))))))))@..............................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+.........................................@)))))))))))))))))))))))))))))))))))&...............................................>,,,,,,=.... ",
|
||||
-" ....+,,,,,,,+..........................................$))))))))))))))))))))))))))))))))@.................................................=,,,,,,=.... ",
|
||||
-" ....+,,,,,,,=............................................$))))))))))))))))))))))))))))$&.................................................&,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,%.............................................$@))))))))))))))))))))))@$&...................................................;,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,=................................................$@@))))))))))))))@@@&'#%..................................................%,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,=&...................................................$$@@@@@@@$$&''**'...................................................%=,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,=+%%%#%%%%#%%%%#%%%%#%%%%#%%%%#%%%%#%%%%#%%..................#----'............%%%#%%%%#%%%%#%%%%#%%%%#%%%%#%%%%#%%%%##+,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,&..................&''..............=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,+....................................;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,&.....................................=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#......................................%,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,+........................................;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>&.........................................>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>............................................>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>..............................................;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,#................................................#=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>%..................................................&+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>%......................................................%>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=;%..........................................................&;=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>................................................................+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,.................................................................%,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,%................................................................#,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+=,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....+,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....;,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,=.... ",
|
||||
-" ....&,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,>.... ",
|
||||
-" ....%;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>;..... ",
|
||||
-" ..................................................................................................................................................... ",
|
||||
-" ................................................................................................................................................... ",
|
||||
-" .................................................................................................................................................. ",
|
||||
-" ............................................................................................................................................... ",
|
||||
+"180 180 17 1",
|
||||
+" c None",
|
||||
+". c #020300",
|
||||
+"+ c #221E1C",
|
||||
+"@ c #312D2C",
|
||||
+"# c #422D09",
|
||||
+"$ c #815711",
|
||||
+"% c #5D5B5C",
|
||||
+"& c #B5802B",
|
||||
+"* c #A98F64",
|
||||
+"= c #949495",
|
||||
+"- c #E59C23",
|
||||
+"; c #FBA616",
|
||||
+"> c #F6C774",
|
||||
+", c #E1CAA5",
|
||||
+"' c #CFD2D4",
|
||||
+") c #F9E3B8",
|
||||
+"! c #F1F4F3",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ======== ",
|
||||
+" ============== ",
|
||||
+" %===============%% ",
|
||||
+" ====================%% ",
|
||||
+" %%=====================%% ",
|
||||
+" %========================%% ",
|
||||
+" %=================='''=====%% ",
|
||||
+" %=================='''!'==%%=*= ",
|
||||
+" %%=================='+++'=%%%*,,, ",
|
||||
+" %%===================+++++=%%**),,) ",
|
||||
+" %%%%=======%%%%%%%=====+++==%*&->,,)))) ",
|
||||
+" %%%%%%=%%%%%%@@@@@%%%%%=%%%%%*&-;-->>>)))) ",
|
||||
+" @%%%%%%%%%@@+++++++++@%%%%%%*$&------->>>>)))) ",
|
||||
+" @%%%%%%%%@@@+++++++++++@@%%*&&>>>>>---------->>>>)) ",
|
||||
+" @%%%%%%%@@++++++++++++++++@%$&&&>,>>>>---------&>>), ",
|
||||
+" @@%%%%%@@+++++++++++++++++++##$$#**>>>>>>>>&********* ",
|
||||
+" @@@%%%@@++++++++++++++++++++++#$$$$&&&*>>>$$&&&&&&&*** ",
|
||||
+" +@@@@@@++++++++++++++++++++++++@$&--&&$$&&&&&&&&---&& ",
|
||||
+" ++@@@@@++++++++++++++++++++++++++@#$&&--&--&&&&&$$$ ",
|
||||
+" +++@@@++++++++++++++++++++++++++++++#$$&&&&&&&&$$ ",
|
||||
+" ++++++++++++++++++++++++++++++++++++++++@#### ",
|
||||
+" +++++++++++++++++++++++++++++++++++++++++++ ",
|
||||
+" ++++++++++++++++++++++++++++++++++++++++++ ",
|
||||
+" ++++++++++++++++++++++++++++++++++++++++++ ",
|
||||
+" +++++++++++++++++++++++++++++++++++++++++++ ",
|
||||
+" +++++++++++++++++++++++++++++++++++++++++++ ",
|
||||
+" ++++++++++++++++++++++++++++++++++++++++++++ ",
|
||||
+" +++++++++++++++++++++++++++++++++++++++++++++ ",
|
||||
+" ++++++++++++++++++++...++++++++++++++++++++++ ",
|
||||
+" ++++++++++++++++@@%%=====%@+++++++++++++++++++ ",
|
||||
+" ++++++++++++++++@%=='!!!!!'%@++++++++++++++++++ ",
|
||||
+" +++++++++++++.+@%=''!!!!!!!!'=%+.+++++++++...++++ ",
|
||||
+" ++++++++++++++@%='!!!!!!!!!!!!!=%@+++++++@@%%%@+++ ",
|
||||
+" ++++++++++++++@='!!!!!!!!!!!!!!!!'=@++++++%='!'=@++ ",
|
||||
+" +++++++++++++@%='!!!!!!!!!!!!!!!!!!'==%%%%=='!!!'=%++ ",
|
||||
+" +++++++++++++@='!!!!!!!!!!!!!!!!!!!!!!'===='!!!!!!!=@++ ",
|
||||
+" @@@++++++++++%='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=@+@@@ ",
|
||||
+" @@@@++++++++@%=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'%+@@%%%%%%%%%%%% ",
|
||||
+" @@@@@++++++++@='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!%@@%%%%%%%%%=========% ",
|
||||
+" @@@@@@+++++++@='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=%@@%%%%%%%%%============ ",
|
||||
+" @@%@@@+++++++@=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=@@%%%%%%%%%%%%========== ",
|
||||
+" @%%%%@@+++++++@=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'@@%%@@@@@@@@@@@@%%%======== ",
|
||||
+" %%%%%@@+++++++%='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'%@@@@@++++++++++@@%%%%======= ",
|
||||
+" %%%%%@@+++++++@=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=%+++++++++++++++++++@%%===='== ",
|
||||
+" %%%%%%@@+++++++@='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'%++++++++++++++++++++@@%%==''''' ",
|
||||
+" %%%%%%@@+++++++@=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=++++@@@@@@@@@@@@@@+++++@%==='''' ",
|
||||
+" %%%%%%@@++++++++='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=@++@@%%=========%%@@+++++@@==''''' ",
|
||||
+" %%%%%%@@+++++++@%'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=%%%====''''''''''====%%@@++@%==''''' ",
|
||||
+" %%%%%%%@++++++++%'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=='''!!!!!!!!!!!!!!!!'==%@@++@%=''''' ",
|
||||
+" %%%%%%%@++++++++%=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'==''!!!!!!!!!!!!!!!!!!''''=%%@@%%=''''' ",
|
||||
+" %%==%%%@++++++++@='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=='!!!!!!!!!!!'''!!!!!!!!'==%@@%%=='''' ",
|
||||
+" %%==%%%@+++++++++%'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=='!!!!!''== !''=%@@%=''''' ",
|
||||
+" %====%%@+++++++++%=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=='!!''' =%%%==='''= ",
|
||||
+" %=====%@++++++++++=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!==!!!=% =%%===== ",
|
||||
+" %=====%@@++++++++@%=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!==!'% ",
|
||||
+" %=====%@+++@%%@++.@='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!=='= ",
|
||||
+" %=====%@@++@%==@++.%'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'=% ",
|
||||
+" =====%%@++@%'==@++@%!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!== ",
|
||||
+" %=====%@++@%'!=@+++%=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!== ",
|
||||
+" ======%@++%='!!%++++=!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'= ",
|
||||
+" %=====%@++%='!!'%.++@'!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'= ",
|
||||
+" ======%++@='!!'=%++@%'!!!!!!!!!!!!!!!!!!!!!))))))!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'= ",
|
||||
+" ======%@+%='!!!'%@++@='!!!!!!!!!!!!!!!!!!!!)>---->,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'= ===== == == = ",
|
||||
+" ======%@+@='!!!!=@+++%'!!!!!!!!!!!!!!!!!!!!!)-;;;;;*,!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' ======== == == == ",
|
||||
+" ======%@+@%'!!!!'=+++.%'!!!!!!!!!!!!!!!!!!!!!)-;;;;-*='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' == === == == == ",
|
||||
+" ======@+@%'!!!!!=%++++=!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' === = ===== == ==== == == == ===== ===== === ",
|
||||
+" ======%@@%'!!!!!'%++++@=!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' == ======= == ====== == == == ======= ===== ===== ",
|
||||
+" ======%+@%'!!!!!=%@++++%=!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' == == == == === == == == == == == == == == ",
|
||||
+" =='===%@@%'!!!!''=@++++@%=!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!)>>>)!!!!!!!!!' == ==== == == == == == ==== == ======= ",
|
||||
+" ='''===@@='!!!!'=@ ++++@%'!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;>,!!!!!!!!! == ====== == == == == == ====== == ======= ",
|
||||
+" =''''=%%%='!!!''=% ++++@%'!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>;;;;->'!!!!!!!! === = === == == == == == == === == == == ",
|
||||
+" '''''==%%='!!!!'=@ @+++@='!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!)>;;;;-&='!!!!!! == === == == == === == == === == == == == === == ",
|
||||
+" ''''''=%%='!!!!'=% @@++@='!!!!!!!!!!!!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>;;;;-&='!!!!!! ======== ======= == ===== ======== == ======= ==== ===== ",
|
||||
+" '''''''===='!!!''= @@@+@=!!!!!!!!!'''!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!)--;-&*%=!!!!!! ===== ==== == == ==== ==== == == ==== == === === ",
|
||||
+" =''''''''==='!!!''= @@@+@=!!!!!!!!!'''!!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!)--&*%='!!!!!! ",
|
||||
+" ='''''''''''''!'' @@@+@=!!!!!!!''''''!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!!,**%=''!!!!!! ",
|
||||
+" ='''''''''!!!'' %@@+@='!!!!!!''''''!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!!''=='!!!!!!! ",
|
||||
+" =='''!!! %%@+@='!!!!!!''''''!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ",
|
||||
+" %%%@@%'!!!!!'''''''!!!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!!))))!!!!!!!!! ",
|
||||
+" %%%@@%'!!!!!'''''''''!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!)>>>>))!!!!!! ;;;;;;;; ;;;; ;;;; ;;; ;;; ",
|
||||
+" %%%@+%=!!!!!'''''''''!!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!)>-;->,''!!!! ;;;;;;;;;;;;;- ;;;;;- ;;;;;- ;;;;;;; ;;;;;;- ",
|
||||
+" %%%@+@=!!!!!''''''''''!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;-*''!!! ;;;;;;;;;;;;;;;- ;;;;;& ;;;;;- $;;;;;;;;; ;;;;;;;;-$ ",
|
||||
+" %=%@+=!!!!!''''''''''!!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;&*='!!! ;;;;;;;;;;;;;;;;;- ;;;;;&# ;;;;;- $;;;;;;;;;- ;;;;;;;;;&$ ",
|
||||
+" %=%@+%!!!!!'''''''''''!!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;&*='!!);;;;;;;---&--;;;;;;- ;;;;;&# ;;;;;-.$;;;;;;;;;;- ;;;;;;;;;-&$ ",
|
||||
+" %==%+%'!!!!''''''''''''!!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!)-;;;&*='!!>;;;;;;-&$$$$&-;;;;;-& ;;;;;&# ;;;;;-+#;----;;;;;;&&;;;;;;;---&$# ",
|
||||
+" ==%@@='!!!'''''''''''''!!!!)-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;&*='!>;;;;;-&$ $-;;;;;- ;;;;;&# ;;;;;-+ $$&&-;;;;;;;;;;;-&$### ",
|
||||
+" ===@@%'!!!!''''''''''''''!!,-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;&*='!-;;;;;&# &-;;;;;$ ;;;;;&# ;;;;;-+ $--;;;;;;;;;-&#. ",
|
||||
+" %==%@@'!!!!'''''''''''''''!,-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;&*=' ;;;;;-$ ;;;;;$ ;;;;;&# ;;;;;-+ &;;;;;;;;-$. ",
|
||||
+" ===%@=!!!!'''''''''''''''',-;;;;-$='!!!!!!!!!!!!!!!!!!>-;;;&*== ;;;;;& ;;;;;& ;;;;;&# ;;;;;-+ -;;;;;;-$# ",
|
||||
+" ===%@%=!!!!''''''''''''''',-;;;;-$=''!!!!!!!!!!!!!!!!'>-;;;&*= ;;;;;$ ;;;;;&$ -;;;;&# ;;;;;-+ ;;;;;;-# ",
|
||||
+" ===%@%!!!!''''''''''''''',-;;;;-$=''!!!!!!!!!!!!'''''>-;;;&$ ;;;;-# ;;;;;&$ -;;;;&# ;;;;;-+ ;;;;;;& ",
|
||||
+" ===%@%'!!!!'''''''''''''',-;;;;-$=''!!!!!''''''''''''>-;;;&$ ;;;;-# ;;;;;&$ -;;;;&# ;;;;;-+ ;;;;-$ ",
|
||||
+" >))) ===%%='!!!'''''''''''''',-;;;;-$='''''''''''''''''''>-;;;&$ ;;;;-# ;;;;;&$ -;;;;&# ;;;;;-+ ;;;;-$ ",
|
||||
+" -->>>>>>)))>>>****%%='!!!''''''''''''',-;;;;-$='''''''''''''''''''>-;;;&$ ;;;;-# ;;;;;&$ -;;;;&# ;;;;;-+ ;;;;-$ ",
|
||||
+" ;;-->>>>>>>))>>>>>>&*#*,'!!''''''''''''',>;;;;-&*'''''''''''''''''''>-;;;&$ ;;;;-# ;;;;;&$ -;;;;&# ;;;;;-+ ;;;;-$ ",
|
||||
+" ;;;;-->>>>>>>>>>>>>>>-&&&&,,'''''''''''''',>-;;;;&*=''''''''''''''''''>-;;;&$ ;;;;-# ;;;;;&$ -;;;;&# ;;;;;-+ ;;;;-& ",
|
||||
+" ;;;;;--->>>>>>>>>>>>>------&>,,'''''''''''',>-;;;;-&=''''''''''''''''!!>;;;;&$ ;;;;-# ;;;;;&$ -;;;;&$ ;;;;;&+ ;;;;;-& ",
|
||||
+" ;;;;;-;;--->>>>>>>>>>>>--------->,'''''''''''',-;;;;;&='''''''''''''''!!!>;;;;&$ ;;;;-# ;;;;;&$ -;;;;-$ ;;;;-&+ ;;;;;;- ",
|
||||
+" ;;----;;;-->>>---->>>>-----------&>,'''''''''',-;;;;;-&'''''''''''''!!! ;;;;&$ ;;;;-# ;;;;;&$ ;;;;-& ;;;;-&+ ;;;;;;;-& ",
|
||||
+" ;------;;;;-------;->----;;;;------&&,''''''''''>;;;;;;->,'''''''''!!!! ;;;;&$ ;;;;-# ;;;;;&$ ;;;;;- ;;;;;-$+ ;;;;;;;;-- ",
|
||||
+" ------;;;;;;;-----;-----;;;;;;;------&*'''''''''>-;;;;;;->,'''''!!!!!! ;;;;&$ ;;;;-# ;;;;;&$ ;;;;;-& ;;;;;&$ ;;;;;;;;;;;-- ",
|
||||
+" ------;;;;;;;-----;;;;;;;;;;;;;;;-----&>,''''''',>;;;;;;;->>>>,,)))>>> ;;;;&$ ;;;;-# ;;;;;&$ ;;;;;-- ;;;;;;$+ ;;;;;;--;;;;;-; ",
|
||||
+" -----;;;;;;-----;;;;;;;;;;;;;;;;------->,''''''',-;;;;;;;;;;;-----;;;; ;;;;&$ ;;;;-# ;;;;;&$ ;;;;;;;- ;;;;;;;-# ;;;;;;;;;&&-;;;;;;;;; ",
|
||||
+" ---;;;;;;-----;;;;;;;;;;;;------------>,!!!!!!',-;;;;;;;;;;;;;;;;;;;$ ;;;;&$ ;;;;-# ;;;;;&$ ;;;;;;;;;;;;;;;;;;-$# ;;;;;;;;;;-$+#-;;;;;;;;;- ",
|
||||
+" --;;;;;------;;;;;;;;;;;;----------;;->,!!!!!!!,>--;;;;;;;;;;;;;;;;# ;;;;&$ ;;;;-# ;;;;;&$ ;;;;;;;;;;;;;;;;-&# ;;;;;;;;-&$+ --;;;;;;;-$ ",
|
||||
+" ----;;--------;;;;;;;;;;----- !!!!!!!,&-;;;;;;;;;;;;;;;-# ;;;;&$ ;;;;-# ;;;;;&$ ;;;;;;;;;;;;;;;&# ;;;;;;;-&#. --;;;;;;&$ ",
|
||||
+" ----;----&------;;;;;;;--- &&&-----------;-# ;;--&$ ;;-;-# ;;;-&$ ---;;;;;;;;-&$# ;;---&&$#. &&&----&$ ",
|
||||
+" -------& &-------;;;;--& #$&&&&&&&&&&&&&# ;-&&$# ;-&&&# --&&$# &&--------&#. -&&&$#. $&&&&$# ",
|
||||
+" --------- ############## #### #### #### ######### ### ### ",
|
||||
+" ------- ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
+" ",
|
||||
" ",
|
||||
" ",
|
||||
" "};
|
||||
@ -1,8 +0,0 @@
|
||||
--- panel-plugin/xkb-cairo.c 2012-07-17 16:23:24.997030066 +0400
|
||||
+++ panel-plugin/xkb-cairo.c 2012-07-17 16:47:34.107054590 +0400
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "xkb-util.h"
|
||||
#include "xfce4-xkb-plugin.h"
|
||||
|
||||
-#define XKB_PREFERRED_FONT "Courier New, Courier 10 Pitch, Monospace Bold %d"
|
||||
+#define XKB_PREFERRED_FONT "Droid Sans, Courier New, Courier 10 Pitch, Monospace Bold %d"
|
||||
Loading…
Reference in new issue