pidgin: 4a856067: Fix for changing silc private key passph...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 4a85606739229eebc3d3a91da0d5eaf001e45966
Ancestor: b625509e5ef6335b33cef9196c64aa72df5fda00
Author: nosnilmot at pidgin.im
Date: 2008-04-23T16:36:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4a85606739229eebc3d3a91da0d5eaf001e45966

Modified files:
        libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/silc.c

ChangeLog: 

Fix for changing silc private key passphrase to or from the empty string,
preventing silc toolkit library trying to read from stdin (!)

-------------- next part --------------
============================================================
--- libpurple/protocols/silc/silc.c	60246aeab3771b2e685177b36c27b001f6b1c7f0
+++ libpurple/protocols/silc/silc.c	0fcc777a1dd4ee0f6d277b559092cadb433d01fc
@@ -1192,11 +1192,11 @@ silcpurple_change_passwd(PurpleConnectio
 static void
 silcpurple_change_passwd(PurpleConnection *gc, const char *old, const char *new)
 {
-        char prd[256];
+	char prd[256];
 	g_snprintf(prd, sizeof(prd), "%s" G_DIR_SEPARATOR_S "private_key.pub", silcpurple_silcdir());
 	silc_change_private_key_passphrase(purple_account_get_string(gc->account,
 								     "private-key",
-								     prd), old, new);
+								     prd), old ? old : "", new ? new : "");
 }
 
 static void
============================================================
--- libpurple/protocols/silc10/silc.c	e355589dff37f1cc90e67cbcaaf957b4a18c2851
+++ libpurple/protocols/silc10/silc.c	c884431c00483ed438d8d10b08a90c2d3599d3d5
@@ -962,11 +962,11 @@ silcpurple_change_passwd(PurpleConnectio
 static void
 silcpurple_change_passwd(PurpleConnection *gc, const char *old, const char *new)
 {
-        char prd[256];
+	char prd[256];
 	g_snprintf(prd, sizeof(prd), "%s" G_DIR_SEPARATOR_S "private_key.pub", silcpurple_silcdir());
 	silc_change_private_key_passphrase(purple_account_get_string(gc->account,
 								   "private-key",
-								   prd), old, new);
+								   prd), old ? old : "", new ? new : "");
 }
 
 static void