saved rejects from 1.patch

e-name-selector-dialog.c.rej (text/plain), 1.56 KB, created by Uwe Breidenbach on 2011-04-10 21:23:22 UTC

***************
*** 117,123 ****
  	category_list = e_categories_get_list ();
  	for (iter = category_list; iter != NULL; iter = iter->next)
  		gtk_combo_box_text_append_text (
- 			GTK_COMBO_BOX (combo_box), iter->data);
  	g_list_free (category_list);
  
  	g_signal_connect_swapped (
--- 119,125 ----
  	category_list = e_categories_get_list ();
  	for (iter = category_list; iter != NULL; iter = iter->next)
  		gtk_combo_box_text_append_text (
+ 			GTK_COMBO_BOX_TEXT (combo_box), iter->data);
  	g_list_free (category_list);
  
  	g_signal_connect_swapped (
***************
*** 876,887 ****
  	gchar         *category_escaped;
  	gchar         *user_fields_str;
  
- 	combo_box = GTK_WIDGET (gtk_builder_get_object (
- 		name_selector_dialog->priv->gui, "combobox-category"));
  	if (gtk_combo_box_get_active (GTK_COMBO_BOX (combo_box)) == -1)
  		gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0);
  
- 	category = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX (combo_box));
  	category_escaped = escape_sexp_string (category);
  
  	text = gtk_entry_get_text (name_selector_dialog->priv->search_entry);
--- 894,904 ----
  	gchar         *category_escaped;
  	gchar         *user_fields_str;
  
+ 	combo_box = priv->combobox_category;
  	if (gtk_combo_box_get_active (GTK_COMBO_BOX (combo_box)) == -1)
  		gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0);
  
+ 	category = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (combo_box));
  	category_escaped = escape_sexp_string (category);
  
  	text = gtk_entry_get_text (name_selector_dialog->priv->search_entry);