* Fixes NB#92178, replaced an old logical id

[modest] / src / widgets / modest-recpt-editor.c

diff --git a/src/widgets/modest-recpt-editor.c b/src/widgets/modest-recpt-editor.c
index a1d408e..c145a19 100644 (file)
--- a/src/widgets/modest-recpt-editor.c
+++ b/src/widgets/modest-recpt-editor.c
@@ -45,9 +45,9 @@
 #include <gtk/gtk.h>
 
 /* FIXNE: we should have no maemo-deps in widgets/ */
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
 #include "maemo/modest-hildon-includes.h"
-#endif /*MODEST_PLATFORM_MAEMO*/
+#endif /*!MODEST_TOOLKIT_GTK*/
 
 
 static GObjectClass *parent_class = NULL;
@@ -153,7 +153,7 @@ modest_recpt_editor_add_recipients (ModestRecptEditor *recpt_editor, const gchar
        ModestRecptEditorPrivate *priv;
        GtkTextBuffer *buffer = NULL;
        GtkTextIter iter;
-       gchar * string_to_add;
+       gchar *string_to_add;
 
        g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor));
        priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
@@ -173,13 +173,14 @@ modest_recpt_editor_add_recipients (ModestRecptEditor *recpt_editor, const gchar
 
        g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor);
 
-       gtk_text_buffer_insert (buffer, &iter, recipients, -1);
+       gtk_text_buffer_insert (buffer, &iter, string_to_add, -1);
        
        g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor);
 
        if (GTK_WIDGET_REALIZED (recpt_editor))
                gtk_widget_queue_resize (GTK_WIDGET (recpt_editor));
 
+       g_free (string_to_add);
 }
 
 void 
@@ -335,7 +336,11 @@ modest_recpt_editor_instance_init (GTypeInstance *instance, gpointer g_class)
        gtk_button_set_focus_on_click (GTK_BUTTON (priv->abook_button), FALSE);
        GTK_WIDGET_UNSET_FLAGS (priv->abook_button, GTK_CAN_FOCUS);
        gtk_button_set_alignment (GTK_BUTTON (priv->abook_button), 1.0, 1.0);
+#ifdef MODEST_TOOLKIT_HILDON2
+       abook_icon = gtk_image_new_from_icon_name ("tasklaunch_contact_64", GTK_ICON_SIZE_BUTTON);
+#else
        abook_icon = gtk_image_new_from_icon_name ("qgn_list_addressbook", GTK_ICON_SIZE_BUTTON);
+#endif
        gtk_container_add (GTK_CONTAINER (priv->abook_button), abook_icon);
 
        priv->text_view = gtk_text_view_new ();