#
#
# patch "mtn-browse"
#  from [a1c5cf32965af72c00f20474764397ff20df656b]
#    to [779942d7f6298eb79232ec8da1a9bea3e12cca3f]
# 
# patch "mtn-browse.glade"
#  from [c07f81f0c5eca122b86421b4255a6f73bddff474]
#    to [860543eeee16c501c6b23eb32f89c04c5128ca06]
#
============================================================
--- mtn-browse	a1c5cf32965af72c00f20474764397ff20df656b
+++ mtn-browse	779942d7f6298eb79232ec8da1a9bea3e12cca3f
@@ -1422,28 +1422,35 @@ sub advanced_find($$$)
     if ($advanced_find->{selected})
     {
 	my($branch_list,
-	   @certs_list);
+	   @certs_list,
+	   $found);
 
 	$$revision_id = $advanced_find->{revisions_treeview_details}->{value};
 
-	# If the find mode is simple then the branch is simply what ever is
-	# selected in the branch combo box. Otherwise build up a list of
-	# branches that the selected revision is on.
+	# Build up a list of branches that the selected revision is on, putting
+	# the branch named in the branch combo box at the head if it is still
+	# applicable.
 
-	if ($advanced_find->{simple_query_radiobutton}->get_active())
+	$advanced_find->{mtn}->certs(address@hidden, $$revision_id);
+	$found = 0;
+	foreach my $cert (@certs_list)
 	{
-	    push(@$branches, $advanced_find->{branch_combo_details}->{value});
-	}
-	else
-	{
-	    $advanced_find->{mtn}->certs(address@hidden, $$revision_id);
-	    foreach my $cert (@certs_list)
+	    if ($cert->{name} eq "branch")
 	    {
-		push(@$branches, $cert->{value})
-		    if ($cert->{name} eq "branch");
+		if ($cert->{value}
+		    ne $advanced_find->{branch_combo_details}->{value})
+		{
+		    push(@$branches, $cert->{value});
+		}
+		else
+		{
+		    $found = 1;
+		}
 	    }
-	    push(@$branches, "") if (scalar(@$branches) == 0);
 	}
+	unshift(@$branches, $advanced_find->{branch_combo_details}->{value})
+	    if ($found);
+	push(@$branches, "") if (scalar(@$branches) == 0);
 
 	return 1;
     }
@@ -2297,7 +2304,6 @@ sub update_advanced_find_state($$)
 	    $advanced_find->{revision_combo_details}->{value} = "";
 	}
 	$advanced_find->{revision_combo_details}->{preset} = 0;
-	set_label_value($advanced_find->{selected_branch_label}, "");
 
 	# Get the new list of revisions.
 
@@ -2342,8 +2348,6 @@ sub update_advanced_find_state($$)
 		splice(@revision_list, 0, scalar(@revision_list) - 100);
 		@revision_list = reverse(@revision_list);
 	    }
-	    set_label_value($advanced_find->{selected_branch_label},
-			    $advanced_find->{branch_combo_details}->{value});
 	    $advanced_find->{appbar}->set_progress_percentage(1);
 	    gtk2_update();
 	}
@@ -2502,7 +2506,8 @@ sub update_advanced_find_state($$)
 	    if ($advanced_find->{selected_revision_label}->get_text()
 		ne $advanced_find->{revisions_treeview_details}->{value})
 	    {
-		my (@certs_list,
+		my ($branch,
+		    @certs_list,
 		    @revision_details);
 		$advanced_find->{mtn}->certs
 		    (address@hidden,
@@ -2525,23 +2530,19 @@ sub update_advanced_find_state($$)
 			get_hadjustment()->set_value(0);
 		}
 
-		# If we are in advanced query mode then don't forget to update
-		# the selected branch label as well as the revision one.
+		# Update the selected branch and revision labels.
 
-		if (! $advanced_find->{simple_query_radiobutton}->get_active())
+		$branch = "";
+		foreach my $cert (@certs_list)
 		{
-		    my $branch = "";
-		    foreach my $cert (@certs_list)
+		    if ($cert->{name} eq "branch")
 		    {
-			if ($cert->{name} eq "branch")
-			{
-			    $branch = $cert->{value};
-			    last;
-			}
+			$branch = $cert->{value};
+			last;
 		    }
-		    set_label_value($advanced_find->{selected_branch_label},
-				    $branch);
 		}
+		set_label_value($advanced_find->{selected_branch_label},
+				$branch);
 		set_label_value($advanced_find->{selected_revision_label},
 				$advanced_find->{revisions_treeview_details}->
 				    {value});
@@ -2553,6 +2554,7 @@ sub update_advanced_find_state($$)
 	{
 	    $advanced_find->{ok_button}->set_sensitive(FALSE);
 	    $advanced_find->{details_buffer}->set_text("");
+	    set_label_value($advanced_find->{selected_branch_label}, "");
 	    set_label_value($advanced_find->{selected_revision_label}, "");
 	}
 
============================================================
--- mtn-browse.glade	c07f81f0c5eca122b86421b4255a6f73bddff474
+++ mtn-browse.glade	860543eeee16c501c6b23eb32f89c04c5128ca06
@@ -782,7 +782,7 @@ with another revision</property>
 				  <property name="can_focus">True</property>
 				  <property name="headers_visible">True</property>
 				  <property name="rules_hint">False</property>
-				  <property name="reorderable">True</property>
+				  <property name="reorderable">False</property>
 				  <property name="enable_search">True</property>
 				  <signal name="cursor_changed" handler="manifest_browser_treeview_cursor_changed_cb" last_modification_time="Sat, 15 Dec 2007 14:16:06 GMT"/>
 				  <signal name="row_activated" handler="manifest_browser_treeview_row_activated_cb" last_modification_time="Sat, 15 Dec 2007 14:16:31 GMT"/>
@@ -2679,7 +2679,7 @@ Tag</property>
 				  <property name="can_focus">True</property>
 				  <property name="headers_visible">True</property>
 				  <property name="rules_hint">False</property>
-				  <property name="reorderable">True</property>
+				  <property name="reorderable">False</property>
 				  <property name="enable_search">True</property>
 				  <signal name="cursor_changed" handler="revisions_treeview_cursor_changed_cb" last_modification_time="Sat, 15 Dec 2007 14:21:33 GMT"/>
 				  <signal name="row_activated" handler="revisions_treeview_row_activated_cb" last_modification_time="Sat, 15 Dec 2007 14:21:51 GMT"/>
@@ -3133,8 +3133,6 @@ Tag</property>
 	      <child>
 		<widget class="GtkButton" id="cancel_button">
 		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="has_default">True</property>
 		  <property name="can_focus">True</property>
 		  <property name="label">gtk-cancel</property>
 		  <property name="use_stock">True</property>
@@ -3151,6 +3149,8 @@ Tag</property>
 	      <child>
 		<widget class="GtkButton" id="ok_button">
 		  <property name="visible">True</property>
+		  <property name="can_default">True</property>
+		  <property name="has_default">True</property>
 		  <property name="can_focus">True</property>
 		  <property name="label">gtk-ok</property>
 		  <property name="use_stock">True</property>