Commit Graph

169 Commits

Author SHA1 Message Date
Ms2ger
105ce73cfa Bug 922268 - Remove empty makefiles; r=gps 2013-10-03 09:10:00 +02:00
Gregory Szorc
cc1da2c22a Bug 920223 - Part 2: Mass convert MOCHITEST_CHROME_FILES to manifests; rs=Ms2ger 2013-09-30 09:52:01 +02:00
Ed Morley
038cae0901 Backed out changeset 68b6b152f51a (bug 920223) 2013-09-30 12:50:09 +01:00
Gregory Szorc
483a776413 Bug 920223 - Part 2: Mass convert MOCHITEST_CHROME_FILES to manifests; rs=Ms2ger 2013-09-30 09:52:01 +02:00
Gregory Szorc
ed68c2482b Bug 901990 - Part 2: Upgrade xpcshell manifests; r=ted
--HG--
rename : toolkit/mozapps/extensions/test/xpcshell-unpack/head_unpack.js => toolkit/mozapps/extensions/test/xpcshell/head_unpack.js
2013-09-24 11:50:08 -07:00
Ehsan Akhgari
b4cc06df88 Bug 918923 - Part 2: Switch to #including nsString.h in code using the internal strings API; r=bsmedberg 2013-09-23 13:25:00 -04:00
Mike Hommey
f1cf3b4238 Bug 912293 - Remove now redundant boilerplate from Makefile.in. r=gps 2013-09-05 09:01:46 +09:00
Geoff Brown
220e4a5f85 Bug 865006 - (4) Add more xpcshell tests for android; r=jmaher 2013-08-25 10:58:31 -06:00
Ms2ger
c3e345584c Bug 883284 - Part f: Move LIBXUL_LIBRARY into moz.build (p-z); r=glandium 2013-08-22 08:56:01 +02:00
Ms2ger
4d968c40e1 Bug 882859 - Part b: Move FAIL_ON_WARNINGS into moz.build; r=joey+gps 2013-08-22 08:55:59 +02:00
Masatoshi Kimura
431087ee79 Bug 856424 - Unpref Components for content. r=bholley 2013-08-20 02:44:31 +09:00
Trevor Saunders
7da524d402 bug 886526 - remove IS_COMPONENT and MODULE_NAME makefile vars for things in libxul r=bsmedberg r=glandium 2013-08-08 20:12:37 -04:00
Ehsan Akhgari
5ee21d6d3f Bug 895322 - Part 1: Replace the usages of MOZ_STATIC_ASSERT with C++11 static_assert; r=Waldo
This patch was mostly generated by running the following scripts on the codebase, with some
manual changes made afterwards:

# static_assert.sh
#!/bin/bash
# Command to convert an NSPR integer type to the equivalent standard integer type

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*/.hg*" \
       ! -wholename "obj-ff-dbg*" \
       ! -name nsXPCOMCID.h \
       ! -name prtypes.h \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.cc" \
         -o -iname "*.mm" \) | \
    xargs -n 1 `dirname $0`/assert_replacer.py #sed -i -e "s/\b$1\b/$2/g"
}

convert MOZ_STATIC_ASSERT static_assert
hg rev --no-backup mfbt/Assertions.h \
                   media/webrtc/signaling/src/sipcc/core/includes/ccapi.h \
                   modules/libmar/src/mar_private.h \
                   modules/libmar/src/mar.h


# assert_replacer.py
#!/usr/bin/python

import sys
import re

pattern = re.compile(r"\bMOZ_STATIC_ASSERT\b")

def replaceInPlace(fname):
  print fname
  f = open(fname, "rw+")
  lines = f.readlines()
  for i in range(0, len(lines)):
    while True:
      index = re.search(pattern, lines[i])
      if index != None:
        index = index.start()
        lines[i] = lines[i][0:index] + "static_assert" + lines[i][index+len("MOZ_STATIC_ASSERT"):]
        for j in range(i + 1, len(lines)):
          if lines[j].find("                 ", index) == index:
            lines[j] = lines[j][0:index] + lines[j][index+4:]
          else:
            break
      else:
        break
  f.seek(0, 0)
  f.truncate()
  f.write("".join(lines))
  f.close()

