diff options
Diffstat (limited to 'composer/e-composer-private.c')
| -rw-r--r-- | composer/e-composer-private.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c index fe5b66ceee..d7e44bf484 100644 --- a/composer/e-composer-private.c +++ b/composer/e-composer-private.c @@ -27,10 +27,12 @@ composer_setup_charset_menu (EMsgComposer *composer) guint merge_id; ui_manager = gtkhtml_editor_get_ui_manager (GTKHTML_EDITOR (composer)); - list = gtk_action_group_list_actions (composer->priv->charset_actions); path = "/main-menu/edit-menu/pre-spell-check/charset-menu"; merge_id = gtk_ui_manager_new_merge_id (ui_manager); + list = gtk_action_group_list_actions (composer->priv->charset_actions); + list = g_list_sort (list, (GCompareFunc) e_action_compare_by_label); + while (list != NULL) { GtkAction *action = list->data; @@ -85,8 +87,8 @@ e_composer_private_init (EMsgComposer *composer) GtkhtmlEditor *editor; GtkUIManager *ui_manager; - GtkWidget *widget; GtkWidget *container; + GtkWidget *widget; GtkWidget *send_widget; const gchar *path; gchar *filename; @@ -142,8 +144,8 @@ e_composer_private_init (EMsgComposer *composer) widget = e_composer_header_table_new (); gtk_container_set_border_width (GTK_CONTAINER (widget), 6); - gtk_box_pack_start (GTK_BOX (editor->vbox), widget, FALSE, FALSE, 0); - gtk_box_reorder_child (GTK_BOX (editor->vbox), widget, 2); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); + gtk_box_reorder_child (GTK_BOX (container), widget, 2); priv->header_table = g_object_ref (widget); gtk_widget_show (widget); @@ -229,6 +231,11 @@ e_composer_private_dispose (EMsgComposer *composer) composer->priv->header_table = NULL; } + if (composer->priv->attachment_paned != NULL) { + g_object_unref (composer->priv->attachment_paned); + composer->priv->attachment_paned = NULL; + } + if (composer->priv->charset_actions != NULL) { g_object_unref (composer->priv->charset_actions); composer->priv->charset_actions = NULL; |