aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog7
-rw-r--r--composer/e-msg-composer.c13
2 files changed, 7 insertions, 13 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 42e693ff00..e544968ed9 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-03 Matthew Barnes <mbarnes@redhat.com>
+
+ * e-msg-cmposer.c:
+ Remove the entry_pixcache array to silence the run-time warnings
+ when opening a new composer window. The composer seems to work
+ fine without them; not sure why it was needed in the first place.
+
2007-10-02 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #469657
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 232b769270..4e43eaa119 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -3590,17 +3590,6 @@ static BonoboUIVerb entry_verbs [] = {
BONOBO_UI_VERB_END
};
-static EPixmap entry_pixcache [] = {
- E_PIXMAP ("/Toolbar/EditCut", "edit-cut", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/EditCopy", "edit-copy", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/Toolbar/EditPaste", "edit-paste", E_ICON_SIZE_LARGE_TOOLBAR),
- E_PIXMAP ("/commands/EditCut", "edit-cut", E_ICON_SIZE_MENU),
- E_PIXMAP ("/commands/EditCopy", "edit-copy", E_ICON_SIZE_MENU),
- E_PIXMAP ("/commands/EditPaste", "edit-paste", E_ICON_SIZE_MENU),
-
- E_PIXMAP_END
-};
-
/* All this snot is so that Cut/Copy/Paste work. */
static gboolean
composer_entry_focus_in_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
@@ -3625,8 +3614,6 @@ composer_entry_focus_in_event_cb (GtkWidget *widget, GdkEventFocus *event, gpoin
"evolution-composer-entries", NULL);
g_free (xmlfile);
- e_pixmaps_update (p->entry_uic, entry_pixcache);
-
bonobo_ui_component_thaw (p->entry_uic, NULL);
return FALSE;