adium-1.4 3385:d9a5f98d907b: The gcc docs state, "There are thre...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/d9a5f98d907b
revision:	3385:d9a5f98d907b
branch:		(none)
author:		Evan Schoenberg
date:		Tue Mar 08 21:57:41 2011 -0600

The gcc docs state, "There are three system names that the build knows about: the machine you are building on (build), the machine that you are building for (host), and the machine that GCC will produce code for (target). When you configure GCC, you specify these with --build=, --host=, and --target=."

--host is the correct argument here; it was changed to --build in a previous commit without indication as to why the change was made.
Subject: adium-1.4 3386:fdd7e33db783: Merge

details:	http://hg.adium.im/adium-1.4/rev/fdd7e33db783
revision:	3386:fdd7e33db783
branch:		(none)
author:		Evan Schoenberg
date:		Tue Mar 08 21:58:56 2011 -0600

Merge
Subject: adium-1.4 3387:3e68b6510977: Building on a virgin installation of 10.6.6, I found that cross-compilation of glib was failing without this environment variable set. Macports uses this solution, and it works well for me. See http://trac.macports.org/ticket/22224 for details.

details:	http://hg.adium.im/adium-1.4/rev/3e68b6510977
revision:	3387:3e68b6510977
branch:		(none)
author:		Evan Schoenberg
date:		Tue Mar 08 22:00:14 2011 -0600

Building on a virgin installation of 10.6.6, I found that cross-compilation of glib was failing without this environment variable set. Macports uses this solution, and it works well for me. See http://trac.macports.org/ticket/22224 for details.

diffs (61 lines):

diff -r ea587caf94d5 -r 3e68b6510977 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt	Sat Feb 05 22:12:10 2011 -0500
+++ b/ChangeLogs/Changes.txt	Tue Mar 08 22:00:14 2011 -0600
@@ -33,8 +33,10 @@
   * Fixed a bug causing a switching of user profiles following Adium updates. (#14432)
   * Fixed 1.4.1 regression of arrows not showing up in the Events tables of the Preference pane and the Get Info pane for active events. (#14629)
   * Fixed a hang that occurred when required parts of loaded message styles were missing. (#7438)
+  * Fixed bookmark icons not updating when changing icon sets. (#13221)
   * Fixed "Remove Link" showing up twice in the input box's context menu on 10.6. (Shawn Khan) (#14454)
   * Fixed 1.4 regression where selection of the active voice in the "Speak Event" and "Speak Text" contact alert actions failed. (#14574)
+  * Fixed positioning of selected icon in Recent Icons not being reapplied when icon is reselected. (#9908)
 
  Localisation
   * Updated the Localizable.strings files, adding missing translatable strings/nibs. (#14588)
diff -r ea587caf94d5 -r 3e68b6510977 Copyright.txt
--- a/Copyright.txt	Sat Feb 05 22:12:10 2011 -0500
+++ b/Copyright.txt	Tue Mar 08 22:00:14 2011 -0600
@@ -29,6 +29,7 @@
 Brian Ganninger
 Thomas Gibson-Robinson
 Kevin Glowacz
+Adrian Godoroja
 Ryan Govostes
 Asher Haig
 Anne Halsall
diff -r ea587caf94d5 -r 3e68b6510977 Source/AIContactListRecentImagesWindowController.m
--- a/Source/AIContactListRecentImagesWindowController.m	Sat Feb 05 22:12:10 2011 -0500
+++ b/Source/AIContactListRecentImagesWindowController.m	Tue Mar 08 22:00:14 2011 -0600
@@ -183,8 +183,8 @@
 	if (selectedIndex < [recentPictures count]) {
 		id		recentPicture = [recentPictures objectAtIndex:selectedIndex];
 		NSData	*imageData = nil;
-		if ([recentPicture respondsToSelector:@selector(editedImage)])
-			imageData = [[recentPicture editedImage] PNGRepresentation];
+		if ([recentPicture respondsToSelector:@selector(smallIcon)])
+			imageData = [[recentPicture smallIcon] PNGRepresentation];
 		else if ([recentPicture respondsToSelector:@selector(originalImagePath)])
 			imageData = [NSData dataWithContentsOfFile:[recentPicture originalImagePath]];
 
diff -r ea587caf94d5 -r 3e68b6510977 Utilities/dep-build-scripts/general_dependencies_make.sh
--- a/Utilities/dep-build-scripts/general_dependencies_make.sh	Sat Feb 05 22:12:10 2011 -0500
+++ b/Utilities/dep-build-scripts/general_dependencies_make.sh	Tue Mar 08 22:00:14 2011 -0600
@@ -78,7 +78,8 @@
 	
 	export PKG_CONFIG="$LOCAL_BIN_DIR/pkg-config"
 	export MSGFMT="$LOCAL_BIN_DIR/msgfmt"
-	
+	export NM="`which nm`"
+
 	#Defining USE_LIBICONV_GNU here is a hack to avoid what *appears* to be a mistaken #error in gconvert.c
 	export CFLAGS="$LOCAL_FLAGS $BASE_CFLAGS -arch $ARCH -DUSE_LIBICONV_GNU"
 	export CPPFLAGS="$CFLAGS"
@@ -97,7 +98,7 @@
 	   --prefix=$TARGET_DIR \
 	   --with-libiconv \
 	   --disable-static --enable-shared \
-	   --build=$HOST >> $LOG_FILE 2>&1
+	   --host=$HOST >> $LOG_FILE 2>&1
 	echo '  make && make install'
 	make -j $NUMBER_OF_CORES >> $LOG_FILE 2>&1 && make install >> $LOG_FILE 2>&1
 	cd ..