Mercurial > pidgin

changeset 3867:43e396e94095

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 4019] compile cleanups by nathan committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Sun, 03 Nov 2002 07:36:09 +0000
parents 994b5c4d15dd
children b7d5c2a2b0d9
files plugins/chatlist.c plugins/docklet/docklet.c plugins/ticker/ticker.c src/aim.c src/conversation.c src/gaim-remote.c src/gaim.h src/gtkimhtml.h src/multi.c src/protocols/icq/gaim_icq.c src/protocols/irc/irc.c src/protocols/jabber/jabber.c src/protocols/oscar/aim.h src/protocols/oscar/oscar.c src/protocols/oscar/ssi.c src/protocols/toc/toc.c src/protocols/zephyr/zephyr.c src/proxy.c src/prpl.c src/prpl.h src/socket.c src/util.c
diffstat 22 files changed, 76 insertions(+), 96 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/chatlist.c	Sun Nov 03 07:32:07 2002 +0000
+++ b/plugins/chatlist.c	Sun Nov 03 07:36:09 2002 +0000
@@ -1,6 +1,5 @@
 #define GAIM_PLUGINS
 
-#include "pixmaps/cancel.xpm"
 #include "pixmaps/refresh.xpm"
 #include "pixmaps/gnome_add.xpm"
 #include "pixmaps/gnome_remove.xpm"
@@ -288,13 +287,6 @@
 	save_chat_prefs();
 }
 
-static void parent_destroy()
-{
-	if (parent)
-		gtk_widget_destroy(parent);
-	parent = NULL;
-}
-
 G_MODULE_EXPORT GtkWidget *gaim_plugin_config_gtk()
 {
 	GtkWidget *ret, *vbox;
--- a/plugins/docklet/docklet.c	Sun Nov 03 07:32:07 2002 +0000
+++ b/plugins/docklet/docklet.c	Sun Nov 03 07:36:09 2002 +0000
@@ -30,11 +30,14 @@
     - support blinking the icon when messages are pending */
 
 /* includes */
-#define GAIM_PLUGINS
 #include <gtk/gtk.h>
 #include "gaim.h"
 #include "eggtrayicon.h"
 
+#ifndef GAIM_PLUGINS
+#define GAIM_PLUGINS
+#endif
+
 /* types */
 enum docklet_status {
 	online,
@@ -50,7 +53,6 @@
 static void docklet_update_status();
 
 /* globals */
-static GtkWidget *configwin;
 static EggTrayIcon *docklet = NULL;
 static GtkWidget *icon;
 static enum docklet_status status;
@@ -199,7 +201,7 @@
 		case connecting:
 			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "connect.png", NULL);
 			break;
-		case offline:
+		default:
 			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "offline.png", NULL);
 	}
 
--- a/plugins/ticker/ticker.c	Sun Nov 03 07:32:07 2002 +0000
+++ b/plugins/ticker/ticker.c	Sun Nov 03 07:36:09 2002 +0000
@@ -22,9 +22,6 @@
  * pluginized- Sean Egan, Summer 2002
  */
 
-#ifndef GAIM_PLUGINS
-#define GAIM_PLUGINS
-#endif
 
 #include <gtk/gtk.h>
 #include "gtkticker.h"
@@ -37,6 +34,10 @@
 #include "win32dep.h"
 #endif
 
+#ifndef GAIM_PLUGINS
+#define GAIM_PLUGINS
+#endif
+
 static GtkWidget *tickerwindow = NULL;
 static GtkWidget *ticker;
 static GModule *handle;
--- a/src/aim.c	Sun Nov 03 07:32:07 2002 +0000
+++ b/src/aim.c	Sun Nov 03 07:36:09 2002 +0000
@@ -48,6 +48,7 @@
 #include <ctype.h>
 #include "prpl.h"
 #include "gaim.h"
+#include "gaim-socket.h"
 #if HAVE_SIGNAL_H
 #include <signal.h>
 #endif
@@ -58,11 +59,6 @@
 #include "win32dep.h"
 #endif
 
