comparison src/ui_spinner.c @ 1523:24a12aa0cb54

Fix up event source ids type: gint -> guint. Functions like g_timeout_add() or g_idle_add() return a guint greater than 0, but in most places it was wrongly stored as int and initialized to -1. This broke assertions matching in g_source_remove() for example since id was always greater than 0 even when timer was not set (-1 was casted to the biggest guint).

1522:d7206703d90f

typedef struct _SpinnerData SpinnerData;
struct _SpinnerData {
	GtkWidget *image;
	GList *list;		/* list of pixbufs */
	guint frame;
	gint timer_id;
};

static void spinner_set_frame(SpinnerData *sp, guint frame)
{
	GdkPixbuf *pb;

static void spinner_set_timeout(SpinnerData *sp, gint interval)
{
	if (!sp) return;

	if (sp->timer_id != -1)
		{
		g_source_remove(sp->timer_id);
		sp->timer_id = -1;
		}

	if (interval > 0)
		{
		sp->timer_id = g_timeout_add(interval, spinner_loop_cb, sp);

GtkWidget *spinner_new(const gchar *path, gint interval)
{
	SpinnerData *sp;

	sp = g_new0(SpinnerData, 1);
	sp->list = NULL;
	sp->timer_id = -1;

	if (path)
		{
		gchar *pathl;
		GdkPixbuf *pb;

void spinner_step(GtkWidget *spinner, gboolean reset)
{
	SpinnerData *sp;

	sp = g_object_get_data(G_OBJECT(spinner), "spinner");
	if (sp->timer_id != -1)
		{
		log_printf("spinner warning: attempt to step with timer set\n");
		return;
		}

1523:24a12aa0cb54

typedef struct _SpinnerData SpinnerData;
struct _SpinnerData {
	GtkWidget *image;
	GList *list;		/* list of pixbufs */
	guint frame;
	guint timer_id; /* event source id */
};

static void spinner_set_frame(SpinnerData *sp, guint frame)
{
	GdkPixbuf *pb;

static void spinner_set_timeout(SpinnerData *sp, gint interval)
{
	if (!sp) return;

	if (sp->timer_id)
		{
		g_source_remove(sp->timer_id);
		sp->timer_id = 0;
		}

	if (interval > 0)
		{
		sp->timer_id = g_timeout_add(interval, spinner_loop_cb, sp);

GtkWidget *spinner_new(const gchar *path, gint interval)
{
	SpinnerData *sp;

	sp = g_new0(SpinnerData, 1);

	if (path)
		{
		gchar *pathl;
		GdkPixbuf *pb;

void spinner_step(GtkWidget *spinner, gboolean reset)
{
	SpinnerData *sp;

	sp = g_object_get_data(G_OBJECT(spinner), "spinner");
	if (sp->timer_id)
		{
		log_printf("spinner warning: attempt to step with timer set\n");
		return;
		}