[vidalia-svn] r1952: added icon for hidden service panel (in branches/hidden-services: . doc pkg/osx pkg/rpm src src/entity src/gui/res/22x22 src/lang)

[kloesing@xxxxxxxxxxxxxxxxxxx]

Author: kloesing
Date: 2007-09-28 09:05:29 -0400 (Fri, 28 Sep 2007)
New Revision: 1952

Added:
   branches/hidden-services/src/gui/res/22x22/hidden-service.png
Modified:
   branches/hidden-services/
   branches/hidden-services/doc/
   branches/hidden-services/pkg/osx/
   branches/hidden-services/pkg/rpm/
   branches/hidden-services/src/entity/user.cpp
   branches/hidden-services/src/lang/
   branches/hidden-services/src/src.pri
Log:
added icon for hidden service panel


Property changes on: branches/hidden-services
___________________________________________________________________
Name: svn:ignore
   - .cdtproject
.project

   + .cdtproject
.project
obj
autom4te.cache
.settings
config.status
configure
Makefile
vidalia



Property changes on: branches/hidden-services/doc
___________________________________________________________________
Name: svn:ignore
   + *



Property changes on: branches/hidden-services/pkg/osx
___________________________________________________________________
Name: svn:ignore
   + *.plist
*.sh



Property changes on: branches/hidden-services/pkg/rpm
___________________________________________________________________
Name: svn:ignore
   + vidalia.spec


Modified: branches/hidden-services/src/entity/user.cpp
===================================================================
--- branches/hidden-services/src/entity/user.cpp	2007-09-27 17:04:29 UTC (rev 1951)
+++ branches/hidden-services/src/entity/user.cpp	2007-09-28 13:05:29 UTC (rev 1952)
@@ -29,7 +29,6 @@
 
 /** Default constructor. */
 User::User() {
-	QMap<QString, QString> _passwords;
 }
 
 /** Constructor to create a new User with initial settings */
@@ -57,7 +56,7 @@
 }
 
 /** Sets the publicKey of a service */
-void User::setUserName(QString publickey) {
+void User::setPublicKey(QString publickey) {
 	_publicKey = publickey;
 }
 
@@ -78,7 +77,9 @@
  * <b>out</b>. */
 QDataStream&operator<<(QDataStream &out, const User &myObj) {
 	out << myObj.userName(); /* Write the QString username */
-	out << myObj.passwords(); /* Write the QString password */
+	out << myObj.introductionPassword(); /* Write the QString password for the introduction point */
+	out << myObj.authentificationPassword(); /* Write the QString password for authetification */
+	out << myObj.publicKey(); /* Write the QString publicKey */	
 	return out;
 }
 
@@ -86,14 +87,19 @@
  populates * the <b>myObj</b> object accordingly. */
 QDataStream&operator>>(QDataStream &in, User &myObj) {
 	QString username;
-	QMap<QString, QString> passwords;
+	QString introductionPassword;
+	QString authentificationPassword;
+	QString publicKey;
 	
 	/* Read in from the data stream */
-	in >> username >> passwords;
+	in >> username >> introductionPassword >> authentificationPassword >> publicKey;
 
 	/* Set the appropriate class member variables */
 	myObj.setUserName(username);
-	myObj.setPasswords(passwords);
+	myObj.setIntroductionPassword(introductionPassword);
+	myObj.setAuthentificationPassword(authentificationPassword);
+	myObj.setPublicKey(publicKey);
+	
 
 	/* Return the updated data stream */
 	return in;

Added: branches/hidden-services/src/gui/res/22x22/hidden-service.png
===================================================================
(Binary files differ)


Property changes on: branches/hidden-services/src/gui/res/22x22/hidden-service.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


Property changes on: branches/hidden-services/src/lang
___________________________________________________________________
Name: svn:ignore
   + vidalia_*.qm


Modified: branches/hidden-services/src/src.pri
===================================================================
--- branches/hidden-services/src/src.pri	2007-09-27 17:04:29 UTC (rev 1951)
+++ branches/hidden-services/src/src.pri	2007-09-28 13:05:29 UTC (rev 1952)
@@ -34,5 +34,5 @@
 include($$PWD/config/config.pri)
 include($$PWD/control/control.pri)
 include($$PWD/util/util.pri)
-include($$PWD/util/entity.pri)
+include($$PWD/entity/entity.pri)