From 8520abf54cedccb6d98eae462c42b89d23b418f3 Mon Sep 17 00:00:00 2001
From: Rohini S <srohini@novell.com>
Date: Mon, 16 Jan 2006 06:41:29 +0000
Subject: ** Fixes bug #246257

2006-01-12  Rohini S  <srohini@novell.com>

	** Fixes bug #246257

	* mail-dialogs.glade: Interchange of label and checkbox
	positions in Find message dialog
	* em-format-html-display.c: (efhd_update_matches),
	(em_format_html_display_search):
	Hide Matches Label on dialog open and Show Matches Label when
	required. Fixes bug 246257.

svn path=/trunk/; revision=31193
---
 mail/ChangeLog                | 11 +++++++++++
 mail/em-format-html-display.c |  3 +++
 mail/mail-dialogs.glade       | 37 +++++++++++++++++++------------------
 3 files changed, 33 insertions(+), 18 deletions(-)

(limited to 'mail')

diff --git a/mail/ChangeLog b/mail/ChangeLog
index c46b4f64b6..b89a659109 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,14 @@
+2006-01-12  Rohini S  <srohini@novell.com>
+	
+	** Fixes bug #246257
+
+	* mail-dialogs.glade: Interchange of label and checkbox 
+	positions in Find message dialog
+	* em-format-html-display.c: (efhd_update_matches),
+	(em_format_html_display_search):
+	Hide Matches Label on dialog open and Show Matches Label when
+	required. Fixes bug 246257.
+
 2006-01-16  Srinivasa Ragavan  <sragavan@novell.com>
 	
 	** Fixes bug #239929 (Committing Rajeev's patch)
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 56fd88b37c..5646246cac 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -496,6 +496,8 @@ efhd_update_matches(EMFormatHTMLDisplay *efhd)
 		sprintf(str, fmt, e_searching_tokenizer_match_count(efhd->search_tok));
 		gtk_label_set_text((GtkLabel *)p->search_matches_label, str);
 	}
+	gtk_widget_show((GtkWidget *)p->search_matches_label);
+	
 }
 
 static void
@@ -613,6 +615,7 @@ em_format_html_display_search(EMFormatHTMLDisplay *efhd)
 	g_signal_connect(p->search_case_check, "toggled", G_CALLBACK(efhd_search_case_toggled), efhd);
 	g_signal_connect(p->search_dialog, "response", G_CALLBACK(efhd_search_response), efhd);
 	gtk_widget_show((GtkWidget *)p->search_dialog);
+	gtk_widget_hide((GtkWidget *)p->search_matches_label);
 }
 
 void
diff --git a/mail/mail-dialogs.glade b/mail/mail-dialogs.glade
index c6df9701ec..89093ec45a 100644
--- a/mail/mail-dialogs.glade
+++ b/mail/mail-dialogs.glade
@@ -131,6 +131,25 @@
 	    </packing>
 	  </child>
 
+	  <child>
+	    <widget class="GtkCheckButton" id="search_case_check">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label" translatable="yes">Case _sensitive</property>
+	      <property name="use_underline">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="active">False</property>
+	      <property name="inconsistent">False</property>
+	      <property name="draw_indicator">True</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
 	  <child>
 	    <widget class="GtkLabel" id="search_matches_label">
 	      <property name="visible">True</property>
@@ -156,24 +175,6 @@
 	    </packing>
 	  </child>
 
-	  <child>
-	    <widget class="GtkCheckButton" id="search_case_check">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Case _sensitive</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="active">False</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
-- 
cgit v1.2.3