[sabayon] Patches for Bug #606121 by Adam J. Lincoln, and an update to ignored files/dirs by Warren Togami

[Scott Balneaves <sbalneav src gnome org>]

commit 74fcedff68d82ff5a742c02e7ca7e43825c06319
Author: Scott Balneaves <sbalneav ltsp org>
Date:   Fri Jan 29 20:17:33 2010 -0600

    Patches for Bug #606121 by Adam J. Lincoln, and an update to ignored files/dirs by Warren Togami

 admin-tool/profilesdialog.py |   13 +++++++++++++
 lib/config.py.in             |    7 +++++--
 lib/systemdb.py              |   27 ++++++++++++++-------------
 3 files changed, 32 insertions(+), 15 deletions(-)
---
diff --git a/admin-tool/profilesdialog.py b/admin-tool/profilesdialog.py
index 517e972..fc09d9f 100755
--- a/admin-tool/profilesdialog.py
+++ b/admin-tool/profilesdialog.py
@@ -368,6 +368,8 @@ class ProfilesDialog:
         self.__setup_profiles_list ()
 
         self.profiles_list.connect ("key-press-event", self.__handle_key_press)
+        self.profiles_list.connect ("row-activated", self.__profile_row_activated)
+
 
         self.add_button = self.builder.get_object ("add_button")
         self.add_button.connect ("clicked", self.__add_button_clicked)
@@ -456,6 +458,17 @@ class ProfilesDialog:
             session.start ()
 
     @errors.checked_callback (debuglog.DEBUG_LOG_DOMAIN_USER)
+    def __profile_row_activated (self, treeview, path, column):
+        profile_name = self.__get_selected_profile ()
+        if profile_name:
+            self.dialog.set_sensitive (False)
+
+            session = Session (PROTOTYPE_USER, profile_name)
+            session.connect ("finished", self.__session_finished)
+            debuglog.uprint ("Starting to edit profile '%s'", profile_name)
+            session.start ()
+
+    @errors.checked_callback (debuglog.DEBUG_LOG_DOMAIN_USER)
     def __details_button_clicked (self, button):
         profile_name = self.__get_selected_profile ()
         if profile_name:
diff --git a/lib/config.py.in b/lib/config.py.in
index b876158..565a893 100755
--- a/lib/config.py.in
+++ b/lib/config.py.in
@@ -97,7 +97,8 @@ FILES_TO_IGNORE = [
     ".gtkrc-1.2-gnome2*",
     ".pulse-cookie",
     ".recently-used*",
-    ".xsession-errors"
+    ".xsession-errors",
+    ".imsettings.log"
 ]
 
 #
@@ -119,7 +120,9 @@ DIRECTORIES_TO_IGNORE_PROFILE = [
     ".pulse",
     ".thumbnails",
     ".wapi",
-    ".Trash"
+    ".Trash",
+    ".evolution/cache",
+    ".local/share/gvfs-metadata"
 ]
 
 #
diff --git a/lib/systemdb.py b/lib/systemdb.py
index 13e0e1d..0f2dbec 100644
--- a/lib/systemdb.py
+++ b/lib/systemdb.py
@@ -213,19 +213,20 @@ class SystemDatabase(object):
         urilist = uris.split(',')
 
         for uri in urilist:
-            l = ldap.initialize (uri)
-            
-            l.protocol_version = get_setting (ldap_node, "version", ldap.VERSION3, int)
-            l.timeout =  get_setting (ldap_node, "timeout", 10, int)
-            
-            bind_dn = get_setting (ldap_node, "bind_dn", "")
-            bind_pw = get_setting (ldap_node, "bind_pw", "")
-            # Bind no matter what, so we know the server's there.
-            l.simple_bind (bind_dn, bind_pw)
-            
-            return l
-        execpt ldap.LDAPError, error_message:
-            dprint("Couldn't bind to %s: %s\n", uri, error_message)
+            try:
+                l = ldap.initialize (uri)
+                
+                l.protocol_version = get_setting (ldap_node, "version", ldap.VERSION3, int)
+                l.timeout =  get_setting (ldap_node, "timeout", 10, int)
+                
+                bind_dn = get_setting (ldap_node, "bind_dn", "")
+                bind_pw = get_setting (ldap_node, "bind_pw", "")
+                # Bind no matter what, so we know the server's there.
+                l.simple_bind (bind_dn, bind_pw)
+                
+                return l
+            execpt ldap.LDAPError, error_message:
+                dprint("Couldn't bind to %s: %s\n", uri, error_message)
 
     def __ldap_query (self, map, replace):
         global has_ldap