All pastes #2100432 Raw Edit

Miscellany

public text v1 · immutable
#2100432 ·published 2012-01-06 14:24 UTC
rendered paste body
diff --git a/eiskaltdcpp-gtk/src/search.cc b/eiskaltdcpp-gtk/src/search.cc
index 08a778e..c37c39a 100644
--- a/eiskaltdcpp-gtk/src/search.cc
+++ b/eiskaltdcpp-gtk/src/search.cc
@@ -39,7 +39,7 @@ GtkTreeModel* Search::searchEntriesModel = NULL;
 
 Search::Search():
     BookEntry(Entry::SEARCH, _("Search"), "search.ui", generateID()),
-    previousGrouping(NOGROUPING)
+    previousGrouping(TTH), refilter(true)
 {
     // Initialize the search entries combo box
     if (searchEntriesModel == NULL)
@@ -65,7 +65,7 @@ Search::Search():
     gtk_combo_box_set_active(GTK_COMBO_BOX(getWidget("comboboxSize")), 1);
     gtk_combo_box_set_active(GTK_COMBO_BOX(getWidget("comboboxUnit")), 2);
     gtk_combo_box_set_active(GTK_COMBO_BOX(getWidget("comboboxFile")), 0);
-    gtk_combo_box_set_active(GTK_COMBO_BOX(getWidget("comboboxGroupBy")), (int)NOGROUPING);
+    gtk_combo_box_set_active(GTK_COMBO_BOX(getWidget("comboboxGroupBy")), (int)TTH);
 
     // Initialize hub list treeview
     hubView.setView(GTK_TREE_VIEW(getWidget("treeviewHubs")));
@@ -126,8 +126,7 @@ Search::Search():
     // Initialize search types
     GtkTreeIter iter;
     GtkComboBox *combo_box = GTK_COMBO_BOX(getWidget("comboboxFile"));
-    GtkTreeModel *model = gtk_combo_box_get_model(combo_box);
-    GtkListStore *store = GTK_LIST_STORE(model);
+    GtkListStore *store = GTK_LIST_STORE(gtk_combo_box_get_model(combo_box));
     const SettingsManager::SearchTypes &searchTypes = SettingsManager::getInstance()->getSearchTypes();
 
     // Predefined
@@ -149,8 +148,6 @@ Search::Search():
     }
     gtk_combo_box_set_active(combo_box, 0);
 
-    gtk_combo_box_set_active (GTK_COMBO_BOX(getWidget("comboboxGroupBy")),5);
-
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(getWidget("togglebuttonSidePanel")), TRUE);
 
     // Connect the signals to their callback functions.
@@ -205,6 +202,7 @@ void Search::show()
 
 void Search::putValue_gui(const string &str, int64_t size, SearchManager::SizeModes mode, SearchManager::TypeModes type)
 {
+    refilter = false;
     gtk_entry_set_text(GTK_ENTRY(searchEntry), str.c_str());
     gtk_entry_set_text(GTK_ENTRY(getWidget("entrySize")), Util::toString(size).c_str());
     gtk_combo_box_set_active(GTK_COMBO_BOX(getWidget("comboboxSize")), (int)mode);
@@ -979,7 +977,9 @@ gboolean Search::onSearchEntryKeyPressed_gui(GtkWidget *widget, GdkEventKey *eve
 void Search::onComboBoxChanged_gui(GtkWidget* widget, gpointer data)
 {
     Search *s = (Search *)data;
-
+    g_print("refilter: %d         ? \n", s->refilter);
+    if (!s->refilter)
+        return;
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(s->getWidget("checkbuttonFilter"))))
         gtk_tree_model_filter_refilter(GTK_TREE_MODEL_FILTER(s->searchFilterModel));
 }
diff --git a/eiskaltdcpp-gtk/src/search.hh b/eiskaltdcpp-gtk/src/search.hh
index d393072..fa9194a 100644
--- a/eiskaltdcpp-gtk/src/search.hh
+++ b/eiskaltdcpp-gtk/src/search.hh
@@ -143,6 +143,7 @@ class Search:
 		UserCommandMenu *userCommandMenu;
 		GroupType previousGrouping;
 		std::unordered_map<std::string, std::vector<dcpp::SearchResultPtr> > results;
+		bool refilter;
 };
 
 #else