# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 991435545 0
# Node ID 8de58cd2892fecff0bebd83c90a462370c15caaa
# Parent  0ec62ca82a8af70f5d89c9b2dc8284bf12d5c629
[gaim-migrate @ 1950]
don't mind this. it just makes my patch for GTK2 smaller.

committer: Tailor Script <tailor@pidgin.im>

diff -r 0ec62ca82a8a -r 8de58cd2892f plugins/jabber/jabber.c
--- a/plugins/jabber/jabber.c	Fri Jun 01 21:43:43 2001 +0000
+++ b/plugins/jabber/jabber.c	Fri Jun 01 22:45:45 2001 +0000
@@ -1807,7 +1807,8 @@
 
 static void jabber_do_new_user()
 {
-	char *name, *pass1, *pass2, *serv;
+	const char *name, *pass1, *pass2, *serv;
+	char *tmp;
 	char *user;
 
 	if (!newname || regjconn)
@@ -1833,7 +1834,9 @@
 	}
 
 	user = g_strdup_printf("%s@%s/GAIM", name, serv);
-	regjconn = jab_new(user, pass1);
+	tmp = g_strdup(pass1);
+	regjconn = jab_new(user, tmp);
+	g_free(tmp);
 	g_free(user);
 
 	jab_state_handler(regjconn, regstate);
diff -r 0ec62ca82a8a -r 8de58cd2892f plugins/msn/msn.c
--- a/plugins/msn/msn.c	Fri Jun 01 21:43:43 2001 +0000
+++ b/plugins/msn/msn.c	Fri Jun 01 22:45:45 2001 +0000
@@ -1279,7 +1279,7 @@
 	struct gaim_connection *gc = b->user->gc;
 	struct msn_data *md = (struct msn_data *)gc->proto_data;
 	char buf[MSN_BUF_LEN - 1];
-	gchar *newname;
+	const gchar *newname;
 
 	newname = gtk_entry_get_text(GTK_ENTRY(b->entry));
 	
diff -r 0ec62ca82a8a -r 8de58cd2892f plugins/napster.c
--- a/plugins/napster.c	Fri Jun 01 21:43:43 2001 +0000
+++ b/plugins/napster.c	Fri Jun 01 22:45:45 2001 +0000
@@ -1059,7 +1059,7 @@
 static void nap_find_callback(GtkObject *w, GtkWidget *entry)
 {
 	struct gaim_connection *gc = (struct gaim_connection *)gtk_object_get_user_data(w);
-	gchar *search;
+	const gchar *search;
 	gchar buf[NAP_BUF_LEN];
 		
 	search = gtk_entry_get_text(GTK_ENTRY(entry));
diff -r 0ec62ca82a8a -r 8de58cd2892f plugins/spellchk.c
--- a/plugins/spellchk.c	Fri Jun 01 21:43:43 2001 +0000
+++ b/plugins/spellchk.c	Fri Jun 01 22:45:45 2001 +0000
@@ -321,7 +321,7 @@
 
 static void bad_changed() {
 	int row;
-	char *m;
+	const char *m;
 
 	if (GTK_CLIST(list)->selection)
 		row = (int) GTK_CLIST (list)->selection->data;
@@ -335,7 +335,7 @@
 
 static void good_changed() {
 	int row;
-	char *m;
+	const char *m;
 
 	if (GTK_CLIST(list)->selection)
 		row = (int) GTK_CLIST (list)->selection->data;
diff -r 0ec62ca82a8a -r 8de58cd2892f plugins/zephyr/zephyr.c
--- a/plugins/zephyr/zephyr.c	Fri Jun 01 21:43:43 2001 +0000
+++ b/plugins/zephyr/zephyr.c	Fri Jun 01 22:45:45 2001 +0000
@@ -29,10 +29,15 @@
 
 #include <gtk/gtk.h>
 #include <string.h>
+#include <stdlib.h>
 #include "gaim.h"
 #include "prpl.h"
 #include "zephyr/zephyr.h"
 
+extern Code_t ZGetLocations(ZLocations_t *, int *);
+extern Code_t ZSetLocation(char *);
+extern Code_t ZUnsetLocation();
+
 typedef struct _zframe zframe;
 typedef struct _zephyr_triple zephyr_triple;
 
@@ -113,7 +118,7 @@
 }
 */
 
-static zephyr_triple *new_triple(char *c, char *i, char *r)
+static zephyr_triple *new_triple(const char *c, const char *i, const char *r)
 {
 	zephyr_triple *zt;
 	zt = g_new0(zephyr_triple, 1);
@@ -693,7 +698,7 @@
 	ZNotice_t notice;
 	zephyr_triple *zt;
 	char *buf;
-	char *sig;
+	const char *sig;
 
 	zt = find_sub_by_id(id);
 	if (!zt)
@@ -730,7 +735,7 @@
 static void zephyr_send_im(struct gaim_connection *gc, char *who, char *im, int away) {
 	ZNotice_t notice;
 	char *buf;
-	char *sig;
+	const char *sig;
 
 	if (away)
 		sig = "Automated reply:";
@@ -872,9 +877,9 @@
 {
 	ZSubscription_t sub;
 	zephyr_triple *zt1, *zt2;
-	char *classname;
-	char *instname;
-	char *recip;
+	const char *classname;
+	const char *instname;
+	const char *recip;
 	char **splitted;
 
 	if (!nm) {