X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=libempathy-gtk%2Fempathy-new-message-dialog.c;h=b1a35095b75a7fbbf7a6458fd64633978f6574ca;hp=b07f13e21f3208d7a969d695d58c27f900bb4ab7;hb=9b9fcd3ce3b9c7fdc62836821d83377bec58d0a5;hpb=692886962aec6022d4fab9cdbd9867f2acd7f75c

diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index b07f13e2..b1a35095 100644
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -25,15 +25,20 @@
 #include <stdlib.h>
 
 #include <gtk/gtk.h>
-#include <glade/glade.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <libmissioncontrol/mc-account.h>
 #include <libmissioncontrol/mission-control.h>
 
-#include <libempathy/empathy-contact-factory.h>
+#include <libempathy/empathy-call-factory.h>
+#include <libempathy/empathy-tp-contact-factory.h>
+#include <libempathy/empathy-contact-manager.h>
+#include <libempathy/empathy-dispatcher.h>
 #include <libempathy/empathy-utils.h>
 
+#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
+#include <libempathy/empathy-debug.h>
+
 #include <libempathy-gtk/empathy-ui-utils.h>
 
 #include "empathy-new-message-dialog.h"
@@ -46,34 +51,172 @@ typedef struct {
 	GtkWidget *entry_id;
 	GtkWidget *button_chat;
 	GtkWidget *button_call;
+	EmpathyContactManager *contact_manager;
 } EmpathyNewMessageDialog;
 
+enum {
+	COMPLETION_COL_TEXT,
+	COMPLETION_COL_ID,
+	COMPLETION_COL_NAME,
+} CompletionCol;
+
+static void
+new_message_dialog_account_changed_cb (GtkWidget               *widget,
+				       EmpathyNewMessageDialog *dialog)
+{
+	EmpathyAccountChooser *chooser;
+	TpConnection          *connection;
+	EmpathyTpContactList *contact_list;
+	GList                *members;
+	GtkListStore         *store;
+	GtkEntryCompletion   *completion;
+	GtkTreeIter           iter;
+	gchar                *tmpstr;
+
+	/* Remove completions */
+	completion = gtk_entry_get_completion (GTK_ENTRY (dialog->entry_id));
+	store = GTK_LIST_STORE (gtk_entry_completion_get_model (completion));
+	gtk_list_store_clear (store);
+
+	/* Get members of the new account */
+	chooser = EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser);
+	connection = empathy_account_chooser_get_connection (chooser);
+	if (!connection) {
+		return;
+	}
+	contact_list = empathy_contact_manager_get_list (dialog->contact_manager,
+							 connection);
+	members = empathy_contact_list_get_members (EMPATHY_CONTACT_LIST (contact_list));
+
+	/* Add members to the completion */
+	while (members) {
+		EmpathyContact *contact = members->data;
+
+		if (empathy_contact_is_online (contact)) {
+			DEBUG ("Adding contact ID %s, Name %s",
+			       empathy_contact_get_id (contact),
+			       empathy_contact_get_name (contact));
+
+			tmpstr = g_strdup_printf ("%s (%s)",
+				empathy_contact_get_name (contact),
+				empathy_contact_get_id (contact));
+
+			gtk_list_store_insert_with_values (store, &iter, -1,
+				COMPLETION_COL_TEXT, tmpstr,
+				COMPLETION_COL_ID, empathy_contact_get_id (contact),
+				COMPLETION_COL_NAME, empathy_contact_get_name (contact),
+				-1);
+
+			g_free (tmpstr);
+		}
+
+		g_object_unref (contact);
+		members = g_list_delete_link (members, members);
+	}
+}
+
+static gboolean
+new_message_dialog_match_selected_cb (GtkEntryCompletion *widget,
+				      GtkTreeModel       *model,
+				      GtkTreeIter        *iter,
+				      EmpathyNewMessageDialog *dialog)
+{
+	gchar *id;
+
+	if (!iter || !model) {
+		return FALSE;
+	}
+
+	gtk_tree_model_get (model, iter, COMPLETION_COL_ID, &id, -1);
+	gtk_entry_set_text (GTK_ENTRY (dialog->entry_id), id);
+
+	DEBUG ("Got selected match **%s**", id);
+
+	g_free (id);
+
+	return TRUE;
+}
+
+static gboolean
+new_message_dialog_match_func (GtkEntryCompletion *completion,
+			       const gchar        *key,
+			       GtkTreeIter        *iter,
+			       gpointer            user_data)
+{
+	GtkTreeModel *model;
+	gchar        *id;
+	gchar        *name;
+
+	model = gtk_entry_completion_get_model (completion);
+	if (!model || !iter) {
+		return FALSE;
+	}
+
+	gtk_tree_model_get (model, iter, COMPLETION_COL_NAME, &name, -1);
+	if (strstr (name, key)) {
+		DEBUG ("Key %s is matching name **%s**", key, name);
+		g_free (name);
+		return TRUE;
+	}
+	g_free (name);
+
+	gtk_tree_model_get (model, iter, COMPLETION_COL_ID, &id, -1);
+	if (strstr (id, key)) {
+		DEBUG ("Key %s is matching ID **%s**", key, id);
+		g_free (id);
+		return TRUE;
+	}
+	g_free (id);
+
+	return FALSE;
+}
+
+static void
+new_message_dialog_call_got_contact_cb (EmpathyTpContactFactory *factory,
+					EmpathyContact          *contact,
+					const GError            *error,
+					gpointer                 user_data,
+					GObject                 *weak_object)
+{
+	EmpathyCallFactory *call_factory;
+
+	if (error != NULL) {
+		DEBUG ("Error: %s", error->message);
+		return;
+	}
+
+	call_factory = empathy_call_factory_get();
+	empathy_call_factory_new_call (call_factory, contact);
+}
+
 static void
 new_message_dialog_response_cb (GtkWidget               *widget,
 				gint                    response,
 				EmpathyNewMessageDialog *dialog)
 {
-	McAccount   *account;
+	TpConnection *connection;
 	const gchar *id;
 
-	account = empathy_account_chooser_get_account (EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser));
+	connection = empathy_account_chooser_get_connection (
+		EMPATHY_ACCOUNT_CHOOSER (dialog->account_chooser));
 	id = gtk_entry_get_text (GTK_ENTRY (dialog->entry_id));
-	if (!account || G_STR_EMPTY (id)) {
-		if (account) {
-			g_object_unref (account);
-		}
+	if (!connection || EMP_STR_EMPTY (id)) {
 		gtk_widget_destroy (widget);
 		return;
 	}
 
 	if (response == 1) {
-		empathy_call_with_contact_id (account, id);
-	}	
-	else if (response == 2) {
-		empathy_chat_with_contact_id (account, id);
+		EmpathyTpContactFactory *factory;
+
+		factory = empathy_tp_contact_factory_dup_singleton (connection);
+		empathy_tp_contact_factory_get_from_id (factory, id,
+			new_message_dialog_call_got_contact_cb,
+			NULL, NULL, NULL);
+		g_object_unref (factory);
+	} else if (response == 2) {
+		empathy_dispatcher_chat_with_contact_id (connection, id, NULL, NULL);
 	}
 
-	g_object_unref (account);
 	gtk_widget_destroy (widget);
 }
 
