New dialog: EmpathySubscriptionDialog. It uses EmpathyContactWidget to

2007-06-06 Xavier Claessens  <xclaesse@gmail.com>

	* libempathy-gtk/empathy-status-icon.c:
	* libempathy-gtk/empathy-subscription-dialog.glade:
	* libempathy-gtk/empathy-contact-widget.c:
	* libempathy-gtk/gossip-contact-list-view.c:
	* libempathy-gtk/empathy-subscription-dialog.c:
	* libempathy-gtk/Makefile.am:
	* libempathy-gtk/empathy-subscription-dialog.h:
	* libempathy/empathy-tp-contact-list.c: New dialog:
	EmpathySubscriptionDialog. It uses EmpathyContactWidget to display
	information about the contact who wants to get your presence. This
	dialog appears when clicking on the status icon when it blinks. You
	can also remove contacts when right-click on it in the roster.


svn path=/trunk/; revision=125

1 files changed, 14 insertions, 7 deletions

diff --git a/libempathy-gtk/gossip-contact-list-view.c b/libempathy-gtk/gossip-contact-list-view.c
index 368ba8be4..b81ccfd40 100644
--- a/libempathy-gtk/gossip-contact-list-view.c
+++ b/libempathy-gtk/gossip-contact-list-view.c
@@ -806,7 +806,7 @@ contact_list_view_drag_data_received (GtkWidget         *widget,
 				      gpointer           user_data)
 {
 	GossipContactListViewPriv *priv;
-	EmpathyContactManager     *manager;
+	EmpathyContactList        *list;
 	GtkTreeModel              *model;
 	GtkTreePath               *path;
 	GtkTreeViewDropPosition    position;
@@ -825,9 +825,8 @@ contact_list_view_drag_data_received (GtkWidget         *widget,
 		      id);
 
 	/* FIXME: This is ambigous, an id can come from multiple accounts */
-	manager = empathy_contact_manager_new ();
-	contact = empathy_contact_list_find (EMPATHY_CONTACT_LIST (manager), id);
-	g_object_unref (manager);
+	list = gossip_contact_list_store_get_list_iface (priv->store);
+	contact = empathy_contact_list_find (list, id);
 
 	if (!contact) {
 		gossip_debug (DEBUG_DOMAIN, "No contact found associated with drag & drop");
@@ -1449,9 +1448,12 @@ static void
 contact_list_view_action_cb (GtkAction             *action,
 			     GossipContactListView *view)
 {
-	GossipContact *contact;
-	const gchar   *name;
-	gchar         *group;
+	GossipContactListViewPriv *priv;
+	GossipContact             *contact;
+	const gchar               *name;
+	gchar                     *group;
+
+	priv = GET_PRIV (view);
 
 	name = gtk_action_get_name (action);
 	if (!name) {
@@ -1471,6 +1473,11 @@ contact_list_view_action_cb (GtkAction             *action,
 	else if (contact && strcmp (name, "Edit") == 0) {
 	}
 	else if (contact && strcmp (name, "Remove") == 0) {
+		EmpathyContactList *list;
+
+		list = gossip_contact_list_store_get_list_iface (priv->store);
+		empathy_contact_list_remove (list, contact,
+					     _("Sorry, I don't want you in my contact list anymore."));
 	}
 	else if (contact && strcmp (name, "Invite") == 0) {
 	}