* Get the device name from the system instead of from bluetooth. Seems that could...

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

diff --git a/src/widgets/modest-recpt-editor.c b/src/widgets/modest-recpt-editor.c
index 730109c..45b7ec2 100644 (file)
--- a/src/widgets/modest-recpt-editor.c
+++ b/src/widgets/modest-recpt-editor.c
@@ -49,6 +49,8 @@
 #include "modest-hildon-includes.h"
 #endif /*!MODEST_TOOLKIT_GTK*/
 
+#define RECPT_BUTTON_WIDTH_HILDON2 118
+
 
 static GObjectClass *parent_class = NULL;
 
@@ -352,10 +354,14 @@ modest_recpt_editor_instance_init (GTypeInstance *instance, gpointer g_class)
        priv = MODEST_RECPT_EDITOR_GET_PRIVATE (instance);
 
        priv->abook_button = gtk_button_new ();
+#ifdef MODEST_TOOLKIT_HILDON2
+       gtk_widget_set_size_request (priv->abook_button, RECPT_BUTTON_WIDTH_HILDON2, -1);
+#else
        gtk_button_set_relief (GTK_BUTTON (priv->abook_button), GTK_RELIEF_NONE);
+#endif
        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);
+       gtk_button_set_alignment (GTK_BUTTON (priv->abook_button), 0.5, 0.5);
 #ifdef MODEST_TOOLKIT_HILDON2
        abook_icon = gtk_image_new_from_icon_name ("general_contacts", HILDON_ICON_SIZE_FINGER);
 #else
@@ -932,7 +938,9 @@ modest_recpt_editor_grab_focus (ModestRecptEditor *recpt_editor)
        g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor));
        priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
 
-       gtk_widget_grab_focus (priv->text_view);
+       if (GTK_WIDGET_VISIBLE (recpt_editor)) {
+               gtk_widget_grab_focus (priv->text_view);
+       }
 }
 
 gboolean
@@ -943,7 +951,8 @@ modest_recpt_editor_has_focus (ModestRecptEditor *recpt_editor)
        g_return_val_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor), FALSE);
        priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
 
-       return gtk_widget_is_focus (priv->text_view);
+       return GTK_WIDGET_VISIBLE (priv->text_view) && 
+               gtk_widget_is_focus (priv->text_view);
 }
 
 static void