Don't emit changed signals while updating the What filter.

1 files changed, 27 insertions, 27 deletions

diff --git a/journaltoolbox.py b/journaltoolbox.py
index 6fc85b1..e77cbf6 100644
--- a/journaltoolbox.py
+++ b/journaltoolbox.py
@@ -247,35 +247,35 @@ class SearchToolbar(gtk.Toolbar):
         current_value = self._what_search_combo.props.value
         current_value_index = 0
 
-        self._what_search_combo.remove_all()
-        # TRANS: Item in a combo box that filters by entry type.
-        self._what_search_combo.append_item(self._ACTION_ANYTHING, _('Anything'))
-
-        appended_separator = False
-        for service_name in datastore.get_unique_values('activity'):
-            activity_info = activity.get_registry().get_activity(service_name)
-            if not activity_info is None:
-                if not appended_separator:
-                    self._what_search_combo.append_separator()            
-                    appended_separator = True
-                self._what_search_combo.append_item(service_name,
-                                                    activity_info.name,
-                                                    file_name=activity_info.icon)
-                if service_name == current_value:
-                    current_value_index = len(self._what_search_combo.get_model()) - 1
-
-        self._what_search_combo.append_separator()
-
-        types = mime.get_all_generic_types()
-        for generic_type in types :
-            self._what_search_combo.append_item(
-                generic_type.type_id, generic_type.name, generic_type.icon)
-            if generic_type.type_id == current_value:
-                current_value_index = len(self._what_search_combo.get_model()) - 1
-
         self._what_search_combo.handler_block(self._what_combo_changed_sid)
         try:
-            self._what_search_combo.set_active(current_value_index)
+            self._what_search_combo.remove_all()
+            # TRANS: Item in a combo box that filters by entry type.
+            self._what_search_combo.append_item(self._ACTION_ANYTHING, _('Anything'))
+
+            appended_separator = False
+            for service_name in datastore.get_unique_values('activity'):
+                activity_info = activity.get_registry().get_activity(service_name)
+                if not activity_info is None:
+                    if not appended_separator:
+                        self._what_search_combo.append_separator()            
+                        appended_separator = True
+                    self._what_search_combo.append_item(service_name,
+                                                        activity_info.name,
+                                                        file_name=activity_info.icon)
+                    if service_name == current_value:
+                        current_value_index = len(self._what_search_combo.get_model()) - 1
+
+            self._what_search_combo.append_separator()
+
+            types = mime.get_all_generic_types()
+            for generic_type in types :
+                self._what_search_combo.append_item(
+                    generic_type.type_id, generic_type.name, generic_type.icon)
+                if generic_type.type_id == current_value:
+                    current_value_index = len(self._what_search_combo.get_model()) - 1
+
+                self._what_search_combo.set_active(current_value_index)
         finally:
             self._what_search_combo.handler_unblock(self._what_combo_changed_sid)