#include <libgnomevfs/gnome-vfs-mime.h>
#include <modest-utils.h>
#include <modest-ui-constants.h>
-#include "modest-color-button.h"
#include <modest-toolkit-utils.h>
#ifdef MODEST_USE_CALENDAR_WIDGETS
#include <hildon/hildon.h>
#include "modest-maemo-utils.h"
#include "modest-hildon-includes.h"
+#include "modest-color-button.h"
#endif
-#define DEFAULT_FONT_SIZE 3
-#define DEFAULT_FONT 2
-#define DEFAULT_SIZE_BUTTON_FONT_FAMILY "Sans"
#define DEFAULT_MAIN_VBOX_SPACING 0
#define SUBJECT_MAX_LENGTH 1000
#define IMAGE_MAX_WIDTH 560
+#ifdef MODEST_TOOLKIT_HILDON2
+#define DEFAULT_SIZE_BUTTON_FONT_FAMILY "Sans"
#define DEFAULT_FONT_SCALE 1.5
+#define DEFAULT_FONT_SIZE 3
+#define DEFAULT_FONT 2
+#else
+#define DEFAULT_SIZE_BUTTON_FONT_FAMILY "Sans"
+#define DEFAULT_FONT_SCALE 1.0
+#define DEFAULT_FONT_SIZE 2
+#define DEFAULT_FONT 2
+#endif
#define ATTACHMENT_BUTTON_WIDTH 118
#define MAX_FROM_VALUE 36
#define MAX_BODY_LENGTH 128*1024
(GInstanceInitFunc) modest_msg_edit_window_init,
NULL
};
- my_type = g_type_register_static (MODEST_TYPE_HILDON2_WINDOW,
+ my_type = g_type_register_static (
+#ifdef MODEST_TOOLKIT_HILDON2
+ MODEST_TYPE_HILDON2_WINDOW,
+#else
+ MODEST_TYPE_SHELL_WINDOW,
+#endif
"ModestMsgEditWindow",
&my_info, 0);
}
init_window (obj);
-
+#ifdef MODEST_TOOLKIT_HILDON2
hildon_program_add_window (hildon_program_get_instance(),
HILDON_WINDOW(obj));
+#endif
}
static gchar *
ModestMsgEditWindowPrivate *priv;
GtkActionGroup *action_group;
ModestWindowPrivate *parent_priv;
- GdkPixbuf *window_icon = NULL;
GError *error = NULL;
GtkSizeGroup *title_size_group;
g_clear_error (&error);
}
- /* Add accelerators */
- gtk_window_add_accel_group (GTK_WINDOW (obj),
- gtk_ui_manager_get_accel_group (parent_priv->ui_manager));
-
parent_priv->menubar = NULL;
title_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
priv->from_field);
gtk_widget_show (from_caption);
} else {
+#ifdef MODEST_TOOLKIT_HILDON2
modest_toolkit_utils_set_hbutton_layout (title_size_group, NULL,
_("mail_va_from"), priv->from_field);
hildon_button_set_alignment (HILDON_BUTTON (priv->from_field), 0.0, 0.5, 1.0, 1.0);
hildon_button_set_title_alignment (HILDON_BUTTON (priv->from_field), 0.0, 0.5);
hildon_button_set_value_alignment (HILDON_BUTTON (priv->from_field), 1.0, 0.5);
from_caption = priv->from_field;
+#endif
}
priv->to_field = modest_recpt_editor_new ();
gtk_entry_set_max_length (GTK_ENTRY (priv->subject_field) ,SUBJECT_MAX_LENGTH);
g_object_set (G_OBJECT (priv->subject_field), "truncate-multiline", TRUE, NULL);
modest_entry_set_hint (priv->subject_field, _("mail_va_no_subject"));
+#ifdef MAEMO_CHANGES
hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->subject_field),
HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP);
+#endif
gtk_box_pack_start (GTK_BOX (priv->subject_box), priv->subject_field, TRUE, TRUE, 0);
priv->attachments_view = modest_attachments_view_new (NULL);
modest_attachments_view_set_style (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
_("mail_va_attachment"),
FALSE,
priv->attachments_view,
+#ifdef MODEST_TOOLKIT_HILDON2
HILDON_SIZE_AUTO_WIDTH |
- HILDON_SIZE_AUTO_HEIGHT);
+ HILDON_SIZE_AUTO_HEIGHT
+#else
+ 0
+#endif
+ );
attachments_label = modest_toolkit_utils_captioned_get_label_widget (priv->attachments_caption);
+#ifdef MAEMO_CHANGES
hildon_gtk_widget_set_theme_size (attachments_label, HILDON_SIZE_AUTO_HEIGHT);
+#endif
+#ifdef MODEST_TOOLKIT_HILDON2
priv->send_button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT);
send_icon = gtk_image_new_from_icon_name (MODEST_TOOLBAR_ICON_MAIL_SEND, HILDON_ICON_SIZE_FINGER);
+#else
+ priv->send_button = gtk_button_new ();
+ send_icon = gtk_image_new_from_icon_name (MODEST_TOOLBAR_ICON_MAIL_SEND, GTK_ICON_SIZE_BUTTON);
+#endif
gtk_container_add (GTK_CONTAINER (priv->send_button), send_icon);
gtk_widget_set_size_request (GTK_WIDGET (priv->send_button), 148, -1);
priv->brand_icon = gtk_image_new ();
gtk_misc_set_alignment (GTK_MISC (priv->brand_icon), 0.5, 0.5);
priv->brand_label = gtk_label_new (NULL);
+#ifdef MODEST_TOOLKIT_HILDON2
hildon_helper_set_logical_font (priv->brand_label, "SmallSystemFont");
+#endif
gtk_misc_set_alignment (GTK_MISC (priv->brand_label), 0.0, 0.5);
gtk_widget_set_no_show_all (priv->brand_icon, TRUE);
gtk_widget_set_no_show_all (priv->brand_label, TRUE);
gtk_box_pack_start (GTK_BOX (window_box), priv->scrollable, TRUE, TRUE, 0);
- /* Set window icon */
- window_icon = modest_platform_get_icon (MODEST_APP_MSG_EDIT_ICON, MODEST_ICON_SIZE_BIG);
- if (window_icon) {
- gtk_window_set_icon (GTK_WINDOW (obj), window_icon);
- g_object_unref (window_icon);
- }
}
static void
}
g_signal_connect (G_OBJECT (loader), "size-prepared", G_CALLBACK (pixbuf_size_prepared), self);
- hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), TRUE);
+ modest_window_show_progress (MODEST_WINDOW (self), TRUE);
tny_stream_reset (TNY_STREAM (stream));
while (!tny_stream_is_eos (TNY_STREAM (stream))) {
while (gtk_events_pending ())
gtk_main_iteration ();
}
- hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), FALSE);
+ modest_window_show_progress (MODEST_WINDOW (self), FALSE);
gdk_pixbuf_loader_close (loader, &error);
if (pixbuf != NULL) {
priv->images_count ++;
priv->images_size += stream_size;
+#ifndef MODEST_HAVE_LIBWPEDITOR_PLUS
wp_text_buffer_replace_image (WP_TEXT_BUFFER (priv->text_buffer), cid, pixbuf);
+#endif
g_object_unref (pixbuf);
}
}
/* Toolbar */
parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
gtk_toolbar_set_show_arrow (GTK_TOOLBAR (parent_priv->toolbar), FALSE);
- gtk_toolbar_set_icon_size (GTK_TOOLBAR (parent_priv->toolbar), HILDON_ICON_SIZE_FINGER);
+ gtk_toolbar_set_icon_size (GTK_TOOLBAR (parent_priv->toolbar),
+#ifdef MODEST_TOOLKIT_HILDON2
+ HILDON_ICON_SIZE_FINGER
+#else
+ GTK_ICON_SIZE_LARGE_TOOLBAR
+#endif
+ );
modest_window_add_toolbar (MODEST_WINDOW (window), GTK_TOOLBAR (parent_priv->toolbar));
/* Font color placeholder */
/* font color */
priv->font_color_toolitem = GTK_WIDGET (gtk_tool_item_new ());
+#ifdef MODEST_TOOLKIT_HILDON2
priv->font_color_button = modest_color_button_new ();
+#else
+ priv->font_color_button = gtk_color_button_new ();
+#endif
gtk_widget_set_size_request (priv->font_color_button, -1, 48);
GTK_WIDGET_UNSET_FLAGS (priv->font_color_toolitem, GTK_CAN_FOCUS);
GTK_WIDGET_UNSET_FLAGS (priv->font_color_button, GTK_CAN_FOCUS);
gtk_label_set_markup (GTK_LABEL (priv->size_tool_button_label), markup);
gtk_misc_set_alignment (GTK_MISC (priv->size_tool_button_label), 1.0, 0.5);
g_free (markup);
+#ifdef MODEST_TOOLKIT_HILDON2
hildon_helper_set_logical_font (priv->size_tool_button_label, "LargeSystemFont");
+#endif
hbox = gtk_hbox_new (MODEST_MARGIN_DEFAULT, FALSE);
gtk_box_pack_start (GTK_BOX (hbox), priv->size_tool_button_label, TRUE, TRUE, 0);
arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup);
gtk_misc_set_alignment (GTK_MISC (priv->font_tool_button_label), 1.0, 0.5);
g_free(markup);
+#ifdef MODEST_TOOLKIT_HILDON2
hildon_helper_set_logical_font (priv->font_tool_button_label, "LargeSystemFont");
+#endif
hbox = gtk_hbox_new (MODEST_MARGIN_DEFAULT, FALSE);
gtk_box_pack_start (GTK_BOX (hbox), priv->font_tool_button_label, TRUE, TRUE, 0);
arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
switch (format) {
case MODEST_MSG_EDIT_FORMAT_HTML:
wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
+ update_signature (self, priv->last_from_account, priv->last_from_account);
if (parent_priv->toolbar) gtk_widget_show (parent_priv->toolbar);
break;
case MODEST_MSG_EDIT_FORMAT_TEXT:
g_signal_handlers_block_by_func (G_OBJECT (priv->font_color_button),
G_CALLBACK (modest_msg_edit_window_color_button_change),
window);
+#ifdef MODEST_TOOLKIT_HILDON2
hildon_color_button_set_color (HILDON_COLOR_BUTTON (priv->font_color_button), & (buffer_format->color));
+#else
+ gtk_color_button_set_color (GTK_COLOR_BUTTON (priv->font_color_button), & (buffer_format->color));
+#endif
g_signal_handlers_unblock_by_func (G_OBJECT (priv->font_color_button),
G_CALLBACK (modest_msg_edit_window_color_button_change),
window);
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), buffer_format, FALSE);
+#ifdef MODEST_TOOLKIT_HILDON2
dialog = hildon_color_chooser_new ();
hildon_color_chooser_set_color (HILDON_COLOR_CHOOSER (dialog), &(buffer_format->color));
g_free (buffer_format);
(gpointer) &col);
}
gtk_widget_destroy (dialog);
-}
-
+#else
+ dialog = gtk_color_selection_dialog_new (NULL);
+ GtkWidget *selection;
-void
-modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window)
-{
- ModestMsgEditWindowPrivate *priv;
- GtkWidget *dialog = NULL;
- GdkColor *old_color = NULL;
-
- priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
- old_color = (GdkColor*)wp_text_buffer_get_background_color (WP_TEXT_BUFFER (priv->text_buffer));
-
- dialog = hildon_color_chooser_new ();
- hildon_color_chooser_set_color (HILDON_COLOR_CHOOSER (dialog),(GdkColor*)old_color);
+ g_object_get (G_OBJECT (dialog), "color_selection", &selection, NULL);
+ gtk_color_selection_set_current_color (GTK_COLOR_SELECTION (selection), &(buffer_format->color));
+ gtk_color_selection_set_previous_color (GTK_COLOR_SELECTION (selection), &(buffer_format->color));
+ g_free (buffer_format);
- if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
GdkColor col;
- hildon_color_chooser_get_color (HILDON_COLOR_CHOOSER(dialog), &col);
- wp_text_buffer_set_background_color (WP_TEXT_BUFFER (priv->text_buffer), &col);
+ gtk_color_selection_get_current_color (GTK_COLOR_SELECTION(selection), &col);
+ wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR,
+ (gpointer) &col);
}
gtk_widget_destroy (dialog);
+#endif
}
+
static TnyStream*
create_stream_for_uri (const gchar* uri)
{
if (stream == NULL) {
modest_platform_information_banner (NULL, NULL,
- _FM("sfil_ib_opening_not_allowed"));
+ _FM_OPENING_NOT_ALLOWED);
g_free (filename);
g_object_unref (mime_part);
gnome_vfs_file_info_unref (info);
if (stream == NULL) {
- modest_platform_information_banner (NULL, NULL, _FM("sfil_ib_opening_not_allowed"));
+ modest_platform_information_banner (NULL, NULL, _FM_OPENING_NOT_ALLOWED);
g_object_unref (mime_part);
g_free (filename);
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
- hildon_color_button_get_color (HILDON_COLOR_BUTTON(priv->font_color_button), &new_color);
+ gtk_color_button_get_color (GTK_COLOR_BUTTON(priv->font_color_button), &new_color);
wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FORECOLOR, (gpointer) &new_color);
font_size_clicked (GtkToolButton *button,
ModestMsgEditWindow *window)
{
+#ifdef MODEST_TOOLKIT_HILDON2
ModestMsgEditWindowPrivate *priv;
GtkWidget *selector, *dialog;
gtk_widget_destroy (dialog);
gtk_widget_grab_focus (GTK_WIDGET (priv->msg_body));
-
+#endif
}
static void
font_face_clicked (GtkToolButton *button,
ModestMsgEditWindow *window)
{
+#ifdef MODEST_TOOLKIT_HILDON2
ModestMsgEditWindowPrivate *priv;
GtkWidget *selector, *dialog;
GtkCellRenderer *renderer;
gtk_widget_destroy (dialog);
gtk_widget_grab_focus (GTK_WIDGET (priv->msg_body));
-
+#endif
}
void
case TNY_HEADER_FLAG_HIGH_PRIORITY:
gtk_image_set_from_icon_name (GTK_IMAGE (priv->priority_icon),
MODEST_HEADER_ICON_HIGH,
- HILDON_ICON_SIZE_SMALL);
+#ifdef MODEST_TOOLKIT_HILDON2
+ HILDON_ICON_SIZE_SMALL
+#else
+ GTK_ICON_SIZE_BUTTON
+#endif
+);
gtk_widget_show (priv->priority_icon);
priority_action = gtk_ui_manager_get_action (parent_priv->ui_manager,
"/MenuBar/ToolsMenu/MessagePriorityMenu/MessagePriorityHighMenu");
case TNY_HEADER_FLAG_LOW_PRIORITY:
gtk_image_set_from_icon_name (GTK_IMAGE (priv->priority_icon),
MODEST_HEADER_ICON_LOW,
- HILDON_ICON_SIZE_SMALL);
+#ifdef MODEST_TOOLKIT_HILDON2
+ HILDON_ICON_SIZE_SMALL
+#else
+ GTK_ICON_SIZE_BUTTON
+#endif
+);
gtk_widget_show (priv->priority_icon);
priority_action = gtk_ui_manager_get_action (parent_priv->ui_manager,
"/MenuBar/ToolsMenu/MessagePriorityMenu/MessagePriorityLowMenu");
case MODEST_FILE_FORMAT_FORMATTED_TEXT:
wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
remove_tags (WP_TEXT_BUFFER (priv->text_buffer));
+ update_signature (window, priv->last_from_account, priv->last_from_account);
if (parent_priv->toolbar)
gtk_widget_show (parent_priv->toolbar);
break;
case MODEST_FILE_FORMAT_PLAIN_TEXT:
{
- GtkWidget *dialog;
gint response;
- dialog = hildon_note_new_confirmation (NULL, _("emev_nc_formatting_lost"));
- response = gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
+ response = modest_platform_run_confirmation_dialog (NULL, _("emev_nc_formatting_lost"));
if (response == GTK_RESPONSE_OK) {
wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE);
if (parent_priv->toolbar)
void
modest_msg_edit_window_select_font (ModestMsgEditWindow *window)
{
+#ifdef MODEST_TOOLKIT_HILDON2
GtkWidget *dialog;
ModestMsgEditWindowPrivate *priv;
WPTextBufferFormat oldfmt, fmt;
gtk_widget_destroy (dialog);
gtk_widget_grab_focus(GTK_WIDGET(priv->msg_body));
+#endif
}
void
}
if (line > MAX_BODY_LINES || offset + utf8_len > MAX_BODY_LENGTH) {
if (priv->max_chars_banner == NULL) {
+#ifdef MODEST_TOOLKIT_HILDON2
priv->max_chars_banner = hildon_banner_show_information (GTK_WIDGET (window), NULL,
- _CS("ckdg_ib_maximum_characters_reached"));
+ _CS_MAXIMUM_CHARACTERS_REACHED);
g_object_weak_ref (G_OBJECT (priv->max_chars_banner), (GWeakNotify) max_chars_banner_unref, window);
+#endif
}
}
}
if (result_len + old_length > 1000) {
modest_platform_system_banner (GTK_WIDGET (window), NULL,
- _CS("ckdg_ib_maximum_characters_reached"));
+ _CS_MAXIMUM_CHARACTERS_REACHED);
}
g_string_free (result, TRUE);
}
g_free (priv->last_search);
priv->last_search = NULL;
/* Information banner about empty search */
- modest_platform_system_banner (NULL, NULL, _CS("ecdg_ib_find_rep_enter_text"));
+ modest_platform_system_banner (NULL, NULL, _CS_FIND_REP_ENTER_TEXT);
return;
}
result = gtk_text_iter_forward_search_insensitive (&selection_end, current_search,
&match_start, &match_end);
if (!result)
- modest_platform_system_banner (NULL, NULL, _HL("ckct_ib_find_search_complete"));
+ modest_platform_system_banner (NULL, NULL, _HL_IB_FIND_COMPLETE);
} else {
GtkTextIter buffer_start;
gtk_text_buffer_get_start_iter (priv->text_buffer, &buffer_start);
result = gtk_text_iter_forward_search_insensitive (&buffer_start, current_search,
&match_start, &match_end);
if (!result)
- modest_platform_system_banner (NULL, NULL, _HL("ckct_ib_find_no_matches"));
+ modest_platform_system_banner (NULL, NULL, _HL_IB_FIND_NO_MATCHES);
}
/* Mark as selected the string found in search */
priv->last_from_account = modest_selector_get_active_id (priv->from_field);
signature = modest_account_mgr_get_signature_from_recipient (mgr, new_account, &has_new_signature);
if (has_new_signature) {
+ gboolean is_rich;
gchar *full_signature = g_strconcat ((gtk_text_iter_starts_line (&iter)) ? "" : "\n",
MODEST_TEXT_UTILS_SIGNATURE_MARKER, "\n",
signature, NULL);
- gtk_text_buffer_insert (priv->text_buffer, &iter, full_signature, -1);
- g_free (full_signature);
+ is_rich = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer));
+ if (is_rich) {
+ WPTextBufferFormat *fmt;
+ GdkColor style_color;
+ if (!gtk_style_lookup_color (GTK_WIDGET (self)->style, "SecondaryTextColor", &style_color)) {
+ gdk_color_parse ("grey", &style_color);
+ }
+ fmt = g_new0 (WPTextBufferFormat, 1);
+ fmt->color = style_color;
+ fmt->cs.color = 0x1;
+ wp_text_buffer_insert_with_attribute (WP_TEXT_BUFFER (priv->text_buffer), &iter,
+ full_signature, -1,
+ fmt, TRUE);
+ g_free (fmt);
+ g_free (full_signature);
+ } else {
+ gtk_text_buffer_insert (priv->text_buffer, &iter, full_signature, -1);
+ }
}
g_free (signature);
gtk_text_buffer_end_user_action (priv->text_buffer);
GtkToggleButton *current_format;
} MessageSettingsHelper;
+#ifdef MODEST_TOOLKIT_HILDON2
static void
on_priority_toggle (GtkToggleButton *button,
MessageSettingsHelper *helper)
}
}
+#endif
static void
modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window)
{
+#ifdef MODEST_TOOLKIT_HILDON2
GtkWidget *dialog;
GtkWidget *align;
GtkWidget *vbox;
dialog = gtk_dialog_new_with_buttons (_("mcen_me_message_settings"), NULL,
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- _HL("wdgt_bd_done"), GTK_RESPONSE_ACCEPT, NULL);
+ _HL_DONE, GTK_RESPONSE_ACCEPT, NULL);
vbox = gtk_vbox_new (FALSE, 0);
align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE, 0);
gtk_widget_destroy (dialog);
g_slist_free (helper.priority_group);
+#endif
}
static void
modest_msg_edit_window_show_msg_settings_dialog (window);
}
+#ifdef MODEST_TOOLKIT_HILDON2
static void
on_cc_button_toggled (GtkWidget *button,
ModestMsgEditWindow *window)
modest_msg_edit_window_show_bcc (MODEST_MSG_EDIT_WINDOW (window),
modest_togglable_get_active (button));
}
+#endif
-static void
+static void
setup_menu (ModestMsgEditWindow *self)
{
ModestMsgEditWindowPrivate *priv = NULL;
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_undo),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_undo));
+#ifdef MODEST_TOOLKIT_HILDON2
priv->cc_button = hildon_check_button_new (0);
gtk_button_set_label (GTK_BUTTON (priv->cc_button), _("mcen_me_editor_showcc"));
hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->cc_button),
NULL);
g_signal_connect (G_OBJECT (priv->bcc_button), "toggled",
G_CALLBACK (on_bcc_button_toggled), (gpointer) self);
+#endif
modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_editor_attach_inlineimage"), NULL,
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_insert_image),
align = gtk_alignment_new (0.0, 0.0, 1.0, 0.0);
gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 0, MODEST_MARGIN_DEFAULT);
+#ifdef MODEST_TOOLKIT_HILDON2
abook_button = hildon_gtk_button_new (HILDON_SIZE_FINGER_HEIGHT);
+#else
+ abook_button = gtk_button_new ();
+#endif
label_widget = gtk_label_new (label);
gtk_misc_set_alignment (GTK_MISC (label_widget), 0.0, 0.5);
gtk_container_add (GTK_CONTAINER (abook_button), label_widget);
projects / modest / blobdiff