#
#
# patch "lib/perl/AdvancedFind.pm"
#  from [380704d8fa44730cb8d24233f20b695d620038d8]
#    to [14153cb90a3c23bf51b2ee94628d9bd638f96a3b]
# 
# patch "lib/ui/mtn-browse.glade"
#  from [d75520e241f852fbacf7e422691c6ad2aca57e8e]
#    to [c7dfda0093203de9bb808675e307578d0adaf494]
#
============================================================
--- lib/perl/AdvancedFind.pm	380704d8fa44730cb8d24233f20b695d620038d8
+++ lib/perl/AdvancedFind.pm	14153cb90a3c23bf51b2ee94628d9bd638f96a3b
@@ -339,6 +339,10 @@ sub populate_button_clicked_cb($$)
     {
 	$to_insert = "/";
     }
+    elsif ($selector eq __("Message"))
+    {
+	$to_insert = "m:" . (($arg eq "") ? __("<Message Text>") : $arg);
+    }
     elsif ($selector eq __("Parent"))
     {
 	$to_insert = "p:" . (($arg eq "") ? __("<Revision Id>") : $arg);
@@ -535,7 +539,9 @@ sub get_advanced_find_window($)
     if (! defined($instance = $wm->find_unused($window_type)))
     {
 
-	my($renderer,
+	my(@delete_list,
+	   $index,
+	   $renderer,
 	   $tv_column);
 
 	$instance = {};
@@ -598,7 +604,7 @@ sub get_advanced_find_window($)
 	$instance->{stop_button}->signal_connect
 	    ("clicked", sub { $_[1]->{stop} = 1; }, $instance);
 
-	# Setup the comboboxes.
+	# Setup the empty comboboxes.
 
 	$instance->{branch_comboboxentry}->
 	    set_model(Gtk2::ListStore->new("Glib::String"));
@@ -611,10 +617,30 @@ sub get_advanced_find_window($)
 	$instance->{search_term_comboboxentry}->
 	    set_model(Gtk2::ListStore->new("Glib::String"));
 	$instance->{search_term_comboboxentry}->set_text_column(0);
-	$instance->{term_combobox}->set_active(0);
 	handle_comboxentry_history($instance->{search_term_comboboxentry},
 				   "advanced_find");
 
+	# Remove any unsupported selectors from the term combobox.
+
+	$index = 0;
+	$instance->{term_combobox}->get_model()->foreach
+	    (sub {
+		 my($model, $path, $iter) = @_;
+		 my $value = $model->get($iter, 0);
+		 push(@delete_list, $index)
+		     if (($value eq __("Message")
+			  && ! $instance->{mtn}->supports(MTN_M_SELECTOR))
+			 || ($value eq __("Parent")
+			     && ! $instance->{mtn}->supports(MTN_P_SELECTOR)));
+		 ++ $index;
+		 return FALSE;
+	     });
+	foreach my $row (reverse(@delete_list))
+	{
+	    $instance->{term_combobox}->remove_text($row);
+	}
+	$instance->{term_combobox}->set_active(0);
+
 	# Setup the revisions list browser.
 
 	$instance->{revisions_liststore} =
============================================================
--- lib/ui/mtn-browse.glade	d75520e241f852fbacf7e422691c6ad2aca57e8e
+++ lib/ui/mtn-browse.glade	c7dfda0093203de9bb808675e307578d0adaf494
@@ -2745,6 +2745,7 @@ Logical And
 Head Revision
 Identifier
 Logical And
+Message
 Parent
 Tag</property>
 				  <signal name="changed" handler="term_combobox_changed_cb" last_modification_time="Sat, 19 Jan 2008 16:11:23 GMT"/>