[gevice] Fixed bug #623562

[Alejandro Valdes Jimenez <avaldes src gnome org>]

commit fd155796aa61d7f14cdf050162c3ea81df49586a
Author: Alejandro Valdes Jimenez <avaldes gnome org>
Date:   Tue Jul 27 15:37:18 2010 -0400

    Fixed bug #623562

 ChangeLog            |    3 +++
 src/gevice.py        |   12 +++++++++---
 src/gevicediagram.py |    6 ++++--
 3 files changed, 16 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b940277..22107d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-07-27  Alejandro Valdes Jimenez  <avaldes gnome org>
+	Fixed bug #623562
+
 2010-07-08  Alejandro Valdes Jimenez  <avaldes gnome org>
 
 	* data/glade/gevice.glade: add new window mantainer edifices
diff --git a/src/gevice.py b/src/gevice.py
index 331bb2c..9bf5ae8 100755
--- a/src/gevice.py
+++ b/src/gevice.py
@@ -562,9 +562,15 @@ class Gevice:
         gevice.gevicefind.show_interface()
 
     def on_action_diagram (gevice,action):
-        gevice.gdiagram = gevicediagram.GeviceDiagram ()
-        gevice.gdiagram.load_interface (gevice)
-        gevice.gdiagram.show_interface ()
+	i = gevice.gmodel.get_iter_selected(gevice.gmodel.treeview)
+
+	#check if the user have selected some device	
+	if (i["iter"]):
+            gevice.gdiagram = gevicediagram.GeviceDiagram ()
+            gevice.gdiagram.load_interface (gevice)
+            gevice.gdiagram.show_interface ()
+	else:
+	    result = gevice.show_message (_("You need choose some device to generate the diagram."),gtk.MESSAGE_WARNING,gtk.BUTTONS_OK)
 
     def on_action_print (gevice,action):
         gprint = geviceprint.GevicePrint()
diff --git a/src/gevicediagram.py b/src/gevicediagram.py
index 80ff595..9fb6326 100644
--- a/src/gevicediagram.py
+++ b/src/gevicediagram.py
@@ -61,7 +61,7 @@ class GeviceDiagram:
         self.close_window(window)
 
     def on_button_diagram_generate_clicked (self,button,gevice):
-        
+    			    
         self.A = AGraph()
         
         # attributes of nodes
@@ -74,13 +74,15 @@ class GeviceDiagram:
         i = gevice.gmodel.get_iter_selected(gevice.gmodel.treeview)
        
         self.iterfirst = i["iter"]
-        self.print_child (gevice,i["iter"],None)
+	self.print_child (gevice,i["iter"],None)
 
         file = config.DEFAULT_TMP + "tmp_gevice_diagram" + "." + self.form
         self.A.draw(file,format=self.form,prog=self.prog) 
 
         # show diagram with eog (FIXME: call to default viewer)
         id = os.spawnlp(os.P_NOWAIT,'eog','eog',file)
+	
+	self.close_window(self.window_diagram)
 
     def get_data_of_device (self,iter,gevice):
         self.name,self.ip,self.model,self.type_link = gevice.gmodel.treestore.get(iter,