Commit Graph

2656 Commits

Author SHA1 Message Date
csoler
0d14351b8a Ported branch commits:
3099: libretroshare/src/tcponudp/udplayer.cc 
      libretroshare/src/tcponudp/udplayer.h 	
      libretroshare/src/util/rsnet.cc 	
      libretroshare/src/util/rsnet.h

	moved operator<<(ostream&,sockaddr_in) to rsnet.h, as it is used at
	different places

3100: libretroshare/src/util/rsdiscspace.cc
	suppressed debug mode

3101: libretroshare/src/serialiser/rsdiscitems.cc

	put correct (i.e. non conservative) size for RsDiscReply packets

3102: libretroshare/src/services/p3disc.cc

	Made a pass on the code in p3disc. Corrected some bugs:
		- suppressed an unwanted return in packet treatment
		- prevented sending info to a peer about itself
		- changed askInfoToAllPeers() such as not to discard info
		  from peers with NODISC flag (because we especially need
		  info for these)
		- enabled receiving p3disc info even if p3discovery is
		  disabled. Indeed, disabeling p3disc is a measure of
		  protection, so it should limit the export of p3disc info,
		  not the import.
		- removed test discarding info about dummy friends, because
		  it is useless
		- don't discard info about peers that have the NODISC flag
		  (meaning that we especially need info for them)
		- added safety check about received GPG keys. Before we
		  relied on this test being performed by
		  p3ConnMgr::addFriend()
		- added some debug info

3103: libretroshare/src/ft/ftcontroller.cc
	removed debug info



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3104 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-10 13:42:49 +00:00
defnax
f22753a586 removed release defines from Connect Friend Wizard
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3098 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-10 12:35:13 +00:00
defnax
37560129c8 fixed string for translation support
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3097 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-10 11:45:51 +00:00
defnax
5df30d555b update translation strings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3096 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-10 11:44:48 +00:00
thunder2
5c92cc4a0d removed unused variables
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3095 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-10 07:50:14 +00:00
defnax
e78ed75d36 * Added Drag and Drop feature for CertificatePage, you can now drag and drop friends key file in a easy way.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3094 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-09 23:46:24 +00:00
thunder2
04aaceaf4d CertificatePage
- enable export of own certificate to file
- enable import certificate of friend from file

read and write of file is done in the gui, because the methods for load from file and save to file on p3Peers are not implemented yet

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3093 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-09 22:28:55 +00:00
thunder2
c3b6da6386 cleaned some compiler warnings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3092 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-09 19:51:46 +00:00
defnax
ead1228535 cleaning some code style
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3091 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-09 15:56:07 +00:00
defnax
ee05917d30 changed color of the MessengerWindow's idle icon
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3090 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-09 13:02:55 +00:00
defnax
6d8c846726 Added Search Filter for Network
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3089 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-09 10:29:34 +00:00
defnax
79010a15f7 modified mingw32make.bat do make clean before start to compile
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3088 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-08 22:24:00 +00:00
thunder2
b343b9699c improvements PeersDialog
- save and load state of peer tree and splitter
- removed maximum length of dynamic dns line edit
- sort peers (only top level items) after internal value of state, not the name

cleaned some include files

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3087 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-08 21:38:36 +00:00
leander-256
b5ce0fc56b Use a RetroShareLink to create a link rather than duplicate code, also removes
an awkward conversion from uint64_t to string.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3086 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-08 00:42:15 +00:00
csoler
4072113805 corrected bug in rsdiscitem that prevented RsDiscReply packets to transfer cp serialiser/rsdiscitems.cc ../../../../trunk/libretroshare/src/serialiser/rsdiscitems.cc
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3084 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-07 22:23:28 +00:00
notdefine
e73a144c8b Fixed compile Problem:
./gui/connect/ConfCertDialog.h:27:42: error: gui/help/browser/HelpBrowser.h: No such file or directory

The file is named "helpbrowser.h" not "HelpBrowser.h"

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3081 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-07 15:11:44 +00:00
leander-256
2af2b056f4 Memory leak fix
Removes unnecessary conversion code as well as a malloc that was never freed


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3080 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-07 14:57:29 +00:00
leander-256
21efccfdd6 Memory leak and compiler warnings fixes:
- memory leaks in pqi/cleanupxpgp.cc , 2 new char[] => 2 delete[]
- reordering some constructors' initializing order
- char* myString = "foo" constructs must be prefixed by "const"
- using size_t for variable types when dealing with STL


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3079 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-07 01:47:15 +00:00
leander-256
5f2f87537b Because some versions of Qt require a non-const QRegExp, we copy _embedInfos to
a non-const variable:

EmbedInHtml embedInfos(_embedInfos) ;

However, since EmbedInHtml is the base class we lose any information added in
the derived class, which causes a problem with EmbedInHtmlImg when we do a
static_cast to what should have been the proper type here:

const EmbedInHtmlImg& embedImg = static_cast<const EmbedInHtmlImg&>(embedInfos);

