Another shadowed variable fix
Another shadowed variable fix

See bug 616154.

cosimoc/glib,iConsole/Console-OS_external_bluetooth_glib,01org/android-bluez-glib,endlessm/glib,darren-clark/android_platform_external_bluetooth_glib,pstglia/external-bluetooth-glib,djdeath/glib,Distrotech/glib,mzabaluev/glib,tchakabam/glib,justinkb/aosp-bluez.glib,ahmedammar/platform_external_gst_glib,gale320/glib,01org/android-bluez-glib,cosimoc/glib,ahmedammar/platform_external_gst_glib,pstglia/platform-external-bluetooth-glib,01org/android-bluez-glib,Distrotech/glib,gale320/glib,cention-sany/glib,pstglia/platform-external-bluetooth-glib,zsx/glib,tamaskenez/glib,MathieuDuponchelle/glib,krichter722/glib,pstglia/external-bluetooth-glib,tamaskenez/glib,gale320/glib,johne53/MB3Glib,ieei/glib,pstglia/platform-external-bluetooth-glib,tamaskenez/glib,dicer/android_external_glib,ieei/glib,zsx/glib,iConsole/Console-OS_external_bluetooth_glib,MathieuDuponchelle/glib,lukasz-skalski/glib,pstglia/platform-external-bluetooth-glib,johne53/MB3Glib,cosimoc/glib,dicer/android_external_glib,pstglia/external-bluetooth-glib,zsx/glib,endlessm/glib,Distrotech/glib,iConsole/Console-OS_external_bluetooth_glib,antono/glib,lukasz-skalski/glib,ieei/glib,MathieuDuponchelle/glib,cention-sany/glib,endlessm/glib,antono/glib,tchakabam/glib,dicer/android_external_glib,mzabaluev/glib,cention-sany/glib,Distrotech/glib,mzabaluev/glib,iConsole/Console-OS_external_bluetooth_glib,krichter722/glib,ieei/glib,gale320/glib,antono/glib,johne53/MB3Glib,pstglia/platform-external-bluetooth-glib,bluez-android/glib,ahmedammar/platform_external_gst_glib,krichter722/glib,mzabaluev/glib,tchakabam/glib,johne53/MB3Glib,darren-clark/android_platform_external_bluetooth_glib,dicer/android_external_glib,lukasz-skalski/glib,johne53/MB3Glib,MathieuDuponchelle/glib,pstglia/external-bluetooth-glib,darren-clark/android_platform_external_bluetooth_glib,justinkb/aosp-bluez.glib,justinkb/aosp-bluez.glib,tamaskenez/glib,lukasz-skalski/glib,cention-sany/glib,endlessm/glib,ieei/glib-old-android,djdeath/glib,zsx/glib,ahmedammar/platform_external_gst_glib,djdeath/glib,bratsche/glib,bratsche/glib,bratsche/glib,Distrotech/glib,01org/android-bluez-glib,cention-sany/glib,djdeath/glib,bluez-android/glib,johne53/MB3Glib,djdeath/glib,ieei/glib-old-android,krichter722/glib,darren-clark/android_platform_external_bluetooth_glib,antono/glib,tchakabam/glib,bratsche/glib,gale320/glib,darren-clark/android_platform_external_bluetooth_glib,krichter722/glib,endlessm/glib,bluez-android/glib,lukasz-skalski/glib,bluez-android/glib,ieei/glib-old-android,MathieuDuponchelle/glib,cosimoc/glib,pstglia/external-bluetooth-glib,mzabaluev/glib,iConsole/Console-OS_external_bluetooth_glib,justinkb/aosp-bluez.glib,cosimoc/glib,bluez-android/glib,01org/android-bluez-glib,ieei/glib,ieei/glib-old-android,dicer/android_external_glib,tamaskenez/glib,justinkb/aosp-bluez.glib,tchakabam/glib