[empathy: 1/5] Allow to specify the subscription request message
- From: Jonny Lamb <jonnylamb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 1/5] Allow to specify the subscription request message
- Date: Mon, 22 Aug 2011 08:02:18 +0000 (UTC)
commit 6afea914d5c915cde2fc3bf660441d8417ffcede
Author: Emilio Pozuelo Monfort <emilio pozuelo collabora co uk>
Date: Wed Jun 1 17:26:36 2011 +0100
Allow to specify the subscription request message
https://bugzilla.gnome.org/show_bug.cgi?id=656934
libempathy-gtk/empathy-contact-search-dialog.c | 37 ++++++++++++++++++++++--
1 files changed, 34 insertions(+), 3 deletions(-)
---
diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c
index 8b2f7f3..c991d64 100644
--- a/libempathy-gtk/empathy-contact-search-dialog.c
+++ b/libempathy-gtk/empathy-contact-search-dialog.c
@@ -73,6 +73,7 @@ struct _EmpathyContactSearchDialogPrivate
GtkWidget *no_contact_found;
GtkWidget *search_entry;
/* GtkWidget *server_entry; */
+ GtkWidget *message;
};
static void
@@ -140,6 +141,7 @@ on_get_contact_factory_get_from_id_cb (TpConnection *connection,
GObject *object)
{
EmpathyContactManager *manager = empathy_contact_manager_dup_singleton ();
+ const gchar *message = user_data;
if (error != NULL)
{
@@ -147,7 +149,8 @@ on_get_contact_factory_get_from_id_cb (TpConnection *connection,
return;
}
- empathy_contact_list_add (EMPATHY_CONTACT_LIST (manager), contact, "");
+ empathy_contact_list_add (EMPATHY_CONTACT_LIST (manager), contact,
+ message);
}
static void
@@ -158,6 +161,9 @@ add_selected_contact (EmpathyContactSearchDialog *self)
TpConnection *conn;
GtkTreeIter iter;
GtkTreeModel *model;
+ GtkTextBuffer *buffer;
+ GtkTextIter start, end;
+ gchar *message;
gboolean sel;
gchar *id;
@@ -170,9 +176,14 @@ add_selected_contact (EmpathyContactSearchDialog *self)
DEBUG ("Requested to add contact: %s", id);
+ buffer = gtk_text_view_get_buffer GTK_TEXT_VIEW (priv->message);
+ gtk_text_buffer_get_start_iter (buffer, &start);
+ gtk_text_buffer_get_end_iter (buffer, &end);
+ message = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+
empathy_tp_contact_factory_get_from_id (conn, id,
- on_get_contact_factory_get_from_id_cb, NULL,
- NULL, NULL);
+ on_get_contact_factory_get_from_id_cb,
+ message, g_free, NULL);
/* Close the dialog */
gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_CANCEL);
@@ -591,6 +602,26 @@ empathy_contact_search_dialog_init (EmpathyContactSearchDialog *self)
gtk_box_pack_start (GTK_BOX (vbox), priv->notebook, TRUE, TRUE, 3);
+ /* Request message textview */
+ label = gtk_label_new (_("Your message introducing yourself:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+
+ priv->message = gtk_text_view_new ();
+ gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (priv->message),
+ GTK_WRAP_WORD_CHAR);
+ gtk_text_buffer_set_text (
+ gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->message)),
+ _("Please let me see when you're online. Thanks!"), -1);
+
+ scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+
+ gtk_container_add (GTK_CONTAINER (scrolled_window), priv->message);
+
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 3);
+ gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, FALSE, TRUE, 3);
+
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (
GTK_DIALOG (self))), vbox, TRUE, TRUE, 0);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]