adium 3761:02ea27441d20: libpurple 2.7.11 [im.pidgin.adium @ 6c1...
commits at adium.im
commits at adium.im
Fri Mar 18 00:34:41 UTC 2011
details: http://hg.adium.im/adium/rev/02ea27441d20
revision: 3761:02ea27441d20
branch: (none)
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Fri Mar 18 01:29:17 2011 +0100
libpurple 2.7.11 [im.pidgin.adium @ 6c11797f5c7d21c307a76ed96d7882e2ce7fe926]
Additionally, fix the build scripts to work even when XCode4 is installed (assuming XCode 3 still lives under /Developer-old).
Subject: adium 3762:235d1a44cfdf: Merging this branch back in. libpurple is now at 2.7.11
details: http://hg.adium.im/adium/rev/235d1a44cfdf
revision: 3762:235d1a44cfdf
branch: (none)
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Fri Mar 18 01:33:47 2011 +0100
Merging this branch back in. libpurple is now at 2.7.11
diffs (679 lines):
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Dependencies/build.sh
--- a/Dependencies/build.sh Tue Mar 15 23:06:35 2011 -0700
+++ b/Dependencies/build.sh Fri Mar 18 01:33:47 2011 +0100
@@ -20,7 +20,26 @@
ARCHS=( "x86_64" "i386" "ppc" )
HOSTS=( "x86_64-${TARGET_BASE}" "i686-${TARGET_BASE}" "powerpc-${TARGET_BASE}" )
NUMBER_OF_CORES=`sysctl -n hw.activecpu`
-SDK_ROOT="/Developer/SDKs/MacOSX10.5.sdk"
+
+# Also try /Developer-old, just in case XCode 4 is installed
+DEVELOPER="/Developer"
+SDK_ROOT="${DEVELOPER}/SDKs/MacOSX10.5.sdk"
+
+if ! [ -d $SDK_ROOT ];
+then
+ warning "10.5 SDK not found in /Developer. You probably have installed XCode4. Trying /Developer-old..."
+ DEVELOPER="/Developer-old"
+ SDK_ROOT="${DEVELOPER}/SDKs/MacOSX10.5.sdk"
+
+ if ! [ -d $SDK_ROOT ];
+ then
+ error "10.5 SDK not found!"
+ exit 1
+ else
+ warning "found!"
+ fi
+fi
+
MIN_OS_VERSION="10.5"
BASE_CFLAGS="-fstack-protector -isysroot $SDK_ROOT \
-mmacosx-version-min=$MIN_OS_VERSION \
@@ -98,14 +117,14 @@
status "Building libotr"
;;
--enable-distcchost=*)
- asserttools "/Developer/usr/bin/distcc"
- asserttools "/Developer/usr/bin/pump"
+ asserttools "$DEVELOPER/usr/bin/distcc"
+ asserttools "$DEVELOPER/usr/bin/pump"
export DISTCC_HOSTS="${DISTCC_HOSTS:=} ${option##*=},lzo,cpp"
;;
--enable-llvm)
- asserttools "/Developer/usr/bin/llvm-gcc"
- export CC="/Developer/usr/bin/llvm-gcc"
- export CXX="/Developer/usr/bin/llvm-g++"
+ asserttools "$DEVELOPER/usr/bin/llvm-gcc"
+ export CC="$DEVELOPER/usr/bin/llvm-gcc"
+ export CXX="$DEVELOPER/usr/bin/llvm-g++"
warning "Building with LLVM! This is unsupported and will probably break things!"
;;
--libpurple-rev=*)
@@ -154,11 +173,17 @@
if [ "$DISTCC_HOSTS" != "" ]; then
export DISTCC_HOSTS="--randomize ${DISTCC_HOSTS} localhost/${NUMBER_OF_CORES}"
- export DISTCC_COMPILER=$(${CC:=/Developer/usr/bin/gcc} --version|head -n1)
- export CC="/Developer/usr/bin/distcc ${CC:=/Developer/usr/bin/gcc}"
- export CXX="/Developer/usr/bin/distcc ${CXX:=/Developer/usr/bin/g++}"
- NUMBER_OF_CORES=`/Developer/usr/bin/distcc -j`
- eval `/Developer/usr/bin/pump --startup`
+ export DISTCC_COMPILER=$(${CC:=$DEVELOPER/usr/bin/gcc} --version|head -n1)
+ export CC="$DEVELOPER/usr/bin/distcc ${CC:=$DEVELOPER/usr/bin/gcc}"
+ export CXX="$DEVELOPER/usr/bin/distcc ${CXX:=$DEVELOPER/usr/bin/g++}"
+ NUMBER_OF_CORES=`$DEVELOPER/usr/bin/distcc -j`
+ eval `$DEVELOPER/usr/bin/pump --startup`
+else
+ # Try to find the right gcc, even when XCode4 is installed
+ export CC="$DEVELOPER/usr/bin/gcc-4.2"
+ export CXX="$DEVELOPER/usr/bin/g++-4.2"
+ export CCAS="$CC"
+ export OBJC="$CC"
fi
# this file contans the stdio and stderr of the most recent build
@@ -179,7 +204,7 @@
# Getting mtn'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`
-export PATH=$ROOTDIR/build/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/Developer/usr/bin:/Developer/usr/sbin
+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"
@@ -214,7 +239,7 @@
fi
if [ "$DISTCC_HOSTS" != "" ]; then
- /Developer/usr/bin/pump --shutdown
+ $DEVELOPER/usr/bin/pump --shutdown
fi
make_framework $@
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Dependencies/phases/make_frameworks.sh
--- a/Dependencies/phases/make_frameworks.sh Tue Mar 15 23:06:35 2011 -0700
+++ b/Dependencies/phases/make_frameworks.sh Fri Mar 18 01:33:47 2011 +0100
@@ -167,7 +167,7 @@
log make install
quiet popd
- status "Copy po files to frameowrk"
+ status "Copy po files to framework"
quiet pushd "${ROOTDIR}/build/share/locale"
quiet mkdir "${PURPLE_RSRC_DIR}" || true
log cp -v -r * "${PURPLE_RSRC_DIR}"
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/Adium Framework/Source/AIChat.h
--- a/Frameworks/Adium Framework/Source/AIChat.h Tue Mar 15 23:06:35 2011 -0700
+++ b/Frameworks/Adium Framework/Source/AIChat.h Fri Mar 18 01:33:47 2011 +0100
@@ -126,6 +126,8 @@
NSMutableSet *customEmoticons;
+ NSDate *lastMessageDate;
+
// Former properties
NSImage *tabStateIcon;
@@ -226,4 +228,6 @@
@property (readonly, nonatomic) BOOL shouldLog;
+ at property (readwrite, copy, nonatomic) NSDate *lastMessageDate;
+
@end
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/Adium Framework/Source/AIChat.m
--- a/Frameworks/Adium Framework/Source/AIChat.m Tue Mar 15 23:06:35 2011 -0700
+++ b/Frameworks/Adium Framework/Source/AIChat.m Fri Mar 18 01:33:47 2011 +0100
@@ -43,6 +43,8 @@
@interface AIChat ()
- (id)initForAccount:(AIAccount *)inAccount;
+- (void)contentObjectAdded:(NSNotification *)notification;
+
- (void)clearUniqueChatID;
- (void)clearListObjectStatuses;
@@ -78,11 +80,23 @@
pendingOutgoingContentObjects = [[NSMutableArray alloc] init];
AILog(@"[AIChat: %x initForAccount]",self);
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(contentObjectAdded:)
+ name:Content_ContentObjectAdded
+ object:self];
}
return self;
}
+- (void)contentObjectAdded:(NSNotification *)notification
+{
+ AIContentMessage *content = [[notification userInfo] objectForKey:@"AIContentObject"];
+
+ self.lastMessageDate = [content date];
+}
+
/*!
* @brief Deallocate
*/
@@ -501,6 +515,8 @@
//Content --------------------------------------------------------------------------------------------------------------
#pragma mark Content
+ at synthesize lastMessageDate;
+
/*!
* @brief Informs the chat that the core and the account are ready to begin filtering and sending a content object
*
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libglib.framework/Versions/2.0.0/libglib
Binary file Frameworks/libglib.framework/Versions/2.0.0/libglib has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule
Binary file Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgobject.framework/Versions/2.0.0/libgobject
Binary file Frameworks/libgobject.framework/Versions/2.0.0/libgobject has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstapp.framework/Versions/0.10.0/libgstapp
Binary file Frameworks/libgstapp.framework/Versions/0.10.0/libgstapp has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstaudio.framework/Versions/0.10.0/libgstaudio
Binary file Frameworks/libgstaudio.framework/Versions/0.10.0/libgstaudio has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstbase.framework/Versions/0.10.0/libgstbase
Binary file Frameworks/libgstbase.framework/Versions/0.10.0/libgstbase has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstcontroller.framework/Versions/0.10.0/libgstcontroller
Binary file Frameworks/libgstcontroller.framework/Versions/0.10.0/libgstcontroller has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstdataprotocol.framework/Versions/0.10.0/libgstdataprotocol
Binary file Frameworks/libgstdataprotocol.framework/Versions/0.10.0/libgstdataprotocol has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstfarsight.framework/Versions/0.10.0/libgstfarsight
Binary file Frameworks/libgstfarsight.framework/Versions/0.10.0/libgstfarsight has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstinterfaces.framework/Versions/0.10.0/libgstinterfaces
Binary file Frameworks/libgstinterfaces.framework/Versions/0.10.0/libgstinterfaces has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstnet.framework/Versions/0.10.0/libgstnet
Binary file Frameworks/libgstnet.framework/Versions/0.10.0/libgstnet has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstnetbuffer.framework/Versions/0.10.0/libgstnetbuffer
Binary file Frameworks/libgstnetbuffer.framework/Versions/0.10.0/libgstnetbuffer has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libfsfunnel.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsfunnel.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libfsmsnconference.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsmsnconference.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libfsrtcpfilter.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsrtcpfilter.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libfsrtpconference.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsrtpconference.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libfsselector.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsselector.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libfsvideoanyrate.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libfsvideoanyrate.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstadder.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstadder.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstalaw.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstalaw.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstapp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstapp.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstaudiorate.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstaudiorate.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstaudioresample.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstaudioresample.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstautodetect.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstautodetect.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstcoreelements.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstcoreelements.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstcoreindexers.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstcoreindexers.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstffmpegcolorspace.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstffmpegcolorspace.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstjrtp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstjrtp.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstlevel.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstlevel.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstmulaw.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstmulaw.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstnetsim.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstnetsim.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstnice.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstnice.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstosxaudio.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstosxaudio.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstosxvideosink.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstosxvideosink.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstrtp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtp.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstrtpdemux.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtpdemux.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstrtpjitterbuffer.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtpjitterbuffer.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstrtpmanager.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtpmanager.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstrtppayloads.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtppayloads.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstrtsp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstrtsp.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgsttcp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgsttcp.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgsttypefindfunctions.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgsttypefindfunctions.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstudp.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstudp.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstvideobox.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideobox.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstvideocrop.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideocrop.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstvideomixer.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideomixer.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstvideorate.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideorate.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstvideoscale.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvideoscale.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/PlugIns/libgstvolume.so
Binary file Frameworks/libgstreamer.framework/PlugIns/libgstvolume.so has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstreamer.framework/Versions/0.10.0/libgstreamer
Binary file Frameworks/libgstreamer.framework/Versions/0.10.0/libgstreamer has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstrtp.framework/Versions/0.10.0/libgstrtp
Binary file Frameworks/libgstrtp.framework/Versions/0.10.0/libgstrtp has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstrtsp.framework/Versions/0.10.0/libgstrtsp
Binary file Frameworks/libgstrtsp.framework/Versions/0.10.0/libgstrtsp has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstsdp.framework/Versions/0.10.0/libgstsdp
Binary file Frameworks/libgstsdp.framework/Versions/0.10.0/libgstsdp has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgsttag.framework/Versions/0.10.0/libgsttag
Binary file Frameworks/libgsttag.framework/Versions/0.10.0/libgsttag has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgstvideo.framework/Versions/0.10.0/libgstvideo
Binary file Frameworks/libgstvideo.framework/Versions/0.10.0/libgstvideo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libgthread.framework/Versions/2.0.0/libgthread
Binary file Frameworks/libgthread.framework/Versions/2.0.0/libgthread has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libintl.framework/Versions/8/Headers/libintl.h
--- a/Frameworks/libintl.framework/Versions/8/Headers/libintl.h Tue Mar 15 23:06:35 2011 -0700
+++ b/Frameworks/libintl.framework/Versions/8/Headers/libintl.h Fri Mar 18 01:33:47 2011 +0100
@@ -1,5 +1,5 @@
/* Message catalogs for internationalization.
- Copyright (C) 1995-1997, 2000-2007 Free Software Foundation, Inc.
+ Copyright (C) 1995-1997, 2000-2006 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -53,7 +53,7 @@
/* Version number: (major<<16) + (minor<<8) + subminor */
-#define LIBINTL_VERSION 0x001100
+#define LIBINTL_VERSION 0x001000
extern int libintl_version;
@@ -328,7 +328,7 @@
extern int vfprintf (FILE *, const char *, va_list);
#undef printf
-#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__
+#if defined __NetBSD__ || defined __CYGWIN__ || defined __MINGW32__
/* Don't break __attribute__((format(printf,M,N))).
This redefinition is only possible because the libc in NetBSD, Cygwin,
mingw does not have a function __printf__. */
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libintl.framework/Versions/8/libintl
Binary file Frameworks/libintl.framework/Versions/8/libintl has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libjson-glib.framework/Versions/1.0.0/libjson-glib
Binary file Frameworks/libjson-glib.framework/Versions/1.0.0/libjson-glib has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libmeanwhile.framework/Versions/1/libmeanwhile
Binary file Frameworks/libmeanwhile.framework/Versions/1/libmeanwhile has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libnice.framework/Versions/0/libnice
Binary file Frameworks/libnice.framework/Versions/0/libnice has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/liboil.framework/Versions/0.3.0/liboil
Binary file Frameworks/liboil.framework/Versions/0.3.0/liboil has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Headers
--- a/Frameworks/libpurple.framework/Headers Tue Mar 15 23:06:35 2011 -0700
+++ b/Frameworks/libpurple.framework/Headers Fri Mar 18 01:33:47 2011 +0100
@@ -1,1 +1,1 @@
-Versions/Current/Headers
\ No newline at end of file
+Versions/0.7.5/Headers
\ No newline at end of file
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Resources
--- a/Frameworks/libpurple.framework/Resources Tue Mar 15 23:06:35 2011 -0700
+++ b/Frameworks/libpurple.framework/Resources Fri Mar 18 01:33:47 2011 +0100
@@ -1,1 +1,1 @@
-Versions/Current/Resources/
\ No newline at end of file
+Versions/0.7.5/Resources
\ No newline at end of file
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/ca/LC_MESSAGES/gst-plugins-base-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/ca/LC_MESSAGES/gst-plugins-base-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/ca/LC_MESSAGES/gst-plugins-good-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/ca/LC_MESSAGES/gst-plugins-good-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/ca/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/ca/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/cs/LC_MESSAGES/gst-plugins-base-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/cs/LC_MESSAGES/gst-plugins-base-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/cs/LC_MESSAGES/gst-plugins-good-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/cs/LC_MESSAGES/gst-plugins-good-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/cs/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/cs/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/da/LC_MESSAGES/gst-plugins-base-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/da/LC_MESSAGES/gst-plugins-base-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/da/LC_MESSAGES/gst-plugins-good-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/da/LC_MESSAGES/gst-plugins-good-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/da/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/da/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/de/LC_MESSAGES/gst-plugins-base-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/de/LC_MESSAGES/gst-plugins-base-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/de/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/de/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/en_GB/LC_MESSAGES/gst-plugins-base-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/en_GB/LC_MESSAGES/gst-plugins-base-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/en_GB/LC_MESSAGES/gst-plugins-good-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/en_GB/LC_MESSAGES/gst-plugins-good-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/en_GB/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/en_GB/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/es/LC_MESSAGES/gst-plugins-base-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/es/LC_MESSAGES/gst-plugins-base-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/es/LC_MESSAGES/gst-plugins-good-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/es/LC_MESSAGES/gst-plugins-good-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/es/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/es/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/fi/LC_MESSAGES/gst-plugins-base-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/fi/LC_MESSAGES/gst-plugins-base-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/fi/LC_MESSAGES/gst-plugins-good-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/fi/LC_MESSAGES/gst-plugins-good-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/fi/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/fi/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/fr/LC_MESSAGES/gst-plugins-base-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/fr/LC_MESSAGES/gst-plugins-base-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/fr/LC_MESSAGES/gst-plugins-good-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/fr/LC_MESSAGES/gst-plugins-good-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/fr/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/fr/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/hu/LC_MESSAGES/gst-plugins-base-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/hu/LC_MESSAGES/gst-plugins-base-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/hu/LC_MESSAGES/gst-plugins-good-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/hu/LC_MESSAGES/gst-plugins-good-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/hu/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/hu/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/it/LC_MESSAGES/gst-plugins-base-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/it/LC_MESSAGES/gst-plugins-base-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/it/LC_MESSAGES/gst-plugins-good-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/it/LC_MESSAGES/gst-plugins-good-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/it/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/it/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/ja/LC_MESSAGES/gst-plugins-base-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/ja/LC_MESSAGES/gst-plugins-base-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/ja/LC_MESSAGES/gst-plugins-good-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/ja/LC_MESSAGES/gst-plugins-good-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/ja/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/ja/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/locale.alias
--- a/Frameworks/libpurple.framework/Versions/0.7.5/Resources/locale.alias Tue Mar 15 23:06:35 2011 -0700
+++ b/Frameworks/libpurple.framework/Versions/0.7.5/Resources/locale.alias Fri Mar 18 01:33:47 2011 +0100
@@ -1,5 +1,5 @@
# Locale name alias data base.
-# Copyright (C) 1996-2001,2003,2007 Free Software Foundation, Inc.
+# Copyright (C) 1996-2001,2003 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU Library General Public License as published
@@ -22,9 +22,10 @@
# A single line contains two fields: an alias and a substitution value.
# All entries are case independent.
-# Note: This file is obsolete and is kept around for the time being for
-# backward compatibility. Nobody should rely on the names defined here.
-# Locales should always be specified by their full name.
+# Note: This file is far from being complete. If you have a value for
+# your own site which you think might be useful for others too, share
+# it with the rest of us. Send it using the `glibcbug' script to
+# bugs at gnu.org.
# Packages using this file: gettext-runtime gettext-tools
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/mai/LC_MESSAGES/pidgin.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/mai/LC_MESSAGES/pidgin.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/nb/LC_MESSAGES/gst-plugins-base-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/nb/LC_MESSAGES/gst-plugins-base-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/nb/LC_MESSAGES/gst-plugins-good-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/nb/LC_MESSAGES/gst-plugins-good-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/nb/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/nb/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/nl/LC_MESSAGES/gst-plugins-base-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/nl/LC_MESSAGES/gst-plugins-base-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/nl/LC_MESSAGES/gst-plugins-good-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/nl/LC_MESSAGES/gst-plugins-good-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/nl/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/nl/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/pl/LC_MESSAGES/gst-plugins-base-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/pl/LC_MESSAGES/gst-plugins-base-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/pl/LC_MESSAGES/gst-plugins-good-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/pl/LC_MESSAGES/gst-plugins-good-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/pl/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/pl/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/pt_BR/LC_MESSAGES/gst-plugins-base-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/pt_BR/LC_MESSAGES/gst-plugins-base-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/pt_BR/LC_MESSAGES/gst-plugins-good-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/pt_BR/LC_MESSAGES/gst-plugins-good-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/pt_BR/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/pt_BR/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/ru/LC_MESSAGES/gst-plugins-base-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/ru/LC_MESSAGES/gst-plugins-base-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/ru/LC_MESSAGES/gst-plugins-good-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/ru/LC_MESSAGES/gst-plugins-good-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/ru/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/ru/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/sv/LC_MESSAGES/gst-plugins-base-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/sv/LC_MESSAGES/gst-plugins-base-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/sv/LC_MESSAGES/gst-plugins-good-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/sv/LC_MESSAGES/gst-plugins-good-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/sv/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/sv/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/tr/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/tr/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/uk/LC_MESSAGES/gst-plugins-base-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/uk/LC_MESSAGES/gst-plugins-base-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/uk/LC_MESSAGES/gst-plugins-good-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/uk/LC_MESSAGES/gst-plugins-good-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/uk/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/uk/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/zh_CN/LC_MESSAGES/gst-plugins-base-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/zh_CN/LC_MESSAGES/gst-plugins-base-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/zh_CN/LC_MESSAGES/gst-plugins-good-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/zh_CN/LC_MESSAGES/gst-plugins-good-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/zh_CN/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/zh_CN/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/zh_TW/LC_MESSAGES/gst-plugins-good-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/zh_TW/LC_MESSAGES/gst-plugins-good-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/Resources/zh_TW/LC_MESSAGES/gstreamer-0.10.mo
Binary file Frameworks/libpurple.framework/Versions/0.7.5/Resources/zh_TW/LC_MESSAGES/gstreamer-0.10.mo has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Frameworks/libpurple.framework/Versions/0.7.5/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.7.5/libpurple has changed
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Plugins/Purple Service/SLPurpleCocoaAdapter.m
--- a/Plugins/Purple Service/SLPurpleCocoaAdapter.m Tue Mar 15 23:06:35 2011 -0700
+++ b/Plugins/Purple Service/SLPurpleCocoaAdapter.m Fri Mar 18 01:33:47 2011 +0100
@@ -589,6 +589,19 @@
valueUTF8String);
}
}
+
+ if (chat.lastMessageDate) {
+
+ NSString *historySince = [[NSDate dateWithTimeInterval:1.0f sinceDate:chat.lastMessageDate]
+ descriptionWithCalendarFormat:@"%Y-%m-%dT%H:%M:%SZ"
+ timeZone:[NSTimeZone timeZoneWithAbbreviation:@"UTC"]
+ locale:nil];
+
+ g_hash_table_replace(components, g_strdup("history_since"), g_strdup([historySince UTF8String]));
+ } else {
+ AILogWithSignature(@"No last message found for history on %@", chat);
+ }
+
//In debug mode, verify we didn't miss any required values
if (AIDebugLoggingIsEnabled()) {
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Source/AIChatController.m
--- a/Source/AIChatController.m Tue Mar 15 23:06:35 2011 -0700
+++ b/Source/AIChatController.m Fri Mar 18 01:33:47 2011 +0100
@@ -33,6 +33,8 @@
#import <AIUtilities/AIArrayAdditions.h>
#import <AIUtilities/AIMenuAdditions.h>
+#import "DCMessageContextDisplayPlugin.h"
+
#define SHOW_JOIN_LEAVE_TITLE AILocalizedString(@"Show Join/Leave Messages", nil)
@interface AIChatController ()
@@ -433,6 +435,13 @@
chat.identifier = identifier;
chat.isGroupChat = YES;
chat.chatCreationDictionary = chatCreationInfo;
+
+ NSArray *lastActivity = [[DCMessageContextDisplayPlugin sharedInstance] contextForChat:chat lines:1 alsoStatus:TRUE];
+
+ if (lastActivity.count > 0) {
+ chat.lastMessageDate = [[lastActivity objectAtIndex:0] date];
+ }
+
/* Negative preference so (default == NO) -> showing join/leave messages */
chat.showJoinLeave = ![[[adium preferenceController] preferenceForKey:[NSString stringWithFormat:@"HideJoinLeave-%@", name]
group:PREF_GROUP_STATUS_PREFERENCES] boolValue];
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Source/DCMessageContextDisplayPlugin.h
--- a/Source/DCMessageContextDisplayPlugin.h Tue Mar 15 23:06:35 2011 -0700
+++ b/Source/DCMessageContextDisplayPlugin.h Fri Mar 18 01:33:47 2011 +0100
@@ -34,4 +34,9 @@
NSInteger linesToDisplay;
}
++ (DCMessageContextDisplayPlugin *)sharedInstance;
+
+- (NSArray *)contextForChat:(AIChat *)chat;
+- (NSArray *)contextForChat:(AIChat *)chat lines:(NSInteger)linesLeftToFind alsoStatus:(BOOL)alsoStatus;
+
@end
diff -r 9bc0cfa2fa0d -r 235d1a44cfdf Source/DCMessageContextDisplayPlugin.m
--- a/Source/DCMessageContextDisplayPlugin.m Tue Mar 15 23:06:35 2011 -0700
+++ b/Source/DCMessageContextDisplayPlugin.m Fri Mar 18 01:33:47 2011 +0100
@@ -19,6 +19,7 @@
#import <AIUtilities/AIDictionaryAdditions.h>
#import <Adium/AIChat.h>
#import <Adium/AIContentContext.h>
+#import <Adium/AIContentStatus.h>
#import <Adium/AIService.h>
//Old school
@@ -40,6 +41,8 @@
#define RESTORED_CHAT_CONTEXT_LINE_NUMBER 50
+static DCMessageContextDisplayPlugin *sharedInstance = nil;
+
/**
* @class DCMessageContextDisplayPlugin
* @brief Component to display in-window message history
@@ -51,10 +54,16 @@
object:(AIListObject *)object preferenceDict:(NSDictionary *)prefDict firstTime:(BOOL)firstTime;
- (NSArray *)contextForChat:(AIChat *)chat;
- (void)addContextDisplayToWindow:(NSNotification *)notification;
++ (DCMessageContextDisplayPlugin *)sharedInstance;
@end
@implementation DCMessageContextDisplayPlugin
++ (DCMessageContextDisplayPlugin *)sharedInstance
+{
+ return sharedInstance;
+}
+
/**
* @brief Install
*/
@@ -69,6 +78,8 @@
//Observe preference changes for whether or not to display message history
[adium.preferenceController registerPreferenceObserver:self forGroup:PREF_GROUP_CONTEXT_DISPLAY];
+
+ sharedInstance = self;
}
/**
@@ -140,28 +151,34 @@
*/
- (NSArray *)contextForChat:(AIChat *)chat
{
- //If there's no log there, there's no message history. Bail out.
- NSArray *logPaths = [AILoggerPlugin sortedArrayOfLogFilesForChat:chat];
-
- if(!logPaths) return nil;
-
NSInteger linesLeftToFind = 0;
- AIHTMLDecoder *decoder = [AIHTMLDecoder decoder];
-
- NSString *logObjectUID = chat.name;
- if (!logObjectUID) logObjectUID = chat.listObject.UID;
- logObjectUID = [logObjectUID safeFilenameString];
-
- NSString *baseLogPath = [[AILoggerPlugin logBasePath] stringByAppendingPathComponent:
- [AILoggerPlugin relativePathForLogWithObject:logObjectUID onAccount:chat.account]];
-
if ([chat boolValueForProperty:@"Restored Chat"] && linesToDisplay < RESTORED_CHAT_CONTEXT_LINE_NUMBER) {
linesLeftToFind = MAX(linesLeftToFind, RESTORED_CHAT_CONTEXT_LINE_NUMBER);
} else {
linesLeftToFind = linesToDisplay;
}
-
+
+ return [self contextForChat:chat lines:linesLeftToFind alsoStatus:NO];
+}
+
+- (NSArray *)contextForChat:(AIChat *)chat lines:(NSInteger)linesLeftToFind alsoStatus:(BOOL)alsoStatus
+{
+ //If there's no log there, there's no message history. Bail out.
+ NSArray *logPaths = [AILoggerPlugin sortedArrayOfLogFilesForChat:chat];
+
+ if(!logPaths || linesLeftToFind == 0) return nil;
+
+ NSString *logObjectUID = chat.name;
+ if (!logObjectUID) logObjectUID = chat.listObject.UID;
+ logObjectUID = [logObjectUID safeFilenameString];
+
+ AIHTMLDecoder *decoder = [AIHTMLDecoder decoder];
+
+ NSString *baseLogPath = [[AILoggerPlugin logBasePath] stringByAppendingPathComponent:
+ [AILoggerPlugin relativePathForLogWithObject:logObjectUID onAccount:chat.account]];
+
+
//Initialize a place to store found messages
NSMutableArray *outerFoundContentContexts = [NSMutableArray arrayWithCapacity:linesLeftToFind];
@@ -219,6 +236,7 @@
[NSValue valueWithPointer:&linesLeftToFind], @"LinesLeftToFindValue",
foundMessages, @"FoundMessages",
elementStack, @"ElementStack",
+ [NSNumber numberWithBool:alsoStatus], @"AlsoAllowStatus",
nil];
[parser setContextInfo:(void *)contextInfo];
}
@@ -311,7 +329,7 @@
NSMutableDictionary *contextInfo = [parser contextInfo];
NSMutableArray *elementStack = [contextInfo objectForKey:@"ElementStack"];
- if ([elementName isEqualToString:@"message"]) {
+ if ([elementName isEqualToString:@"message"] || ([[contextInfo valueForKey:@"AlsoAllowStatus"] boolValue] && [elementName isEqualToString:@"status"])) {
[elementStack insertObject:[AIXMLElement elementWithName:elementName] atIndex:0U];
}
else if ([elementStack count]) {
@@ -395,7 +413,22 @@
} else {
NSLog(@"Null message context display time for %@",element);
}
- }
+ } else if ([[contextInfo valueForKey:@"AlsoAllowStatus"] boolValue] && [elementName isEqualToString:@"status"]) {
+
+ AIChat *chat = [contextInfo objectForKey:@"Chat"];
+
+ NSDictionary *attributes = [element attributes];
+ NSString *timeString = [attributes objectForKey:@"time"];
+
+ if (timeString) {
+ NSCalendarDate *timeVal = [NSCalendarDate calendarDateWithString:timeString];
+
+ AIContentStatus *status = [[AIContentStatus alloc] initWithChat:chat source:nil destination:nil date:timeVal];
+
+ [foundMessages insertObject:status atIndex:0];
+ [status release];
+ }
+ }
[elementStack removeObjectAtIndex:0U];
if ([foundMessages count] == *linesLeftToFind) {
More information about the commits
mailing list