Keep track of which entry widget has focus.

2003-04-01  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (composer_entry_focus_in_event_cb): Keep track
	of which entry widget has focus.
	(composer_entry_focus_out_event_cb): Same.
	(control_entry_focus_in_event_cb): Same idea, but since this is in
	another component, tell that component that its widget has focus
	so it can merge bonoboui cut/copy/paste (and anything else) menus.
	(control_entry_focus_out_event_cb): Same.
	(setup_cut_copy_paste): Connect to the focus-in and focus-out
	events for all the entry widgets and the html editor.
	(menu_edit_cut_cb): New callback function since the composer will
	now own the Cut/Copy/Paste menu items sometimes (depending on
	which widget is in focus... confused yet? good).

	* e-msg-composer-hdrs.c (from_changed): Update the Reply-To entry
	to be a normal GtkEntry.
	(create_headers): Same.
	(e_msg_composer_hdrs_set_reply_to): Here too.
	(e_msg_composer_hdrs_get_reply_to): And finally here.

svn path=/trunk/; revision=20623

1 files changed, 4 insertions, 9 deletions

diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index 2d3a9fccdc..0dc4819efd 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -187,7 +187,7 @@ from_changed (GtkWidget *item, gpointer data)
 	/* we do this rather than calling e_msg_composer_hdrs_set_reply_to()
 	   because we don't want to change the visibility of the header */
 	reply_to = hdrs->account->id->reply_to;
-	e_entry_set_text (E_ENTRY (hdrs->priv->reply_to.entry), reply_to ? reply_to : "");
+	gtk_entry_set_text (GTK_ENTRY (hdrs->priv->reply_to.entry), reply_to ? reply_to : "");
 	
 	g_signal_emit (hdrs, signals [FROM_CHANGED], 0);
 }
@@ -508,12 +508,7 @@ create_headers (EMsgComposerHdrs *hdrs)
 	 * expects the reply_to fields to be initialized.
 	 */
 	priv->reply_to.label = gtk_label_new (_("Reply-To:"));
-	priv->reply_to.entry = e_entry_new ();
-	g_object_set (priv->reply_to.entry,
-		      "editable", TRUE,
-		      "use_ellipsis", TRUE,
-		      "allow_newlines", FALSE,
-		      NULL);
+	priv->reply_to.entry = gtk_entry_new ();
 	
 	/*
 	 * From
@@ -1055,7 +1050,7 @@ e_msg_composer_hdrs_set_reply_to (EMsgComposerHdrs *hdrs,
 {
 	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
 	
-	e_entry_set_text (E_ENTRY (hdrs->priv->reply_to.entry), reply_to ? reply_to : "");
+	gtk_entry_set_text (GTK_ENTRY (hdrs->priv->reply_to.entry), reply_to ? reply_to : "");
 	
 	if (reply_to && *reply_to)
 		set_pair_visibility (hdrs, &hdrs->priv->cc, TRUE);
@@ -1152,7 +1147,7 @@ e_msg_composer_hdrs_get_reply_to (EMsgComposerHdrs *hdrs)
 	
 	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);
 	
-	reply_to = e_entry_get_text (E_ENTRY (hdrs->priv->reply_to.entry));
+	reply_to = gtk_entry_get_text (GTK_ENTRY (hdrs->priv->reply_to.entry));
 	
 	if (!reply_to || *reply_to == '\0')
 		return NULL;