changeset 1157:27c528068f28

[gaim-migrate @ 1167] No more segfault. :) committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Tue, 28 Nov 2000 10:39:35 +0000
parents b6b2d26a4e2f
children cae996433dc5
files src/buddy.c src/dialogs.c
diffstat 2 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/buddy.c	Tue Nov 28 10:34:13 2000 +0000
+++ b/src/buddy.c	Tue Nov 28 10:39:35 2000 +0000
@@ -421,15 +421,14 @@
 		gtk_menu_append(GTK_MENU(menu), button);
 		gtk_widget_show(button);
 
-		/* FIXME: for now, we're not going to do buddy pounces from the menu,
+		/* ddFIXME: for now, we're not going to do buddy pounces from the menu,
 		 * since the person is already online. when we do per-connection pounces,
-		 * then this'll come back
+		 * then this'll come back */
 		button = gtk_menu_item_new_with_label(_("Add Buddy Pounce"));
 		gtk_signal_connect(GTK_OBJECT(button), "activate",
 				   GTK_SIGNAL_FUNC(new_bp_callback), b->name);
 		gtk_menu_append(GTK_MENU(menu), button);
 		gtk_widget_show(button);
-		*/
 
 		if (g_slist_length(cn) > 1) {
 			while (cn) {
--- a/src/dialogs.c	Tue Nov 28 10:34:13 2000 +0000
+++ b/src/dialogs.c	Tue Nov 28 10:39:35 2000 +0000
@@ -1117,6 +1117,12 @@
 
 	menu = gtk_menu_new();
 
+	/* We should go ahead and set this in order to prevent problems */
+	if (u) {
+		a = (struct aim_user *)u->data;
+		b->user = a;
+	}
+
 	while (u) {
 		a = (struct aim_user *)u->data;
 		opt = gtk_menu_item_new_with_label(a->username);