soc.2008.masterpassword: 0a45dcb0: Remove trailing whitespace.
qulogic at pidgin.im
qulogic at pidgin.im
Mon Oct 31 04:04:06 EDT 2011
----------------------------------------------------------------------
Revision: 0a45dcb0f9e5db18f29633820ec26636a67f616c
Parent: 3d56b84e396a8dca307c964e42849d5d1ca8a713
Author: qulogic at pidgin.im
Date: 10/31/11 03:08:13
Branch: im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/0a45dcb0f9e5db18f29633820ec26636a67f616c
Changelog:
Remove trailing whitespace.
Changes against parent 3d56b84e396a8dca307c964e42849d5d1ca8a713
patched libpurple/keyring.c
patched libpurple/keyring.h
patched libpurple/plugins/keyrings/gnomekeyring.c
patched libpurple/plugins/keyrings/internalkeyring.c
patched libpurple/plugins/keyrings/kwallet.cpp
-------------- next part --------------
============================================================
--- libpurple/keyring.h 03b048e2b40c946d6ebd370a079838faaff2e3d1
+++ libpurple/keyring.h b526bc4d9bf470aa88fa72980807f2c6c3a04b68
@@ -2,7 +2,7 @@
* @file keyring.h Keyring plugin API
* @ingroup core
*
- * @todo
+ * @todo
* - Offer a way to prompt the user for a password or for a password change.
*/
@@ -79,7 +79,7 @@ typedef void (*PurpleKeyringReadCallback
* @param account The account of which the password was saved.
* @param data Data passed to the callback.
*/
-typedef void (*PurpleKeyringSaveCallback)(PurpleAccount * account,
+typedef void (*PurpleKeyringSaveCallback)(PurpleAccount * account,
GError * error,
gpointer data);
@@ -127,8 +127,8 @@ typedef void (*PurpleKeyringRead)(Purple
/**
* Store a password in the keyring.
* @param account The account for which the password is to be stored.
- * @param password The password to be stored. This password will be freed once
- * the function returns, so one must take care to make a copy if they call other
+ * @param password The password to be stored. This password will be freed once
+ * the function returns, so one must take care to make a copy if they call other
* async functions later. If the password is NULL, this means that the keyring
* should forget about that password.
* @param cb A callback to be called once the password is saved.
@@ -164,7 +164,7 @@ typedef void (*PurpleKeyringChangeMaster
* @param data Data that was stored, Can be NULL, will be freed when function returns (so copy it if you need it).
* @return TRUE on success, FALSE on failure.
*/
-typedef gboolean (*PurpleKeyringImportPassword)(PurpleAccount * account,
+typedef gboolean (*PurpleKeyringImportPassword)(PurpleAccount * account,
const char * mode,
const char * data,
GError ** error);
@@ -223,13 +223,13 @@ void purple_keyring_uninit(void);
/**
* Get the keyring list. Used by the UI.
*/
-const GList *
+const GList *
purple_keyring_get_keyrings(void);
/**
* Get the keyring being used.
*/
-const PurpleKeyring *
+const PurpleKeyring *
purple_keyring_get_inuse(void);
/**
@@ -241,7 +241,7 @@ purple_keyring_get_inuse(void);
* @param error Error that may occur.
* @param cb The callback to call once the change is done.
* @param data A pointer that will be passed to the callback.
- * @param force FALSE if the change can be cancelled. If this is TRUE and an
+ * @param force FALSE if the change can be cancelled. If this is TRUE and an
* error occurs, data might be lost.
*/
void
@@ -255,7 +255,7 @@ purple_keyring_set_inuse(const PurpleKey
* Register a keyring plugin.
* @param keyrint The keyring to register.
*/
-void
+void
purple_keyring_register(PurpleKeyring * keyring);
/**
@@ -264,7 +264,7 @@ purple_keyring_register(PurpleKeyring *
* to unregister will be properly closed.
* @param keyrint The keyring to unregister.
*/
-void
+void
purple_keyring_unregister(PurpleKeyring * keyring);
/*@}*/
@@ -283,7 +283,7 @@ purple_keyring_unregister(PurpleKeyring
* @param data Data that was stored, can be NULL.
* @return TRUE if the input was accepted, FALSE otherwise.
*/
-gboolean purple_keyring_import_password(PurpleAccount * account,
+gboolean purple_keyring_import_password(PurpleAccount * account,
const char * keyringid,
const char * mode,
const char * data,
@@ -314,7 +314,7 @@ purple_keyring_export_password(PurpleAcc
* @param cb The callback to be called.
* @param data A pointer passed to the callback.
*/
-void
+void
purple_keyring_get_password(PurpleAccount *account,
PurpleKeyringReadCallback cb,
gpointer data);
@@ -327,7 +327,7 @@ purple_keyring_get_password(PurpleAccoun
* @param cb A callback for once the password is saved.
* @param data A pointer to be passed to the callback.
*/
-void
+void
purple_keyring_set_password(PurpleAccount *account,
const gchar *password,
PurpleKeyringSaveCallback cb,
@@ -347,7 +347,7 @@ purple_keyring_close(PurpleKeyring * key
* @param cb A callback to notify once we're done.
* @param data A pointer to be passed to the callback.
*/
-void
+void
purple_keyring_change_master(PurpleKeyringChangeMasterCallback cb,
gpointer data);
@@ -387,7 +387,7 @@ void purple_keyring_set_export_password(
/*@{*/
/**
- * Error domain GQuark.
+ * Error domain GQuark.
* See @ref purple_keyring_error_domain .
*/
#define ERR_PIDGINKEYRING purple_keyring_error_domain()
============================================================
--- libpurple/keyring.c 620d252c907011b3a9f8a8c1660285157036fe8d
+++ libpurple/keyring.c 5849f6194a2104870f91c2b0725fb296006d4c90
@@ -89,7 +89,7 @@ purple_keyring_free(PurpleKeyring *keyri
}
/* Accessors */
-const char *
+const char *
purple_keyring_get_name(const PurpleKeyring * keyring)
{
g_return_val_if_fail(keyring != NULL, NULL);
@@ -97,7 +97,7 @@ purple_keyring_get_name(const PurpleKeyr
return keyring->name;
}
-const char *
+const char *
purple_keyring_get_id(const PurpleKeyring * keyring)
{
g_return_val_if_fail(keyring != NULL, NULL);
@@ -105,7 +105,7 @@ purple_keyring_get_id(const PurpleKeyrin
return keyring->id;
}
-PurpleKeyringRead
+PurpleKeyringRead
purple_keyring_get_read_password(const PurpleKeyring * keyring)
{
g_return_val_if_fail(keyring != NULL, NULL);
@@ -113,7 +113,7 @@ purple_keyring_get_read_password(const P
return keyring->read_password;
}
-PurpleKeyringSave
+PurpleKeyringSave
purple_keyring_get_save_password(const PurpleKeyring * keyring)
{
g_return_val_if_fail(keyring != NULL, NULL);
@@ -121,7 +121,7 @@ purple_keyring_get_save_password(const P
return keyring->save_password;
}
-PurpleKeyringClose
+PurpleKeyringClose
purple_keyring_get_close_keyring(const PurpleKeyring * keyring)
{
g_return_val_if_fail(keyring != NULL, NULL);
@@ -129,7 +129,7 @@ purple_keyring_get_close_keyring(const P
return keyring->close_keyring;
}
-PurpleKeyringChangeMaster
+PurpleKeyringChangeMaster
purple_keyring_get_change_master(const PurpleKeyring * keyring)
{
g_return_val_if_fail(keyring != NULL, NULL);
@@ -137,7 +137,7 @@ purple_keyring_get_change_master(const P
return keyring->change_master;
}
-PurpleKeyringImportPassword
+PurpleKeyringImportPassword
purple_keyring_get_import_password(const PurpleKeyring * keyring)
{
g_return_val_if_fail(keyring != NULL, NULL);
@@ -145,7 +145,7 @@ purple_keyring_get_import_password(const
return keyring->import_password;
}
-PurpleKeyringExportPassword
+PurpleKeyringExportPassword
purple_keyring_get_export_password(const PurpleKeyring * keyring)
{
g_return_val_if_fail(keyring != NULL, NULL);
@@ -153,7 +153,7 @@ purple_keyring_get_export_password(const
return keyring->export_password;
}
-void
+void
purple_keyring_set_name(PurpleKeyring * keyring, char * name)
{
g_return_if_fail(keyring != NULL);
@@ -162,7 +162,7 @@ purple_keyring_set_name(PurpleKeyring *
keyring->name = g_strdup(name);
}
-void
+void
purple_keyring_set_id(PurpleKeyring * keyring, char * id)
{
g_return_if_fail(keyring != NULL);
@@ -232,7 +232,7 @@ static guint purple_keyring_pref_cb_id;
static char * purple_keyring_to_use;
static guint purple_keyring_pref_cb_id;
-static void
+static void
purple_keyring_pref_cb(const char *pref,
PurplePrefType type,
gconstpointer id,
@@ -250,7 +250,7 @@ purple_keyring_pref_cb(const char *pref,
purple_keyring_set_inuse(new, FALSE, NULL, data);
}
-void
+void
purple_keyring_init()
{
PurpleCore * core;
@@ -264,13 +264,13 @@ purple_keyring_init()
core = purple_get_core();
purple_signal_register(core, "keyring-register",
- purple_marshal_VOID__POINTER_POINTER,
+ purple_marshal_VOID__POINTER_POINTER,
NULL, 2,
purple_value_new(PURPLE_TYPE_STRING), /* keyring ID */
purple_value_new(PURPLE_TYPE_BOXED, "PurpleKeyring *")); /* a pointer to the keyring */
purple_signal_register(core, "keyring-unregister",
- purple_marshal_VOID__POINTER_POINTER,
+ purple_marshal_VOID__POINTER_POINTER,
NULL, 2,
purple_value_new(PURPLE_TYPE_STRING), /* keyring ID */
purple_value_new(PURPLE_TYPE_BOXED, "PurpleKeyring *")); /* a pointer to the keyring */
@@ -288,7 +288,7 @@ purple_keyring_init()
purple_keyring_to_use = g_strdup(touse);
}
- purple_keyring_pref_cb_id = purple_prefs_connect_callback(NULL,
+ purple_keyring_pref_cb_id = purple_prefs_connect_callback(NULL,
"/purple/keyring/active", purple_keyring_pref_cb, NULL);
purple_debug_info("keyring", "purple_keyring_init() done, selected keyring is : %s.\n",
@@ -320,13 +320,13 @@ purple_keyring_find_keyring_by_id(char *
return NULL;
}
-const GList *
+const GList *
purple_keyring_get_keyrings()
{
return purple_keyring_keyrings;
}
-const PurpleKeyring *
+const PurpleKeyring *
purple_keyring_get_inuse()
{
return purple_keyring_inuse;
@@ -405,7 +405,7 @@ purple_keyring_set_inuse_check_error_cb(
}
/* if this was the last one */
if (tracker->finished == TRUE && tracker->read_outstanding == 0) {
-
+
if (tracker->abort == TRUE && tracker->force == FALSE) {
if (tracker->cb != NULL)
@@ -426,7 +426,7 @@ purple_keyring_set_inuse_check_error_cb(
purple_prefs_disconnect_callback(purple_keyring_pref_cb_id);
purple_prefs_set_string("/purple/keyring/active",
purple_keyring_get_id(tracker->old));
- purple_keyring_pref_cb_id = purple_prefs_connect_callback(NULL,
+ purple_keyring_pref_cb_id = purple_prefs_connect_callback(NULL,
"/purple/keyring/active", purple_keyring_pref_cb, NULL);
@@ -458,9 +458,9 @@ static void
static void
-purple_keyring_set_inuse_got_pw_cb(PurpleAccount * account,
- gchar * password,
- GError * error,
+purple_keyring_set_inuse_got_pw_cb(PurpleAccount * account,
+ gchar * password,
+ GError * error,
gpointer data)
{
const PurpleKeyring * new;
@@ -497,7 +497,7 @@ purple_keyring_set_inuse_got_pw_cb(Purpl
* in having a keyring that can't store passwords, but it
* will prevent crash with invalid keyrings
*/
- save(account, password,
+ save(account, password,
purple_keyring_set_inuse_check_error_cb, tracker);
} else {
@@ -544,7 +544,7 @@ purple_keyring_set_inuse(const PurpleKey
/* at this point, we know the keyring won't let us
* read passwords, so there no point in copying them.
- * therefore we just cleanup the old and setup the new
+ * therefore we just cleanup the old and setup the new
* one later.
*/
@@ -571,7 +571,7 @@ purple_keyring_set_inuse(const PurpleKey
tracker->force = force;
tracker->error = NULL;
- for (cur = purple_accounts_get_all();
+ for (cur = purple_accounts_get_all();
(cur != NULL) && (tracker->abort == FALSE);
cur = cur->next) {
@@ -637,14 +637,14 @@ purple_keyring_get_keyring_by_id(const c
-void
+void
purple_keyring_register(PurpleKeyring * keyring)
{
const char * keyring_id;
PurpleCore * core;
g_return_if_fail(keyring != NULL);
-
+
keyring_id = purple_keyring_get_id(keyring);
/* keyring with no ID. Add error handling ? */
@@ -674,7 +674,7 @@ purple_keyring_register(PurpleKeyring *
}
-void
+void
purple_keyring_unregister(PurpleKeyring * keyring)
{
PurpleCore * core;
@@ -683,8 +683,8 @@ purple_keyring_unregister(PurpleKeyring
const char * keyring_id;
g_return_if_fail(keyring != NULL);
-
- purple_debug_info("keyring",
+
+ purple_debug_info("keyring",
"Unregistering keyring %s",
purple_keyring_get_id(keyring));
@@ -722,7 +722,7 @@ gboolean
gboolean
-purple_keyring_import_password(PurpleAccount * account,
+purple_keyring_import_password(PurpleAccount * account,
const char * keyringid,
const char * mode,
const char * data,
@@ -742,7 +742,7 @@ purple_keyring_import_password(PurpleAcc
if (inuse == NULL) {
*error = g_error_new(ERR_PIDGINKEYRING , ERR_NOKEYRING,
"No keyring configured, cannot import password info");
- purple_debug_info("Keyring",
+ purple_debug_info("Keyring",
"No keyring configured, cannot import password info for account %s (%s).\n",
purple_account_get_username(account), purple_account_get_protocol_id(account));
return FALSE;
@@ -772,7 +772,7 @@ purple_keyring_import_password(PurpleAcc
purple_debug_info("Keyring", "Configured keyring cannot import password info. This might be normal.");
return FALSE;
}
-
+
return import(account, mode, data, error);
}
@@ -826,7 +826,7 @@ purple_keyring_export_password(PurpleAcc
return export(account, mode, data, error, destroy);
}
-void
+void
purple_keyring_get_password(PurpleAccount *account,
PurpleKeyringReadCallback cb,
gpointer data)
@@ -875,8 +875,8 @@ purple_keyring_get_password(PurpleAccoun
}
}
-static void
-purple_keyring_set_password_async_cb(PurpleAccount * account,
+static void
+purple_keyring_set_password_async_cb(PurpleAccount * account,
GError * error,
gpointer data)
{
@@ -900,7 +900,7 @@ purple_keyring_set_password_async_cb(Pur
g_free(data);
}
-void
+void
purple_keyring_set_password(PurpleAccount * account,
const gchar *password,
PurpleKeyringSaveCallback cb,
@@ -964,7 +964,7 @@ purple_keyring_close(PurpleKeyring * key
}
-void
+void
purple_keyring_change_master(PurpleKeyringChangeMasterCallback cb,
gpointer data)
{
@@ -973,7 +973,7 @@ purple_keyring_change_master(PurpleKeyri
const PurpleKeyring * inuse;
inuse = purple_keyring_get_inuse();
-
+
if (inuse == NULL) {
error = g_error_new(ERR_PIDGINKEYRING, ERR_NOCAP,
"Keyring doesn't support master passwords.");
============================================================
--- libpurple/plugins/keyrings/gnomekeyring.c d1f3b1cb5c12e8e0b36d3ef6b4d8c610ab537d35
+++ libpurple/plugins/keyrings/gnomekeyring.c c8277a505fecab01c0a2f0bce80a7e7c1dc96a2e
@@ -2,7 +2,7 @@
* @file gnomekeyring.c Gnome keyring password storage
* @ingroup plugins
*
- * @todo
+ * @todo
* cleanup error handling and reporting
* refuse unloading when active (in internal keyring too)
*/
@@ -101,7 +101,7 @@ static void gkp_read_continue(GnomeKeyri
switch(result)
{
case GNOME_KEYRING_RESULT_NO_MATCH :
- error = g_error_new(ERR_GNOMEKEYRINGPLUGIN,
+ error = g_error_new(ERR_GNOMEKEYRINGPLUGIN,
ERR_NOPASSWD, "no password found for account : %s",
purple_account_get_username(account));
if(cb != NULL)
@@ -111,7 +111,7 @@ static void gkp_read_continue(GnomeKeyri
case GNOME_KEYRING_RESULT_NO_KEYRING_DAEMON :
case GNOME_KEYRING_RESULT_IO_ERROR :
- error = g_error_new(ERR_GNOMEKEYRINGPLUGIN,
+ error = g_error_new(ERR_GNOMEKEYRINGPLUGIN,
ERR_NOCHANNEL, "Failed to communicate with gnome keyring (account : %s).",
purple_account_get_username(account));
if(cb != NULL)
@@ -120,7 +120,7 @@ static void gkp_read_continue(GnomeKeyri
return;
default :
- error = g_error_new(ERR_GNOMEKEYRINGPLUGIN,
+ error = g_error_new(ERR_GNOMEKEYRINGPLUGIN,
ERR_NOCHANNEL, "Unknown error (account : %s).",
purple_account_get_username(account));
if(cb != NULL)
@@ -139,7 +139,7 @@ static void gkp_read_continue(GnomeKeyri
}
}
-static void
+static void
gkp_read(PurpleAccount * account,
PurpleKeyringReadCallback cb,
gpointer data)
@@ -173,7 +173,7 @@ gkp_save_continue(GnomeKeyringResult res
cb = storage->cb;
account = storage->account;
-
+
g_free(storage->name);
if (result != GNOME_KEYRING_RESULT_OK) {
@@ -184,7 +184,7 @@ gkp_save_continue(GnomeKeyringResult res
"Could not update password for %s (%s) : not found.\n",
purple_account_get_username(account),
purple_account_get_protocol_id(account));
- error = g_error_new(ERR_GNOMEKEYRINGPLUGIN,
+ error = g_error_new(ERR_GNOMEKEYRINGPLUGIN,
ERR_NOPASSWD, "Could not update password for %s : not found",
purple_account_get_username(account));
if(cb != NULL)
@@ -198,7 +198,7 @@ gkp_save_continue(GnomeKeyringResult res
"Failed to communicate with gnome keyring (account : %s (%s)).\n",
purple_account_get_username(account),
purple_account_get_protocol_id(account));
- error = g_error_new(ERR_GNOMEKEYRINGPLUGIN,
+ error = g_error_new(ERR_GNOMEKEYRINGPLUGIN,
ERR_NOCHANNEL, "Failed to communicate with gnome keyring (account : %s).",
purple_account_get_username(account));
if(cb != NULL)
@@ -211,7 +211,7 @@ gkp_save_continue(GnomeKeyringResult res
"Unknown error (account : %s (%s)).\n",
purple_account_get_username(account),
purple_account_get_protocol_id(account));
- error = g_error_new(ERR_GNOMEKEYRINGPLUGIN,
+ error = g_error_new(ERR_GNOMEKEYRINGPLUGIN,
ERR_NOCHANNEL, "Unknown error (account : %s).",
purple_account_get_username(account));
if(cb != NULL)
@@ -286,7 +286,7 @@ static gboolean
}
static gboolean
-gkp_import_password(PurpleAccount * account,
+gkp_import_password(PurpleAccount * account,
const char * mode,
const char * data,
GError ** error)
@@ -296,7 +296,7 @@ gkp_import_password(PurpleAccount * acco
return TRUE;
}
-static gboolean
+static gboolean
gkp_export_password(PurpleAccount * account,
const char ** mode,
char ** data,
@@ -319,7 +319,7 @@ gkp_change_master(PurpleKeyringChangeMas
purple_debug_info("Gnome-Keyring plugin",
"This keyring does not support master passwords.\n");
- purple_notify_info(NULL, _("Gnome-Keyring plugin"),
+ purple_notify_info(NULL, _("Gnome-Keyring plugin"),
_("Failed to change master password."),
_("This plugin does not really support master passwords, it just pretends to."));
if(cb)
@@ -421,9 +421,9 @@ PurplePluginInfo plugininfo =
NULL,
};
-static void
+static void
init_plugin(PurplePlugin *plugin)
-{
+{
purple_debug_info("Gnome Keyring plugin", "init plugin called.\n");
}
============================================================
--- libpurple/plugins/keyrings/internalkeyring.c d0c69882458b963ba77e03319f6e2605e860b6c2
+++ libpurple/plugins/keyrings/internalkeyring.c a811b736122090c0ca212aa73ab2412612b80710
@@ -2,7 +2,7 @@
* @file internalkeyring.c internal keyring
* @ingroup plugins
*
- * @todo
+ * @todo
* cleanup error handling and reporting
*/
@@ -65,9 +65,9 @@
g_hash_table_replace(internal_keyring_passwords, account, password)
#define ACTIVATE()\
if (internal_keyring_is_active == FALSE)\
- internal_keyring_open();
-
+ internal_keyring_open();
+
static GHashTable * internal_keyring_passwords = NULL;
static PurpleKeyring * keyring_handler = NULL;
static gboolean internal_keyring_is_active = FALSE;
@@ -83,7 +83,7 @@ internal_keyring_open()
internal_keyring_is_active = TRUE;
}
-static void
+static void
internal_keyring_read(PurpleAccount * account,
PurpleKeyringReadCallback cb,
gpointer data)
@@ -104,7 +104,7 @@ internal_keyring_read(PurpleAccount * ac
if(cb != NULL)
cb(account, password, NULL, data);
} else {
- error = g_error_new(ERR_PIDGINKEYRING,
+ error = g_error_new(ERR_PIDGINKEYRING,
ERR_NOPASSWD, "password not found");
if(cb != NULL)
cb(account, NULL, error, data);
@@ -153,7 +153,7 @@ static gboolean
}
static gboolean
-internal_keyring_import_password(PurpleAccount * account,
+internal_keyring_import_password(PurpleAccount * account,
const char * mode,
const char * data,
GError ** error)
@@ -165,7 +165,7 @@ internal_keyring_import_password(PurpleA
purple_debug_info("Internal keyring",
"Importing password");
- if (account != NULL &&
+ if (account != NULL &&
data != NULL &&
(mode == NULL || g_strcmp0(mode, "cleartext") == 0)) {
@@ -183,7 +183,7 @@ internal_keyring_import_password(PurpleA
return TRUE;
}
-static gboolean
+static gboolean
internal_keyring_export_password(PurpleAccount * account,
const char ** mode,
char ** data,
@@ -297,9 +297,9 @@ PurplePluginInfo plugininfo =
NULL,
};
-static void
+static void
init_plugin(PurplePlugin *plugin)
-{
+{
purple_debug_info("internalkeyring", "init plugin called.\n");
}
============================================================
--- libpurple/plugins/keyrings/kwallet.cpp 267e031dccce8db1a0dd1c22b9ab75ee888884d6
+++ libpurple/plugins/keyrings/kwallet.cpp a3c77670836ad172e1cd327916e5eb24d0755100
@@ -2,7 +2,7 @@
* @file kwallet.cpp KWallet password storage
* @ingroup plugins
*
- * @todo
+ * @todo
* cleanup error handling and reporting
* refuse unloading when active (in internal keyring too)
*/
@@ -145,7 +145,7 @@ KWalletPlugin::engine::~engine()
pinstance = NULL;
}
-engine *
+engine *
KWalletPlugin::engine::Instance()
{
if (pinstance == NULL)
@@ -189,7 +189,7 @@ class KWalletPlugin::request
class KWalletPlugin::request
{
- public :
+ public :
virtual void abort();
virtual void execute(KWallet::wallet * wallet);
@@ -244,7 +244,7 @@ KWalletPlugin::save_request::abort()
{
GError * error;
if (cb != NULL) {
- error = g_error_new(ERR_KWALLETPLUGIN,
+ error = g_error_new(ERR_KWALLETPLUGIN,
ERR_UNKNOWN,
"Failed to save password");
cb(account, error, data);
@@ -257,7 +257,7 @@ KWalletPlugin::read_request::abort()
{
GError * error;
if (callback != NULL) {
- error = g_error_new(ERR_KWALLETPLUGIN,
+ error = g_error_new(ERR_KWALLETPLUGIN,
ERR_UNKNOWN,
"Failed to save password");
cb(account, NULL, error, data);
@@ -273,7 +273,7 @@ KWalletPlugin::read_request::execute(KWa
key = "purple-" + purple_account_get_username(account) + " " + purple_account_get_protocol_id(account);
result = wallet.readPassword(key, password);
-
+
if(result != 0)
abort();
else
@@ -289,7 +289,7 @@ KWalletPlugin::save_request::execute(KWa
key = "purple-" + purple_account_get_username(account) + " " + purple_account_get_protocol_id(account);
result = wallet.writePassword(key, password);
-
+
if(result != 0)
abort();
else
@@ -306,7 +306,7 @@ KWalletPlugin::save_request::execute(KWa
-void
+void
kwallet_read(PurpleAccount * account,
PurpleKeyringReadCallback cb,
gpointer data)
@@ -316,7 +316,7 @@ kwallet_read(PurpleAccount * account,
}
-void
+void
kwallet_save(PurpleAccount * account,
const char * password,
PurpleKeyringSaveCallback cb,
@@ -327,14 +327,14 @@ kwallet_save(PurpleAccount * account,
}
-void
+void
kwallet_close(GError ** error)
{
delete KWalletPlugin::engine::instance();
}
-void
-kwallet_import(PurpleAccount * account,
+void
+kwallet_import(PurpleAccount * account,
const char * mode,
const char * data,
GError ** error)
@@ -342,7 +342,7 @@ kwallet_import(PurpleAccount * account,
return TRUE;
}
-void
+void
kwallet_export(PurpleAccount * account,
const char ** mode,
char ** data,
@@ -386,9 +386,9 @@ gkp_destroy(PurplePlugin *plugin)
kwallet_close();
}
-void
+void
init_plugin(PurplePlugin *plugin)
-{
+{
purple_debug_info("KWallet plugin", "init plugin called.\n");
}
More information about the Commits
mailing list