Remove commented out code.

[geeqie.git] / src / ui_spinner.c

diff --git a/src/ui_spinner.c b/src/ui_spinner.c
index dcf600e..e1d5a54 100644 (file)
--- a/src/ui_spinner.c
+++ b/src/ui_spinner.c
@@ -1,6 +1,7 @@
 /*
  * (SLIK) SimpLIstic sKin functions
  * (C) 2004 John Ellis
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: John Ellis
  *
@@ -20,6 +21,7 @@
 
 #include <gtk/gtk.h>
 
+#include "main.h"
 #include "ui_spinner.h"
 
 #include "ui_icons.h"
@@ -39,11 +41,11 @@ typedef struct _SpinnerData SpinnerData;
 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;
 
@@ -73,10 +75,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)
@@ -115,8 +117,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)
                {
@@ -148,7 +148,7 @@ GtkWidget *spinner_new(const gchar *path, gint interval)
                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++)
@@ -191,14 +191,14 @@ 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)
                {
-               printf("spinner warning: attempt to step with timer set\n");
+               log_printf("spinner warning: attempt to step with timer set\n");
                return;
                }
 
@@ -211,3 +211,4 @@ void spinner_step(GtkWidget *spinner, gint reset)
                spinner_increment_frame(sp);
                }
 }
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */