added a simple test for the spinner widget

2005-06-11  Bastien Nocera  <hadess@hadess.net>

	* src/Makefile.am:
	* src/gnomebt-controller-test.c: (main):
	* src/spinner-test.c: (spin_me), (on_start_clicked),
	(on_stop_clicked), (main): added a simple test for the spinner widget

2005-06-11  Bastien Nocera  <hadess@hadess.net>

	* Makefile.in.in: removed, shouldn't be in CVS

6 files changed, 78 insertions, 293 deletions

diff --git a/ChangeLog b/ChangeLog
index 22b98012..c34820be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-06-11  Bastien Nocera  <hadess@hadess.net>
 
+	* src/Makefile.am:
+	* src/gnomebt-controller-test.c: (main):
+	* src/spinner-test.c: (spin_me), (on_start_clicked),
+	(on_stop_clicked), (main): added a simple test for the spinner widget
+
+2005-06-11  Bastien Nocera  <hadess@hadess.net>
+
 	* src/controller.gob: patch from Marc O'Morain <marc.omorain@gmail.com>
 	to add some assertions
 
diff --git a/po/ChangeLog b/po/ChangeLog
index 7866e2bc..c157777f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-11  Bastien Nocera  <hadess@hadess.net>
+
+	* Makefile.in.in: removed, shouldn't be in CVS
+
 2005-06-06  Ignacio Casal Quinteiro  <nacho.resa@gmail.com>
 
 	* gl.po: Updated Galician translation.
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
deleted file mode 100644
index b79b407a..00000000
--- a/po/Makefile.in.in
+++ /dev/null
@@ -1,256 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-#
-# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-#
-# - Modified by jacob berkman <jacob@ximian.com> to install
-#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = @datadir@
-libdir = @libdir@
-localedir = $(libdir)/locale
-gnulocaledir = $(datadir)/locale
-gettextsrcdir = $(datadir)/glib-2.0/gettext/po
-subdir = po
-install_sh = @install_sh@
-mkdir_p = @mkdir_p@
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-CC = @CC@
-GENCAT = @GENCAT@
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-
-INCLUDES = -I.. -I$(top_srcdir)/intl
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-SOURCES = 
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \
-$(POFILES) $(GMOFILES) $(SOURCES)
-
-POTFILES = \
-
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
-
-.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
-
-.c.o:
-	$(COMPILE) $<
-
-.po.pox:
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*pox
-
-.po.mo:
-	$(MSGFMT) -o $@ $<
-
-.po.gmo:
-	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && $(GENCAT) $@ $*.msg
-
-
-all: all-@USE_NLS@
-
-all-yes: $(CATALOGS)
-all-no:
-
-$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
-	$(GENPOT)
-
-install: install-exec install-data
-install-exec:
-install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
-	if test -n "$(MKINSTALLDIRS)"; then \
-	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
-	else \
-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
-	fi
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  case "$$cat" in \
-	    *.gmo) destdir=$(gnulocaledir);; \
-	    *)     destdir=$(localedir);; \
-	  esac; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
-	  if test -n "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $$dir; \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
-	  fi; \
-	  if test -r $$cat; then \
-	    $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
-	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $(srcdir)/$$cat as" \
-		 "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
-	  fi; \
-	  if test -r $$cat.m; then \
-	    $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	    echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
-	  else \
-	    if test -r $(srcdir)/$$cat.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
-		$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	      echo "installing $(srcdir)/$$cat as" \
-		   "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
-	    else \
-	      true; \
-	    fi; \
-	  fi; \
-	done
-	if test "$(PACKAGE)" = "glib"; then \
-	  if test -n "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
-	  fi; \
-	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-	else \
-	  : ; \
-	fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
-	done
-	if test "$(PACKAGE)" = "glib"; then \
-	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-	fi
-
-check: all
-
-dvi info tags TAGS ID:
-
-mostlyclean:
-	rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp
-	rm -fr *.o
-	rm -f .intltool-merge-cache
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f $(GMOFILES)
-
-distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: update-po $(DISTFILES)
-	dists="$(DISTFILES)"; \
-	for file in $$dists; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir); \
-	done
-
-update-po: Makefile
-	$(MAKE) $(GETTEXT_PACKAGE).pot
-	tmpdir=`pwd`; \
-	cd $(srcdir); \
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  echo "$$lang:"; \
-	  if $$tmpdir/$(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -o $$tmpdir/$$lang.new.po $$lang; then \
-	    if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	      rm -f $$tmpdir/$$lang.new.po; \
-            else \
-	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	        :; \
-	      else \
-	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	        rm -f $$tmpdir/$$lang.new.po; \
-	        exit 1; \
-	      fi; \
-	    fi; \
-	  else \
-	    echo "msgmerge for $$cat failed!"; \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  fi; \
-	done
-
-# POTFILES is created from POTFILES.in by stripping comments, empty lines
-# and Intltool tags (enclosed in square brackets), and appending a full
-# relative path to them
-POTFILES: POTFILES.in
-	( if test 'x$(srcdir)' != 'x.'; then \
-	    posrcprefix='$(top_srcdir)/'; \
-	  else \
-	    posrcprefix="../"; \
-	  fi; \
-	  rm -f $@-t $@ \
-	    && (sed -e '/^#/d' 						\
-		    -e "s/^\[.*\] +//" 					\
-		    -e '/^[ 	]*$$/d' 				\
-		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in	\
-		| sed -e '$$s/\\$$//') > $@-t \
-	    && chmod a-w $@-t \
-	    && mv $@-t $@ )
-
-Makefile: Makefile.in.in ../config.status POTFILES
-	cd .. \
-	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-	       $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/src/Makefile.am b/src/Makefile.am
index 44088c1d..e9ecdcb0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
 
 noinst_PROGRAMS=gconftest gnomebt-controller-test \
 	gnomebt-chooser-test gnomebt-permissiondialog-test \
-	gnomebt-fileactiondialog-test
+	gnomebt-fileactiondialog-test spinner-test
 
 lib_LTLIBRARIES = libgnomebt.la
 py_LTLIBRARIES = controller.la chooser.la
@@ -58,6 +58,12 @@ gnomebt_permissiondialog_test_SOURCES = \
 gnomebt_permissiondialog_test_LDADD = \
 	$(GNOME_BLUETOOTH_LIBS) libgnomebt.la
 
+spinner_test_SOURCES = \
+	spinner-test.c
+
+spinner_test_LDADD = \
+	$(GNOME_BLUETOOTH_LIBS) libgnomebt.la
+
 gconftest_SOURCES = \
 	gconftest.c
 
diff --git a/src/gnomebt-controller-test.c b/src/gnomebt-controller-test.c
index 1b3086fb..fbbf9017 100644
--- a/src/gnomebt-controller-test.c
+++ b/src/gnomebt-controller-test.c
@@ -13,25 +13,6 @@
 
 #define TBDADDR "00:80:37:2A:B6:BC"
 
-static void status_callback(GnomebtController *bc,
-        gint    field,
-        gpointer data) {
-
-    printf("got status %d\n", field);
-    if (field == BTCTL_STATUS_COMPLETE || 
-            field == BTCTL_STATUS_ERROR) {
-        int *complete = (int*)data;
-        *complete = 1;
-    }
-}
-
-static void add_device_callback(GnomebtController *bc,
-        gchar*    name,
-        gpointer data) {
-
-    printf("got device %s\n", name);
-}
-
 static void device_name_callback(GnomebtController *bc,
         gchar*   device,
         gchar*   name,
@@ -40,16 +21,6 @@ static void device_name_callback(GnomebtController *bc,
     printf("device %s is called %s\n", device, name);
 }
 
-static void add_device_service_callback(GnomebtController *bc,
-                            gchar *addr, gchar *name, 
-                            guint clsid, guint channel,
-										gpointer data)
-{
-    printf("device %s (%s) has service %d channel %d\n",
-                addr, name, clsid, channel);
-}
-
-
 int main(int argc, char **argv)
 {
     GnomebtController *bc;
@@ -68,15 +39,8 @@ int main(int argc, char **argv)
      * which update the gconf registry with cached information
      */
     
-    g_signal_connect (G_OBJECT(bc), "status_change",
-                G_CALLBACK(status_callback), &complete);
-    g_signal_connect (G_OBJECT(bc), "add_device",
-                G_CALLBACK(add_device_callback), NULL);
     g_signal_connect (G_OBJECT(bc), "device_name",
                 G_CALLBACK(device_name_callback), NULL);
-    g_signal_connect (G_OBJECT(bc), "add_device_service",
-                G_CALLBACK(add_device_service_callback),
-                NULL);
 
     printf("Removing entry 00:40:8C:5E:5D:A4\n");
 
diff --git a/src/spinner-test.c b/src/spinner-test.c
new file mode 100644
index 00000000..f069464b
--- /dev/null
+++ b/src/spinner-test.c
@@ -0,0 +1,60 @@
+
+#include <gtk/gtk.h>
+#include "gnomebt-spinner.h"
+
+guint id = -1;
+
+static gboolean spin_me (GnomebtSpinner *spinner)
+{
+	gnomebt_spinner_spin (spinner);
+}
+
+static void
+on_start_clicked (GtkButton *button, GnomebtSpinner *spinner)
+{
+	g_message ("starting spinner");
+	if (id != -1)
+		return;
+
+	id = g_timeout_add (500, spin_me, spinner);
+}
+
+static void
+on_stop_clicked (GtkButton *button, GnomebtSpinner *spinner)
+{
+	g_message ("stopping spinner");
+	if (id != -1) {
+		g_source_remove (id);
+		gnomebt_spinner_reset (spinner);
+	}
+	id = -1;
+}
+
+int main (int argc, char **argv)
+{
+	GtkWidget *window, *box, *start, *stop, *spinner;
+	gtk_init (&argc, &argv);
+
+	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+	start = gtk_button_new_with_label ("Start");
+	stop = gtk_button_new_with_label ("Stop");
+	box = gtk_vbox_new (FALSE, 8);
+	spinner = gnomebt_spinner_new ();
+
+	gtk_container_add (GTK_CONTAINER (window), box);
+	gtk_box_pack_end (GTK_BOX (box), start,
+			FALSE, FALSE, 4);
+	gtk_box_pack_end (GTK_BOX (box), stop,
+			FALSE, FALSE, 4);
+	gtk_box_pack_end (GTK_BOX (box), spinner,
+			FALSE, FALSE, 4);
+
+	g_signal_connect (G_OBJECT (start), "clicked",
+			on_start_clicked, spinner);
+	g_signal_connect (G_OBJECT (stop), "clicked",
+			on_stop_clicked, spinner);
+
+	gtk_widget_show_all (window);
+	gtk_main ();
+}
+