embedInfos is not an EmbedInHtmlImg any more, just a mere EmbedInHtml.

We could const_cast the QRegExp object instead but let's keep it simple and
remove the embedInfos constness from the method's signature.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-07 00:49:26 +00:00
defnax
749945dda8 added a idle icon
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3076 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-05 23:27:08 +00:00
defnax
3056ec0875 Added to display Friends rsstatus on PeersDialog, icon and color change when Friend is Idle, Away or Busy
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3075 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-05 22:42:32 +00:00
defnax
619a2d7491 improvements with user friendly words for Profile Generation labels.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3074 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-05 21:17:46 +00:00
defnax
7331d17b16 removed the icon for Folders Button and set text-align to left.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3073 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-05 19:48:04 +00:00
csoler
7b0757c4bc Merged branch commits:
3068: added verification for file size computation (bug correction)

3069: set heartbeat values to intermediate values

3070: suppressed uninitialised memory read

3071: automatic removal of file lists from deleted peers, at restart (After
      double check that this does not alter exchange of file lists in any way)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3072 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-05 19:16:39 +00:00
chrisparker126
0470477bcc group modifications now propagate
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3067 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-05 11:19:04 +00:00
defnax
2d087cea4c some improvements for Generating Profile Dialog, change Label and Button strings when switching to generate a new Profile or new Location.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3066 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-05 00:44:43 +00:00
thunder2
342768e626 improvements messages:
- save msgId in configuration file
- enable previous improvements read/unread state and tags

new function for creating backups of a file
bool createBackup (std::string sFilename, unsigned int nCount = 5);

currently its only available for windows compile. maybe there is a linux developer who change it for linux.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3064 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-04 23:39:33 +00:00
chrisparker126
fe98568329 added edit chan info dialog files
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3063 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-04 22:56:06 +00:00
chrisparker126
478c4e1c29 edit channel info dialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3062 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-04 22:52:54 +00:00
chrisparker126
ef56b199b8 added edit channel info
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3061 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-04 22:52:01 +00:00
chrisparker126
458eb34fb6 added edit channel info feature and edit distrib group info
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3060 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-04 22:51:18 +00:00
chrisparker126
163c0e96a7 added edit channel info feature
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3059 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-04 22:50:39 +00:00
defnax
dd7e074791 added TabWidget to Messages
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3058 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-03 23:41:46 +00:00
thunder2
08ea7232f7 bugfix in MessageDialog, rs could crash when removing two or more messages at once
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3057 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-03 22:12:07 +00:00
defnax
5264f46f9e update the windows bat files, to not close the cmd box when there is a error on compiling.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3056 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-03 18:41:26 +00:00
defnax
d951674f64 Added Trust settings and Signing informations to HelpBrowser
Added Trust info Button to call HelpBrowser for Trust Settings and Signing informations.
Clean up Peer Details Trust TabWidget, removed not needed Labels.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3055 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-03 18:34:43 +00:00
thunder2
f06ed5fbed the default tags can be reset to standard in the settings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3053 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-02 12:11:09 +00:00
defnax
141fdbe6fe reorder the default tags
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3052 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-02 00:26:15 +00:00
defnax
d7816689e4 added for tag list items default folder icon
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3051 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-01 23:27:34 +00:00
defnax
b30c142592 added for windows compile and revision bat files, and template rsversion.in
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3050 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-01 23:03:12 +00:00
defnax
ca56bee921 added svn_revision.bat file to update easier the rsversion.h under Windows, and modifyd the mingw32make.bat before compiling write the latest revision to rsversion.h
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3049 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-01 22:46:56 +00:00
thunder2
7c73ecef47 improvements MessagesDialog:
- filled tag list and filter the messages after the selected tag
- state of tag list is saved in settings

bugfix MessagesDialog:
- remove tag with uncheck of menu item

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3048 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-01 22:14:52 +00:00
csoler
860f3a0568 augmented the heartbeat parameters, to reduce the stress on connections. Seems to help a lot when the traffic is high.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3047 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-01 20:33:27 +00:00
defnax
626947a7a1 update version
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3046 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-01 20:15:44 +00:00
defnax
2088ff808d Set icons for Signed and none signed Forum Messages, set a default minimum size for thread items.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3045 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-31 23:02:45 +00:00
defnax
9eb5af1f0b removed unused old im icons
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3044 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-31 22:20:14 +00:00
defnax
647c08c8da Added Folders and Tags Header Buttons, and moved "Total Inbox" and "Total Sent" to the Bottom into a QLabel.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3043 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-31 21:27:57 +00:00
thunder2
c23ea03190 comment out unused method AuthGPG::updateTrustAllKeys_locked
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3042 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-31 19:20:52 +00:00
defnax
bed4cb1d4a possible fix for search line edit for macos
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3041 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-31 00:14:57 +00:00
defnax
4f4bad4d5a moved Forum Title Column as First column
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3040 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-05-30 23:49:20 +00:00