-#ifndef _WIN32
-static gchar *aspell_cmd[] = { "aspell", "--sug-mode=fast","-a", NULL };
-static gchar *ispell_cmd[] = { "ispell", "-a", NULL };
-#endif
-
 static GtkWidget *name;
 static GtkWidget *pass;
 
--- a/src/conversation.c	Sun Nov 03 07:32:07 2002 +0000
+++ b/src/conversation.c	Sun Nov 03 07:36:09 2002 +0000
@@ -63,9 +63,6 @@
 #include "pixmaps/download.xpm"
 #include "pixmaps/farted.xpm"
 
-static gchar *ispell_cmd[] = { "ispell", "-a", NULL };
-static gchar *aspell_cmd[] = { "aspell", "--sug-mode=fast","-a", NULL };
-
 int state_lock = 0;
 
 GdkPixmap *dark_icon_pm = NULL;
@@ -194,7 +191,7 @@
 	update_checkbox(c);
 	update_smilies(c);
 	plugin_event(event_new_conversation, name);
-	gtk_imhtml_to_bottom(c->text);
+	gtk_imhtml_to_bottom(GTK_IMHTML(c->text));
 	return c;
 }
 
@@ -1050,6 +1047,7 @@
 		g_signal_stop_emission_by_name(G_OBJECT(widget), "button_press_event");
 		return TRUE;
 	}
+	return FALSE;
 }
 
 static void got_typing_keypress(struct conversation *c, gboolean first) {
@@ -2617,7 +2615,7 @@
 
 	update_convo_status(c);
 
-	gtk_imhtml_to_bottom(c->text);
+	gtk_imhtml_to_bottom(GTK_IMHTML(c->text));
 }
 
 void update_convo_status(struct conversation *c) {
--- a/src/gaim-remote.c	Sun Nov 03 07:32:07 2002 +0000
+++ b/src/gaim-remote.c	Sun Nov 03 07:36:09 2002 +0000
@@ -21,6 +21,7 @@
 
 #include "gaim.h"
 #include <getopt.h>
+#include <unistd.h>
 #include "gaim-socket.h"
 
 void show_remote_usage(char *name) 
@@ -151,7 +152,10 @@
 	return 0;
 }
 
-int command_info(){}
+int command_info(){
+	fprintf(stderr, "Info not yet implemented\n");
+    return 1;
+}
 
 int main (int argc, char *argv[])
 {
--- a/src/gaim.h	Sun Nov 03 07:32:07 2002 +0000
+++ b/src/gaim.h	Sun Nov 03 07:36:09 2002 +0000
@@ -456,7 +456,7 @@
 extern char *away_subs(char *, char *);
 extern char *stylize(gchar *, int);
 extern void show_usage (int, char *);
-extern char *gaim_home_dir();
+extern const gchar *gaim_home_dir();
 extern char *gaim_user_dir();
 extern void strncpy_nohtml(gchar *, const gchar *, size_t);
 extern void strncpy_withhtml(gchar *, const gchar *, size_t);
--- a/src/gtkimhtml.h	Sun Nov 03 07:32:07 2002 +0000
+++ b/src/gtkimhtml.h	Sun Nov 03 07:36:09 2002 +0000
@@ -145,6 +145,7 @@
 void       gtk_imhtml_page_up          (GtkIMHtml        *imhtml);
 
 void       gtk_imhtml_page_down        (GtkIMHtml        *imhtml);
+void       gtk_imhtml_to_bottom        (GtkIMHtml        *imhtml);
 
 #ifdef __cplusplus
 }
--- a/src/multi.c	Sun Nov 03 07:32:07 2002 +0000
+++ b/src/multi.c	Sun Nov 03 07:36:09 2002 +0000
@@ -26,15 +26,8 @@
 #include "multi.h"
 #include "gaim.h"
 
-#include "pixmaps/gnome_add.xpm"
-#include "pixmaps/gnome_preferences.xpm"
-#include "pixmaps/join.xpm"
-#include "pixmaps/gnome_remove.xpm"
 #include "pixmaps/cancel.xpm"
 #include "pixmaps/ok.xpm"
