/*
- * (SLIK) SimpLIstic sKin functions
- * (C) 2004 John Ellis
+ * Copyright (C) 2004 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
*
* Author: John Ellis
*
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
#include <gtk/gtk.h>
+#include "main.h"
#include "ui_spinner.h"
#include "ui_icons.h"
struct _SpinnerData {
GtkWidget *image;
GList *list; /* list of pixbufs */
- gint frame;
- gint timer_id;
+ guint frame;
+ guint timer_id; /* event source id */
};
-static void spinner_set_frame(SpinnerData *sp, gint frame)
+static void spinner_set_frame(SpinnerData *sp, guint frame)
{
GdkPixbuf *pb;
{
if (!sp) return;
- if (sp->timer_id != -1)
+ if (sp->timer_id)
{
g_source_remove(sp->timer_id);
- sp->timer_id = -1;
+ sp->timer_id = 0;
}
if (interval > 0)
SpinnerData *sp;
sp = g_new0(SpinnerData, 1);
- sp->list = NULL;
- sp->timer_id = -1;
if (path)
{
gint n;
gint w, h;
- pb = gdk_pixbuf_new_from_inline (-1, icon_spinner, FALSE, NULL);
+ pb = gdk_pixbuf_new_from_inline(-1, icon_spinner, FALSE, NULL);
w = gdk_pixbuf_get_width(pb);
h = gdk_pixbuf_get_height(pb) / SPINNER_FRAMES;
for (n = 0; n < SPINNER_FRAMES; n++)
spinner_set_timeout(sp, interval);
}
-void spinner_step(GtkWidget *spinner, gint reset)
+void spinner_step(GtkWidget *spinner, gboolean reset)
{
SpinnerData *sp;
sp = g_object_get_data(G_OBJECT(spinner), "spinner");
- if (sp->timer_id != -1)
+ if (sp->timer_id)
{
- printf("spinner warning: attempt to step with timer set\n");
+ log_printf("spinner warning: attempt to step with timer set\n");
return;
}
spinner_increment_frame(sp);
}
}
-
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */