diff options
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/ChangeLog | 12 | ||||
| -rw-r--r-- | composer/Makefile.am | 1 | ||||
| -rw-r--r-- | composer/e-msg-composer-attachment.c | 14 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 6 |
4 files changed, 26 insertions, 7 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index d077cd9316..e8b01d63b7 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,15 @@ +2003-08-22 Antonio Xu <antonio.xu@sun.com> + + * e-msg-composer-attachment.c (): Connect response signal to + attachment properties dialog, fix bug #47950. + +2003-08-21 Antonio Xu <antonio.xu@sun.com> + + * Makefile.am (INCLUDES): add EVOLUTION_IMAGESDIR define + * e-msg-composer.c (create_composer): use EVOLUTION_IMAGESDIR + and composer icon name to get the path of composer icon. + [#47781] + 2003-08-19 Jeffrey Stedfast <fejj@ximian.com> * Original patch from David Woodhouse, but modified a bit by me. diff --git a/composer/Makefile.am b/composer/Makefile.am index 811bbf881f..17803541e1 100644 --- a/composer/Makefile.am +++ b/composer/Makefile.am @@ -49,6 +49,7 @@ INCLUDES = \ -I$(top_builddir)/shell \ -I$(top_srcdir)/shell \ -DEVOLUTION_DATADIR=\"$(datadir)\" \ + -DEVOLUTION_IMAGESDIR=\"$(imagesdir)\" \ -DEVOLUTION_UIDIR=\"$(evolutionuidir)\" \ -DEVOLUTION_GLADEDIR=\"$(gladedir)\" \ -DPREFIX=\"$(prefix)\" \ diff --git a/composer/e-msg-composer-attachment.c b/composer/e-msg-composer-attachment.c index fb7fe46073..1c9e19b9ea 100644 --- a/composer/e-msg-composer-attachment.c +++ b/composer/e-msg-composer-attachment.c @@ -377,7 +377,15 @@ ok_cb (GtkWidget *widget, gpointer data) close_cb (widget, data); } - +static void +response_cb (GtkWidget *widget, gint response, gpointer data) +{ + if (response == GTK_RESPONSE_OK) + ok_cb (widget, data); + else + close_cb (widget, data); +} + void e_msg_composer_attachment_edit (EMsgComposerAttachment *attachment, GtkWidget *parent) { @@ -438,9 +446,7 @@ e_msg_composer_attachment_edit (EMsgComposerAttachment *attachment, GtkWidget *p gtk_toggle_button_set_active (dialog_data->disposition_checkbox, disposition && !g_ascii_strcasecmp (disposition, "inline")); - connect_widget (editor_gui, "ok_button", "clicked", (GCallback)ok_cb, dialog_data); - connect_widget (editor_gui, "close_button", "clicked", (GCallback)close_cb, dialog_data); - + connect_widget (editor_gui, "dialog", "response", (GCallback)response_cb, dialog_data); #warning "signal connect while alive" /* make sure that when the composer gets hidden/closed that our windows also close */ parent = gtk_widget_get_toplevel (parent); diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 5a78a68a02..c15dedd7df 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -2937,9 +2937,9 @@ create_composer (int visible_mask) gtk_window_set_default_size (GTK_WINDOW (composer), DEFAULT_WIDTH, DEFAULT_HEIGHT); - gnome_window_icon_set_from_file (GTK_WINDOW (composer), EVOLUTION_DATADIR - "/images/evolution/compose-message.png"); - + gnome_window_icon_set_from_file (GTK_WINDOW (composer), EVOLUTION_IMAGESDIR + "/compose-message.png"); + /* DND support */ gtk_drag_dest_set (GTK_WIDGET (composer), GTK_DEST_DEFAULT_ALL, drop_types, num_drop_types, GDK_ACTION_COPY); |