diff options
| -rw-r--r-- | composer/ChangeLog | 12 | ||||
| -rw-r--r-- | composer/e-msg-composer-hdrs.c | 2 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 38 |
3 files changed, 13 insertions, 39 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index eb439600da..7c7c09c999 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,15 @@ +2003-04-07 Chris Toshok <toshok@ximian.com> + + [ fixes bug #39763 ] + * e-msg-composer.c (setup_cut_copy_paste): remove the + control_entry_focus_{in,out}_event_cb signal stuff. + (control_entry_focus_in_event_cb): nuke + (control_entry_focus_in_event_cb): same. + + * e-msg-composer-hdrs.c (create_addressbook_entry): pass the + contain to bonobo_widget_new_control_from_objref when creating the + entries. + 2003-04-04 Jeffrey Stedfast <fejj@ximian.com> * e-msg-composer.c (autosave_save_draft): If the composer isn't diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c index 0dc4819efd..e5f45cff4b 100644 --- a/composer/e-msg-composer-hdrs.c +++ b/composer/e-msg-composer-hdrs.c @@ -446,7 +446,7 @@ create_addressbook_entry (EMsgComposerHdrs *hdrs, const char *name) CORBA_exception_free (&ev); control_widget = bonobo_widget_new_control_from_objref ( - corba_control, CORBA_OBJECT_NIL); + corba_control, bonobo_ui_component_get_container (priv->uic)); cf = bonobo_widget_get_control_frame (BONOBO_WIDGET (control_widget)); pb = bonobo_control_frame_get_control_property_bag (cf, NULL); diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index aab14e230a..9db2ab7d10 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -2841,30 +2841,6 @@ composer_entry_focus_out_event_cb (GtkWidget *widget, GdkEventFocus *event, gpoi return FALSE; } -static gboolean -control_entry_focus_in_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer user_data) -{ - EMsgComposer *composer = user_data; - - g_assert (composer->focused_entry == NULL); - - bonobo_control_frame_control_activate (bonobo_widget_get_control_frame (BONOBO_WIDGET (widget))); - - return FALSE; -} - -static gboolean -control_entry_focus_out_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer user_data) -{ - EMsgComposer *composer = user_data; - - g_assert (composer->focused_entry == NULL); - - bonobo_control_frame_control_deactivate (bonobo_widget_get_control_frame (BONOBO_WIDGET (widget))); - - return FALSE; -} - static void setup_cut_copy_paste (EMsgComposer *composer) { @@ -2880,20 +2856,6 @@ setup_cut_copy_paste (EMsgComposer *composer) entry = e_msg_composer_hdrs_get_reply_to_entry (hdrs); g_signal_connect (entry, "focus-in-event", G_CALLBACK (composer_entry_focus_in_event_cb), composer); g_signal_connect (entry, "focus-out-event", G_CALLBACK (composer_entry_focus_out_event_cb), composer); - - entry = e_msg_composer_hdrs_get_to_entry (hdrs); - g_signal_connect (entry, "focus-in-event", G_CALLBACK (control_entry_focus_in_event_cb), composer); - g_signal_connect (entry, "focus-out-event", G_CALLBACK (control_entry_focus_out_event_cb), composer); - - entry = e_msg_composer_hdrs_get_cc_entry (hdrs); - g_signal_connect (entry, "focus-in-event", G_CALLBACK (control_entry_focus_in_event_cb), composer); - g_signal_connect (entry, "focus-out-event", G_CALLBACK (control_entry_focus_out_event_cb), composer); - - entry = e_msg_composer_hdrs_get_bcc_entry (hdrs); - g_signal_connect (entry, "focus-in-event", G_CALLBACK (control_entry_focus_in_event_cb), composer); - g_signal_connect (entry, "focus-out-event", G_CALLBACK (control_entry_focus_out_event_cb), composer); - - /* FIXME: do the same for the gtkhtml editor */ } static EMsgComposer * |