--- aircraft-manager-12.1miura1.orig/aircraft-manager.in
+++ aircraft-manager-12.1miura1/aircraft-manager.in
@@ -75,6 +75,10 @@
         # when user changes to new state or reverts to initial
         self.gconf_key_wifi__in_am_init_state = self.gconf_client.get_bool(self.gconf_key_wifi_am_state)
 
+        self.cb_charge_airplane = self.wTree.get_widget("checkbutton_charge_airplane")
+        if (self.cb_charge_airplane):
+            self.cb_charge_airplane.connect("clicked", self.cb_charge_airplane_clicked)
+
         #set check boxes to actual radio power state, before signals are connected
         self.cbBT.set_active(self.getBtState())
         self.cbWIFI.set_active(self.getWifiState())
@@ -129,6 +133,13 @@
                 self.but_cancel.set_sensitive(False)
         return None
 
+    def cb_charge_airplane_clicked(self, widget):
+        if not self.aircraftMode or self.initializing:
+            return None
+        self.but_OK.set_sensitive(True)
+        self.but_cancel.set_sensitive(True)
+        return None
+
     def buttonEnterAM_clicked(self, widget):
         self.nextAMstate = True
         self.but_OK_was_clicked = False
@@ -174,7 +185,8 @@
             os.system(cmd)
 
             #turn off AC charging
-            self.ac_charging_off()
+            if  self.cb_charge_airplane.get_active(): 
+                 self.ac_charging_off()
 
             #shut off radios that are on
 
--- aircraft-manager-12.1miura1.orig/ui/aircraft-manager.glade
+++ aircraft-manager-12.1miura1/ui/aircraft-manager.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Tue Jul 22 13:03:47 2008 -->
+<!--Generated with glade3 3.4.5 on Sat Aug 22 11:14:42 2009 -->
 <glade-interface>
   <widget class="GtkDialog" id="dialog1">
     <property name="visible">True</property>
@@ -11,7 +11,6 @@
     <property name="window_position">GTK_WIN_POS_CENTER</property>
     <property name="icon_name">gnome-control-center</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="transient_for">window1</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox2">
@@ -135,10 +134,25 @@
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="padding">20</property>
+                    <property name="padding">18</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
+                <child>
+                  <widget class="GtkCheckButton" id="checkbutton_charge_airplane">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="tooltip" translatable="yes">Stop charging battery to reduce power consumption due to external power limitations</property>
+                    <property name="label" translatable="yes">Disable charging battery  in Airplane Mode</property>
+                    <property name="response_id">0</property>
+                    <property name="draw_indicator">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
               </widget>
               <packing>
                 <property name="position">1</property>
--- aircraft-manager-12.1miura1.orig/debian/changelog
+++ aircraft-manager-12.1miura1/debian/changelog
@@ -1,3 +1,9 @@
+aircraft-manager (12.1miura1) hardy; urgency=low
+
+  * Add checkbox for disabling/enabling battery charge in Airplane mode 
+
+ -- Hiroshi Miura <miurahr@miurahr>  Sat, 22 Aug 2009 12:05:07 +0900
+
 aircraft-manager (12.1) jaunty; urgency=low
 
   * Update method for enabling/disabling wifi via dbus