diff src/dialogs.c @ 4695:4bdd9a5fd026

[gaim-migrate @ 5006] This may very well have issues, but it's a slightly better core/ui split, removing global variables and fixing some GTK+ runtime errors and a couple segfaults. It's some progress. committer: Tailor Script <[e-mail]>

--- a/src/dialogs.c	Mon Mar 10 16:39:46 2003 +0000
+++ b/src/dialogs.c	Mon Mar 10 18:16:29 2003 +0000
@@ -585,10 +585,12 @@
 	GtkWidget *window;
 	GtkWidget *hbox;
 	GtkWidget *label;
-	
+	struct gaim_gtk_buddy_list *gtkblist;
 	char *filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_cool.png", NULL);
 	GtkWidget *img = gtk_image_new_from_file(filename);
-	
+
+	gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
+
 	label = gtk_label_new(NULL);
 	if (ee == 0)
 		gtk_label_set_markup(GTK_LABEL(label), 
@@ -658,11 +660,14 @@
 	GtkWidget *table, *menu, *opt;
 	GSList *g = connections;
 	struct gaim_connection *c;
+	struct gaim_gtk_buddy_list *gtkblist;
 	char buf[256];
 	char *filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_question.png", NULL);
 	GtkWidget *img = gtk_image_new_from_file(filename);
 	struct getuserinfo *info = NULL;
 
+	gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
+
 	g_free(filename);
 
 	if (!imdialog) {
@@ -764,8 +769,11 @@
 	GSList *g = connections;
 	struct gaim_connection *c;
 	struct getuserinfo *info = g_new0(struct getuserinfo, 1);
+	struct gaim_gtk_buddy_list *gtkblist;
 	char buf[256];
 
+	gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
+
 	g_free(filename);
 	info->gc = connections->data;
 
@@ -941,10 +949,13 @@
 
 	GtkWidget *hbox, *vbox;
 	GtkWidget *label;
+	struct gaim_gtk_buddy_list *gtkblist;
 	char *filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_question.png", NULL);
 	GtkWidget *img = gtk_image_new_from_file(filename);
 	struct addbuddy *a = g_new0(struct addbuddy, 1);
 
+	gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
+
 	g_free(filename);
 	a->gc = gc;
 
@@ -1051,13 +1062,14 @@
 	GtkWidget *label;
 	GtkWidget *hbox;
 	GtkWidget *vbox;
-
+	struct gaim_gtk_buddy_list *gtkblist;
 	char *filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_question.png", NULL);
 	GtkWidget *img = gtk_image_new_from_file(filename);
-
 	struct addbuddy *a = g_new0(struct addbuddy, 1);
 	a->gc = gc ? gc : connections->data;
 
+	gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
+
 	g_free(filename);
 
 	GAIM_DIALOG(a->window);
@@ -3911,12 +3923,15 @@
 
 	GtkWidget *hbox, *vbox;
 	GtkWidget *label;
+	struct gaim_gtk_buddy_list *gtkblist;
 	char *filename = g_build_filename(DATADIR, "pixmaps", "gaim", "dialogs", "gaim_question.png", NULL);
 	GtkWidget *img = gtk_image_new_from_file(filename);
 	GtkWidget *name_entry = NULL;
 
 	g_free(filename);
 
+	gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
+
 	if (!rename_dialog) {
 		rename_dialog =  gtk_dialog_new_with_buttons(_("Rename Group"), GTK_WINDOW(gtkblist->window), GTK_DIALOG_MODAL, 
 						 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);