Description: Give the devices list a less common variable name
Author: Neil Williams <codehelp@debian.org>
Bug-Debian: http://bugs.debian.org/713607

--- gpe-bluetooth-0.56.orig/main.c
+++ gpe-bluetooth-0.56/main.c
@@ -86,7 +86,7 @@ static GtkWidget *devices_window;
 static GtkWidget *iconlist;
 static GtkWidget *radio_on_progress;
 
-GSList *devices;
+GSList *gb_devices;
 
 gboolean radio_is_on;
 GdkWindow *dock_window;
@@ -464,7 +464,7 @@ run_scan (gpointer data)
 
       baswap (&bdaddr, &(info+i)->bdaddr);
 
-      for (iter = devices; iter; iter = iter->next)
+      for (iter = gb_devices; iter; iter = iter->next)
 	{
 	  struct bt_device *d = (struct bt_device *)iter->data;
 	  if (memcmp (&d->bdaddr, &bdaddr, sizeof (bdaddr)) == 0)
@@ -491,7 +491,7 @@ run_scan (gpointer data)
 
       gdk_pixbuf_ref (bd->pixbuf);
 
-      devices = g_slist_append (devices, bd);
+      gb_devices = g_slist_append (gb_devices, bd);
     }
   
   close (dd);
@@ -504,7 +504,7 @@ run_scan (gpointer data)
   bt_progress_dialog_update (w, _("Retrieving service information"));
   gdk_flush ();
 
-  for (iter = devices; iter; iter = iter->next)
+  for (iter = gb_devices; iter; iter = iter->next)
     {
       struct bt_device *bd = iter->data;
       GObject *item;
--- gpe-bluetooth-0.56.orig/pin-dbus.c
+++ gpe-bluetooth-0.56/pin-dbus.c
@@ -33,7 +33,7 @@
 
 #define _(x) gettext (x)
 
-extern GSList *devices;
+extern GSList *gb_devices;
 
 
 struct pin_request_context
@@ -84,7 +84,7 @@ get_name (bdaddr_t addr)
   GSList *iter;
   gboolean found = FALSE;
 
-  for (iter = devices; iter; iter = iter->next)
+  for (iter = gb_devices; iter; iter = iter->next)
     {
       struct bt_device *d = (struct bt_device *)iter->data;
       if (memcmp (&d->bdaddr, &addr, sizeof (addr)) == 0)