@@ -85,7 +228,7 @@ new_message_change_state_button_cb  (GtkEditable             *editable,
 	gboolean     sensitive;
 
 	id = gtk_entry_get_text (GTK_ENTRY (editable));
-	sensitive = !G_STR_EMPTY (id);
+	sensitive = !EMP_STR_EMPTY (id);
 	
 	gtk_widget_set_sensitive (dialog->button_chat, sensitive);
 	gtk_widget_set_sensitive (dialog->button_call, sensitive);
@@ -94,7 +237,8 @@ new_message_change_state_button_cb  (GtkEditable             *editable,
 static void
 new_message_dialog_destroy_cb (GtkWidget               *widget,
 			       EmpathyNewMessageDialog *dialog)
-{	
+{
+	g_object_unref (dialog->contact_manager);
 	g_free (dialog);
 }
 
@@ -102,8 +246,10 @@ GtkWidget *
 empathy_new_message_dialog_show (GtkWindow *parent)
 {
 	static EmpathyNewMessageDialog *dialog = NULL;
-	GladeXML                       *glade;
+	GtkBuilder                     *gui;
 	gchar                          *filename;
+	GtkEntryCompletion             *completion;
+	GtkListStore                   *model;
 
 	if (dialog) {
 		gtk_window_present (GTK_WINDOW (dialog->dialog));
@@ -112,11 +258,12 @@ empathy_new_message_dialog_show (GtkWindow *parent)
 
 	dialog = g_new0 (EmpathyNewMessageDialog, 1);
 
-	filename = empathy_file_lookup ("empathy-new-message-dialog.glade",
+	/* create a contact manager */
+	dialog->contact_manager = empathy_contact_manager_dup_singleton ();
+
+	filename = empathy_file_lookup ("empathy-new-message-dialog.ui",
 					"libempathy-gtk");
-	glade = empathy_glade_get_file (filename,
-				        "new_message_dialog",
-				        NULL,
+	gui = empathy_builder_get_file (filename,
 				        "new_message_dialog", &dialog->dialog,
 				        "table_contact", &dialog->table_contact,
 				        "entry_id", &dialog->entry_id,
@@ -125,8 +272,22 @@ empathy_new_message_dialog_show (GtkWindow *parent)
 				        NULL);
 	g_free (filename);
 
-	empathy_glade_connect (glade,
-			       dialog,
+	/* text completion */
+	completion = gtk_entry_completion_new ();
+	model = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+	gtk_entry_completion_set_text_column (completion, COMPLETION_COL_TEXT);
+	gtk_entry_completion_set_match_func (completion,
+					     new_message_dialog_match_func,
+					     NULL, NULL);
+	gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (model));
+	gtk_entry_set_completion (GTK_ENTRY (dialog->entry_id), completion);
+	g_signal_connect (completion, "match-selected",
+			  G_CALLBACK (new_message_dialog_match_selected_cb),
+			  dialog);
+	g_object_unref(completion);
+	g_object_unref(model);
+
+	empathy_builder_connect (gui, dialog,
 			       "new_message_dialog", "destroy", new_message_dialog_destroy_cb,
 			       "new_message_dialog", "response", new_message_dialog_response_cb,
 			       "entry_id", "changed", new_message_change_state_button_cb,
@@ -134,7 +295,7 @@ empathy_new_message_dialog_show (GtkWindow *parent)
 
 	g_object_add_weak_pointer (G_OBJECT (dialog->dialog), (gpointer) &dialog);
 
-	g_object_unref (glade);
+	g_object_unref (gui);
 
 	/* Create account chooser */
 	dialog->account_chooser = empathy_account_chooser_new ();
@@ -146,6 +307,11 @@ empathy_new_message_dialog_show (GtkWindow *parent)
 					    NULL);
 	gtk_widget_show (dialog->account_chooser);
 
+	new_message_dialog_account_changed_cb (dialog->account_chooser, dialog);
+	g_signal_connect (dialog->account_chooser, "changed", 
+			  G_CALLBACK (new_message_dialog_account_changed_cb),
+			  dialog);
+
 	if (parent) {
 		gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog),
 					      GTK_WINDOW (parent));
@@ -158,4 +324,3 @@ empathy_new_message_dialog_show (GtkWindow *parent)
 
 	return dialog->dialog;
 }
-