[gevice] add/remove apropiate Makefile.am on data/ui and data/glade

[Alejandro Valdes Jimenez <avaldes src gnome org>]

commit e7a1fc23acc8177c1817a6e6f09f7d106b3f9f38
Author: Alejandro Valdes Jimenez <avaldes gnome org>
Date:   Mon Jul 25 11:50:41 2011 -0400

    add/remove apropiate Makefile.am on data/ui and data/glade

 ChangeLog                      |    5 +++++
 data/{glade => ui}/Makefile.am |    0
 src/gevice.py                  |    9 ++++-----
 src/geviceprefer.py            |    2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 54429cc..a614d3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 2011-07-25  Alejandro Valdes Jimenez  <avaldes gnome org>
+
+	* data/glade/Makefile.am: remove file
+	* data/ui/Makefile.am: add file
+
+2011-07-25  Alejandro Valdes Jimenez  <avaldes gnome org>
 	* data/glade/gevice.glade: remove file
 	* data/ui/gevice.xml: add file
 	* data/ui/menu.xml: add file
diff --git a/data/glade/Makefile.am b/data/ui/Makefile.am
similarity index 100%
rename from data/glade/Makefile.am
rename to data/ui/Makefile.am
diff --git a/src/gevice.py b/src/gevice.py
index cb59497..ce32848 100755
--- a/src/gevice.py
+++ b/src/gevice.py
@@ -225,11 +225,10 @@ class Gevice:
         self.window_main.set_title(config.PACKAGE)
 
         # load preferences
-        self.gpref = geviceprefer.GevicePrefer(self)
-        self.gpref.load_preferences(self)
-        self.gpref.load_interface (self)
-
-        self.set_listusers_on_combobox()
+        ###self.gpref = geviceprefer.GevicePrefer(self)
+        ###self.gpref.load_preferences(self)
+        ###self.gpref.load_interface (self)
+        ###self.set_listusers_on_combobox()
 
         # show all
         self.window_main.show_all()
diff --git a/src/geviceprefer.py b/src/geviceprefer.py
index f63d1e7..bf3a920 100644
--- a/src/geviceprefer.py
+++ b/src/geviceprefer.py
@@ -33,7 +33,7 @@ class GevicePrefer:
         
     
     def load_interface (self,gevice):
-        glade_file = gtk.glade.XML (os.path.join (config.UIDIR, "gevice.glade"),"window_prefer",None)
+        glade_file = gtk.glade.XML (os.path.join (config.UIDIR, "gevice.xml"),"window_prefer",None)
         self.window_prefer = glade_file.get_widget ("window_prefer")
         self.button_close_prefer = glade_file.get_widget ("button_close_prefer")
         self.checkbutton_ip = glade_file.get_widget ("checkbutton_ip")