comparison src/ft.c @ 4247:3ea14f99c35c

[gaim-migrate @ 4497] Fixed the "Clicking the close button on a file transfer send crashes gaim" bug. It turns out everything was mapped to ft_cancel(), which accepted a struct file_transfer *, but all those signal handlers had different params, so all kinds of bad, evil things happened. Tsk tsk. And now, back to work on my Instant Massage prpl. committer: Tailor Script <[e-mail]>

4246:2a2d6d21f1d7

static void ft_delete(struct file_transfer *xfer);
static void ft_callback(gpointer data, gint source, GaimInputCondition condition);
static void ft_nextfile(struct file_transfer *xfer);
static int ft_mkdir(const char *name);
static int ft_mkdir_help(char *dir);

static struct file_transfer *ft_new(int type, struct gaim_connection *gc,
		const char *who)
{
	struct file_transfer *xfer = g_new0(struct file_transfer, 1);
	xfer->type = type;
	xfer->state = FILE_TRANSFER_STATE_ASK;
	xfer->gc = gc;
	xfer->who = g_strdup(who);
	xfer->filesdone = 0;

	return xfer;
}

struct file_transfer *transfer_in_add(struct gaim_connection *gc,

/* We canceled the transfer, either by declining the initial
 * confirmation dialog or canceling the file dialog.
 */
static void ft_cancel(struct file_transfer *xfer)
{
	/* Make sure we weren't aborted while waiting for
	 * confirmation from the user.
	 */
	if (xfer->state == FILE_TRANSFER_STATE_INTERRUPTED) {
		xfer->state = FILE_TRANSFER_STATE_CLEANUP;

	else if (xfer->state == FILE_TRANSFER_STATE_CHOOSEFILE) {
		/* It's safe to clean up now.  Just make sure we
		 * destroy the dialog window first.
		 */
		if (xfer->w) {
			gtk_signal_disconnect_by_func(GTK_OBJECT(xfer->w),
					G_CALLBACK(ft_cancel), xfer);
			gtk_widget_destroy(xfer->w);
			xfer->w = NULL;
		}
	}

	*size = xfer->sizes[xfer->filesdone];
	*name = xfer->names[xfer->filesdone];
	return 0;
}

static int ft_choose_file(struct file_transfer *xfer)
{
	char *curdir = g_get_current_dir(); /* should be freed */
	char *initstr;

	gtk_file_selection_set_filename(GTK_FILE_SELECTION(xfer->w),
			initstr);
	g_free(initstr);

	g_signal_connect(GTK_OBJECT(xfer->w), "delete_event",
			G_CALLBACK(ft_cancel), xfer);
        g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(xfer->w)->cancel_button),
			"clicked", G_CALLBACK(ft_cancel), xfer);
	g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(xfer->w)->ok_button),
			"clicked", G_CALLBACK(ft_choose_ok), xfer);
	gtk_widget_show(xfer->w);

	return 0;
}

4247:3ea14f99c35c

static void ft_delete(struct file_transfer *xfer);
static void ft_callback(gpointer data, gint source, GaimInputCondition condition);
static void ft_nextfile(struct file_transfer *xfer);
static int ft_mkdir(const char *name);
static int ft_mkdir_help(char *dir);
static gboolean ft_choose_file_close(GtkWidget *widget, GdkEvent *event,
									 gpointer user_data);

static struct file_transfer *ft_new(int type, struct gaim_connection *gc,
		const char *who)
{
	struct file_transfer *xfer = g_new0(struct file_transfer, 1);
	xfer->type = type;
	xfer->state = FILE_TRANSFER_STATE_ASK;
	xfer->gc = gc;
	xfer->who = g_strdup(who);
	xfer->filesdone = 0;
	xfer->w = NULL;

	return xfer;
}

struct file_transfer *transfer_in_add(struct gaim_connection *gc,

/* We canceled the transfer, either by declining the initial
 * confirmation dialog or canceling the file dialog.
 */
static void ft_cancel(struct file_transfer *xfer)
{
	debug_printf("** ft_cancel\n");

	/* Make sure we weren't aborted while waiting for
	 * confirmation from the user.
	 */
	if (xfer->state == FILE_TRANSFER_STATE_INTERRUPTED) {
		xfer->state = FILE_TRANSFER_STATE_CLEANUP;

	else if (xfer->state == FILE_TRANSFER_STATE_CHOOSEFILE) {
		/* It's safe to clean up now.  Just make sure we
		 * destroy the dialog window first.
		 */
		if (xfer->w) {
			g_signal_handlers_disconnect_by_func(G_OBJECT(xfer->w),
					G_CALLBACK(ft_choose_file_close), xfer);
			gtk_widget_destroy(xfer->w);
			xfer->w = NULL;
		}
	}

	*size = xfer->sizes[xfer->filesdone];
	*name = xfer->names[xfer->filesdone];
	return 0;
}

static gboolean
ft_choose_file_close(GtkWidget *widget, GdkEvent *event, gpointer user_data)
{
	ft_cancel((struct file_transfer *)user_data);

	return FALSE;
}

static void
ft_cancel_button_cb(GtkButton *button, gpointer user_data)
{
	ft_cancel((struct file_transfer *)user_data);
}

static int ft_choose_file(struct file_transfer *xfer)
{
	char *curdir = g_get_current_dir(); /* should be freed */
	char *initstr;

	gtk_file_selection_set_filename(GTK_FILE_SELECTION(xfer->w),
			initstr);
	g_free(initstr);

	g_signal_connect(G_OBJECT(xfer->w), "delete_event",
					 G_CALLBACK(ft_choose_file_close), xfer);
	g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(xfer->w)->cancel_button), "clicked",
					 G_CALLBACK(ft_cancel_button_cb), xfer);
	g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(xfer->w)->ok_button), "clicked",
					 G_CALLBACK(ft_choose_ok), xfer);

	gtk_widget_show(xfer->w);

	return 0;
}