diff options
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/e-composer-actions.c | 4 | ||||
| -rw-r--r-- | composer/e-composer-post-header.c | 8 | ||||
| -rw-r--r-- | composer/e-composer-private.c | 4 | ||||
| -rw-r--r-- | composer/e-composer-private.h | 1 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 1 |
5 files changed, 12 insertions, 6 deletions
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c index 433a17ab66..fc1ec7a475 100644 --- a/composer/e-composer-actions.c +++ b/composer/e-composer-actions.c @@ -106,7 +106,7 @@ action_charset_cb (GtkRadioAction *action, if (action != current) return; - charset = gtk_action_get_name (GTK_ACTION (current)); + charset = g_object_get_data (G_OBJECT (action), "charset"); g_free (composer->priv->charset); composer->priv->charset = g_strdup (charset); @@ -686,7 +686,7 @@ e_composer_actions_init (EMsgComposer *composer) gtk_action_group_set_translation_domain ( action_group, GETTEXT_PACKAGE); e_charset_add_radio_actions ( - action_group, composer->priv->charset, + action_group, "charset-", composer->priv->charset, G_CALLBACK (action_charset_cb), composer); gtk_ui_manager_insert_action_group (manager, action_group, 0); diff --git a/composer/e-composer-post-header.c b/composer/e-composer-post-header.c index 2ff98d053b..5a5ca2e610 100644 --- a/composer/e-composer-post-header.c +++ b/composer/e-composer-post-header.c @@ -393,12 +393,16 @@ e_composer_post_header_set_folder_tree_model (EComposerPostHeader *header, EMFolderTreeModel *model) { g_return_if_fail (E_IS_COMPOSER_POST_HEADER (header)); - g_return_if_fail (EM_IS_FOLDER_TREE_MODEL (model)); + + if (model != NULL) { + g_return_if_fail (EM_IS_FOLDER_TREE_MODEL (model)); + g_object_ref (model); + } if (header->priv->model != NULL) g_object_unref (header->priv->model); - header->priv->model = g_object_ref (model); + header->priv->model = model; g_object_notify (G_OBJECT (header), "folder-tree-model"); } diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c index 0d2995b9b2..0c3cce3512 100644 --- a/composer/e-composer-private.c +++ b/composer/e-composer-private.c @@ -29,10 +29,12 @@ composer_setup_charset_menu (EMsgComposer *composer) guint merge_id; 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 (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; diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h index f43f2c7eb2..c31fa2751a 100644 --- a/composer/e-composer-private.h +++ b/composer/e-composer-private.h @@ -30,6 +30,7 @@ #include "e-composer-autosave.h" #include "e-composer-header-table.h" #include "e-util/e-binding.h" +#include "e-util/e-util.h" #include "e-util/gconf-bridge.h" #define E_MSG_COMPOSER_GET_PRIVATE(obj) \ diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 87dcabda17..88ac673454 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -66,7 +66,6 @@ #include "e-util/e-error.h" #include "e-util/e-plugin-ui.h" #include "e-util/e-util-private.h" -#include "e-util/e-util.h" #include "e-signature-combo-box.h" #include "shell/e-shell.h" |