- label = gtk_bin_get_child (GTK_BIN (new_size_menuitem));
- markup = g_strconcat ("<span font_family='Sans'>", gtk_label_get_text (GTK_LABEL (label)), "</span>", NULL);
- gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup);
- g_free (markup);
- g_signal_handlers_block_by_func (G_OBJECT (new_size_menuitem),
- G_CALLBACK (modest_msg_edit_window_size_change),
- window);
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (new_size_menuitem), TRUE);
- g_signal_handlers_unblock_by_func (G_OBJECT (new_size_menuitem),
- G_CALLBACK (modest_msg_edit_window_size_change),
- window);
- }
-
- new_font_menuitem = GTK_WIDGET ((g_slist_nth (priv->font_items_group,
- buffer_format->font))->data);
- if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (new_font_menuitem))) {
- GtkWidget *label;
- gchar *markup;
+ path = gtk_tree_path_new_from_indices (buffer_format->font_size, -1);
+ if (gtk_tree_model_get_iter (priv->sizes_model, &iter, path)) {
+ gchar *size_text;
+ gchar *markup;
+
+ priv->current_size_index = buffer_format->font_size;
+
+ gtk_tree_model_get (priv->sizes_model, &iter, 0, &size_text, -1);
+ markup = g_strconcat ("<span font_family='Sans'>",
+ size_text, ldots, "</span>", NULL);
+
+ gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup);
+ g_free (markup);
+ g_free (size_text);
+ }
+ gtk_tree_path_free (path);
+ }
+
+ if (priv->current_face_index != buffer_format->font) {
+ GtkTreeIter iter;
+ GtkTreePath *path;
+
+ path = gtk_tree_path_new_from_indices (buffer_format->font, -1);
+ if (gtk_tree_model_get_iter (priv->faces_model, &iter, path)) {
+ gchar *face_name;
+ gchar *markup;
+
+ priv->current_face_index = buffer_format->font;
+ gtk_tree_model_get (priv->faces_model, &iter, 0, &face_name, -1);
+ markup = g_strconcat ("<span font_family='", face_name, "'>Tt", ldots, "</span>", NULL);
+ gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup);
+ g_free (face_name);
+ g_free (markup);
+ }