linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 427
committer: Steven Sheehy <steven.sheehy@xxxxxxxxx>
branch nick: coreupgrade
timestamp: Thu 2011-05-05 00:17:30 -0500
message:
  Fix UserCommandMenu and add c++0x ^Cild flag
modified:
  SConstruct
  linux/UserCommandMenu.cc


--
lp:~linuxdcpp-team/linuxdcpp/coreupgrade
https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/coreupgrade

Your team LinuxDC++ Team is subscribed to branch lp:~linuxdcpp-team/linuxdcpp/coreupgrade.
To unsubscribe from this branch go to https://code.launchpad.net/~linuxdcpp-team/linuxdcpp/coreupgrade/+edit-subscription

=== modified file 'SConstruct'
--- SConstruct	2011-05-04 03:46:13 +0000
+++ SConstruct	2011-05-05 05:17:30 +0000
@@ -283,6 +283,7 @@
 
 	env.MergeFlags(BUILD_FLAGS['common'])
 	env.MergeFlags(BUILD_FLAGS[env['mode']])
+	env.Append(CXXFLAGS = '-std=c++0x') # Hack due to scons bug 2732. Fixed in 2.1
 	env.ParseConfig('pkg-config --libs libglade-2.0')
 	env.ParseConfig('pkg-config --libs gthread-2.0')
 

=== modified file 'linux/UserCommandMenu.cc'
--- linux/UserCommandMenu.cc	2010-10-14 03:51:12 +0000
+++ linux/UserCommandMenu.cc	2011-05-05 05:17:30 +0000
@@ -198,7 +198,10 @@
 
 		UserPtr user = ClientManager::getInstance()->findUser(CID(cid));
 		if (user)
-			ClientManager::getInstance()->userCommand(user, uc, params, true);
+		{
+			HintedUser hintedUser(user, hub);
+			ClientManager::getInstance()->userCommand(hintedUser, uc, params, true);
+		}
 	}
 }