author | zautrix <zautrix> | 2004-09-16 15:13:40 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-16 15:13:40 (UTC) |
commit | 02e7ae4983679a787834277176a031286a8310c2 (patch) (unidiff) | |
tree | ea7e33e59b86b8fed2b033609d1018a9f245baff /kmicromail/libmailwrapper | |
parent | 68b1f3bce4b6e89bb343b965256537d93e63f7be (diff) | |
download | kdepimpi-02e7ae4983679a787834277176a031286a8310c2.zip kdepimpi-02e7ae4983679a787834277176a031286a8310c2.tar.gz kdepimpi-02e7ae4983679a787834277176a031286a8310c2.tar.bz2 |
Foldername fixes
-rw-r--r-- | kmicromail/libmailwrapper/mailwrapper.cpp | 7 | ||||
-rw-r--r-- | kmicromail/libmailwrapper/mailwrapper.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/kmicromail/libmailwrapper/mailwrapper.cpp b/kmicromail/libmailwrapper/mailwrapper.cpp index 9400649..2ee1ab3 100644 --- a/kmicromail/libmailwrapper/mailwrapper.cpp +++ b/kmicromail/libmailwrapper/mailwrapper.cpp | |||
@@ -33,37 +33,38 @@ Folder::Folder(const QString&tmp_name, const QString&sep ) | |||
33 | { | 33 | { |
34 | name = tmp_name; | 34 | name = tmp_name; |
35 | nameDisplay = name; | 35 | nameDisplay = name; |
36 | separator = sep; | 36 | separator = sep; |
37 | prefix = ""; | 37 | prefix = ""; |
38 | } | 38 | } |
39 | 39 | ||
40 | Folder::~Folder() | 40 | Folder::~Folder() |
41 | { | 41 | { |
42 | } | 42 | } |
43 | 43 | ||
44 | const QString& Folder::Separator()const | 44 | const QString& Folder::Separator()const |
45 | { | 45 | { |
46 | return separator; | 46 | return separator; |
47 | } | 47 | } |
48 | 48 | ||
49 | IMAPFolder::IMAPFolder(const QString&name,const QString&sep, bool select,bool no_inf, const QString&aprefix ) | 49 | IMAPFolder::IMAPFolder(const QString&t_name,const QString&sep, bool select,bool no_inf, const QString&aprefix ) |
50 | : Folder( name,sep ),m_MaySelect(select),m_NoInferior(no_inf) | 50 | : Folder( t_name,sep ),m_MaySelect(select),m_NoInferior(no_inf) |
51 | { | 51 | { |
52 | // Decode IMAP foldername | 52 | // Decode IMAP foldername |
53 | nameDisplay = IMAPFolder::decodeFolderName( name ); | 53 | nameDisplay = IMAPFolder::decodeFolderName( t_name ); |
54 | name = nameDisplay ; | ||
54 | /* | 55 | /* |
55 | odebug << "folder " + name + " - displayed as " + nameDisplay << oendl; | 56 | odebug << "folder " + name + " - displayed as " + nameDisplay << oendl; |
56 | */ | 57 | */ |
57 | prefix = aprefix; | 58 | prefix = aprefix; |
58 | 59 | ||
59 | if (prefix.length()>0) { | 60 | if (prefix.length()>0) { |
60 | if (nameDisplay.startsWith(prefix) && nameDisplay.length()>prefix.length()) { | 61 | if (nameDisplay.startsWith(prefix) && nameDisplay.length()>prefix.length()) { |
61 | nameDisplay=nameDisplay.right(nameDisplay.length()-prefix.length()); | 62 | nameDisplay=nameDisplay.right(nameDisplay.length()-prefix.length()); |
62 | } | 63 | } |
63 | } | 64 | } |
64 | } | 65 | } |
65 | 66 | ||
66 | IMAPFolder::~IMAPFolder() | 67 | IMAPFolder::~IMAPFolder() |
67 | { | 68 | { |
68 | } | 69 | } |
69 | 70 | ||
diff --git a/kmicromail/libmailwrapper/mailwrapper.h b/kmicromail/libmailwrapper/mailwrapper.h index cefe64e..2ba908b 100644 --- a/kmicromail/libmailwrapper/mailwrapper.h +++ b/kmicromail/libmailwrapper/mailwrapper.h | |||
@@ -107,22 +107,22 @@ protected: | |||
107 | typedef Opie::Core::OSmartPointer<Folder> FolderP; | 107 | typedef Opie::Core::OSmartPointer<Folder> FolderP; |
108 | 108 | ||
109 | class MHFolder : public Folder | 109 | class MHFolder : public Folder |
110 | { | 110 | { |
111 | public: | 111 | public: |
112 | MHFolder(const QString&disp_name,const QString&mbox); | 112 | MHFolder(const QString&disp_name,const QString&mbox); |
113 | virtual ~MHFolder(); | 113 | virtual ~MHFolder(); |
114 | }; | 114 | }; |
115 | 115 | ||
116 | class IMAPFolder : public Folder | 116 | class IMAPFolder : public Folder |
117 | { | 117 | { |
118 | public: | 118 | public: |
119 | IMAPFolder(const QString&name, const QString&sep, bool select=true,bool noinf=false,const QString&prefix="" ); | 119 | IMAPFolder(const QString&name, const QString&sep, bool select=true,bool noinf=false,const QString&prefix="" ); |
120 | virtual ~IMAPFolder(); | 120 | virtual ~IMAPFolder(); |
121 | virtual bool may_select()const{return m_MaySelect;} | 121 | virtual bool may_select()const{return m_MaySelect;} |
122 | virtual bool no_inferior()const{return m_NoInferior;} | 122 | virtual bool no_inferior()const{return m_NoInferior;} |
123 | private: | ||
124 | static QString decodeFolderName( const QString &name ); | 123 | static QString decodeFolderName( const QString &name ); |
124 | private: | ||
125 | bool m_MaySelect,m_NoInferior; | 125 | bool m_MaySelect,m_NoInferior; |
126 | }; | 126 | }; |
127 | 127 | ||
128 | #endif | 128 | #endif |