summaryrefslogtreecommitdiff
path: root/finch/gntprefs.c
diff options
context:
space:
mode:
authorElliott Sales de Andrade <qulogic@pidgin.im>2011-10-30 21:53:14 +0000
committerElliott Sales de Andrade <qulogic@pidgin.im>2011-10-30 21:53:14 +0000
commite0ccbae4e7aac06e52b0fddf4ef9d5827150d112 (patch)
treef9627961bb687eb1d25fc8934bfb5efff77ff2df /finch/gntprefs.c
parent964bd28e6ed4b294b65ec745663640b2180c83ce (diff)
parent24407cca1572e7cbf3d7d31cf5f164496b1d450c (diff)
downloadpidgin-e0ccbae4e7aac06e52b0fddf4ef9d5827150d112.tar.gz
propagate from branch 'im.pidgin.pidgin' (head e275f5e7b257ee56363a918879d8af746c519d8d)
to branch 'im.pidgin.soc.2008.masterpassword' (head c49f6e9ea27d2da03e0e9cf9693c21349ef041c0)
Diffstat (limited to 'finch/gntprefs.c')
-rw-r--r--finch/gntprefs.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/finch/gntprefs.c b/finch/gntprefs.c
index f1870976a9..b09d059fa2 100644
--- a/finch/gntprefs.c
+++ b/finch/gntprefs.c
@@ -1,6 +1,7 @@
/**
* @file gntprefs.c GNT Preferences API
* @ingroup finch
+ * @todo : add support for master password changing.
*/
/* finch
@@ -73,6 +74,13 @@ typedef struct
} Prefs;
static GList *
+get_keyring_options(void)
+{
+ return purple_keyring_get_options();
+}
+
+
+static GList *
get_log_options(void)
{
return purple_log_logger_get_options();
@@ -195,6 +203,11 @@ static Prefs logging[] =
{PURPLE_PREF_NONE, NULL, NULL, NULL},
};
+static Prefs keyring[] =
+{
+ {PURPLE_PREF_STRING, "/purple/keyring/active", N_("Active keyring"), purple_keyring_get_options}
+};
+
static Prefs idle[] =
{
{PURPLE_PREF_STRING, "/purple/away/idle_reporting", N_("Report Idle time"), get_idle_options},
@@ -250,6 +263,7 @@ void finch_prefs_show_all()
add_pref_group(fields, _("Buddy List"), blist);
add_pref_group(fields, _("Conversations"), convs);
+ add_pref_group(fields, _("Keyring"), keyring);
add_pref_group(fields, _("Logging"), logging);
add_pref_group(fields, _("Idle"), idle);