Add methods get/set_show_abook in recpt editor

pmo-trunk-r9127

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 71ca3b2..b7fdfdf 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -877,6 +877,9 @@ init_window (ModestMsgEditWindow *obj)
        priv->to_field      = modest_recpt_editor_new ();
        priv->cc_field      = modest_recpt_editor_new ();
        priv->bcc_field     = modest_recpt_editor_new ();
        priv->to_field      = modest_recpt_editor_new ();
        priv->cc_field      = modest_recpt_editor_new ();
        priv->bcc_field     = modest_recpt_editor_new ();

+       modest_recpt_editor_set_show_abook_button (MODEST_RECPT_EDITOR (priv->to_field), FALSE);
+       modest_recpt_editor_set_show_abook_button (MODEST_RECPT_EDITOR (priv->cc_field), FALSE);
+       modest_recpt_editor_set_show_abook_button (MODEST_RECPT_EDITOR (priv->bcc_field), FALSE);

        priv->subject_box = gtk_hbox_new (FALSE, MODEST_MARGIN_NONE);
        priv->priority_icon = gtk_image_new ();
        gtk_box_pack_start (GTK_BOX (priv->subject_box), priv->priority_icon, FALSE, FALSE, 0);
        priv->subject_box = gtk_hbox_new (FALSE, MODEST_MARGIN_NONE);
        priv->priority_icon = gtk_image_new ();
        gtk_box_pack_start (GTK_BOX (priv->subject_box), priv->priority_icon, FALSE, FALSE, 0);

diff --git a/src/widgets/modest-recpt-editor.c b/src/widgets/modest-recpt-editor.c
index a0add3a..d1a5c89 100644 (file)
--- a/src/widgets/modest-recpt-editor.c
+++ b/src/widgets/modest-recpt-editor.c
@@ -72,6 +72,7 @@ struct _ModestRecptEditorPrivate
        GtkWidget *scrolled_window;
        gchar *recipients;
        gulong on_mark_set_handler;
        GtkWidget *scrolled_window;
        gchar *recipients;
        gulong on_mark_set_handler;

+       gboolean show_abook;

 };
 
 #define MODEST_RECPT_EDITOR_GET_PRIVATE(o)     \
 };
 
 #define MODEST_RECPT_EDITOR_GET_PRIVATE(o)     \

@@ -384,7 +385,10 @@ modest_recpt_editor_instance_init (GTypeInstance *instance, gpointer g_class)
 
        priv = MODEST_RECPT_EDITOR_GET_PRIVATE (instance);
 
 
        priv = MODEST_RECPT_EDITOR_GET_PRIVATE (instance);
 

+       priv->show_abook = TRUE;

        priv->abook_button = gtk_button_new ();
        priv->abook_button = gtk_button_new ();

+       gtk_widget_set_no_show_all (GTK_WIDGET (priv->abook_button), TRUE);
+       gtk_widget_show (priv->abook_button);

 #ifdef MODEST_TOOLKIT_HILDON2
        gtk_widget_set_size_request (priv->abook_button, RECPT_BUTTON_WIDTH_HILDON2, -1);
 #else
 #ifdef MODEST_TOOLKIT_HILDON2
        gtk_widget_set_size_request (priv->abook_button, RECPT_BUTTON_WIDTH_HILDON2, -1);
 #else

@@ -994,6 +998,34 @@ modest_recpt_editor_has_focus (ModestRecptEditor *recpt_editor)
                gtk_widget_is_focus (priv->text_view);
 }
 
                gtk_widget_is_focus (priv->text_view);
 }
 

+void 
+modest_recpt_editor_set_show_abook_button (ModestRecptEditor *recpt_editor, gboolean show)
+{
+       ModestRecptEditorPrivate *priv;
+       
+       g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor));
+       priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
+
+       priv->show_abook = show;
+
+       if (show)
+               gtk_widget_show (priv->abook_button);
+       else
+               gtk_widget_hide (priv->abook_button);
+}
+
+gboolean
+modest_recpt_editor_get_show_abook_button (ModestRecptEditor *recpt_editor, gboolean show)
+{
+       ModestRecptEditorPrivate *priv;
+       
+       g_return_val_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor), FALSE);
+       priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
+
+       return priv->show_abook;
+       
+}
+

 static void
 modest_recpt_editor_finalize (GObject *object)
 {
 static void
 modest_recpt_editor_finalize (GObject *object)
 {

diff --git a/src/widgets/modest-recpt-editor.h b/src/widgets/modest-recpt-editor.h
index 3cc172c..f608899 100644 (file)
--- a/src/widgets/modest-recpt-editor.h
+++ b/src/widgets/modest-recpt-editor.h
@@ -85,6 +85,8 @@ void modest_recpt_editor_set_field_size_group (ModestRecptEditor *recpt_editor,
 GtkTextBuffer *modest_recpt_editor_get_buffer (ModestRecptEditor *recpt_editor);
 void modest_recpt_editor_grab_focus (ModestRecptEditor *recpt_editor);
 gboolean modest_recpt_editor_has_focus (ModestRecptEditor *recpt_editor);
 GtkTextBuffer *modest_recpt_editor_get_buffer (ModestRecptEditor *recpt_editor);
 void modest_recpt_editor_grab_focus (ModestRecptEditor *recpt_editor);
 gboolean modest_recpt_editor_has_focus (ModestRecptEditor *recpt_editor);

+void modest_recpt_editor_set_show_abook_button (ModestRecptEditor *recpt_editor, gboolean show);
+gboolean modest_recpt_editor_get_show_abook_button (ModestRecptEditor *recpt_editor, gboolean show);

 
 G_END_DECLS
 
 
 G_END_DECLS