-#include "pixmaps/tb_redo.xpm"
-#include "pixmaps/tb_undo.xpm"
-#include "pixmaps/tb_refresh.xpm"
 /*#include "pixmaps/no_icon.xpm"*/
 
 #define LOGIN_STEPS 5
@@ -928,8 +921,6 @@
 static void mod_acct(GtkWidget *w, gpointer d)
 {
 	GtkTreeSelection *selection;
-	GtkTreeIter iter;
-	GtkTreeModel *model;
 
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
 
@@ -1055,7 +1046,6 @@
 {
 	GtkTreeModel *model = (GtkTreeModel *)d;
 	GtkTreeIter iter;
-	GtkTreePath *path = gtk_tree_path_new_from_string(path_str);
 
 	struct aim_user *u = NULL;
 	struct prpl *p = NULL;
@@ -1094,12 +1084,10 @@
 static void acct_autologin(GtkCellRendererToggle *cell, gchar *path_str,
 						   gpointer d)
 {
- 	GtkTreeModel *model = (GtkTreeModel *)d;
- 	GtkTreeIter iter;
- 	GtkTreePath *path = gtk_tree_path_new_from_string(path_str);
+	GtkTreeModel *model = (GtkTreeModel *)d;
+	GtkTreeIter iter;
 
 	struct aim_user *u = NULL;
-	struct prpl *p = NULL;
 
 	gtk_tree_model_get_iter_from_string(model, &iter, path_str);
 	gtk_tree_model_get(model, &iter, COLUMN_DATA, &u, -1);
@@ -1148,8 +1136,6 @@
 static void del_acct(GtkWidget *w, gpointer d)
 {
 	GtkTreeSelection *selection;
-	GtkTreeIter iter;
-	GtkTreeModel *model;
 
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
 
@@ -1179,7 +1165,6 @@
 	/* please kill me */
 	GtkWidget *vbox;
 	GtkWidget *hbox;
-	GtkWidget *vbox2;
 	GtkWidget *sw;
 	GtkWidget *button;	/* used for many things */
 	GtkWidget *sep;
@@ -1324,7 +1309,6 @@
 
 void account_online(struct gaim_connection *gc)
 {
-	int i;
 	struct signon_meter *meter = find_signon_meter(gc);
 	GtkTreeIter iter;
 
--- a/src/protocols/icq/gaim_icq.c	Sun Nov 03 07:32:07 2002 +0000
+++ b/src/protocols/icq/gaim_icq.c	Sun Nov 03 07:36:09 2002 +0000
@@ -519,7 +519,7 @@
 
 #ifndef STATIC
 
-void *gaim_prpl_init(struct prpl *prpl)
+G_MODULE_EXPORT void gaim_prpl_init(struct prpl *prpl)
 {
 	icq_init(prpl);
 	prpl->plug->desc.api_version = PLUGIN_API_VERSION;
--- a/src/protocols/irc/irc.c	Sun Nov 03 07:32:07 2002 +0000
+++ b/src/protocols/irc/irc.c	Sun Nov 03 07:36:09 2002 +0000
@@ -36,6 +36,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <sys/time.h>
 #include <time.h>
 #include <sys/stat.h>
 #include <ctype.h>
@@ -1571,6 +1572,7 @@
                }
                r = r->next;
        }
+	   return TRUE;
 }
 
 static void 
@@ -2519,7 +2521,7 @@
 {
 	char buf[IRC_BUF_LEN];
 
-	g_snprintf (buf, sizeof(buf), "\001PING %ul\001", time(NULL));
+	g_snprintf (buf, sizeof(buf), "\001PING %ld\001", time(NULL));
 	irc_send_privmsg(gc, who, buf, FALSE);
 }
 
--- a/src/protocols/jabber/jabber.c	Sun Nov 03 07:32:07 2002 +0000
+++ b/src/protocols/jabber/jabber.c	Sun Nov 03 07:36:09 2002 +0000
@@ -2489,15 +2489,15 @@
  * If "alias" or "group" are NULL, gets them from Gaim's current buddylist values
  * for the buddy.
  */
-static void jabber_roster_update(struct gaim_connection *gc, char *name, char *alias, char *group)
+static void jabber_roster_update(struct gaim_connection *gc, const char *name, const char *alias, const char *group)
 {
 	xmlnode x, y;
 	char *realwho;
 	gjconn gjc;
 	struct buddy *buddy = NULL;
 	struct group *buddy_group = NULL;
-	char *my_alias = NULL;
-	char *my_group = NULL;
+	const char *my_alias = NULL;
+	const char *my_group = NULL;
 
 	if(gc && gc->proto_data && ((struct jabber_data *)gc->proto_data)->gjc && name) {
 		gaim_jid gjid;
@@ -2574,7 +2574,7 @@
 /*
  * Change buddy's group on server roster
  */
-static void jabber_group_change(struct gaim_connection *gc, char *name, char *old_group, char *new_group)
+static void jabber_group_change(struct gaim_connection *gc, const char *name, const char *old_group, const char *new_group)
 {
 	if(old_group && new_group && strcmp(old_group, new_group))
 		jabber_roster_update(gc, name, NULL, new_group);
@@ -2588,8 +2588,8 @@
  * the group attribute for each of them.
  */
 static void jabber_rename_group(struct gaim_connection *gc,
-				char *old_group,
-				char *new_group,
+				const char *old_group,
+				const char *new_group,
 				GList *members)
 {
 	if(old_group && new_group && strcmp(old_group, new_group))
--- a/src/protocols/oscar/aim.h	Sun Nov 03 07:32:07 2002 +0000
+++ b/src/protocols/oscar/aim.h	Sun Nov 03 07:36:09 2002 +0000
@@ -1092,9 +1092,9 @@
 faim_export int aim_ssi_addmastergroup(aim_session_t *sess, aim_conn_t *conn);
 faim_export int aim_ssi_addgroups(aim_session_t *sess, aim_conn_t *conn, const char **gn, unsigned int num);
 faim_export int aim_ssi_addpord(aim_session_t *sess, aim_conn_t *conn, const char **sn, unsigned int num, fu16_t type);
-faim_export int aim_ssi_movebuddy(aim_session_t *sess, aim_conn_t *conn, char *oldgn, char *newgn, char *sn);
-faim_export int aim_ssi_rename_group(aim_session_t *sess, aim_conn_t *conn, char *oldgn, char *newgn);
-faim_export int aim_ssi_delbuddies(aim_session_t *sess, aim_conn_t *conn, char *gn, char **sn, unsigned int num);
+faim_export int aim_ssi_movebuddy(aim_session_t *sess, aim_conn_t *conn, const char *oldgn, const char *newgn, const char *sn);
+faim_export int aim_ssi_rename_group(aim_session_t *sess, aim_conn_t *conn, const char *oldgn, const char *newgn);
+faim_export int aim_ssi_delbuddies(aim_session_t *sess, aim_conn_t *conn, const char *gn, char **sn, unsigned int num);
 faim_export int aim_ssi_delmastergroup(aim_session_t *sess, aim_conn_t *conn);
 faim_export int aim_ssi_delgroups(aim_session_t *sess, aim_conn_t *conn, char **gn, unsigned int num);
 faim_export int aim_ssi_deletelist(aim_session_t *sess, aim_conn_t *conn);
--- a/src/protocols/oscar/oscar.c	Sun Nov 03 07:32:07 2002 +0000
+++ b/src/protocols/oscar/oscar.c	Sun Nov 03 07:36:09 2002 +0000
@@ -1985,7 +1985,7 @@
 static void gaim_icq_authask(struct gaim_connection *gc, fu32_t uin, char *msg) {
 	struct channel4_data *data = g_new(struct channel4_data, 1);
 	/* The first 6 chars of the message are some type of alien gibberish, so skip them */
-	char *dialog_msg = g_strdup_printf("The user %lu wants to add you to their buddy list for the following reason:", uin, (msg && strlen(msg)>6) ? msg+6 : "No reason given.");
+	char *dialog_msg = g_strdup_printf("The user %lu wants to add you to their buddy list for the following reason: %s", uin, (msg && strlen(msg)>6) ? msg+6 : "No reason given.");
 	debug_printf("Received an authorization request from UIN %lu\n", uin);
 	data->gc = gc;
 	data->uin = g_strdup_printf("%lu", uin);
@@ -3701,7 +3701,7 @@
 	}
 }
 
-static void oscar_move_buddy(struct gaim_connection *g, char *name, char *old_group, char *new_group) {
+static void oscar_move_buddy(struct gaim_connection *g, const char *name, const char *old_group, const char *new_group) {
 	struct oscar_data *odata = (struct oscar_data *)g->proto_data;
 	if (!odata->icq)
 		if (odata->sess->ssi.received_data) {
@@ -3723,7 +3723,7 @@
 	}
 }
 
-static void oscar_remove_buddies(struct gaim_connection *g, GList *buddies, char *group) {
+static void oscar_remove_buddies(struct gaim_connection *g, GList *buddies, const char *group) {
 	struct oscar_data *odata = (struct oscar_data *)g->proto_data;
 	if (odata->icq) {
 		GList *cur;
@@ -3753,7 +3753,7 @@
 	}
 }
 
-static void oscar_rename_group(struct gaim_connection *g, char *old_group, char *new_group, GList *members) {
+static void oscar_rename_group(struct gaim_connection *g, const char *old_group, const char *new_group, GList *members) {
 	struct oscar_data *odata = (struct oscar_data *)g->proto_data;
 	if (!odata->icq)
 		if (odata->sess->ssi.received_data) {
--- a/src/protocols/oscar/ssi.c	Sun Nov 03 07:32:07 2002 +0000
+++ b/src/protocols/oscar/ssi.c	Sun Nov 03 07:36:09 2002 +0000
@@ -690,7 +690,7 @@
  * @param sn The name of the buddy to be moved.
  * @return Return 0 if no errors, otherwise return the error number.
  */
-faim_export int aim_ssi_movebuddy(aim_session_t *sess, aim_conn_t *conn, char *oldgn, char *newgn, char *sn)
+faim_export int aim_ssi_movebuddy(aim_session_t *sess, aim_conn_t *conn, const char *oldgn, const char *newgn, const char *sn)
 {
 	struct aim_ssi_item **groups, *buddy, *cur;
 	fu16_t i;
@@ -766,7 +766,7 @@
  * @param newgn The new group name.
  * @return Return 0 if no errors, otherwise return the error number.
  */
-faim_export int aim_ssi_rename_group(aim_session_t *sess, aim_conn_t *conn, char *oldgn, char *newgn)
+faim_export int aim_ssi_rename_group(aim_session_t *sess, aim_conn_t *conn, const char *oldgn, const char *newgn)
 {
 	struct aim_ssi_item *group;
 
@@ -805,7 +805,7 @@
  * @param num The number of screen names you are deleting (size of the sn array).
  * @return Return 0 if no errors, otherwise return the error number.
  */
-faim_export int aim_ssi_delbuddies(aim_session_t *sess, aim_conn_t *conn, char *gn, char **sn, unsigned int num)
+faim_export int aim_ssi_delbuddies(aim_session_t *sess, aim_conn_t *conn, const char *gn, char **sn, unsigned int num)
 {
 	struct aim_ssi_item *cur, *parentgroup, **delitems;
 	int i;
--- a/src/protocols/toc/toc.c	Sun Nov 03 07:32:07 2002 +0000
+++ b/src/protocols/toc/toc.c	Sun Nov 03 07:36:09 2002 +0000
@@ -1101,7 +1101,7 @@
 	toc_set_config(g);
 }
 
-static void toc_remove_buddies(struct gaim_connection *g, GList *buddies, char *group)
+static void toc_remove_buddies(struct gaim_connection *g, GList *buddies, const char *group)
 {
 	char buf[BUF_LEN * 2];
 	int n;
@@ -1919,6 +1919,17 @@
 	}
 }
 
+static void toc_reject_ft(struct ft_request *ft) {
+	g_free(ft->user);
+	g_free(ft->filename);
+	g_free(ft->ip);
+	g_free(ft->cookie);
+	if (ft->message)
+		g_free(ft->message);
+	g_free(ft);
+}
+
+
 static void toc_accept_ft(struct ft_request *fr) {
 	GtkWidget *window;
 	char buf[BUF_LEN];
@@ -1947,17 +1958,7 @@
 				   GTK_SIGNAL_FUNC(toc_get_file), ft);
 
 	gtk_widget_show(window);
-	toc_reject_ft(ft);
-}
-
-static void toc_reject_ft(struct ft_request *ft) {
-	g_free(ft->user);
-	g_free(ft->filename);
-	g_free(ft->ip);
-	g_free(ft->cookie);
-	if (ft->message)
-		g_free(ft->message);
-	g_free(ft);
+	toc_reject_ft(fr);
 }
 
 static void accept_file_dialog(struct ft_request *ft) {
--- a/src/protocols/zephyr/zephyr.c	Sun Nov 03 07:32:07 2002 +0000
+++ b/src/protocols/zephyr/zephyr.c	Sun Nov 03 07:36:09 2002 +0000
@@ -961,7 +961,7 @@
 
 #ifndef STATIC
 
-void *gaim_prpl_init(struct prpl *prpl)
+G_MODULE_EXPORT void gaim_prpl_init(struct prpl *prpl)
 {
 	zephyr_init(prpl);
 	prpl->plug->desc.api_version = PLUGIN_API_VERSION;
--- a/src/proxy.c	Sun Nov 03 07:32:07 2002 +0000
+++ b/src/proxy.c	Sun Nov 03 07:36:09 2002 +0000
@@ -332,7 +332,6 @@
 {
 	struct sockaddr_in *sin;
 	int fd = -1;
-	u_long imode;
 
 	debug_printf("connecting to %s:%d via %s:%d using HTTP\n", host, port, proxyhost, proxyport);
 
--- a/src/prpl.c	Sun Nov 03 07:32:07 2002 +0000
+++ b/src/prpl.c	Sun Nov 03 07:36:09 2002 +0000
@@ -133,14 +133,6 @@
 	gtk_widget_destroy(b);
 }
 
-static void rem_win(GtkWidget *a, GtkWidget *b)
-{
-	void *d = gtk_object_get_user_data(GTK_OBJECT(a));
-	if (d)
-		gtk_signal_disconnect_by_data(GTK_OBJECT(b), d);
-	gtk_widget_destroy(b);
-}
-
 struct doaskstruct {
 	void (*yesfunc)(gpointer);
 	void (*nofunc)(gpointer);
--- a/src/prpl.h	Sun Nov 03 07:32:07 2002 +0000
+++ b/src/prpl.h	Sun Nov 03 07:36:09 2002 +0000
@@ -149,7 +149,7 @@
 	void (* add_buddy)	(struct gaim_connection *, const char *name);
 	void (* add_buddies)	(struct gaim_connection *, GList *buddies);
 	void (* remove_buddy)	(struct gaim_connection *, char *name, char *group);
-	void (* remove_buddies)	(struct gaim_connection *, GList *buddies, char *group);
+	void (* remove_buddies)	(struct gaim_connection *, GList *buddies, const char *group);
 	void (* add_permit)	(struct gaim_connection *, char *name);
 	void (* add_deny)	(struct gaim_connection *, char *name);
 	void (* rem_permit)	(struct gaim_connection *, char *name);
@@ -174,10 +174,10 @@
 	void (* alias_buddy)	(struct gaim_connection *, char *who);
 
 	/* change a buddy's group on a server list/roster */
-	void (* group_buddy)	(struct gaim_connection *, char *who, char *old_group, char *new_group);
+	void (* group_buddy)	(struct gaim_connection *, const char *who, const char *old_group, const char *new_group);
 
 	/* rename a group on a server list/roster */
-	void (* rename_group)	(struct gaim_connection *, char *old_group, char *new_group, GList *members);
+	void (* rename_group)	(struct gaim_connection *, const char *old_group, const char *new_group, GList *members);
 
 	void (* buddy_free)	(struct buddy *);
 
--- a/src/socket.c	Sun Nov 03 07:32:07 2002 +0000
+++ b/src/socket.c	Sun Nov 03 07:36:09 2002 +0000
@@ -31,6 +31,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <unistd.h>
 #include "gaim.h"
 #include "gaim-socket.h"
 
@@ -102,19 +103,19 @@
 	struct gaim_cui_packet *p = g_new0(struct gaim_cui_packet, 1);
 	char *data = NULL;
 
-	if (!(read(fd, p->type, sizeof(p->type)))) {
+	if (!(read(fd, &p->type, sizeof(p->type)))) {
 		g_free(p);
 		return NULL;
 	}
 	
 	
-	if (!(read(fd, p->subtype, sizeof(p->subtype)))) {
+	if (!(read(fd, &p->subtype, sizeof(p->subtype)))) {
 		g_free(p);
 		return NULL;
 	}
 	
 	
-	if (!(read(fd, p->length, sizeof(p->length)))) {
+	if (!(read(fd, &p->length, sizeof(p->length)))) {
 		g_free(p);
 		return NULL;
 	}
@@ -127,6 +128,7 @@
 		}
 	}
 	p->data = data;
+	return p;
 }
 
 /* copied directly from xmms_connect_to_session */
--- a/src/util.c	Sun Nov 03 07:32:07 2002 +0000
+++ b/src/util.c	Sun Nov 03 07:36:09 2002 +0000
@@ -864,7 +864,7 @@
 	}
 }
 
-gchar *gaim_home_dir()
+const gchar *gaim_home_dir()
 {
 	if(g_get_home_dir())
 		return g_get_home_dir();
@@ -1246,13 +1246,14 @@
 const char *handle_uri(char *uri) {
 	GString *str;
 	GSList *conn = connections;
-	struct gaim_connection *gc;
+	struct gaim_connection *gc = NULL;
 
 	debug_printf("Handling URI: %s\n", uri);
 	
 	/* Well, we'd better check to make sure we have at least one
 	   AIM account connected. */
-	while (gc = conn->data) {
+	while (conn) {
+		gc = conn->data;
 		if (gc->protocol == PROTO_TOC) {
 			break;
 		}
@@ -1297,7 +1298,6 @@
 		set_convo_gc(c, gc);
 		g_free(who);
 		if (what) {
-			int finish;
 			gtk_text_buffer_insert_at_cursor(c->entry_buffer, what, -1);
 			g_free(what);
 		}
@@ -1410,8 +1410,10 @@
 GtkWidget *gaim_new_item_from_stock(GtkWidget *menu, const char *str, const char *icon, GtkSignalFunc sf, gpointer data, guint accel_key, guint accel_mods, char *mod)
 {
 	GtkWidget *menuitem;
+	/*
 	GtkWidget *hbox;
 	GtkWidget *label;
+	*/
 	GtkWidget *image;
 
 	if (icon == NULL)
@@ -1429,12 +1431,13 @@
 		image = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU);
 		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image);
 	}
-
+/* FIXME: this isn't right
 	if (mod) {
 		label = gtk_label_new(mod);
 		gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 2);
 		gtk_widget_show(label);
 	}
+*/
 /*
 	if (accel_key) {
 		gtk_widget_add_accelerator(menuitem, "activate", accel, accel_key,
@@ -1450,8 +1453,10 @@
 GtkWidget *gaim_new_item_from_pixbuf(GtkWidget *menu, const char *str, char *iconname, GtkSignalFunc sf, gpointer data, guint accel_key, guint accel_mods, char *mod)
 {
 	GtkWidget *menuitem;
+	/*
 	GtkWidget *hbox;
 	GtkWidget *label;
+	*/
 	GtkWidget *image;
 
 	if (iconname == NULL)
@@ -1474,12 +1479,13 @@
 		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image);
 		g_free(filename);
 	}
-
+/* FIXME: this isn't right either
 	if (mod) {
 		label = gtk_label_new(mod);
 		gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 2);
 		gtk_widget_show(label);
 	}
+*/
 /*
 	if (accel_key) {
 		gtk_widget_add_accelerator(menuitem, "activate", accel, accel_key,