7366N/AAutomatically enable the pidgin-gnome-keyring plugin so that account
7366N/Apasswords can be saved in the system keyring rather than as cleartext
7366N/Ain ~/.purple/accounts.xml
7366N/A
7366N/ASee PSARC/2016/385 for more details.
5089N/A
7366N/AThis patch will not be submitted upsteam.
7366N/A
7366N/A--- pidgin-2.11.0/configure.ac.orig 2016-08-17 07:39:38.956248926 -0700
7366N/A+++ pidgin-2.11.0/configure.ac 2016-08-17 07:41:48.502561778 -0700
7366N/A@@ -2469,6 +2469,20 @@
5089N/A LDFLAGS="$orig_LDFLAGS"
5089N/A fi
5089N/A
5089N/A+dnl #######################################################################
5089N/A+dnl # Check for gnome-keyring
5089N/A+dnl #--enable-gnome-keyring=(yes|no)
5089N/A+dnl #######################################################################
5089N/A+AC_ARG_ENABLE(gnome-keyring,
7366N/A+AC_HELP_STRING([--enable-gnome-keyring],
7366N/A+ [use gnome keyring for storing password [default=no]]),,
7366N/A+ enable_gnome_keyring=no)
5089N/A+if test "x$enable_gnome_keyring" = "xyes"; then
5089N/A+ PKG_CHECK_MODULES(GAIM_KEYRING,
5089N/A+ gnome-keyring-1,
5089N/A+ AC_DEFINE(GAIM_ENABLE_KEYRING, [], [Set if we should use gnome-keyring]))
5089N/A+fi
5089N/A+
5089N/A AC_MSG_CHECKING(for me pot o' gold)
5089N/A AC_MSG_RESULT(no)
5089N/A AC_CHECK_FUNCS(gethostid lrand48 timegm)
7366N/A--- pidgin-2.11.0/libpurple/core.c.orig 2016-08-17 08:59:22.042425765 -0700
7366N/A+++ pidgin-2.11.0/libpurple/core.c 2016-08-17 09:48:56.584454917 -0700
7366N/A@@ -161,6 +161,12 @@
7366N/A purple_connections_init();
7366N/A
7366N/A purple_accounts_init();
7366N/A+
7366N/A+ /* Potentially load the gnome keyring plugin here because we need to
7366N/A+ * have had a couple signals registered by purple_accounts_init() first.
7366N/A+ */
7366N/A+ purple_plugin_load_gnome_keyring_plugin();
7366N/A+
7366N/A purple_savedstatuses_init();
7366N/A purple_notify_init();
7366N/A purple_certificate_init();
7366N/A--- pidgin-2.11.0/libpurple/plugin.h.orig 2016-08-17 09:08:26.448023611 -0700
7366N/A+++ pidgin-2.11.0/libpurple/plugin.h 2016-08-17 09:49:20.857940837 -0700
7366N/A@@ -733,6 +733,12 @@
7366N/A */
7366N/A void purple_plugin_action_free(PurplePluginAction *action);
7366N/A
7366N/A+/**
7366N/A+ * Potentially load the gnome keyring plugin.
7366N/A+ */
7366N/A+
7366N/A+void purple_plugin_load_gnome_keyring_plugin(void);
7366N/A+
7366N/A #ifdef __cplusplus
7366N/A }
7366N/A #endif
7366N/A--- pidgin-2.11.0/libpurple/plugin.c.orig 2016-08-17 07:42:35.456904439 -0700
7366N/A+++ pidgin-2.11.0/libpurple/plugin.c 2016-08-17 12:05:29.285059614 -0700
7366N/A@@ -54,6 +54,10 @@
7366N/A
7366N/A } PurplePluginIpcCommand;
5089N/A
5089N/A+#ifdef GAIM_ENABLE_KEYRING
7366N/A+static PurplePlugin *gnome_keyring_plugin = NULL;
5089N/A+#endif
5089N/A+
7366N/A static GList *search_paths = NULL;
7366N/A static GList *plugins = NULL;
7366N/A static GList *loaded_plugins = NULL;
7366N/A@@ -207,6 +211,10 @@
7366N/A gchar *basename = NULL;
7366N/A gboolean (*purple_init_plugin)(PurplePlugin *);
7366N/A
5089N/A+#ifdef GAIM_ENABLE_KEYRING
7366N/A+ gboolean is_gnome_keyring = FALSE;
5089N/A+#endif
7366N/A+
7366N/A purple_debug_misc("plugins", "probing %s\n", filename);
7366N/A g_return_val_if_fail(filename != NULL, NULL);
7366N/A
7366N/A@@ -216,6 +224,12 @@
7366N/A /* If this plugin has already been probed then exit */
7366N/A basename = purple_plugin_get_basename(filename);
7366N/A plugin = purple_plugins_find_with_basename(basename);
7366N/A+
7366N/A+#ifdef GAIM_ENABLE_KEYRING
7366N/A+ if (!strcmp(basename, "gnome-keyring"))
7366N/A+ is_gnome_keyring = TRUE;
7366N/A+#endif
7366N/A+
7366N/A g_free(basename);
7366N/A if (plugin != NULL)
7366N/A {
7366N/A@@ -484,6 +498,13 @@
7366N/A }
5089N/A }
5089N/A
5089N/A+#ifdef GAIM_ENABLE_KEYRING
7366N/A+ if (is_gnome_keyring) {
7366N/A+ purple_debug_misc("plugins", "setting gnome_keyring_plugin.\n");
7366N/A+ gnome_keyring_plugin = plugin;
7366N/A+ }
5089N/A+#endif
7366N/A+
7366N/A return plugin;
7366N/A #else
7366N/A return NULL;
7366N/A@@ -1673,3 +1694,15 @@
7366N/A g_free(action->label);
7366N/A g_free(action);
5089N/A }
5089N/A+
7366N/A+void
7366N/A+purple_plugin_load_gnome_keyring_plugin()
5089N/A+{
7366N/A+#ifdef GAIM_ENABLE_KEYRING
7366N/A+ purple_debug_misc("plugins", "purple_plugin_load_gnome_keyring_plugin called.\n");
7366N/A+ if (gnome_keyring_plugin != NULL) {
7366N/A+ purple_debug_misc("plugins", "purple_plugin_load_gnome_keyring_plugin: calling purple_plugin_load.\n");
7366N/A+ purple_plugin_load(gnome_keyring_plugin);
7366N/A+ }
7366N/A+#endif
5089N/A+}