[Dcplusplus-commit] SF.net SVN: dcplusplus: [628] dcplusplus/trunk

[<arn...@us...>]

Revision: 628
Author:   arnetheduck
Date:     2006-07-09 02:15:27 -0700 (Sun, 09 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/dcplusplus/?rev=628&view=rev

Log Message:
-----------
Patches

Modified Paths:
--------------
    dcplusplus/trunk/changelog.txt
    dcplusplus/trunk/client/DirectoryListing.cpp
    dcplusplus/trunk/windows/HubFrame.cpp
    dcplusplus/trunk/windows/HubFrame.h
Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt	2006-07-08 18:46:12 UTC (rev 627)
+++ dcplusplus/trunk/changelog.txt	2006-07-09 09:15:27 UTC (rev 628)
@@ -1,4 +1,4 @@
--- 0.692 --
+-- 0.692 2006-07-09 --
 * [bug 927] Fixed OP detection bug really (thanks pothead)
 * [bug 938] Added a few more ADC info fields (thanks ullner)
 * [bug 939] Fixed hub info update (thanks ullner)
@@ -37,6 +37,8 @@
 * [bug 949] Fixed a crash when reading invalid XML files
 * TLS port may now be specified in settings and is only opened if TLS is enabled
 * Added TLS port to /connection
+* [bug 977] Added copy hub address to hub right-click menu (thanks pothead)
+* [bug 1001] Fixed assertion on unix (thanks steven sheehy)
 
 -- 0.691 2006-06-03 -- 
 * Links to bugzilla in html changelog

Modified: dcplusplus/trunk/client/DirectoryListing.cpp
===================================================================
--- dcplusplus/trunk/client/DirectoryListing.cpp	2006-07-08 18:46:12 UTC (rev 627)
+++ dcplusplus/trunk/client/DirectoryListing.cpp	2006-07-09 09:15:27 UTC (rev 628)
@@ -338,7 +338,7 @@
 
 void DirectoryListing::download(const string& aDir, const string& aTarget, bool highPrio) {
 	dcassert(aDir.size() > 2);
-	dcassert(aDir[aDir.size() - 1] == PATH_SEPARATOR);
+	dcassert(aDir[aDir.size() - 1] == '\\'); // This should not be PATH_SEPARATOR
 	Directory* d = find(aDir, getRoot());
 	if(d != NULL)
 		download(d, aTarget, highPrio);

Modified: dcplusplus/trunk/windows/HubFrame.cpp
===================================================================
--- dcplusplus/trunk/windows/HubFrame.cpp	2006-07-08 18:46:12 UTC (rev 627)
+++ dcplusplus/trunk/windows/HubFrame.cpp	2006-07-09 09:15:27 UTC (rev 628)
@@ -119,6 +119,7 @@
 	tabMenu = CreatePopupMenu();
 	tabMenu.AppendMenu(MF_STRING, IDC_ADD_AS_FAVORITE, CTSTRING(ADD_TO_FAVORITES));
 	tabMenu.AppendMenu(MF_STRING, ID_FILE_RECONNECT, CTSTRING(MENU_RECONNECT));
+	tabMenu.AppendMenu(MF_STRING, IDC_COPY_HUB, CTSTRING(COPY_HUB));
 
 	showJoins = BOOLSETTING(SHOW_JOINS);
 	favShowJoins = BOOLSETTING(FAV_SHOW_JOINS);
@@ -373,6 +374,11 @@
 	return 0;
 }
 
+LRESULT HubFrame::onCopyHub(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) {
+	WinUtil::setClipboard(Text::toT(client->getHubUrl()));
+	return 0;
+}
+
 LRESULT HubFrame::onDoubleClickUsers(int /*idCtrl*/, LPNMHDR pnmh, BOOL& /*bHandled*/) {
 	NMITEMACTIVATE* item = (NMITEMACTIVATE*)pnmh;
 	if(item->iItem != -1) {

Modified: dcplusplus/trunk/windows/HubFrame.h
===================================================================
--- dcplusplus/trunk/windows/HubFrame.h	2006-07-08 18:46:12 UTC (rev 627)
+++ dcplusplus/trunk/windows/HubFrame.h	2006-07-09 09:15:27 UTC (rev 628)
@@ -72,6 +72,7 @@
 		COMMAND_ID_HANDLER(IDC_SEND_MESSAGE, onSendMessage)
 		COMMAND_ID_HANDLER(IDC_ADD_AS_FAVORITE, onAddAsFavorite)
 		COMMAND_ID_HANDLER(IDC_COPY_NICK, onCopyNick)
+		COMMAND_ID_HANDLER(IDC_COPY_HUB, onCopyHub)
 		COMMAND_ID_HANDLER(IDC_CLOSE_WINDOW, onCloseWindow)
 		CHAIN_COMMANDS(ucBase)
 		CHAIN_COMMANDS(uibBase)
@@ -92,6 +93,7 @@
 
 	LRESULT onSpeaker(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/);
 	LRESULT onCopyNick(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+	LRESULT onCopyHub(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 	LRESULT onClose(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled);
 	LRESULT onDoubleClickUsers(int idCtrl, LPNMHDR pnmh, BOOL& bHandled);
 	LRESULT OnCreate(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.