[ekg2-commit] ekg2: gg.c (HEAD) pubdir.c (HEAD) [darkjames]

[CVS commit]

Module name:	ekg2
Changes by:	darkjames	07/02/17 20:50:30

Modified files:
	gg.c pubdir.c

Log message:
support for gg_change_passwd4() required by newer libgadu && /passwd

Index: gg.c
===================================================================
RCS file: /home/cvs/ekg2/plugins/gg/gg.c,v
diff -d -u -r1.160 -r1.161
--- gg.c	29 Dec 2006 17:52:58 -0000	1.160
+++ gg.c	17 Feb 2007 19:50:28 -0000	1.161
@@ -1281,6 +1281,7 @@
 	plugin_var_add(&gg_plugin, "concat_multiline_status", VAR_INT, "3", 0, NULL);
 	plugin_var_add(&gg_plugin, "connection_save", VAR_INT, "0", 0, NULL);
 	plugin_var_add(&gg_plugin, "display_notify", VAR_INT, "-1", 0, NULL);
+	plugin_var_add(&gg_plugin, "email", VAR_STR, 0, 0, NULL);
 	plugin_var_add(&gg_plugin, "local_ip", VAR_STR, 0, 0, NULL);
 	plugin_var_add(&gg_plugin, "log_formats", VAR_STR, "xml,simple", 0, NULL);
 	plugin_var_add(&gg_plugin, "password", VAR_STR, "foo", 1, NULL);

Index: pubdir.c
===================================================================
RCS file: /home/cvs/ekg2/plugins/gg/pubdir.c,v
diff -d -u -r1.24 -r1.25
--- pubdir.c	13 Sep 2006 11:10:23 -0000	1.24
+++ pubdir.c	17 Feb 2007 19:50:28 -0000	1.25
@@ -318,7 +318,23 @@
 	char *newpasswd = gg_locale_to_cp(xstrdup(params[0]));
 
 #ifdef HAVE_GG_CHANGE_PASSWD4 /* gg_change_passwd4 since ~ LIBGADU 20030930 */
-	if (!(h = gg_change_passwd4(atoi(session->uid + 3), "email", (oldpasswd) ? oldpasswd : "", newpasswd, "tokenid", "tokenval", 1)))
+	const char *config_email = session_get(session, "email");
+
+	if (!last_tokenid) {
+		printq("gg_token_missing");
+		return -1;
+	}
+	if (!params[1]) {
+		printq("not_enough_params", name);
+		return -1;
+	}
+
+	if (!config_email) {
+		printq("var_not_set", name, "/session email");
+		return -1;
+	}
+
+	if (!(h = gg_change_passwd4(atoi(session->uid + 3), config_email, (oldpasswd) ? oldpasswd : "", newpasswd, last_tokenid, params[1], 1)))
 #else 
 	if (!(h = gg_change_passwd3(atoi(session->uid + 3), (oldpasswd) ? oldpasswd : "", newpasswd, "", 1)))
 #endif