adium 4997:072a38e0a9bc: Merged adium-1.6 into default.
commits at adium.im
commits at adium.im
Sun Aug 12 22:30:59 UTC 2012
details: http://hg.adium.im/adium/rev/072a38e0a9bc
revision: 4997:072a38e0a9bc
branch: (none)
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Mon Aug 13 00:26:14 2012 +0200
Merged adium-1.6 into default.
diffs (truncated from 6219 to 1000 lines):
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Thu Aug 09 03:10:57 2012 +0200
+++ b/Adium.xcodeproj/project.pbxproj Mon Aug 13 00:26:14 2012 +0200
@@ -145,9 +145,6 @@
11879C0B0F6FF4C400CACFB1 /* AITwitterAccountOAuthSetup.m in Sources */ = {isa = PBXBuildFile; fileRef = 11879C0A0F6FF4C400CACFB1 /* AITwitterAccountOAuthSetup.m */; };
11879DF80F6FFC0B00CACFB1 /* OAuthConsumer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11879DF70F6FFC0B00CACFB1 /* OAuthConsumer.framework */; };
11879E0A0F6FFC1000CACFB1 /* OAuthConsumer.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 11879DF70F6FFC0B00CACFB1 /* OAuthConsumer.framework */; };
- 118A44500FEEA828008153C0 /* libjson-glib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 118A444F0FEEA828008153C0 /* libjson-glib.framework */; };
- 118A44510FEEA828008153C0 /* libjson-glib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 118A444F0FEEA828008153C0 /* libjson-glib.framework */; };
- 118A44540FEEA82E008153C0 /* libjson-glib.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 118A444F0FEEA828008153C0 /* libjson-glib.framework */; };
1192E6D90FD3056F003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1192E6B10FD30307003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.h */; };
1192E6DA0FD30578003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1192E6B20FD30307003CAEF5 /* AIAnnoyingIRCMessagesHiderPlugin.m */; };
1197F6710FCF8D180032F19B /* AITwitterStatusFollowup.m in Sources */ = {isa = PBXBuildFile; fileRef = 1197F6700FCF8D180032F19B /* AITwitterStatusFollowup.m */; };
@@ -1478,6 +1475,9 @@
C6A42AB915C5DD790032FAB3 /* FTProgressStopRollover_Selected at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42AAD15C5DD790032FAB3 /* FTProgressStopRollover_Selected at 2x.png */; };
C6A42ABA15C5DD790032FAB3 /* FTProgressStopRollover.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42AAE15C5DD790032FAB3 /* FTProgressStopRollover.png */; };
C6A42ABB15C5DD790032FAB3 /* FTProgressStopRollover at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42AAF15C5DD790032FAB3 /* FTProgressStopRollover at 2x.png */; };
+ C6B545A815D338EE0005F1F8 /* SoundFileIcon at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6B545A715D338EE0005F1F8 /* SoundFileIcon at 2x.png */; };
+ C6B545AA15D3390F0005F1F8 /* ABSearch at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6B545A915D3390F0005F1F8 /* ABSearch at 2x.png */; };
+ C6B545AE15D339B70005F1F8 /* stackImage at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6B545AD15D339B70005F1F8 /* stackImage at 2x.png */; };
C6EE433E15C0A9BC00A4B96C /* default-icon at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EE433D15C0A9BC00A4B96C /* default-icon at 2x.png */; };
C6EE434015C0AA4600A4B96C /* emoticonBlank at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EE433F15C0AA4600A4B96C /* emoticonBlank at 2x.png */; };
C6EE434215C0AA6F00A4B96C /* sidebarActionWidget at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6EE434115C0AA6F00A4B96C /* sidebarActionWidget at 2x.png */; };
@@ -1648,7 +1648,6 @@
dstSubfolderSpec = 10;
files = (
116E369A10B72934002EDB0F /* Growl.framework in Copy Frameworks */,
- 118A44540FEEA82E008153C0 /* libjson-glib.framework in Copy Frameworks */,
633404710F9C18EF003C77A9 /* AIUtilities.framework in Copy Frameworks */,
639DF9D80F97E678003C9A32 /* AdiumLibpurple.framework in Copy Frameworks */,
11879E0A0F6FFC1000CACFB1 /* OAuthConsumer.framework in Copy Frameworks */,
@@ -2896,7 +2895,6 @@
347E786A07CA972100350507 /* AddGroup.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = AddGroup.xib; path = Resources/AddGroup.xib; sourceTree = "<group>"; };
347E787207CA975900350507 /* msg-add-contact.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "msg-add-contact.tiff"; path = "Resources/msg-add-contact.tiff"; sourceTree = "<group>"; };
347E787507CA975900350507 /* remove.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = remove.tiff; path = Resources/remove.tiff; sourceTree = "<group>"; };
- 347E787607CA975900350507 /* importContacts.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = importContacts.png; path = Resources/importContacts.png; sourceTree = "<group>"; };
347E788707CA978D00350507 /* CBActionSupportPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = CBActionSupportPlugin.m; path = Source/CBActionSupportPlugin.m; sourceTree = "<group>"; };
347E788807CA978D00350507 /* CBActionSupportPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CBActionSupportPlugin.h; path = Source/CBActionSupportPlugin.h; sourceTree = "<group>"; };
347E790D07CAA51400350507 /* AIManualSort.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIManualSort.m; path = Source/AIManualSort.m; sourceTree = "<group>"; };
@@ -4451,7 +4449,6 @@
979AA6B414D5A452008730DF /* libgobject.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgobject.framework; path = Frameworks/libgobject.framework; sourceTree = "<group>"; };
979AA6B514D5A452008730DF /* libgthread.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgthread.framework; path = Frameworks/libgthread.framework; sourceTree = "<group>"; };
979AA6B614D5A452008730DF /* libintl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libintl.framework; path = Frameworks/libintl.framework; sourceTree = "<group>"; };
- 979AA6B714D5A452008730DF /* libjson-glib.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = "libjson-glib.framework"; path = "Frameworks/libjson-glib.framework"; sourceTree = "<group>"; };
979AA6B814D5A452008730DF /* libmeanwhile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libmeanwhile.framework; path = Frameworks/libmeanwhile.framework; sourceTree = "<group>"; };
979AA6B914D5A452008730DF /* libpurple.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libpurple.framework; path = Frameworks/libpurple.framework; sourceTree = "<group>"; };
97AF5CD913191DE200550C41 /* AIContactListUserPictureMenuController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIContactListUserPictureMenuController.h; path = Source/AIContactListUserPictureMenuController.h; sourceTree = "<group>"; };
@@ -4540,6 +4537,9 @@
C6A42AAD15C5DD790032FAB3 /* FTProgressStopRollover_Selected at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressStopRollover_Selected at 2x.png"; path = "Resources/FTProgressStopRollover_Selected at 2x.png"; sourceTree = "<group>"; };
C6A42AAE15C5DD790032FAB3 /* FTProgressStopRollover.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressStopRollover.png; path = Resources/FTProgressStopRollover.png; sourceTree = "<group>"; };
C6A42AAF15C5DD790032FAB3 /* FTProgressStopRollover at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressStopRollover at 2x.png"; path = "Resources/FTProgressStopRollover at 2x.png"; sourceTree = "<group>"; };
+ C6B545A715D338EE0005F1F8 /* SoundFileIcon at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "SoundFileIcon at 2x.png"; path = "Resources/SoundFileIcon at 2x.png"; sourceTree = "<group>"; };
+ C6B545A915D3390F0005F1F8 /* ABSearch at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ABSearch at 2x.png"; path = "Resources/ABSearch at 2x.png"; sourceTree = "<group>"; };
+ C6B545AD15D339B70005F1F8 /* stackImage at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "stackImage at 2x.png"; path = "Frameworks/Adium Framework/stackImage at 2x.png"; sourceTree = "<group>"; };
C6EE433D15C0A9BC00A4B96C /* default-icon at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "default-icon at 2x.png"; path = "Resources/default-icon at 2x.png"; sourceTree = "<group>"; };
C6EE433F15C0AA4600A4B96C /* emoticonBlank at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "emoticonBlank at 2x.png"; path = "Resources/emoticonBlank at 2x.png"; sourceTree = "<group>"; };
C6EE434115C0AA6F00A4B96C /* sidebarActionWidget at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "sidebarActionWidget at 2x.png"; path = "Resources/sidebarActionWidget at 2x.png"; sourceTree = "<group>"; };
@@ -4730,7 +4730,6 @@
811035180CDE783800EC6038 /* SecurityInterface.framework in Frameworks */,
633405990F9C2C00003C77A9 /* AIUtilities.framework in Frameworks */,
3485D8EB09EB446900232CC4 /* Adium.framework in Frameworks */,
- 118A44500FEEA828008153C0 /* libjson-glib.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -4766,7 +4765,6 @@
340C1ABF0BD58FAB00D09235 /* Security.framework in Frameworks */,
31E0CD810C5EEF5200271DB1 /* CoreAudio.framework in Frameworks */,
11879DF80F6FFC0B00CACFB1 /* OAuthConsumer.framework in Frameworks */,
- 118A44510FEEA828008153C0 /* libjson-glib.framework in Frameworks */,
34C846AF101E515900140B4B /* QTKit.framework in Frameworks */,
9719C92C1530EDF700217FBE /* FriBidi.framework in Frameworks */,
9719C92E1530EE0C00217FBE /* ShortcutRecorder.framework in Frameworks */,
@@ -6736,6 +6734,7 @@
F55B416E03AB8C3201A8010A /* AIPasswordPromptController.h */,
F55B416603AB8BFC01A8010A /* AIPasswordPromptController.m */,
349DDD5206406A7D00542726 /* stackImage.png */,
+ C6B545AD15D339B70005F1F8 /* stackImage at 2x.png */,
);
name = Interface;
sourceTree = "<group>";
@@ -8156,7 +8155,6 @@
979AA6B414D5A452008730DF /* libgobject.framework */,
979AA6B514D5A452008730DF /* libgthread.framework */,
979AA6B614D5A452008730DF /* libintl.framework */,
- 979AA6B714D5A452008730DF /* libjson-glib.framework */,
979AA6B914D5A452008730DF /* libpurple.framework */,
979AA6B814D5A452008730DF /* libmeanwhile.framework */,
);
@@ -8566,8 +8564,8 @@
isa = PBXGroup;
children = (
EE147A6C0896B18700A21377 /* ABSearch.png */,
+ C6B545A915D3390F0005F1F8 /* ABSearch at 2x.png */,
347E787207CA975900350507 /* msg-add-contact.tiff */,
- 347E787607CA975900350507 /* importContacts.png */,
);
name = Images;
sourceTree = "<group>";
@@ -8688,6 +8686,7 @@
34A6FB2507D6F97B00972830 /* EventSoundContactAlert.xib */,
34A6FB2B07D6F98600972830 /* events-sound-alert.tiff */,
34A6FB2C07D6F98600972830 /* SoundFileIcon.png */,
+ C6B545A715D338EE0005F1F8 /* SoundFileIcon at 2x.png */,
);
name = Sound;
sourceTree = "<group>";
@@ -9749,6 +9748,9 @@
C6A42AB915C5DD790032FAB3 /* FTProgressStopRollover_Selected at 2x.png in Resources */,
C6A42ABA15C5DD790032FAB3 /* FTProgressStopRollover.png in Resources */,
C6A42ABB15C5DD790032FAB3 /* FTProgressStopRollover at 2x.png in Resources */,
+ C6B545A815D338EE0005F1F8 /* SoundFileIcon at 2x.png in Resources */,
+ C6B545AA15D3390F0005F1F8 /* ABSearch at 2x.png in Resources */,
+ C6B545AE15D339B70005F1F8 /* stackImage at 2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff -r 0d7a0d3f6855 -r 072a38e0a9bc ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt Thu Aug 09 03:10:57 2012 +0200
+++ b/ChangeLogs/Changes.txt Mon Aug 13 00:26:14 2012 +0200
@@ -1,6 +1,6 @@
Adium Version History
-----------------------
-Version 1.5.3 (8/XX/2012)
+Version 1.5.3 (8/12/2012)
* Fixed another problem with the transcript viewer causing search to fail when closing and reopening the window. (#13586, #15699)
* Fixed a problem with iTunes 10.6.3 on Mac OS X 10.6.8 causing the chat window's toolbar to break. (#16046)
* Fixed crash at startup that was meant to be fixed in 1.5.2. (#15787)
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Dependencies/build.sh
--- a/Dependencies/build.sh Thu Aug 09 03:10:57 2012 +0200
+++ b/Dependencies/build.sh Mon Aug 13 00:26:14 2012 +0200
@@ -23,7 +23,8 @@
# Also try /Developer-old, just in case XCode 4 is installed
DEVELOPER=$(xcode-select -print-path)
-SDK_ROOT="${DEVELOPER}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"
+SDK_ROOT="${DEVELOPER}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk"
+# SDK_ROOT="/Developer/SDKs/MacOSX10.6.sdk/"
MIN_OS_VERSION="10.6"
BASE_CFLAGS="-fstack-protector -isysroot $SDK_ROOT \
@@ -68,7 +69,7 @@
BUILD_OTR=false
STRAIGHT_TO_LIBPURPLE=false
DOWNLOAD_LIBPURPLE=false
-MTN_UPDATE_PARAM=""
+HG_UPDATE_PARAM=""
DISTCC_HOSTS=""
for option in ${@:1} ; do
case $option in
@@ -109,12 +110,12 @@
warning "Building with LLVM! This is unsupported and will probably break things!"
;;
--libpurple-rev=*)
- MTN_REV=${option##*=}
- MTN_UPDATE_PARAM="${MTN_UPDATE_PARAM} -r ${MTN_REV}"
+ HG_REV=${option##*=}
+ HG_UPDATE_PARAM="${HG_UPDATE_PARAM} -r ${HG_REV}"
;;
--libpurple-branch=*)
- MTN_BRANCH=${option##*=}
- MTN_UPDATE_PARAM="${MTN_UPDATE_PARAM} -b ${MTN_BRANCH}"
+ HG_BRANCH=${option##*=}
+ HG_UPDATE_PARAM="${HG_UPDATE_PARAM} ${HG_BRANCH}"
;;
--libpurple-only)
STRAIGHT_TO_LIBPURPLE=true
@@ -139,7 +140,7 @@
--libpurple-branch=[branch] : Force a secific libpurple branch
--libpurple-only : Assume all dependencies are already built
and start the build with libpurple itself
- --download-libpurple : Download the libpurple mtn bootstrap db.
+ --download-libpurple : Download the libpurple Mercurial repository
--help : This help text
Note that explicitly setting any arch flags implies a forced reconfigure.'
@@ -161,8 +162,8 @@
eval `$DEVELOPER/usr/bin/pump --startup`
else
# Try to find the right gcc, even when XCode4 is installed
- export CC="/opt/local/bin/gcc-apple-4.2"
- export CXX="/opt/local/bin/g++-apple-4.2"
+ export CC="clang"
+ export CXX="clang"
export CCAS="$CC"
export OBJC="$CC"
fi
@@ -178,13 +179,13 @@
# assert that the developer can, in fact, build libpurple. Why waste his time if he can't?
asserttools gcc
-asserttools mtn
+asserttools hg
# Ok, so we keep running into issues where MacPorts will volunteer to supply
# dependencies that we want to build ourselves.
-# Getting mtn's path before we export our own (safer?) path will ensure it works,
+# Getting hg's path before we export our own (safer?) path will ensure it works,
# even if it's being managed by MacPorts, Fink, or similar.
-MTN=`which mtn`
+HG=`which hg`
export PATH=$ROOTDIR/build/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:$DEVELOPER/usr/bin:$DEVELOPER/usr/sbin
export PKG_CONFIG="$ROOTDIR/build/bin/pkg-config"
export PKG_CONFIG_PATH="$ROOTDIR/build/lib/pkgconfig:/usr/lib/pkgconfig"
@@ -207,7 +208,7 @@
build_meanwhile $@
build_intltool $@
- build_jsonglib $@
+ # build_jsonglib $@
#build_gstreamer $@
#build_farsight $@
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Dependencies/phases/build_dependencies.sh
--- a/Dependencies/phases/build_dependencies.sh Thu Aug 09 03:10:57 2012 +0200
+++ b/Dependencies/phases/build_dependencies.sh Mon Aug 13 00:26:14 2012 +0200
@@ -14,6 +14,7 @@
if needsconfigure $@; then
status "Configuring pkg-config"
+ export CFLAGS="-std=gnu89"
log ./configure --prefix="$ROOTDIR/build"
fi
@@ -39,6 +40,7 @@
if needsconfigure $@; then
(
status "Configuring gettext"
+ export "gl_cv_absolute_stdint_h=${SDK_ROOT}/usr/include/stdint.h"
CONFIG_CMD="./configure \
--prefix=$ROOTDIR/build \
--disable-java \
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Dependencies/phases/build_purple.sh
--- a/Dependencies/phases/build_purple.sh Thu Aug 09 03:10:57 2012 +0200
+++ b/Dependencies/phases/build_purple.sh Mon Aug 13 00:26:14 2012 +0200
@@ -13,7 +13,7 @@
if [[ '' != ${version} ]] ; then
LIBPURPLE_VERSION="${LIBPURPLE_VERSION}.${version}"
fi
- done < "${ROOTDIR}/source/im.pidgin.adium/libpurple/version.h"
+ done < "${ROOTDIR}/source/libpurple/libpurple/version.h"
LIBPURPLE_VERSION="0.${LIBPURPLE_VERSION:3}"
}
@@ -23,33 +23,15 @@
fetch_libpurple() {
quiet pushd "$ROOTDIR/source"
- if [ -d "im.pidgin.adium" ]; then
-
+ if [ -d "libpurple" ]; then
status "Pulling latest changes to libpurple"
- cd "im.pidgin.adium"
- $MTN pull
- $MTN update ${MTN_UPDATE_PARAM}
-
+ cd "libpurple"
+ $HG pull
+
+ status "Updating libpurple with ${HG_UPDATE_PARAM}"
+ $HG update ${HG_UPDATE_PARAM}
else
-
- quiet mkdir "im.pidgin.adium"
- cd "im.pidgin.adium"
-
- status "Downloading bootstrap database for libpurple"
- curl -LOf "http://developer.pidgin.im/static/pidgin.mtn.bz2"
-
- status "Extracting bootstrap database"
- bzip2 -d "pidgin.mtn.bz2"
-
- status "Migrating database to new schema"
- $MTN db -d "pidgin.mtn" migrate
-
- status "Pulling updates to monotone database"
- $MTN -d "pidgin.mtn" pull --set-default "mtn.pidgin.im" "im.pidgin.*"
-
- status "Checking out im.pidgin.adium branch"
- $MTN -d "pidgin.mtn" co -b "im.pidgin.adium" .
-
+ $HG clone -b adium "http://hg.adium.im/libpurple/" libpurple
fi
quiet popd
@@ -62,7 +44,7 @@
if $DOWNLOAD_LIBPURPLE; then
fetch_libpurple
fi
- if [ ! -d "$ROOTDIR/source/im.pidgin.adium" ]; then
+ if [ ! -d "$ROOTDIR/source/libpurple" ]; then
error "libpurple checkout not found; use --download-libpurple"
exit 1;
fi
@@ -75,7 +57,7 @@
quiet mkdir -p "$ROOTDIR/build/include/sasl"
log cp -f "$ROOTDIR/source/cyrus-sasl/include/"*.h "$ROOTDIR/build/include/sasl"
- quiet pushd "$ROOTDIR/source/im.pidgin.adium"
+ quiet pushd "$ROOTDIR/source/libpurple"
PROTOCOLS="bonjour,gg,irc,jabber,msn,myspace,novell,oscar,"
PROTOCOLS+="sametime,simple,yahoo,zephyr"
@@ -124,10 +106,10 @@
$KERBEROS"
xconfigure "$BASE_CFLAGS -I/usr/include/kerberosIV -DHAVE_SSL \
-DHAVE_OPENSSL -fno-common -DHAVE_ZLIB" \
- "$BASE_LDFLAGS -lsasl2 -ljson-glib-1.0 -lz" \
+ "$BASE_LDFLAGS -lsasl2 -lz" \
"${CONFIG_CMD}" \
- "${ROOTDIR}/source/im.pidgin.adium/libpurple/purple.h" \
- "${ROOTDIR}/source/im.pidgin.adium/config.h"
+ "${ROOTDIR}/source/libpurple/libpurple/purple.h" \
+ "${ROOTDIR}/source/libpurple/config.h"
)
fi
@@ -136,28 +118,28 @@
log make install
status "Copying internal libpurple headers"
- log cp -f "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/oscar/oscar.h" \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/oscar/snactypes.h" \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/oscar/peer.h" \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/cmds.h" \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/internal.h" \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/msn/"*.h \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/yahoo/"*.h \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/gg/buddylist.h" \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/gg/gg.h" \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/gg/search.h" \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/auth.h" \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/bosh.h" \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/buddy.h" \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/caps.h" \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/jutil.h" \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/presence.h" \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/si.h" \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/jabber.h" \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/iq.h" \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/namespaces.h" \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/irc/irc.h" \
- "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/gg/lib/libgadu.h" \
+ log cp -f "$ROOTDIR/source/libpurple/libpurple/protocols/oscar/oscar.h" \
+ "$ROOTDIR/source/libpurple/libpurple/protocols/oscar/snactypes.h" \
+ "$ROOTDIR/source/libpurple/libpurple/protocols/oscar/peer.h" \
+ "$ROOTDIR/source/libpurple/libpurple/cmds.h" \
+ "$ROOTDIR/source/libpurple/libpurple/internal.h" \
+ "$ROOTDIR/source/libpurple/libpurple/protocols/msn/"*.h \
+ "$ROOTDIR/source/libpurple/libpurple/protocols/yahoo/"*.h \
+ "$ROOTDIR/source/libpurple/libpurple/protocols/gg/buddylist.h" \
+ "$ROOTDIR/source/libpurple/libpurple/protocols/gg/gg.h" \
+ "$ROOTDIR/source/libpurple/libpurple/protocols/gg/search.h" \
+ "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/auth.h" \
+ "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/bosh.h" \
+ "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/buddy.h" \
+ "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/caps.h" \
+ "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/jutil.h" \
+ "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/presence.h" \
+ "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/si.h" \
+ "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/jabber.h" \
+ "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/iq.h" \
+ "$ROOTDIR/source/libpurple/libpurple/protocols/jabber/namespaces.h" \
+ "$ROOTDIR/source/libpurple/libpurple/protocols/irc/irc.h" \
+ "$ROOTDIR/source/libpurple/libpurple/protocols/gg/lib/libgadu.h" \
"$ROOTDIR/build/include/libpurple"
quiet popd
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Dependencies/phases/make_frameworks.sh
--- a/Dependencies/phases/make_frameworks.sh Thu Aug 09 03:10:57 2012 +0200
+++ b/Dependencies/phases/make_frameworks.sh Mon Aug 13 00:26:14 2012 +0200
@@ -54,14 +54,6 @@
local meanwhileDir="${ROOTDIR}/build/lib/include/libmeanwhile-${MEANWHILE_VERSION}"
quiet mkdir "${meanwhileDir}" || true
touch "${meanwhileDir}/no_headers_here.txt"
-
- #json-glib
- status "Staging json-glib headers"
- local jsonDir="${ROOTDIR}/build/lib/include/libjson-glib-${JSON_GLIB_VERSION}.0"
- quiet rm -r "${jsonDir}" || true
- quiet mkdir "${jsonDir}" || true
- log cp -R "${ROOTDIR}/build/include/json-glib-${JSON_GLIB_VERSION}/json-glib" "${jsonDir}"
-
#libpurple
status "Staging libpurple headers"
@@ -130,7 +122,8 @@
PURPLE_RSRC_DIR="${ROOTDIR}/Frameworks/libpurple.subproj/libpurple.framework/Resources"
status "Building libpurple po files"
- quiet pushd "${ROOTDIR}/source/im.pidgin.adium/po"
+ quiet pushd "${ROOTDIR}/source/libpurple/po"
+ log make -j $NUMBER_OF_CORES update-po
log make all
log make install
quiet popd
@@ -147,4 +140,4 @@
quiet popd
status "libpurple po files built!"
-}
\ No newline at end of file
+}
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Frameworks/Adium Framework/stackImage.png
Binary file Frameworks/Adium Framework/stackImage.png has changed
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Frameworks/Adium Framework/stackImage.tiff
Binary file Frameworks/Adium Framework/stackImage.tiff has changed
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Frameworks/Adium Framework/stackImage at 2x.png
Binary file Frameworks/Adium Framework/stackImage at 2x.png has changed
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Frameworks/libglib.framework/Versions/2.0.0/Headers/glibconfig.h
--- a/Frameworks/libglib.framework/Versions/2.0.0/Headers/glibconfig.h Thu Aug 09 03:10:57 2012 +0200
+++ b/Frameworks/libglib.framework/Versions/2.0.0/Headers/glibconfig.h Mon Aug 13 00:26:14 2012 +0200
@@ -139,7 +139,7 @@
#endif
#define G_HAVE_GNUC_VARARGS 1
-#define G_HAVE_GROWING_STACK 0
+#define G_HAVE_GROWING_STACK 1
#if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
#define G_GNUC_INTERNAL __attribute__((visibility("hidden")))
@@ -289,15 +289,15 @@
#define GLIB_SIZEOF_LONG 4
#define GLIB_SIZEOF_SIZE_T 4
-typedef signed long gssize;
-typedef unsigned long gsize;
-#define G_GSIZE_MODIFIER "l"
-#define G_GSSIZE_FORMAT "li"
-#define G_GSIZE_FORMAT "lu"
+typedef signed int gssize;
+typedef unsigned int gsize;
+#define G_GSIZE_MODIFIER ""
+#define G_GSSIZE_FORMAT "i"
+#define G_GSIZE_FORMAT "u"
-#define G_MAXSIZE G_MAXULONG
-#define G_MINSSIZE G_MINLONG
-#define G_MAXSSIZE G_MAXLONG
+#define G_MAXSIZE G_MAXUINT
+#define G_MINSSIZE G_MININT
+#define G_MAXSSIZE G_MAXINT
typedef gint64 goffset;
#define G_MINOFFSET G_MININT64
@@ -364,7 +364,7 @@
#endif
#define G_HAVE_GNUC_VARARGS 1
-#define G_HAVE_GROWING_STACK 0
+#define G_HAVE_GROWING_STACK 1
#if defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
#define G_GNUC_INTERNAL __attribute__((visibility("hidden")))
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Frameworks/libglib.framework/Versions/2.0.0/Headers/gobject/gobjectnotifyqueue.c
--- a/Frameworks/libglib.framework/Versions/2.0.0/Headers/gobject/gobjectnotifyqueue.c Thu Aug 09 03:10:57 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,171 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_OBJECT_NOTIFY_QUEUE_H__
-#define __G_OBJECT_NOTIFY_QUEUE_H__
-
-#include <string.h> /* memset */
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-
-/* --- typedefs --- */
-typedef struct _GObjectNotifyContext GObjectNotifyContext;
-typedef struct _GObjectNotifyQueue GObjectNotifyQueue;
-typedef void (*GObjectNotifyQueueDispatcher) (GObject *object,
- guint n_pspecs,
- GParamSpec **pspecs);
-
-
-/* --- structures --- */
-struct _GObjectNotifyContext
-{
- GQuark quark_notify_queue;
- GObjectNotifyQueueDispatcher dispatcher;
- GTrashStack *_nqueue_trash; /* unused */
-};
-struct _GObjectNotifyQueue
-{
- GObjectNotifyContext *context;
- GSList *pspecs;
- guint16 n_pspecs;
- guint16 freeze_count;
- /* currently, this structure abuses the GList allocation chain and thus
- * must be <= sizeof (GList)
- */
-};
-
-
-/* --- functions --- */
-static void
-g_object_notify_queue_free (gpointer data)
-{
- GObjectNotifyQueue *nqueue = data;
-
- g_slist_free (nqueue->pspecs);
- g_list_free_1 ((void*) nqueue);
-}
-
-static inline GObjectNotifyQueue*
-g_object_notify_queue_freeze (GObject *object,
- GObjectNotifyContext *context)
-{
- GObjectNotifyQueue *nqueue;
-
- nqueue = g_datalist_id_get_data (&object->qdata, context->quark_notify_queue);
- if (!nqueue)
- {
- nqueue = (void*) g_list_alloc ();
- memset (nqueue, 0, sizeof (*nqueue));
- nqueue->context = context;
- g_datalist_id_set_data_full (&object->qdata, context->quark_notify_queue,
- nqueue, g_object_notify_queue_free);
- }
-
- g_return_val_if_fail (nqueue->freeze_count < 65535, nqueue);
- nqueue->freeze_count++;
-
- return nqueue;
-}
-
-static inline void
-g_object_notify_queue_thaw (GObject *object,
- GObjectNotifyQueue *nqueue)
-{
- GObjectNotifyContext *context = nqueue->context;
- GParamSpec *pspecs_mem[16], **pspecs, **free_me = NULL;
- GSList *slist;
- guint n_pspecs = 0;
-
- g_return_if_fail (nqueue->freeze_count > 0);
-
- nqueue->freeze_count--;
- if (nqueue->freeze_count)
- return;
- g_return_if_fail (object->ref_count > 0);
-
- pspecs = nqueue->n_pspecs > 16 ? free_me = g_new (GParamSpec*, nqueue->n_pspecs) : pspecs_mem;
- /* set first entry to NULL since it's checked unconditionally */
- pspecs[0] = NULL;
- for (slist = nqueue->pspecs; slist; slist = slist->next)
- {
- GParamSpec *pspec = slist->data;
- guint i = 0;
-
- /* dedup, make pspecs in the list unique */
- redo_dedup_check:
- if (pspecs[i] == pspec)
- continue;
- if (++i < n_pspecs)
- goto redo_dedup_check;
-
- pspecs[n_pspecs++] = pspec;
- }
- g_datalist_id_set_data (&object->qdata, context->quark_notify_queue, NULL);
-
- if (n_pspecs)
- context->dispatcher (object, n_pspecs, pspecs);
- g_free (free_me);
-}
-
-static inline void
-g_object_notify_queue_clear (GObject *object,
- GObjectNotifyQueue *nqueue)
-{
- g_return_if_fail (nqueue->freeze_count > 0);
-
- g_slist_free (nqueue->pspecs);
- nqueue->pspecs = NULL;
- nqueue->n_pspecs = 0;
-}
-
-static inline void
-g_object_notify_queue_add (GObject *object,
- GObjectNotifyQueue *nqueue,
- GParamSpec *pspec)
-{
- if (pspec->flags & G_PARAM_READABLE)
- {
- GParamSpec *redirect;
-
- g_return_if_fail (nqueue->n_pspecs < 65535);
-
- redirect = g_param_spec_get_redirect_target (pspec);
- if (redirect)
- pspec = redirect;
-
- /* we do the deduping in _thaw */
- nqueue->pspecs = g_slist_prepend (nqueue->pspecs, pspec);
- nqueue->n_pspecs++;
- }
-}
-
-static inline GObjectNotifyQueue*
-g_object_notify_queue_from_object (GObject *object,
- GObjectNotifyContext *context)
-{
- return g_datalist_id_get_data (&object->qdata, context->quark_notify_queue);
-}
-
-
-G_END_DECLS
-
-#endif /* __G_OBJECT_NOTIFY_QUEUE_H__ */
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Frameworks/libglib.framework/Versions/2.0.0/libglib
Binary file Frameworks/libglib.framework/Versions/2.0.0/libglib has changed
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule
Binary file Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule has changed
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Frameworks/libgobject.framework/Versions/2.0.0/Headers/gobjectnotifyqueue.c
--- a/Frameworks/libgobject.framework/Versions/2.0.0/Headers/gobjectnotifyqueue.c Thu Aug 09 03:10:57 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,171 +0,0 @@
-/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998-1999, 2000-2001 Tim Janik and Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __G_OBJECT_NOTIFY_QUEUE_H__
-#define __G_OBJECT_NOTIFY_QUEUE_H__
-
-#include <string.h> /* memset */
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-
-/* --- typedefs --- */
-typedef struct _GObjectNotifyContext GObjectNotifyContext;
-typedef struct _GObjectNotifyQueue GObjectNotifyQueue;
-typedef void (*GObjectNotifyQueueDispatcher) (GObject *object,
- guint n_pspecs,
- GParamSpec **pspecs);
-
-
-/* --- structures --- */
-struct _GObjectNotifyContext
-{
- GQuark quark_notify_queue;
- GObjectNotifyQueueDispatcher dispatcher;
- GTrashStack *_nqueue_trash; /* unused */
-};
-struct _GObjectNotifyQueue
-{
- GObjectNotifyContext *context;
- GSList *pspecs;
- guint16 n_pspecs;
- guint16 freeze_count;
- /* currently, this structure abuses the GList allocation chain and thus
- * must be <= sizeof (GList)
- */
-};
-
-
-/* --- functions --- */
-static void
-g_object_notify_queue_free (gpointer data)
-{
- GObjectNotifyQueue *nqueue = data;
-
- g_slist_free (nqueue->pspecs);
- g_list_free_1 ((void*) nqueue);
-}
-
-static inline GObjectNotifyQueue*
-g_object_notify_queue_freeze (GObject *object,
- GObjectNotifyContext *context)
-{
- GObjectNotifyQueue *nqueue;
-
- nqueue = g_datalist_id_get_data (&object->qdata, context->quark_notify_queue);
- if (!nqueue)
- {
- nqueue = (void*) g_list_alloc ();
- memset (nqueue, 0, sizeof (*nqueue));
- nqueue->context = context;
- g_datalist_id_set_data_full (&object->qdata, context->quark_notify_queue,
- nqueue, g_object_notify_queue_free);
- }
-
- g_return_val_if_fail (nqueue->freeze_count < 65535, nqueue);
- nqueue->freeze_count++;
-
- return nqueue;
-}
-
-static inline void
-g_object_notify_queue_thaw (GObject *object,
- GObjectNotifyQueue *nqueue)
-{
- GObjectNotifyContext *context = nqueue->context;
- GParamSpec *pspecs_mem[16], **pspecs, **free_me = NULL;
- GSList *slist;
- guint n_pspecs = 0;
-
- g_return_if_fail (nqueue->freeze_count > 0);
-
- nqueue->freeze_count--;
- if (nqueue->freeze_count)
- return;
- g_return_if_fail (object->ref_count > 0);
-
- pspecs = nqueue->n_pspecs > 16 ? free_me = g_new (GParamSpec*, nqueue->n_pspecs) : pspecs_mem;
- /* set first entry to NULL since it's checked unconditionally */
- pspecs[0] = NULL;
- for (slist = nqueue->pspecs; slist; slist = slist->next)
- {
- GParamSpec *pspec = slist->data;
- guint i = 0;
-
- /* dedup, make pspecs in the list unique */
- redo_dedup_check:
- if (pspecs[i] == pspec)
- continue;
- if (++i < n_pspecs)
- goto redo_dedup_check;
-
- pspecs[n_pspecs++] = pspec;
- }
- g_datalist_id_set_data (&object->qdata, context->quark_notify_queue, NULL);
-
- if (n_pspecs)
- context->dispatcher (object, n_pspecs, pspecs);
- g_free (free_me);
-}
-
-static inline void
-g_object_notify_queue_clear (GObject *object,
- GObjectNotifyQueue *nqueue)
-{
- g_return_if_fail (nqueue->freeze_count > 0);
-
- g_slist_free (nqueue->pspecs);
- nqueue->pspecs = NULL;
- nqueue->n_pspecs = 0;
-}
-
-static inline void
-g_object_notify_queue_add (GObject *object,
- GObjectNotifyQueue *nqueue,
- GParamSpec *pspec)
-{
- if (pspec->flags & G_PARAM_READABLE)
- {
- GParamSpec *redirect;
-
- g_return_if_fail (nqueue->n_pspecs < 65535);
-
- redirect = g_param_spec_get_redirect_target (pspec);
- if (redirect)
- pspec = redirect;
-
- /* we do the deduping in _thaw */
- nqueue->pspecs = g_slist_prepend (nqueue->pspecs, pspec);
- nqueue->n_pspecs++;
- }
-}
-
-static inline GObjectNotifyQueue*
-g_object_notify_queue_from_object (GObject *object,
- GObjectNotifyContext *context)
-{
- return g_datalist_id_get_data (&object->qdata, context->quark_notify_queue);
-}
-
-
-G_END_DECLS
-
-#endif /* __G_OBJECT_NOTIFY_QUEUE_H__ */
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Frameworks/libgobject.framework/Versions/2.0.0/libgobject
Binary file Frameworks/libgobject.framework/Versions/2.0.0/libgobject has changed
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Frameworks/libgthread.framework/Versions/2.0.0/libgthread
Binary file Frameworks/libgthread.framework/Versions/2.0.0/libgthread has changed
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Frameworks/libintl.framework/Versions/8/libintl
Binary file Frameworks/libintl.framework/Versions/8/libintl has changed
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Frameworks/libjson-glib.framework/Headers
--- a/Frameworks/libjson-glib.framework/Headers Thu Aug 09 03:10:57 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Versions/1.0.0/Headers
\ No newline at end of file
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Frameworks/libjson-glib.framework/Resources
--- a/Frameworks/libjson-glib.framework/Resources Thu Aug 09 03:10:57 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Versions/1.0.0/Resources
\ No newline at end of file
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-enum-types.h
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-enum-types.h Thu Aug 09 03:10:57 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-
-/* Generated data (by glib-mkenums) */
-
-#if !defined(__JSON_GLIB_INSIDE__) && !defined(JSON_COMPILATION)
-#error "Only <json-glib/json-glib.h> can be included directly."
-#endif
-
-#ifndef __JSON_ENUM_TYPES_H__
-#define __JSON_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* enumerations from "../json-glib/json-parser.h" */
-GType json_parser_error_get_type (void) G_GNUC_CONST;
-#define JSON_TYPE_PARSER_ERROR (json_parser_error_get_type())
-
-/* enumerations from "../json-glib/json-types.h" */
-GType json_node_type_get_type (void) G_GNUC_CONST;
-#define JSON_TYPE_NODE_TYPE (json_node_type_get_type())
-
-G_END_DECLS
-
-#endif /* !__JSON_ENUM_TYPES_H__ */
-
-/* Generated data ends here */
-
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-generator.h
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-generator.h Thu Aug 09 03:10:57 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/* json-generator.h - JSON streams generator
- *
- * This file is part of JSON-GLib
- * Copyright (C) 2007 OpenedHand Ltd.
- * Copyright (C) 2009 Intel Corp.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- * Emmanuele Bassi <ebassi at linux.intel.com>
- */
-
-#if !defined(__JSON_GLIB_INSIDE__) && !defined(JSON_COMPILATION)
-#error "Only <json-glib/json-glib.h> can be included directly."
-#endif
-
-#ifndef __JSON_GENERATOR_H__
-#define __JSON_GENERATOR_H__
-
-#include <json-glib/json-types.h>
-
-G_BEGIN_DECLS
-
-#define JSON_TYPE_GENERATOR (json_generator_get_type ())
-#define JSON_GENERATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), JSON_TYPE_GENERATOR, JsonGenerator))
-#define JSON_IS_GENERATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), JSON_TYPE_GENERATOR))
-#define JSON_GENERATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), JSON_TYPE_GENERATOR, JsonGeneratorClass))
-#define JSON_IS_GENERATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), JSON_TYPE_GENERATOR))
-#define JSON_GENERATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), JSON_TYPE_GENERATOR, JsonGeneratorClass))
-
-typedef struct _JsonGenerator JsonGenerator;
-typedef struct _JsonGeneratorPrivate JsonGeneratorPrivate;
-typedef struct _JsonGeneratorClass JsonGeneratorClass;
-
-/**
- * JsonGenerator:
- *
- * JSON data streams generator. The contents of the #JsonGenerator structure
- * are private and should only be accessed via the provided API.
- */
-struct _JsonGenerator
-{
- /*< private >*/
- GObject parent_instance;
-
- JsonGeneratorPrivate *priv;
-};
-
-/**
- * JsonGeneratorClass:
- *
- * #JsonGenerator class
- */
-struct _JsonGeneratorClass
-{
- /*< private >*/
- GObjectClass parent_class;
-
- /* padding, for future expansion */
- void (* _json_reserved1) (void);
- void (* _json_reserved2) (void);
- void (* _json_reserved3) (void);
- void (* _json_reserved4) (void);
-};
-
-GType json_generator_get_type (void) G_GNUC_CONST;
-
-JsonGenerator *json_generator_new (void);
-gchar * json_generator_to_data (JsonGenerator *generator,
- gsize *length);
-gboolean json_generator_to_file (JsonGenerator *generator,
- const gchar *filename,
- GError **error);
-void json_generator_set_root (JsonGenerator *generator,
- JsonNode *node);
-
-G_END_DECLS
-
-#endif /* __JSON_GENERATOR_H__ */
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-glib
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-glib Thu Aug 09 03:10:57 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/Users/sholt/Documents/Projects/FOSS/adium/Dependencies/build/include/json-glib-1.0/json-glib
\ No newline at end of file
diff -r 0d7a0d3f6855 -r 072a38e0a9bc Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-glib.h
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-glib.h Thu Aug 09 03:10:57 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/* json-glib.h: Main header
- *
- * This file is part of JSON-GLib
- * Copyright (C) 2007 OpenedHand Ltd.
- * Copyright (C) 2009 Intel Corp.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Author:
- * Emmanuele Bassi <ebassi at linux.intel.com>
- */
-
-#ifndef __JSON_GLIB_H__
-#define __JSON_GLIB_H__
-
-#define __JSON_GLIB_INSIDE__
-
-#include <json-glib/json-types.h>
-#include <json-glib/json-generator.h>
-#include <json-glib/json-parser.h>
-#include <json-glib/json-version.h>
-#include <json-glib/json-enum-types.h>
-
-#include <json-glib/json-gobject.h>
-
-#undef __JSON_GLIB_INSIDE__
-
More information about the commits
mailing list