argc = len(sys.argv)
for i in range(1, argc):
  replaceInPlace(sys.argv[i])

--HG--
extra : rebase_source : 4b4a4047d82f2c205b9fad8d56dfc3f1afc0b045
2013-07-18 13:59:53 -04:00
Trevor Saunders
6b3c839046 backout bug 886526 because it probably made us use a lot more memory to link on windows 2013-07-29 11:03:21 -04:00
Joshua Cranmer
48e91a819c Bug 884061 - Part 3v: Use NS_DECL_THREADSAFE_ISUPPORTS in toolkit/, r=Mossop
--HG--
extra : rebase_source : ad2b2f20219b42b192c313b6fa9da3383f904805
2013-07-18 21:24:15 -05:00
Trevor Saunders
82e5558b37 bug 887483 - remove a bunch of useless assignments to FORCE_STATIC_LIB implied by LIBXUL_LIBRARY=1 r=mshal 2013-07-11 11:06:34 -04:00
Matthew Noorenberghe
a8f6808b50 Bug 888584 - Lazily load IdentityUtils.jsm. r=khuey 2013-07-09 18:15:34 -07:00
Matthew Noorenberghe
34ee03c801 Bug 875826 - Skip xpcshell tests that require the identity components on Android since they're not packaged there. r=dolske 2013-06-28 23:33:19 -04:00
Jed Parsons
3d3c1734fd Bug 778817 - Add and expose Base64UrlDecode in IdentityCryptoService. r=benadida, r=bsmith 2013-07-08 16:34:33 -04:00
Trevor Saunders
6be251fe42 bug 886526 - disallow MODULE_NAME and IS_COMPONENT for makefiles in libxul r=bsmedberg 2013-06-25 11:15:21 -04:00
Justin Lebar
6c46d0633d Bug 820686 - Remove code after MOZ_CRASH or MOZ_ASSUME_NOT_REACHED. r=(see below)
r=tbsaunde for accessible
r=jmuizelaar for gfx
r=waldo for js
r=roc for layout
r=glandium for mozglue
r=jduell for netwerk
r=khuey for everything else
2013-06-28 18:38:32 -07:00
Justin Lebar
75c400493b Bug 802686 - s/MOZ_NOT_REACHED/MOZ_CRASH/ in Gecko. r=(see below)
r=tbsaunde for accessible
r=jmuizelaar for gfx
r=roc for layout
r=glandium for mozglue
r=jduell for netwerk
r=khuey for everything else

