Sun, 20 Nov 2011 04:55:50 +0000
These destroy functions appear to do the same thing as the unload
functions, which seems like it would cause trouble.
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
1 | /** |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
2 | * @file kwallet.cpp KWallet password storage |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
3 | * @ingroup plugins |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
4 | * |
|
34033
910f2ed3988b
Remove trailing whitespace.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34032
diff
changeset
|
5 | * @todo |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
6 | * cleanup error handling and reporting |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
7 | * refuse unloading when active (in internal keyring too) |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
8 | */ |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
9 | |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
10 | /* purple |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
11 | * |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
12 | * Purple is the legal property of its developers, whose names are too numerous |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
13 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
14 | * source distribution. |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
15 | * |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
16 | * This program is free software; you can redistribute it and/or modify |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
17 | * it under the terms of the GNU General Public License as published by |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
18 | * the Free Software Foundation; either version 2 of the License, or |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
19 | * (at your option) any later version. |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
20 | * |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
21 | * This program is distributed in the hope that it will be useful, |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
22 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
23 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
24 | * GNU General Public License for more details. |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
25 | * |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
26 | * You should have received a copy of the GNU General Public License |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
27 | * along with this program ; if not, write to the Free Software |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
28 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
29 | */ |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
30 | |
|
34076
64e389ae5cc3
Clean up headers and stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34073
diff
changeset
|
31 | #include "internal.h" |
|
64e389ae5cc3
Clean up headers and stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34073
diff
changeset
|
32 | #include "account.h" |
|
64e389ae5cc3
Clean up headers and stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34073
diff
changeset
|
33 | #include "debug.h" |
|
64e389ae5cc3
Clean up headers and stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34073
diff
changeset
|
34 | #include "keyring.h" |
|
64e389ae5cc3
Clean up headers and stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34073
diff
changeset
|
35 | #include "plugin.h" |
|
64e389ae5cc3
Clean up headers and stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34073
diff
changeset
|
36 | #include "version.h" |
|
34014
647e174899a9
Took stuff from kwallet.cpp out of the extern "C" {}
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
34005
diff
changeset
|
37 | |
|
34079
fcf75ee4d190
Use a QQueue instead of a STL list.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34077
diff
changeset
|
38 | #include <QQueue> |
|
34060
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
39 | #include <kwallet.h> |
|
34014
647e174899a9
Took stuff from kwallet.cpp out of the extern "C" {}
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
34005
diff
changeset
|
40 | |
|
34060
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
41 | #define KWALLET_NAME N_("KWallet") |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
42 | #define KWALLET_VERSION "0.3b" |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
43 | #define KWALLET_DESCRIPTION N_("This plugin will store passwords in KWallet.") |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
44 | #define KWALLET_AUTHOR "Scrouaf (scrouaf[at]soc.pidgin.im)" |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
45 | #define KWALLET_ID "core-scrouaf-kwallet" |
|
34014
647e174899a9
Took stuff from kwallet.cpp out of the extern "C" {}
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
34005
diff
changeset
|
46 | |
|
34034
f508fa47f2ac
Reformat many things.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34033
diff
changeset
|
47 | PurpleKeyring *keyring_handler; |
|
34014
647e174899a9
Took stuff from kwallet.cpp out of the extern "C" {}
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
34005
diff
changeset
|
48 | |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
49 | #define ERR_KWALLETPLUGIN kwallet_plugin_error_domain() |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
50 | |
|
34060
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
51 | namespace KWalletPlugin { |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
52 | |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
53 | class request |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
54 | { |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
55 | public: |
|
34077
3e4d7e7d3064
Make KWalletPlugin::request class abstract. Unfortunately, this
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34076
diff
changeset
|
56 | virtual void abort() = 0; |
|
3e4d7e7d3064
Make KWalletPlugin::request class abstract. Unfortunately, this
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34076
diff
changeset
|
57 | virtual void execute(KWallet::Wallet *wallet) = 0; |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
58 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
59 | protected: |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
60 | gpointer data; |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
61 | PurpleAccount *account; |
|
34072
5450e39dd3c5
It appears that a QString can be treated as if it were a value type.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34071
diff
changeset
|
62 | QString password; |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
63 | }; |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
64 | |
|
34079
fcf75ee4d190
Use a QQueue instead of a STL list.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34077
diff
changeset
|
65 | class engine : private QObject, private QQueue<request*> |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
66 | { |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
67 | public: |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
68 | engine(); |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
69 | ~engine(); |
|
34077
3e4d7e7d3064
Make KWalletPlugin::request class abstract. Unfortunately, this
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34076
diff
changeset
|
70 | void queue(request *req); |
|
34034
f508fa47f2ac
Reformat many things.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34033
diff
changeset
|
71 | static engine *Instance(); |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
72 | |
|
34067
8643ef2b5bf4
This seems to fix compiling the signal stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34062
diff
changeset
|
73 | signals: |
|
8643ef2b5bf4
This seems to fix compiling the signal stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34062
diff
changeset
|
74 | void walletOpened(bool opened); |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
75 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
76 | private: |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
77 | bool connected; |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
78 | KWallet::Wallet *wallet; |
|
34034
f508fa47f2ac
Reformat many things.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34033
diff
changeset
|
79 | static engine *pinstance; |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
80 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
81 | /* KApplication *app; */ |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
82 | void ExecuteRequests(); |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
83 | }; |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
84 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
85 | class save_request : public request |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
86 | { |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
87 | public: |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
88 | save_request(PurpleAccount *account, const char *password, PurpleKeyringSaveCallback cb, void *data); |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
89 | void abort(); |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
90 | void execute(KWallet::Wallet *wallet); |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
91 | |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
92 | private: |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
93 | PurpleKeyringSaveCallback callback; |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
94 | }; |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
95 | |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
96 | class read_request : public request |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
97 | { |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
98 | public: |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
99 | read_request(PurpleAccount *account, PurpleKeyringReadCallback cb, void *data); |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
100 | void abort(); |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
101 | void execute(KWallet::Wallet *wallet); |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
102 | |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
103 | private: |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
104 | PurpleKeyringReadCallback callback; |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
105 | }; |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
106 | |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
107 | static GQuark |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
108 | kwallet_plugin_error_domain(void) |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
109 | { |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
110 | return g_quark_from_static_string("KWallet keyring"); |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
111 | } |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
112 | |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
113 | } |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
114 | |
|
34080
098a43dd4835
Initialize pinstance.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34079
diff
changeset
|
115 | KWalletPlugin::engine *KWalletPlugin::engine::pinstance = NULL; |
|
098a43dd4835
Initialize pinstance.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34079
diff
changeset
|
116 | |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
117 | KWalletPlugin::engine::engine() |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
118 | { |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
119 | /* KAboutData aboutData("libpurple_plugin", N_("LibPurple KWallet Plugin"), "", "", KAboutData::License_GPL, ""); |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
120 | KCmdLineArgs::init( &aboutData ); |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
121 | app = new KApplication(false, false); */ |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
122 | |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
123 | connected = FALSE; |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
124 | wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Asynchronous); |
|
34067
8643ef2b5bf4
This seems to fix compiling the signal stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34062
diff
changeset
|
125 | QObject::connect(wallet, SIGNAL(KWallet::Wallet::walletOpened(bool)), SLOT(walletOpened(bool))); |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
126 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
127 | |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
128 | KWalletPlugin::engine::~engine() |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
129 | { |
|
34079
fcf75ee4d190
Use a QQueue instead of a STL list.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34077
diff
changeset
|
130 | while (!isEmpty()) { |
|
fcf75ee4d190
Use a QQueue instead of a STL list.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34077
diff
changeset
|
131 | request *req = dequeue(); |
|
34077
3e4d7e7d3064
Make KWalletPlugin::request class abstract. Unfortunately, this
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34076
diff
changeset
|
132 | req->abort(); |
|
3e4d7e7d3064
Make KWalletPlugin::request class abstract. Unfortunately, this
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34076
diff
changeset
|
133 | delete req; |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
134 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
135 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
136 | KWallet::Wallet::closeWallet(KWallet::Wallet::NetworkWallet(), TRUE); |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
137 | delete wallet; |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
138 | pinstance = NULL; |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
139 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
140 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
141 | KWalletPlugin::engine * |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
142 | KWalletPlugin::engine::Instance() |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
143 | { |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
144 | if (pinstance == NULL) |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
145 | pinstance = new engine; |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
146 | return pinstance; |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
147 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
148 | |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
149 | void |
|
34067
8643ef2b5bf4
This seems to fix compiling the signal stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34062
diff
changeset
|
150 | KWalletPlugin::engine::walletOpened(bool opened) |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
151 | { |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
152 | connected = opened; |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
153 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
154 | if (opened) { |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
155 | ExecuteRequests(); |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
156 | } else { |
|
34079
fcf75ee4d190
Use a QQueue instead of a STL list.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34077
diff
changeset
|
157 | while (!isEmpty()) { |
|
fcf75ee4d190
Use a QQueue instead of a STL list.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34077
diff
changeset
|
158 | request *req = dequeue(); |
|
34077
3e4d7e7d3064
Make KWalletPlugin::request class abstract. Unfortunately, this
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34076
diff
changeset
|
159 | req->abort(); |
|
3e4d7e7d3064
Make KWalletPlugin::request class abstract. Unfortunately, this
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34076
diff
changeset
|
160 | delete req; |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
161 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
162 | delete this; |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
163 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
164 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
165 | |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
166 | void |
|
34077
3e4d7e7d3064
Make KWalletPlugin::request class abstract. Unfortunately, this
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34076
diff
changeset
|
167 | KWalletPlugin::engine::queue(request *req) |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
168 | { |
|
34079
fcf75ee4d190
Use a QQueue instead of a STL list.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34077
diff
changeset
|
169 | enqueue(req); |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
170 | ExecuteRequests(); |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
171 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
172 | |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
173 | void |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
174 | KWalletPlugin::engine::ExecuteRequests() |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
175 | { |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
176 | if (connected) { |
|
34079
fcf75ee4d190
Use a QQueue instead of a STL list.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34077
diff
changeset
|
177 | while (!isEmpty()) { |
|
fcf75ee4d190
Use a QQueue instead of a STL list.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34077
diff
changeset
|
178 | request *req = dequeue(); |
|
34077
3e4d7e7d3064
Make KWalletPlugin::request class abstract. Unfortunately, this
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34076
diff
changeset
|
179 | req->execute(wallet); |
|
3e4d7e7d3064
Make KWalletPlugin::request class abstract. Unfortunately, this
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34076
diff
changeset
|
180 | delete req; |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
181 | } |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
182 | } |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
183 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
184 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
185 | KWalletPlugin::save_request::save_request(PurpleAccount *acc, const char *pw, PurpleKeyringSaveCallback cb, void *userdata) |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
186 | { |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
187 | account = acc; |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
188 | data = userdata; |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
189 | callback = cb; |
|
34072
5450e39dd3c5
It appears that a QString can be treated as if it were a value type.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34071
diff
changeset
|
190 | password = QString(pw); |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
191 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
192 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
193 | KWalletPlugin::read_request::read_request(PurpleAccount *acc, PurpleKeyringReadCallback cb, void *userdata) |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
194 | { |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
195 | account = acc; |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
196 | data = userdata; |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
197 | callback = cb; |
|
34072
5450e39dd3c5
It appears that a QString can be treated as if it were a value type.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34071
diff
changeset
|
198 | password = QString(); |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
199 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
200 | |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
201 | void |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
202 | KWalletPlugin::save_request::abort() |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
203 | { |
|
34034
f508fa47f2ac
Reformat many things.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34033
diff
changeset
|
204 | GError *error; |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
205 | if (callback != NULL) { |
|
34033
910f2ed3988b
Remove trailing whitespace.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34032
diff
changeset
|
206 | error = g_error_new(ERR_KWALLETPLUGIN, |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
207 | PURPLE_KEYRING_ERROR_UNKNOWN, |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
208 | "Failed to save password"); |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
209 | callback(account, error, data); |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
210 | g_error_free(error); |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
211 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
212 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
213 | |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
214 | void |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
215 | KWalletPlugin::read_request::abort() |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
216 | { |
|
34034
f508fa47f2ac
Reformat many things.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34033
diff
changeset
|
217 | GError *error; |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
218 | if (callback != NULL) { |
|
34033
910f2ed3988b
Remove trailing whitespace.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34032
diff
changeset
|
219 | error = g_error_new(ERR_KWALLETPLUGIN, |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
220 | PURPLE_KEYRING_ERROR_UNKNOWN, |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
221 | "Failed to read password"); |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
222 | callback(account, NULL, error, data); |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
223 | g_error_free(error); |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
224 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
225 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
226 | |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
227 | void |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
228 | KWalletPlugin::read_request::execute(KWallet::Wallet *wallet) |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
229 | { |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
230 | int result; |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
231 | QString key; |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
232 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
233 | key = QString("purple-") + purple_account_get_username(account) + " " + purple_account_get_protocol_id(account); |
|
34072
5450e39dd3c5
It appears that a QString can be treated as if it were a value type.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34071
diff
changeset
|
234 | result = wallet->readPassword(key, password); |
|
34033
910f2ed3988b
Remove trailing whitespace.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34032
diff
changeset
|
235 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
236 | if (result != 0) |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
237 | abort(); |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
238 | else if (callback != NULL) |
|
34072
5450e39dd3c5
It appears that a QString can be treated as if it were a value type.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34071
diff
changeset
|
239 | callback(account, password.toUtf8().constData(), NULL, data); |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
240 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
241 | |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
242 | void |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
243 | KWalletPlugin::save_request::execute(KWallet::Wallet *wallet) |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
244 | { |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
245 | int result; |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
246 | QString key; |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
247 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
248 | key = QString("purple-") + purple_account_get_username(account) + " " + purple_account_get_protocol_id(account); |
|
34072
5450e39dd3c5
It appears that a QString can be treated as if it were a value type.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34071
diff
changeset
|
249 | result = wallet->writePassword(key, password); |
|
34033
910f2ed3988b
Remove trailing whitespace.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34032
diff
changeset
|
250 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
251 | if (result != 0) |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
252 | abort(); |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
253 | else if (callback != NULL) |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
254 | callback(account, NULL, data); |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
255 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
256 | |
|
34060
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
257 | extern "C" |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
258 | { |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
259 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
260 | static void |
|
34034
f508fa47f2ac
Reformat many things.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34033
diff
changeset
|
261 | kwallet_read(PurpleAccount *account, |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
262 | PurpleKeyringReadCallback cb, |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
263 | gpointer data) |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
264 | { |
|
34077
3e4d7e7d3064
Make KWalletPlugin::request class abstract. Unfortunately, this
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34076
diff
changeset
|
265 | KWalletPlugin::read_request *req; |
|
3e4d7e7d3064
Make KWalletPlugin::request class abstract. Unfortunately, this
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34076
diff
changeset
|
266 | req = new KWalletPlugin::read_request(account, cb, data); |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
267 | KWalletPlugin::engine::Instance()->queue(req); |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
268 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
269 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
270 | static void |
|
34034
f508fa47f2ac
Reformat many things.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34033
diff
changeset
|
271 | kwallet_save(PurpleAccount *account, |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
272 | const char *password, |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
273 | PurpleKeyringSaveCallback cb, |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
274 | gpointer data) |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
275 | { |
|
34077
3e4d7e7d3064
Make KWalletPlugin::request class abstract. Unfortunately, this
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34076
diff
changeset
|
276 | KWalletPlugin::save_request *req; |
|
3e4d7e7d3064
Make KWalletPlugin::request class abstract. Unfortunately, this
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34076
diff
changeset
|
277 | req = new KWalletPlugin::save_request(account, password, cb, data); |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
278 | KWalletPlugin::engine::Instance()->queue(req); |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
279 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
280 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
281 | static void |
|
34034
f508fa47f2ac
Reformat many things.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34033
diff
changeset
|
282 | kwallet_close(GError **error) |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
283 | { |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
284 | delete KWalletPlugin::engine::Instance(); |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
285 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
286 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
287 | static gboolean |
|
34034
f508fa47f2ac
Reformat many things.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34033
diff
changeset
|
288 | kwallet_import(PurpleAccount *account, |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
289 | const char *mode, |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
290 | const char *data, |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
291 | GError **error) |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
292 | { |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
293 | return TRUE; |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
294 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
295 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
296 | static gboolean |
|
34034
f508fa47f2ac
Reformat many things.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34033
diff
changeset
|
297 | kwallet_export(PurpleAccount *account, |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
298 | const char **mode, |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
299 | char **data, |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
300 | GError **error, |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
301 | GDestroyNotify *destroy) |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
302 | { |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
303 | *mode = NULL; |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
304 | *data = NULL; |
|
34073
5da1137555a8
There seems to be an asterisk missing here.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34072
diff
changeset
|
305 | *destroy = NULL; |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
306 | |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
307 | return TRUE; |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
308 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
309 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
310 | static gboolean |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
311 | kwallet_load(PurplePlugin *plugin) |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
312 | { |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
313 | keyring_handler = purple_keyring_new(); |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
314 | |
|
34060
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
315 | purple_keyring_set_name(keyring_handler, KWALLET_NAME); |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
316 | purple_keyring_set_id(keyring_handler, KWALLET_ID); |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
317 | purple_keyring_set_read_password(keyring_handler, kwallet_read); |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
318 | purple_keyring_set_save_password(keyring_handler, kwallet_save); |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
319 | purple_keyring_set_close_keyring(keyring_handler, kwallet_close); |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
320 | /* purple_keyring_set_change_master(keyring_handler, kwallet_change_master);*/ |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
321 | purple_keyring_set_import_password(keyring_handler, kwallet_import); |
|
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
322 | purple_keyring_set_export_password(keyring_handler, kwallet_export); |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
323 | |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
324 | purple_keyring_register(keyring_handler); |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
325 | |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
326 | return TRUE; |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
327 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
328 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
329 | static gboolean |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
330 | kwallet_unload(PurplePlugin *plugin) |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
331 | { |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
332 | kwallet_close(NULL); |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
333 | return TRUE; |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
334 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
335 | |
|
34060
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
336 | PurplePluginInfo plugininfo = |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
337 | { |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
338 | PURPLE_PLUGIN_MAGIC, /* magic */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
339 | PURPLE_MAJOR_VERSION, /* major_version */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
340 | PURPLE_MINOR_VERSION, /* minor_version */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
341 | PURPLE_PLUGIN_STANDARD, /* type */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
342 | NULL, /* ui_requirement */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
343 | PURPLE_PLUGIN_FLAG_INVISIBLE|PURPLE_PLUGIN_FLAG_AUTOLOAD, /* flags */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
344 | NULL, /* dependencies */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
345 | PURPLE_PRIORITY_DEFAULT, /* priority */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
346 | KWALLET_ID, /* id */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
347 | KWALLET_NAME, /* name */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
348 | KWALLET_VERSION, /* version */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
349 | "KWallet Keyring Plugin", /* summary */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
350 | KWALLET_DESCRIPTION, /* description */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
351 | KWALLET_AUTHOR, /* author */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
352 | "N/A", /* homepage */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
353 | kwallet_load, /* load */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
354 | kwallet_unload, /* unload */ |
|
34081
b7fd12507799
These destroy functions appear to do the same thing as the unload
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34080
diff
changeset
|
355 | NULL, /* destroy */ |
|
34060
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
356 | NULL, /* ui_info */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
357 | NULL, /* extra_info */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
358 | NULL, /* prefs_info */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
359 | NULL, /* actions */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
360 | NULL, /* padding... */ |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
361 | NULL, |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
362 | NULL, |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
363 | NULL, |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
364 | }; |
|
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
365 | |
|
34062
7879224489fd
Hey, I think this almost compiles now!
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34061
diff
changeset
|
366 | void init_plugin(PurplePlugin *plugin); |
|
34033
910f2ed3988b
Remove trailing whitespace.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34032
diff
changeset
|
367 | void |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
368 | init_plugin(PurplePlugin *plugin) |
|
34033
910f2ed3988b
Remove trailing whitespace.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34032
diff
changeset
|
369 | { |
|
34060
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
370 | purple_debug_info("keyring-kwallet", "init plugin called.\n"); |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
371 | } |
|
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
372 | |
|
34060
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
373 | PURPLE_INIT_PLUGIN(kwallet_keyring, init_plugin, plugininfo) |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
374 | |
|
34060
1ff15466f569
This should hopefully namespace things correctly. I'll admit that the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
34035
diff
changeset
|
375 | } /* extern "C" */ |
|
34005
592e6e8213a9
Cleanup in gnomekeyring.c
Vivien Bernet-Rollande <scrouaf@soc.pidgin.im>
parents:
diff
changeset
|
376 |