aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog5
-rw-r--r--composer/e-msg-composer.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 38436936d0..09b62b1819 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-26 JP Rosevear <jpr@novell.com>
+
+ * e-msg-composer.c (create_composer): get image from icon factory
+ directly
+
2004-10-28 Not Zed <NotZed@Ximian.com>
* e-msg-composer.c (drag_data_received): fix the popup id.
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index ec9b3d6b1f..d3cf2f345f 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -3324,7 +3324,6 @@ create_composer (int visible_mask)
int vis;
GList *icon_list;
BonoboControlFrame *control_frame;
- GdkPixbuf *attachment_pixbuf;
composer = g_object_new (E_TYPE_MSG_COMPOSER, "win_name", _("Compose a message"), NULL);
gtk_window_set_title ((GtkWindow *) composer, _("Compose a message"));
@@ -3444,11 +3443,9 @@ create_composer (int visible_mask)
gtk_misc_set_alignment (GTK_MISC (composer->attachment_expander_num), 1.0, 0.5);
expander_hbox = gtk_hbox_new (FALSE, 0);
- attachment_pixbuf = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU);
- composer->attachment_expander_icon = gtk_image_new_from_pixbuf (attachment_pixbuf);
+ composer->attachment_expander_icon = e_icon_factory_get_image ("stock_attach", E_ICON_SIZE_MENU);
gtk_misc_set_alignment (GTK_MISC (composer->attachment_expander_icon), 1, 0.5);
gtk_widget_set_size_request (composer->attachment_expander_icon, 100, -1);
- g_object_unref (attachment_pixbuf);
gtk_box_pack_start (GTK_BOX (expander_hbox), composer->attachment_expander_label,
TRUE, TRUE, 0);