[gevice] Fixed bug #656157

[Alejandro Valdes Jimenez <avaldes src gnome org>]

commit 8dd735ef5ca05d3d4d28f87945fb0f27fd05ed3e
Author: Alejandro Valdes Jimenez <avaldes gnome org>
Date:   Mon Aug 8 09:54:47 2011 -0400

    Fixed bug #656157

 ChangeLog             |    6 ++++++
 data/ui/main.xml      |    3 +--
 data/ui/menu.xml      |    2 ++
 src/gevicedatabase.py |   10 ++++++----
 4 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 30f117c..2cc5f6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-08  Alejandro Valdes Jimenez  <avaldes gnome org>
+	* data/ui/main.xml: change default width/high.
+	* data/ui/menu.xml: add item Quit in memnubar.
+	* src/gevicedatabase.py:
+	* Fixed bug #656157
+
 2011-07-26  Alejandro Valdes Jimenez  <avaldes gnome org>
 	* src/gevice.py: not show the local terminal. Fixed.
 
diff --git a/data/ui/main.xml b/data/ui/main.xml
index 8e345ff..c867f16 100644
--- a/data/ui/main.xml
+++ b/data/ui/main.xml
@@ -3,7 +3,7 @@
   <!-- interface-requires gtk+ 2.6 -->
   <object class="GtkWindow" id="window_main">
     <property name="width_request">800</property>
-    <property name="height_request">400</property>
+    <property name="height_request">600</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Gevice</property>
     <property name="window_position">center</property>
@@ -19,7 +19,6 @@
           <object class="GtkStatusbar" id="statusbar">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
             <property name="spacing">2</property>
           </object>
           <packing>
diff --git a/data/ui/menu.xml b/data/ui/menu.xml
index 780b37f..9565ecd 100644
--- a/data/ui/menu.xml
+++ b/data/ui/menu.xml
@@ -60,6 +60,8 @@
       <toolitem action="Connect" />
       <separator/>
       <toolitem action="Dual" />
+      <separator/>
+      <toolitem action="Quit" />      
     </placeholder>
   </toolbar>
 </ui>
diff --git a/src/gevicedatabase.py b/src/gevicedatabase.py
index c81f9a9..53cfb92 100644
--- a/src/gevicedatabase.py
+++ b/src/gevicedatabase.py
@@ -78,15 +78,17 @@ class GeviceDatabase:
 	self.label_user_dbase = builder.get_object ("label_user_dbase")
 	self.entry_passwd_dbase = builder.get_object ("entry_passwd_dbase")
 	
+	self.button_connect_cancel.connect ("clicked",self.on_button_connect_cancel_clicked)
+	
 	if action=="save":
 	  self.button_connect_dbase.connect ("clicked",self.on_button_connect_dbase_clicked_save,gevice)
+	  self.entry_passwd_dbase.connect ("key-press-event", self.on_entry_passwd_dbase_key_press_save,gevice)	  
 	  self.window_database.set_title (_("Save database"))
 	  self.button_connect_dbase.set_label (_("Save"))
 	else:
-	  self.button_connect_dbase.connect ("clicked",self.on_button_connect_dbase_clicked,gevice)	  
-	  
-	self.entry_passwd_dbase.connect ("key-press-event", self.on_entry_passwd_dbase_key_press,gevice)		
-	self.button_connect_cancel.connect ("clicked",self.on_button_connect_cancel_clicked)
+	  self.button_connect_dbase.connect ("clicked",self.on_button_connect_dbase_clicked,gevice)
+	  self.entry_passwd_dbase.connect ("key-press-event", self.on_entry_passwd_dbase_key_press,gevice)
+
 
     def close_window (self,window):
 	    window.destroy()