Pull the search UI construction code out into a distinct function.

[geeqie.git] / src / ui_spinner.c

diff --git a/src/ui_spinner.c b/src/ui_spinner.c
index c047c10..372c8c6 100644 (file)
--- a/src/ui_spinner.c
+++ b/src/ui_spinner.c
@@ -1,13 +1,22 @@
 /*
- * (SLIK) SimpLIstic sKin functions
- * (C) 2004 John Ellis
- * Copyright (C) 2008 The Geeqie Team
+ * 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
@@ -42,7 +51,7 @@ struct _SpinnerData {
        GtkWidget *image;
        GList *list;            /* list of pixbufs */
        guint frame;
-       gint timer_id;
+       guint timer_id; /* event source id */
 };
 
 static void spinner_set_frame(SpinnerData *sp, guint frame)
@@ -75,10 +84,10 @@ static void spinner_set_timeout(SpinnerData *sp, gint interval)
 {
        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)
@@ -117,8 +126,6 @@ GtkWidget *spinner_new(const gchar *path, gint interval)
        SpinnerData *sp;
 
        sp = g_new0(SpinnerData, 1);
-       sp->list = NULL;
-       sp->timer_id = -1;
 
        if (path)
                {
@@ -193,12 +200,12 @@ void spinner_set_interval(GtkWidget *spinner, gint interval)
        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)
                {
                log_printf("spinner warning: attempt to step with timer set\n");
                return;