This is a mechanical change made with sed.  Later patches in this queue
clean up the whitespace errors and so on.
2013-06-28 18:38:30 -07:00
Mike Shal
b77ae67471 Bug 880245 - Move EXTRA_JS_MODULES to moz.build (batch #2); r=joey 2013-06-17 15:22:56 -04:00
Mike Shal
8362c486f5 Bug 880245 - Convert JS_MODULES_PATH to be relative to $(FINAL_TARGET); r=gps 2013-06-17 13:59:49 -04:00
Jed Parsons
bb7ffc9270 Bug 882496 - Fail gracefully if Persona observer methods called before watch(). r=benadida 2013-06-13 17:44:44 -07:00
Brian O'Keefe
5f8b5163e8 Bug 875934 - Move LIBRARY_NAME to moz.build (batch #1); r=mshal
--HG--
extra : rebase_source : 385d3fd65475ffc18ee44ae088753649470e214b
2013-06-17 15:21:01 -04:00
Matthew Noorenberghe
650d9c49ec Bug 759964 - Part 2 - Set allowMedia = false in social and identity code to address TODO comments. r=gavin 2013-03-29 14:52:59 -07:00
Mike Shal
994cfe0b6b Bug 864774 - Part 2: Move CPPSRCS to moz.build as CPP_SOURCES; r=joey CLOSED TREE
From 9e0ba7f425143f545eb6c4b26a9a96b5ade4d8e9 Mon Sep 17 00:00:00 2001
2013-04-23 17:54:15 -04:00
Gregory Szorc
14c4938355 Bug 873629 - Remove 129 empty Makefile.in files; r=ted 2013-05-17 16:20:11 -07:00
Joey Armstrong
2dbf79e9a4 bug 869143: phase2 cleanup for XPCSHELL_TEST conversion. r=mshal 2013-05-13 16:24:07 -04:00
Josh Matthews
9970b1ec42 Bug 869893 - Remove Off-Main-Thread XPCWrappedJS refcounting from SignRunnable. r=jedp 2013-05-08 10:50:36 -04:00
Jed Parsons
8def247b2a Bug 864886 - logout() logs out all tabs with the same origin. r=benadida 2013-04-30 16:29:35 -07:00
Joey Armstrong
8e99512c32 bug 844655: Port XPCSHELL_TESTS to moz.build as XPCSHELL_TESTS_MANIFESTS 2013-04-29 14:49:00 -04:00
Bobby Holley
9097d7f863 Bug 850253 - Remove Off-Main-Thread XPCWrappedJS refcounting from KeyGenRunnable. r=jedp 2013-04-11 14:05:35 -07:00
Kyle Machulis
5aa83c3e11 Bug 855465 - Add emacs python mode comments to moz.build files; r=gps 2013-04-01 11:36:59 -07:00
Kyle Machulis
c79ccc0693 Backout for changeset 03452b187c14 (Bug 855465) due to bustage on a CLOSED TREE; r=qdot 2013-03-29 15:12:58 -07:00
Kyle Machulis
a59d40f143 Bug 855465 - Add emacs python mode comments to moz.build files; r=gps
--HG--
extra : rebase_source : 004a756492323e1a049586e85b3be5037159df20
2013-03-29 13:56:18 -07:00
Ryan VanderMeulen
4b5747b46b Backed out changeset 6580ca3028de (bug 845546) for B2G xpcshell failures on a CLOSED TREE. 2013-03-27 13:01:46 -04:00
Jed Parsons
a81b79511e Bug 845546 - Port b2g identity implementation to desktop. r=benadida 2013-03-27 11:19:09 -04:00
Mike Shal
c2a9341a2e Bug 852534 - Remove GRE_MODULE from Makefile.in; r=gps 2013-03-21 08:41:00 -07:00
Mike Shal
9680b82df6 Bug 844654 - Part 2: Move MODULE to moz.build; rs=gps 2013-03-19 11:47:00 -07:00
Gregory Szorc
2288b28e43 Bug 844635 - Part 3: Remove empty Makefile.in files; r=glandium 2013-03-17 18:01:25 -07:00
Ms2ger
d52bebdeb3 Bug 845374 - Part s: Stop including nsTArray.h in nsContentUtils.h; r=khuey 2013-03-17 08:55:16 +01:00
Jed Parsons
2af6369124 Bug 839500 - Close system persona iframe when not in use. r=fabrice, r=benadida 2013-03-14 15:19:34 -04:00
Gregory Szorc
7bb3ee056b Bug 818246 - Part 4: Move XPIDLSRCS into moz.build (auto); rs=glandium
This is the result of running
|mach mozbuild-migrate --list XPIDLSRCS SDK_XPIDLSRCS XPIDL_SOURCES| and
reverting xpcom/sample/*.
2013-03-12 10:17:46 -07:00
Gregory Szorc
58b7ec0116 Bug 818246 - Part 1: Remove unncessary definitions of XPIDL_MODULE; r=glandium
XPIDL_MODULE defaults to MODULE. These Makefile.in were setting
XPIDL_MODULE to the same value as MODULE.

--HG--
extra : rebase_source : e96bd34d5949d0ab94cecbec35d6c9f4bffec01e
2013-03-07 05:03:51 -08:00
Ms2ger
cd9c6150fe Merge m-c to b-s. 2013-02-26 19:09:25 +01:00
Gregory Szorc
faf262c4ee Merge mozilla-central into build-system
Only conflict was configure.in amd was due to context, not
changed lines themselves.
2013-02-25 22:09:18 -08:00
Gregory Szorc
14545664e3 Bug 784841 - Part 18θ: Convert /toolkit f=Mossop, Ms2ger; rs=ted 2013-02-25 13:19:09 -08:00
Bobby Holley
440bea3fd7 Bug 843711 - Fix up new |Components| culprits in test suite. r=mccr8 2013-02-25 10:43:03 -08:00
L. David Baron
57d19fbb86 Bug 404077: Annotate known assertions in mochitests. 2013-02-25 18:39:21 -08:00
Jed Parsons
0ae29d94ea Bug 823751 - When persona login in the Trusty UI is canceled, fire the RP's oncancel() callback; r=benadida, a=bb+ 2013-01-10 09:56:10 +01:00
Chris Peterson
4c4bf85b10 Bug 785918 - Part 1: Replace PR_ARRAY_SIZE() with mozilla::ArrayLength() and MOZ_ARRAY_LENGTH(). r=ehsan 2013-01-05 23:37:25 -08:00
Brian Smith
6c0a65320c Bug 804663: Create a CryptoTask API to simplify the creation of correct async crypto operations and add more utilities to ScopedNSSTypes.h, r=honzab
--HG--
extra : rebase_source : de29f383e6d5b109a06837b887d96bbcbce55817
2012-07-13 15:44:24 -07:00
Mike Hommey
4790d7bbe7 Bug 817955 - Only install identity modules in modules/identity. r=benadida,r=jparsons
--HG--
extra : rebase_source : 027b0cae0a29d00c34424e542fe4d57192aab5b1
2012-12-05 09:25:21 +01:00
Brian Smith
d9bc34c46b Backed out changeset 84bf2e19c701
--HG--
extra : rebase_source : 446249323b44e54161bf187c0d386db645402bb7
2012-11-30 19:39:46 -08:00
Brian Smith
46c8b420d3 Bug 804663: Create a CryptoTask API to simplify the creation of correct async crypto operations and add more utilities to ScopedNSSTypes.h, r=honzab 2012-07-13 15:44:24 -07:00
Jed Parsons
6cc0782ec9 Bug 790141 - Native implementation of browserid get() and getVerifiedEmail(). r=benadida 2012-11-20 20:28:34 -05:00
Brian Smith
57d66aaf73 Backed out changeset ef6db4ced917 (bug 804663) due to build bustage, a=bustage
--HG--
extra : rebase_source : 20d434a5f205052e836e059bcee57a0bf84725c4
2012-11-19 20:24:47 -08:00
Brian Smith
3b421f7cf1 Bug 804663: Add a CryptoTask class for asynchronous crypto operations and add more utilities to ScopedNSSTypes.h
--HG--
extra : source : cc195997c6e526ce4b64d28cfb065d671b90bdba
2012-07-13 15:44:24 -07:00
Jed Parsons
2bb3eca524 Bug 811014 - Ensure forceIssuer parameter is passed through. r=benadida 2012-11-18 00:02:13 -05:00
Jed Parsons
af0c792537 Bug 811012 - Allow forceAuthentication parameter to request for whitelisted Marketplace. r=benadida 2012-11-17 08:19:38 -05:00
Jed Parsons
c22756ca57 Bug 804932 - Pass arbitrary options from RPs to BrowserID internal api methods. r=benadida 2012-11-16 18:34:32 -05:00
Jim Mathies
20abab5b8c Bug 810704 - Fixup misc. toolkit resource path issues. r=mak77 2012-11-14 10:24:05 -06:00
Jed Parsons
4db96ce158 Bug 809265 - Update Identity js and jsm modules to use new global object. r=benadida
--HG--
extra : rebase_source : e28a25b4a6556157532bcd082878ae36f6741607
2012-11-08 20:54:13 -05:00
Bobby Holley
c351c18d32 Bug 805807 - Make Components wrapper throw on denial. r=mrbkap
There's really no reason to use the wishy-washy static COW Deny() here.

Also, note that the xpcshell-test wasn't testing what it thought it
was - interfaces is accessible from content code.
2012-11-02 21:47:49 -03:00
Ed Morley
b159aab211 Backout 23c9f61a243b & 6ca11f4b470c (bug 805807) for mochitest-1 orange in test_contextmenu.html 2012-11-02 14:12:51 +00:00
Bobby Holley
ac090a0e20 Bug 805807 - Make Components wrapper throw on denial. r=mrbkap
There's really no reason to use the wishy-washy static COW Deny() here.

Also, note that the xpcshell-test wasn't testing what it thought it
was - interfaces is accessible from content code.
2012-11-02 13:27:59 +01:00
Jed Parsons
4886a2138b Bug 806605 - Replace loggedInEmail parameter with loggedInUser. r=benadida 2012-11-01 19:23:14 -04:00
Kyle Huey
1482122303 Bug 798491: Add an option to stick all chrome JSMs/JS components in the same compartment. r=mrbkap,philikon
--HG--
extra : rebase_source : 98337b6a8c07d05e8c961a452dd05a7d75c3c60b
2012-10-31 09:13:28 -07:00
Vicamo Yang
8297cdabd6 Backout 67cb43bb8865: Breaks B2G Marionette 2012-10-31 16:35:11 +08:00
Kyle Huey
bdf47895bb Bug 798491: Add an option to stick all chrome JSMs/JS components in the same compartment. r=mrbkap,philikon 2012-10-30 12:28:11 -07:00
Ed Morley
777eed8444 Backout a145ded68994, e0cf397089ec & 1545e91c658e (bug 798491) for bustage on a CLOSED TREE 2012-10-30 17:02:31 +00:00
Kyle Huey
aa1997a51a Bug 798491: Add an option to stick all chrome JSMs/JS components in the same compartment. r=mrbkap,philikon 2012-10-30 08:26:12 -07:00
Jed Parsons
e4891fd894 Bug 794680 - Connect gecko to gaia identity ui. r=benadida, r=cjones 2012-10-26 07:39:38 -04:00
Ehsan Akhgari
f117c7a7b0 Backed out 2 changesets (bug 579517)
Backed out changeset 5298adc70963
Backed out changeset 86ccf7c918ce (bug 579517)
2012-10-25 12:32:24 -04:00
Ehsan Akhgari
48b5c1a608 Code hygiene: don't use PR_TRUE and PR_FALSE, and use stdint types instead of PRInt types (no bug really, but you could say bug 579517) 2012-10-25 11:48:19 -04:00
Phil Ringnalda
abfd8dde73 Back out 4f8830d30f62 (bug 794680) for bustage on a CLOSED TREE 2012-10-16 19:58:32 -07:00
Jed Parsons
f46a0d35ef Bug 794680 - Connect gecko to b2g identity ui. r=benadida 2012-10-16 21:34:02 -04:00
Mounir Lamouri
3b3a2df3ce Bug 769569 - Check that navigator.id.request was called as a result of user input. r=benadida 2012-10-08 14:03:14 +01:00
Benjamin Peterson
d66436f7f5 backout 5f9951a2e6df (bug 785918) for breaking on osx 2012-09-25 10:24:09 -04:00
José Guilherme Vanz
8596bb0170 Bug 785918 - Replace the usages of PR_ARRAY_SIZE with mozilla::ArrayLength; r=ehsan 2012-09-25 09:57:08 -04:00
Gavin Sharp
c6264766e1 Bug 770063: disable intermittently passing todos, r=mattn 2012-09-24 12:59:27 -07:00
Bobby Holley
9f03f90fb7 Bug 792036 - Automated fixups. r=mccr8
find /files/mozilla/build/d/_tests/testing/mochitest/tests/ | egrep "\.(xhtml|html|xml|js)$" | grep -v SimpleTest | grep -vi mochikit | grep -v simpleThread | grep -v test_ipc_messagemanager_blob.html | grep -v "indexedDB/test" | xargs grep -l Components |  xargs grep -L enablePrivilege | perl -pe 's#.*mochitest/tests/##' | xargs perl -p -i.bakkk -e 's/Components\.interfaces(\s|;|\.|\[)/SpecialPowers\.Ci$1/g, s/SpecialPowers\.wrap\(Components\)\.(.)(lasses|tils|nterfaces|esults)/SpecialPowers.C$1/g, s/(?<![\.a-zA-Z])Components/SpecialPowers\.Components/g, s/window\.Components/window\.SpecialPowers\.Components/g'
2012-09-24 14:46:29 +02:00
Bobby Holley
7f912ddc79 Bug 792036 - Fix up tests to avoid relying on the existence of window.Components (MANUAL). r=mccr8
These are the manual fixes that the ensuing auto-generation can't deal with. Some of them
just fix up formatting (such as Components.\nFoo, so that subsequent auto-generation can
work better).
2012-09-24 14:46:28 +02:00
Matthew Noorenberghe
f48137da63 Bug 786835 - Stop using setIsBrowserElement for docShell isolation in Sandbox.jsm. r=imelven,gavin,benadida
--HG--
extra : rebase_source : df7720c490e139f639a7fd58a6dec8d5eba548a2
2012-08-29 16:47:44 -07:00
Andrew McCreight
e833ece4f7 Bug 775868, part 1: make tests access DomWinUtils via SpecialPowers. r=smaug 2012-09-10 12:43:45 -07:00
Ehsan Akhgari
0fd9123eac Bug 579517 - Part 1: Automated conversion of NSPR numeric types to stdint types in Gecko; r=bsmedberg
This patch was generated by a script.  Here's the source of the script for
future reference:

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*/.hg*" \
       ! -wholename "obj-ff-dbg*" \
       ! -name nsXPCOMCID.h \
       ! -name prtypes.h \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert PRInt8 int8_t
convert PRUint8 uint8_t
convert PRInt16 int16_t
convert PRUint16 uint16_t
convert PRInt32 int32_t
convert PRUint32 uint32_t
convert PRInt64 int64_t
convert PRUint64 uint64_t

convert PRIntn int
convert PRUintn unsigned

convert PRSize size_t

convert PROffset32 int32_t
convert PROffset64 int64_t

convert PRPtrdiff ptrdiff_t

convert PRFloat64 double
2012-08-22 11:56:38 -04:00
Mark Capella
f6b3d51d4a Bug 772272 - Remove do_load_httpd_js from xpcshell tests, Toolkits, r=ted, f=gps 2012-08-14 10:06:12 -04:00
Matthew Noorenberghe
c667677715 Bug 764213 - Provisional desktop UI for website sign-in with Persona. r=dolske
--HG--
extra : rebase_source : 8785a377e88b11f59ec00d44b58e6c21fce576a7
2012-06-12 18:16:00 -07:00
Matthew Noorenberghe
03f4088515 Bug 773485 - Update identity Makefiles to use MOCHITEST_FILES. r=glandium
--HG--
extra : rebase_source : 62987cfce90e63b2fa1fa7de69e2bccdd5cfa725
2012-08-09 00:07:38 -07:00
John Schoenick
160257fb86 Bug 771666 - Update sandbox test to reflect expected plugin behavior. r=mattn 2012-08-05 19:33:22 -07:00
Mike Hommey
6173fa297f Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted 2012-08-04 20:26:44 +02:00
Jed Parsons
c654e841fd Bug 778002: Identity should use createInstance, not getService, to get an XHR. r=me 2012-07-30 15:14:30 -07:00
Aryeh Gregor
417223dce7 Bug 777292 - Add casts and annoyed comments where we make up nsresult codes on the fly; r=ehsan 2012-07-27 17:03:25 +03:00
Ms2ger
9a0065cf81 Back out bug 771666 and bug 745030. 2012-07-25 22:39:01 +02:00
John Schoenick
8ca5dea2f0 Bug 771666 - Update sandbox test to reflect expected plugin behavior. r=mattn 2012-07-25 09:51:02 -07:00
Joshua Cranmer
4b8f318e78 Bug 773637 - Kill NS_SCRIPTABLE annotations, Part 1: Remove NS_*PARAM annotations. r=ehsan
--HG--
extra : rebase_source : a0b4bc50fece36d9a90fed61431635948bfa33b5
2012-07-06 15:14:07 -05:00
Mounir Lamouri
7935452e46 Bug 775408 - Rename nsIDocShell::SetIsBrowser() to SetIsBrowserElement(). r=jlebar 2012-07-21 17:39:41 -07:00
Mounir Lamouri
397bc64735 Bug 774957 - Update nsDocShell jazz so distinction between browser and app frame is clearer. r=jlebar sr=sicking 2012-07-18 22:26:21 -07:00