From 6211cadb6d83d8130505ec045b80d5390339eda7 Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Fri, 11 Dec 2009 16:59:08 +1100 Subject: Include Channel.Interface.Conference draft from tp-spec --- extensions/Channel_Interface_Conference.xml | 400 ++++++++++++++++++++++++++++ extensions/misc.xml | 1 + 2 files changed, 401 insertions(+) create mode 100644 extensions/Channel_Interface_Conference.xml diff --git a/extensions/Channel_Interface_Conference.xml b/extensions/Channel_Interface_Conference.xml new file mode 100644 index 000000000..af3e627b9 --- /dev/null +++ b/extensions/Channel_Interface_Conference.xml @@ -0,0 +1,400 @@ + + + Copyright © 2009 Collabora Limited + Copyright © 2009 Nokia Corporation + +

This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version.

+ +

This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details.

+ +

You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA.

+ + + (draft 1) + + + + +

An interface for multi-user conference channels that can "continue + from" one or more individual channels.

+ + +

This interface addresses freedesktop.org bug + #24906 (GSM-compatible conference calls) and bug + #24939 (upgrading calls and chats to multi-user). + See those bugs for rationale and use cases.

+ +

Examples of usage:

+ +

Active and held GSM calls C1, C2 can be merged into a single + channel Cn with the Conference interface, by calling + CreateChannel({...ChannelType: ...Call, + ...InitialChannels: [C1, C2]}) + which returns Cn.

+ +

An XMPP 1-1 conversation C1 can be continued in a newly created + multi-user chatroom Cn by calling + CreateChannel({...ChannelType: ...Text, + ...InitialChannels: [C1]}) + which returns Cn.

+ +

An XMPP 1-1 conversation C1 can be continued in a specified + multi-user chatroom by calling + CreateChannel({...ChannelType: ...Text, ...HandleType: ROOM, + ...TargetID: 'telepathy@conf.example.com', + ...InitialChannels: [C1]}) + which returns a Conference channel.

+ +

Either of the XMPP cases could work for Call channels, to + upgrade from 1-1 Jingle to multi-user Muji. Any of the XMPP cases + could in principle work for link-local XMPP (XEP-0174).

+ +

The underlying switchboard representing an MSN 1-1 conversation C1 + with a contact X can be moved to a representation as a nameless + chatroom, Cn, to which more contacts can be invited, by calling + CreateChannel({...ChannelType: ...Text, + ...InitialChannels: [C1]}) + which returns Cn. C1 SHOULD remain open, with no underlying + switchboard attached. If X establishes a new switchboard with the + local user, C1 SHOULD pick up that switchboard rather than letting + it create a new channel. + [FIXME: should it?] + Similarly, if the local user sends a message in C1, then + a new switchboard to X should be created and associated with C1.

+ +

XMPP and MSN do not natively have a concept of merging two or more + channels C1, C2... into one channel, Cn. However, the GSM-style + merging API can be supported on XMPP and MSN, as an API short-cut + for upgrading C1 into a conference Cn (which invites the + TargetHandle of C1 into Cn), then immediately inviting the + TargetHandle of C2, the TargetHandle of C3, etc. into Cn as well.

+ +

With a suitable change of terminology, Skype has behaviour similar + to MSN.

+ + +

The Group MAY have channel-specific handles for participants; + clients SHOULD support both Conferences that have channel-specific handles, + and those that do not.

+ + +

In the GSM case, the Conference's Group interface MAY have + channel-specific handles, to reflect the fact that the identities of + the participants might not be known - it can be possible to know that + there is another participant in the Conference, but not know who + they are. + [FIXME: fact check from GSM gurus needed] +

+ +

In the XMPP case, the Conference's Group interface SHOULD have + channel-specific handles, to reflect the fact that the participants + have MUC-specific identities, and the user might also be able to see + their global identities, or not.

+ +

In most other cases, including MSN and link-local XMPP, the + Conference's Group interface SHOULD NOT have channel-specific + handles, since users' identities are always visible.

+ + +

Connection managers implementing channels with this interface + MUST NOT allow the object paths of channels that could be merged + into a Conference to be re-used, unless the channel re-using the + object path is equivalent to the channel that previously used it.

+ + +

If you upgrade some channels into a conference, and then close + the original channels, InitialChannels + (which is immutable) will contain paths to channels which no longer + exist. This implies that you should not re-use channel object paths, + unless future incarnations of the path are equivalent.

+ +

For instance, on protocols where you can only have + zero or one 1-1 text channels with Emily at one time, it would + be OK to re-use the same object path for every 1-1 text channel + with Emily; but on protocols where this is not true, it would + be misleading.

+ + + + + + +

The individual Channels that + are continued by this conference, which have the same ChannelType as this one, but with TargetHandleType = CONTACT.

+ +

This property MUST NOT be requestable. + [FIXME: or would it be better for this one, and not IC, to be + requestable?] +

+ +

Change notification is via the + ChannelMerged and + ChannelRemoved signals.

+ + + + + +

Emitted when a new channel is added to the value of + Channels.

+ + + + The channel that was added to + Channels. + + + + + +

Emitted when a channel is removed from the value of + Channels, either because it closed + or because it was split using the Splittable.DRAFT.Split method.

+ +

[FIXME: relative ordering of this vs. Closed? Do we + care?]

+ + + + The channel that was removed from + Channels. + + + + + +

The initial value of Channels.

+ +

This property SHOULD be requestable. Omitting it from a request is + equivalent to providing it with an empty list as value. Requests + where its value has at least two elements SHOULD be expected to + succeed on any implementation of this interface.

+ +

Whether a request with 0 or 1 elements in the list will succeed is + indicated by SupportsNonMerges.

+ + +

In GSM, a pair of calls can be merged into a conference. In XMPP + and MSN, you can create a new chatroom, or upgrade one 1-1 channel + into a chatroom; however, on these protocols, it is also possible + to fake GSM-style merging by upgrading the first channel, then + inviting the targets of all the other channels into it.

+ + +

If possible, the Channels' states SHOULD + NOT be altered by merging them into a conference. However, depending on + the protocol, the Channels MAY be placed in a "frozen" state by placing + them in this property's value or by calling + MergeableConference.DRAFT.Merge on them. + [FIXME: there's nothing in RequestableChannelClasses yet + to say what will happen, see #24906 comment 6]

+ + +

In Jingle, nothing special will happen to merged calls. UIs MAY + automatically place calls on hold before merging them, if that is + the desired behaviour; this SHOULD always work. Not doing + an implicit hold/unhold seems to preserve least-astonishment.

+ +

[FIXME: check whether ring supports faking Hold on both + channels, as it probably should: see #24906 comment 6] +

+ +

In GSM, the calls that are merged go into a state similar to + Hold, but they cannot be unheld, only split from the conference + call using Channel.Interface.Splittable.DRAFT.Split.

+ + +

Depending on the protocol, it might be signalled to remote users + that this channel is a continuation of all the requested channels, + or that it is only a continuation of the first channel in the + list.

+ + +

In MSN, the conference steals the underlying switchboard (protocol + construct) from one of its component channels, so the conference + appears to remote users to be a continuation of that channel and no + other. The connection manager has to make some arbitrary choice, so + we arbitrarily mandate that it SHOULD choose the first channel in + the list as the one to continue.

+ + +

This property is immutable.

+ + + + + +

A list of additional contacts invited to this conference when it + was created.

+ +

This property SHOULD be requestable, and appear in the allowed + properties in RequestableChannelClasses, in all connection + managers that can implement its semantics (in practice, this is + likely to mean exactly those connection managers where + SupportsNonMerges will be true).

+ +

If included in a request, the given contacts are automatically + invited into the new channel, as if they had been added with + Group.AddMembers(InitialInviteeHandles, + InvitationMessage immediately after + the channel was created.

+ + +

This is a simple convenience API for the common case that a UI + upgrades a 1-1 chat to a multi-user chat solely in order to invite + someone else to participate.

+ + +

At most one of InitialInviteeHandles and InitialInviteeIDs may + appear in each request.

+ +

If the local user was not the initiator of this channel, the + Group.SelfHandle SHOULD appear in the value of this + property, together with any other contacts invited at the same time + (if that information is known).

+ +

This property is immutable.

+ + + + + +

A list of additional contacts invited to this conference when it + was created.

+ +

This property SHOULD be requestable, as an alternative to + InitialInviteeHandles. Its semantics + are the same, except that it takes a list of the string + representations of contact handles.

+ +

At most one of InitialInviteeHandles and InitialInviteeIDs may + appear in each request.

+ +

When a channel is created, the values of InitialInviteeHandles and + InitialInviteeIDs MUST correspond to each other.

+ +

This property is immutable.

+ + + + + +

The message that was sent to the + InitialInviteeHandles when they were + invited.

+ +

This property SHOULD be requestable, and appear in the allowed + properties in RequestableChannelClasses, in protocols where + invitations can have an accompanying text message.

+ + +

This allows invitations with a message to be sent when using + InitialInviteeHandles or + InitialInviteeIDs.

+ + +

If the local user was not the initiator of this channel, the + message with which they were invited (if any) SHOULD appear in the + value of this property.

+ +

This property is immutable.

+ + + + + +

[FIXME: needs a better name; or perhaps it could be implied + by InitialInviteeHandles being requestable in XMPP/MSN but not in + GSM?]

+ +

If true, requests with InitialChannels + omitted, empty, or one element long should be expected to succeed.

+ +

This property SHOULD appear in RequestableChannelClasses for + conference channels if and only if its value on those channels will + be true.

+ + +

Putting this in RequestableChannelClasses means clients can find + out whether their request will succeed early enough to do + something about it.

+ +

In XMPP, you can request a channel of type ROOM without + incorporating any 1-1 chats at all - indeed, this is the normal + way to do it - or as a continuation of a single 1-1 chat, and then + invite other people in later.

+ +

The sense of this property is a bit awkward, but it avoids making it + an anti-capability. If the sense were inverted, then its presence in + RequestableChannelClasses would imply that the protocol lacks + a feature; as it stands, it is additive. (Contrast with + ImmutableStreams, which is the wrong way around for + backwards-compatibility reasons.)

+ + +

If false, InitialChannels SHOULD be + supplied in all requests for this channel class, and contain at least + two channels. Requests where this requirement is not met SHOULD fail + with NotImplemented. +

+ + +

In GSM, you can only make a conference call by merging at least + two channels. + [FIXME: the CM could conceivably fake it, but that would be + rather nasty] +

+ + + + + + diff --git a/extensions/misc.xml b/extensions/misc.xml index 746cd9074..6eea49a2d 100644 --- a/extensions/misc.xml +++ b/extensions/misc.xml @@ -7,5 +7,6 @@ + -- cgit v1.2.3 From 5dcbaaf03567a2aede850bf17e4d595126ea98b4 Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Fri, 11 Dec 2009 16:59:56 +1100 Subject: Add an Invite Participants menu item and make it request the Conf channel --- src/empathy-chat-window.c | 76 ++++++++++++++++++++++++++++++++++++++++++++-- src/empathy-chat-window.ui | 7 +++++ 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 658e59426..0ed5011df 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -35,8 +35,7 @@ #include #include -#include -#include +#include #include #include @@ -54,6 +53,8 @@ #include #include +#include + #include "empathy-chat-window.h" #include "empathy-about-dialog.h" @@ -818,6 +819,76 @@ chat_window_contacts_toggled_cb (GtkToggleAction *toggle_action, empathy_chat_set_show_contacts (priv->current_chat, active); } +static void +upgrade_to_muc_cb (TpConnection *connection, + gboolean yours, + const char *object_path, + GHashTable *properties, + const GError *error, + gpointer user_data, + GObject *window) +{ + if (error) + { + g_critical ("%s", error->message); + return; + } + + g_print ("GOT CHANNEL! %s\n", object_path); +} + +static void +chat_window_invite_participant_activate_cb (GtkAction *action, + EmpathyChatWindow *window) +{ + EmpathyChatWindowPriv *priv; + EmpathyTpChat *tp_chat; + TpConnection *connection; + TpChannel *channel; + GHashTable *props; + GPtrArray *channels; + char *invitees[3] = { NULL, }; + + g_print ("INVITE PARTICIPANT\n"); + + priv = GET_PRIV (window); + + g_return_if_fail (priv->current_chat != NULL); + + /* FIXME: this is for upgrading a 1-to-1 channel to a MUC, inviting + * a user to a MUC is much easier, and needs to be written */ + + tp_chat = empathy_chat_get_tp_chat (priv->current_chat); + connection = empathy_tp_chat_get_connection (tp_chat); + channel = empathy_tp_chat_get_channel (tp_chat); + + /* Ensure a MUC channel */ + channels = g_ptr_array_sized_new (1); + g_ptr_array_add (channels, (char *) tp_proxy_get_object_path (channel)); + + invitees[0] = (char *) tp_channel_get_identifier (channel); + // invitees[1] = /* FIXME: ask for this */ + + props = tp_asv_new ( + TP_IFACE_CHANNEL ".ChannelType", G_TYPE_STRING, + TP_IFACE_CHANNEL_TYPE_TEXT, + TP_IFACE_CHANNEL ".TargetHandleType", G_TYPE_UINT, + TP_HANDLE_TYPE_NONE, + EMP_IFACE_CHANNEL_INTERFACE_CONFERENCE ".InitialChannels", + TP_ARRAY_TYPE_OBJECT_PATH_LIST, channels, + EMP_IFACE_CHANNEL_INTERFACE_CONFERENCE ".InitialInviteeIDs", + G_TYPE_STRV, invitees, + /* FIXME: InvitationMessage ? */ + NULL); + + /* FIXME: this probably needs to go through EmpathyDispatcher */ + tp_cli_connection_interface_requests_call_ensure_channel ( + connection, -1, props, upgrade_to_muc_cb, NULL, NULL, + G_OBJECT (window)); + + g_hash_table_destroy (props); +} + static void chat_window_close_activate_cb (GtkAction *action, EmpathyChatWindow *window) @@ -1725,6 +1796,7 @@ empathy_chat_window_init (EmpathyChatWindow *window) "menu_conv_clear", "activate", chat_window_clear_activate_cb, "menu_conv_favorite", "toggled", chat_window_favorite_toggled_cb, "menu_conv_toggle_contacts", "toggled", chat_window_contacts_toggled_cb, + "menu_conv_invite_participant", "activate", chat_window_invite_participant_activate_cb, "menu_conv_close", "activate", chat_window_close_activate_cb, "menu_edit", "activate", chat_window_edit_activate_cb, "menu_edit_cut", "activate", chat_window_cut_activate_cb, diff --git a/src/empathy-chat-window.ui b/src/empathy-chat-window.ui index 57326a3e3..88d099c16 100644 --- a/src/empathy-chat-window.ui +++ b/src/empathy-chat-window.ui @@ -38,6 +38,12 @@ _Show Contact List + + + menu_conv_invite_participant + Invite _Participant... + + gtk-close @@ -145,6 +151,7 @@ + -- cgit v1.2.3 From 0ad2641ae9ac96dc082d79feef619ce9572eda63 Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Fri, 11 Dec 2009 21:50:17 +1100 Subject: Don't leak GPtrArray --- src/empathy-chat-window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 0ed5011df..bdc1a0196 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -887,6 +887,7 @@ chat_window_invite_participant_activate_cb (GtkAction *action, G_OBJECT (window)); g_hash_table_destroy (props); + g_ptr_array_free (channels, TRUE); } static void -- cgit v1.2.3 From d8d74645987b0188f437b967c7d88dd3fda2db13 Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Mon, 14 Dec 2009 14:48:08 +1100 Subject: Use EmpathyDispatcher to create the PMUC channel --- src/empathy-chat-window.c | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index bdc1a0196..26829a3bb 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -819,29 +819,12 @@ chat_window_contacts_toggled_cb (GtkToggleAction *toggle_action, empathy_chat_set_show_contacts (priv->current_chat, active); } -static void -upgrade_to_muc_cb (TpConnection *connection, - gboolean yours, - const char *object_path, - GHashTable *properties, - const GError *error, - gpointer user_data, - GObject *window) -{ - if (error) - { - g_critical ("%s", error->message); - return; - } - - g_print ("GOT CHANNEL! %s\n", object_path); -} - static void chat_window_invite_participant_activate_cb (GtkAction *action, EmpathyChatWindow *window) { EmpathyChatWindowPriv *priv; + EmpathyDispatcher *dispatcher = empathy_dispatcher_dup_singleton (); EmpathyTpChat *tp_chat; TpConnection *connection; TpChannel *channel; @@ -849,8 +832,6 @@ chat_window_invite_participant_activate_cb (GtkAction *action, GPtrArray *channels; char *invitees[3] = { NULL, }; - g_print ("INVITE PARTICIPANT\n"); - priv = GET_PRIV (window); g_return_if_fail (priv->current_chat != NULL); @@ -881,13 +862,14 @@ chat_window_invite_participant_activate_cb (GtkAction *action, /* FIXME: InvitationMessage ? */ NULL); - /* FIXME: this probably needs to go through EmpathyDispatcher */ - tp_cli_connection_interface_requests_call_ensure_channel ( - connection, -1, props, upgrade_to_muc_cb, NULL, NULL, - G_OBJECT (window)); + /* Although this is a MUC, it's anonymous, so CreateChannel is valid */ + empathy_dispatcher_create_channel (dispatcher, connection, + props, NULL, NULL); g_hash_table_destroy (props); g_ptr_array_free (channels, TRUE); + + g_object_unref (dispatcher); } static void -- cgit v1.2.3 From b39e12f74ac06de310870a54b08e7fb32d2d2fe0 Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Wed, 16 Dec 2009 18:09:55 +1100 Subject: Add a rudimentry UI to select a 3rd contact to invite Needs support for inviting in MUCs added --- src/Makefile.am | 1 + src/empathy-chat-window.c | 67 +++++++++++++++---- src/empathy-invite-participant-dialog.c | 111 ++++++++++++++++++++++++++++++++ src/empathy-invite-participant-dialog.h | 46 +++++++++++++ 4 files changed, 213 insertions(+), 12 deletions(-) create mode 100644 src/empathy-invite-participant-dialog.c create mode 100644 src/empathy-invite-participant-dialog.h diff --git a/src/Makefile.am b/src/Makefile.am index ecec8923f..3370f9bed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -44,6 +44,7 @@ empathy_handwritten_source = \ empathy-import-pidgin.c empathy-import-pidgin.h \ empathy-import-utils.c empathy-import-utils.h \ empathy-import-widget.c empathy-import-widget.h \ + empathy-invite-participant-dialog.c empathy-invite-participant-dialog.h \ empathy-main-window.c empathy-main-window.h \ empathy-new-chatroom-dialog.c empathy-new-chatroom-dialog.h \ empathy-preferences.c empathy-preferences.h \ diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 26829a3bb..17662b115 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -57,6 +57,7 @@ #include "empathy-chat-window.h" #include "empathy-about-dialog.h" +#include "empathy-invite-participant-dialog.h" #define DEBUG_FLAG EMPATHY_DEBUG_CHAT #include @@ -820,10 +821,9 @@ chat_window_contacts_toggled_cb (GtkToggleAction *toggle_action, } static void -chat_window_invite_participant_activate_cb (GtkAction *action, - EmpathyChatWindow *window) +chat_window_upgrade_to_muc (EmpathyChat *chat, + EmpathyContact *invitee) { - EmpathyChatWindowPriv *priv; EmpathyDispatcher *dispatcher = empathy_dispatcher_dup_singleton (); EmpathyTpChat *tp_chat; TpConnection *connection; @@ -832,14 +832,7 @@ chat_window_invite_participant_activate_cb (GtkAction *action, GPtrArray *channels; char *invitees[3] = { NULL, }; - priv = GET_PRIV (window); - - g_return_if_fail (priv->current_chat != NULL); - - /* FIXME: this is for upgrading a 1-to-1 channel to a MUC, inviting - * a user to a MUC is much easier, and needs to be written */ - - tp_chat = empathy_chat_get_tp_chat (priv->current_chat); + tp_chat = empathy_chat_get_tp_chat (chat); connection = empathy_tp_chat_get_connection (tp_chat); channel = empathy_tp_chat_get_channel (tp_chat); @@ -848,7 +841,7 @@ chat_window_invite_participant_activate_cb (GtkAction *action, g_ptr_array_add (channels, (char *) tp_proxy_get_object_path (channel)); invitees[0] = (char *) tp_channel_get_identifier (channel); - // invitees[1] = /* FIXME: ask for this */ + invitees[1] = (char *) empathy_contact_get_id (invitee); props = tp_asv_new ( TP_IFACE_CHANNEL ".ChannelType", G_TYPE_STRING, @@ -872,6 +865,56 @@ chat_window_invite_participant_activate_cb (GtkAction *action, g_object_unref (dispatcher); } +static void +chat_window_invite_participant_activate_cb (GtkAction *action, + EmpathyChatWindow *window) +{ + EmpathyChatWindowPriv *priv; + GtkWidget *dialog; + EmpathyTpChat *tp_chat; + TpChannel *channel; + int response; + + priv = GET_PRIV (window); + + g_return_if_fail (priv->current_chat != NULL); + + tp_chat = empathy_chat_get_tp_chat (priv->current_chat); + channel = empathy_tp_chat_get_channel (tp_chat); + + /* FIXME: should filter out the existing participants from the + * list */ + dialog = empathy_invite_participant_dialog_new ( + GTK_WINDOW (priv->dialog)); + gtk_widget_show (dialog); + + response = gtk_dialog_run (GTK_DIALOG (dialog)); + + if (response == GTK_RESPONSE_OK) + { + EmpathyContact *contact; + TpHandleType handle_type; + + contact = empathy_invite_participant_dialog_dup_selected_contact (EMPATHY_INVITE_PARTICIPANT_DIALOG (dialog)); + tp_channel_get_handle (channel, &handle_type); + + if (handle_type == TP_HANDLE_TYPE_CONTACT) + { + chat_window_upgrade_to_muc (priv->current_chat, + contact); + } + else + { + /* FIXME: do something with MUC */ + g_warning ("Not implemented yet"); + } + + g_object_unref (contact); + } + + gtk_widget_destroy (dialog); +} + static void chat_window_close_activate_cb (GtkAction *action, EmpathyChatWindow *window) diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c new file mode 100644 index 000000000..07c12c9b0 --- /dev/null +++ b/src/empathy-invite-participant-dialog.c @@ -0,0 +1,111 @@ +/* + * empathy-invite-participant-dialog.c + * + * EmpathyInviteParticipantDialog + * + * (c) 2009, Collabora Ltd. + * + * Authors: + * Danielle Madeley + */ + +#include + +#include + +#include + +#include "empathy-invite-participant-dialog.h" + +#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_INVITE_PARTICIPANT_DIALOG, EmpathyInviteParticipantDialogPrivate)) + +G_DEFINE_TYPE (EmpathyInviteParticipantDialog, empathy_invite_participant_dialog, GTK_TYPE_DIALOG); + +typedef struct _EmpathyInviteParticipantDialogPrivate EmpathyInviteParticipantDialogPrivate; +struct _EmpathyInviteParticipantDialogPrivate +{ + GtkWidget *selector; +}; + +static void +invite_participant_enable_join (GtkComboBox *selector, + GtkWidget *button) +{ + gtk_widget_set_sensitive (button, TRUE); +} + +static void +empathy_invite_participant_dialog_class_init (EmpathyInviteParticipantDialogClass *klass) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (gobject_class, sizeof (EmpathyInviteParticipantDialogPrivate)); +} + +static void +empathy_invite_participant_dialog_init (EmpathyInviteParticipantDialog *self) +{ + EmpathyInviteParticipantDialogPrivate *priv = GET_PRIVATE (self); + EmpathyContactManager *manager = empathy_contact_manager_dup_singleton (); + GtkWidget *vbox = gtk_vbox_new (FALSE, 6); + GtkWidget *label = gtk_label_new (NULL); + GtkWidget *join_button; + char *str; + + str = g_strdup_printf ( + "%s\n\n%s", + _("Invite Participant"), + _("Choose a contact to invite into the conversation:")); + gtk_label_set_markup (GTK_LABEL (label), str); + g_free (str); + + priv->selector = empathy_contact_selector_new ( + EMPATHY_CONTACT_LIST (manager)); + + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), priv->selector, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), + vbox, TRUE, TRUE, 6); + + gtk_widget_show_all (vbox); + + gtk_dialog_add_button (GTK_DIALOG (self), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + join_button = gtk_dialog_add_button (GTK_DIALOG (self), + "Invite", GTK_RESPONSE_OK); + + gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE); + + gtk_widget_set_sensitive (join_button, FALSE); + g_signal_connect (priv->selector, "changed", + G_CALLBACK (invite_participant_enable_join), join_button); + + g_object_unref (manager); +} + +EmpathyContact * +empathy_invite_participant_dialog_dup_selected_contact ( + EmpathyInviteParticipantDialog *self) +{ + EmpathyInviteParticipantDialogPrivate *priv; + + g_return_val_if_fail (EMPATHY_IS_INVITE_PARTICIPANT_DIALOG (self), NULL); + + priv = GET_PRIVATE (self); + + return empathy_contact_selector_dup_selected ( + EMPATHY_CONTACT_SELECTOR (priv->selector)); +} + +GtkWidget * +empathy_invite_participant_dialog_new (GtkWindow *parent) +{ + GtkWidget *self = g_object_new (EMPATHY_TYPE_INVITE_PARTICIPANT_DIALOG, NULL); + + if (parent != NULL) + { + gtk_window_set_transient_for (GTK_WINDOW (self), parent); + } + + return self; +} diff --git a/src/empathy-invite-participant-dialog.h b/src/empathy-invite-participant-dialog.h new file mode 100644 index 000000000..642733871 --- /dev/null +++ b/src/empathy-invite-participant-dialog.h @@ -0,0 +1,46 @@ +/* + * empathy-invite-participant-dialog.h + * + * EmpathyInviteParticipantDialog + * + * (c) 2009, Collabora Ltd. + * + * Authors: + * Danielle Madeley + */ + +#ifndef __EMPATHY_INVITE_PARTICIPANT_DIALOG_H__ +#define __EMPATHY_INVITE_PARTICIPANT_DIALOG_H__ + +#include + +G_BEGIN_DECLS + +#define EMPATHY_TYPE_INVITE_PARTICIPANT_DIALOG (empathy_invite_participant_dialog_get_type ()) +#define EMPATHY_INVITE_PARTICIPANT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_INVITE_PARTICIPANT_DIALOG, EmpathyInviteParticipantDialog)) +#define EMPATHY_INVITE_PARTICIPANT_DIALOG_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), EMPATHY_TYPE_INVITE_PARTICIPANT_DIALOG, EmpathyInviteParticipantDialogClass)) +#define EMPATHY_IS_INVITE_PARTICIPANT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_INVITE_PARTICIPANT_DIALOG)) +#define EMPATHY_IS_INVITE_PARTICIPANT_DIALOG_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), EMPATHY_TYPE_INVITE_PARTICIPANT_DIALOG)) +#define EMPATHY_INVITE_PARTICIPANT_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_INVITE_PARTICIPANT_DIALOG, EmpathyInviteParticipantDialogClass)) + +typedef struct _EmpathyInviteParticipantDialog EmpathyInviteParticipantDialog; +typedef struct _EmpathyInviteParticipantDialogClass EmpathyInviteParticipantDialogClass; + +struct _EmpathyInviteParticipantDialog +{ + GtkDialog parent; +}; + +struct _EmpathyInviteParticipantDialogClass +{ + GtkDialogClass parent_class; +}; + +GType empathy_invite_participant_dialog_get_type (void); +GtkWidget *empathy_invite_participant_dialog_new (GtkWindow *parent); +EmpathyContact *empathy_invite_participant_dialog_dup_selected_contact (EmpathyInviteParticipantDialog *self); + + +G_END_DECLS + +#endif -- cgit v1.2.3 From 041b5b174f64ddde0f400843ed2a8b89b52ba18d Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Wed, 16 Dec 2009 20:21:44 +1100 Subject: Add support for inviting to MUCs --- src/empathy-chat-window.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 17662b115..bea85c648 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -905,8 +905,13 @@ chat_window_invite_participant_activate_cb (GtkAction *action, } else { - /* FIXME: do something with MUC */ - g_warning ("Not implemented yet"); + TpHandle handle = empathy_contact_get_handle (contact); + GArray handles = {(gchar *) &handle, 1}; + + tp_cli_channel_interface_group_call_add_members ( + channel, -1, &handles, + _("Inviting to this room"), + NULL, NULL, NULL, NULL); } g_object_unref (contact); -- cgit v1.2.3 From 91b6954805de2541dad743256cc3f9e9c6f65943 Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Thu, 17 Dec 2009 08:50:33 +1100 Subject: Don't destroy the request properties, EmpathyDispatcher now owns them This is not the same as tp-glib semantics (e.g. tp_..._call_create_channel). Add some docs to EmpathyDispatcher to explain this, for the next person. --- libempathy/empathy-dispatcher.c | 13 +++++++++++++ src/empathy-chat-window.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c index 49be0babe..839dababb 100644 --- a/libempathy/empathy-dispatcher.c +++ b/libempathy/empathy-dispatcher.c @@ -1610,6 +1610,19 @@ empathy_dispatcher_call_create_or_ensure_channel ( } } +/** + * empathy_dispatcher_create_channel: + * @self: the EmpathyDispatcher + * @connection: the Connection to dispatch on + * @request: an a{sv} map of properties for the request, i.e. using tp_asv_new() + * @callback: a callback for when the channel arrives (or NULL) + * @user_data: optional user data (or NULL) + * + * When calling this function, #EmpathyDispatcher takes ownership of your + * reference to @request. DO NOT unref or destroy @request. When the request is + * done, @request will be unreferenced. Take another reference if you want to + * keep it around. + */ void empathy_dispatcher_create_channel (EmpathyDispatcher *self, TpConnection *connection, diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index bea85c648..2dbe09d5d 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -856,10 +856,10 @@ chat_window_upgrade_to_muc (EmpathyChat *chat, NULL); /* Although this is a MUC, it's anonymous, so CreateChannel is valid */ + /* props now belongs to EmpathyDispatcher, don't free it */ empathy_dispatcher_create_channel (dispatcher, connection, props, NULL, NULL); - g_hash_table_destroy (props); g_ptr_array_free (channels, TRUE); g_object_unref (dispatcher); -- cgit v1.2.3 From acff8e6eece48cbe0915ca60166923afc5aa774b Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Thu, 17 Dec 2009 08:54:59 +1100 Subject: Bump tp-glib version to 0.9.2 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6085e9b35..363e70fb6 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ AC_COPYRIGHT([ GLIB_REQUIRED=2.22.0 GTK_REQUIRED=2.18.0 GCONF_REQUIRED=1.2.0 -TELEPATHY_GLIB_REQUIRED=0.9.0 +TELEPATHY_GLIB_REQUIRED=0.9.2 ENCHANT_REQUIRED=1.2.0 ISO_CODES_REQUIRED=0.35 LIBNOTIFY_REQUIRED=0.4.4 -- cgit v1.2.3 From 845c851672bb392dd265cd63afde325ed1dfad49 Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Sat, 19 Dec 2009 13:16:02 +1100 Subject: Port EmpathyInviteParticipantDialog over to EmpathyContactSelectorDialog --- src/empathy-chat-window.c | 64 ++++++++++++++++++++++-------- src/empathy-invite-participant-dialog.c | 70 +++++++++------------------------ src/empathy-invite-participant-dialog.h | 8 ++-- 3 files changed, 70 insertions(+), 72 deletions(-) diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 2dbe09d5d..240dc4b68 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -821,8 +822,8 @@ chat_window_contacts_toggled_cb (GtkToggleAction *toggle_action, } static void -chat_window_upgrade_to_muc (EmpathyChat *chat, - EmpathyContact *invitee) +chat_window_upgrade_to_muc (EmpathyChat *chat, + const char *id) { EmpathyDispatcher *dispatcher = empathy_dispatcher_dup_singleton (); EmpathyTpChat *tp_chat; @@ -841,7 +842,7 @@ chat_window_upgrade_to_muc (EmpathyChat *chat, g_ptr_array_add (channels, (char *) tp_proxy_get_object_path (channel)); invitees[0] = (char *) tp_channel_get_identifier (channel); - invitees[1] = (char *) empathy_contact_get_id (invitee); + invitees[1] = (char *) id; props = tp_asv_new ( TP_IFACE_CHANNEL ".ChannelType", G_TYPE_STRING, @@ -865,6 +866,32 @@ chat_window_upgrade_to_muc (EmpathyChat *chat, g_object_unref (dispatcher); } +static void +got_contact_cb (EmpathyTpContactFactory *factory, + EmpathyContact *contact, + const GError *error, + gpointer user_data, + GObject *object) +{ + TpChannel *channel = TP_CHANNEL (user_data); + + if (error != NULL) + { + DEBUG ("Failed: %s", error->message); + return; + } + else + { + TpHandle handle = empathy_contact_get_handle (contact); + GArray handles = {(gchar *) &handle, 1}; + + tp_cli_channel_interface_group_call_add_members ( + channel, -1, &handles, + _("Inviting to this room"), + NULL, NULL, NULL, NULL); + } +} + static void chat_window_invite_participant_activate_cb (GtkAction *action, EmpathyChatWindow *window) @@ -890,33 +917,38 @@ chat_window_invite_participant_activate_cb (GtkAction *action, response = gtk_dialog_run (GTK_DIALOG (dialog)); - if (response == GTK_RESPONSE_OK) + if (response == GTK_RESPONSE_ACCEPT) { - EmpathyContact *contact; + const char *id; TpHandleType handle_type; - contact = empathy_invite_participant_dialog_dup_selected_contact (EMPATHY_INVITE_PARTICIPANT_DIALOG (dialog)); + id = empathy_contact_selector_dialog_get_selected ( + EMPATHY_CONTACT_SELECTOR_DIALOG (dialog), NULL); + if (EMP_STR_EMPTY (id)) goto out; + tp_channel_get_handle (channel, &handle_type); if (handle_type == TP_HANDLE_TYPE_CONTACT) { - chat_window_upgrade_to_muc (priv->current_chat, - contact); + chat_window_upgrade_to_muc (priv->current_chat, id); } else { - TpHandle handle = empathy_contact_get_handle (contact); - GArray handles = {(gchar *) &handle, 1}; + TpConnection *connection; + EmpathyTpContactFactory *factory; - tp_cli_channel_interface_group_call_add_members ( - channel, -1, &handles, - _("Inviting to this room"), - NULL, NULL, NULL, NULL); - } + connection = tp_channel_borrow_connection (channel); + factory = empathy_tp_contact_factory_dup_singleton (connection); + + empathy_tp_contact_factory_get_from_id (factory, id, + got_contact_cb, channel, NULL, NULL); - g_object_unref (contact); + + g_object_unref (factory); + } } +out: gtk_widget_destroy (dialog); } diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c index 07c12c9b0..f67a7fede 100644 --- a/src/empathy-invite-participant-dialog.c +++ b/src/empathy-invite-participant-dialog.c @@ -11,29 +11,19 @@ #include -#include - -#include - #include "empathy-invite-participant-dialog.h" #define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_INVITE_PARTICIPANT_DIALOG, EmpathyInviteParticipantDialogPrivate)) -G_DEFINE_TYPE (EmpathyInviteParticipantDialog, empathy_invite_participant_dialog, GTK_TYPE_DIALOG); +G_DEFINE_TYPE (EmpathyInviteParticipantDialog, + empathy_invite_participant_dialog, EMPATHY_TYPE_CONTACT_SELECTOR_DIALOG); typedef struct _EmpathyInviteParticipantDialogPrivate EmpathyInviteParticipantDialogPrivate; struct _EmpathyInviteParticipantDialogPrivate { - GtkWidget *selector; + int dum; }; -static void -invite_participant_enable_join (GtkComboBox *selector, - GtkWidget *button) -{ - gtk_widget_set_sensitive (button, TRUE); -} - static void empathy_invite_participant_dialog_class_init (EmpathyInviteParticipantDialogClass *klass) { @@ -45,13 +35,12 @@ empathy_invite_participant_dialog_class_init (EmpathyInviteParticipantDialogClas static void empathy_invite_participant_dialog_init (EmpathyInviteParticipantDialog *self) { - EmpathyInviteParticipantDialogPrivate *priv = GET_PRIVATE (self); - EmpathyContactManager *manager = empathy_contact_manager_dup_singleton (); - GtkWidget *vbox = gtk_vbox_new (FALSE, 6); - GtkWidget *label = gtk_label_new (NULL); - GtkWidget *join_button; + EmpathyContactSelectorDialog *parent = EMPATHY_CONTACT_SELECTOR_DIALOG (self); + // EmpathyInviteParticipantDialogPrivate *priv = GET_PRIVATE (self); + GtkWidget *label; char *str; + label = gtk_label_new (NULL); str = g_strdup_printf ( "%s\n\n%s", _("Invite Participant"), @@ -59,42 +48,19 @@ empathy_invite_participant_dialog_init (EmpathyInviteParticipantDialog *self) gtk_label_set_markup (GTK_LABEL (label), str); g_free (str); - priv->selector = empathy_contact_selector_new ( - EMPATHY_CONTACT_LIST (manager)); - - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (vbox), priv->selector, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), - vbox, TRUE, TRUE, 6); - - gtk_widget_show_all (vbox); - - gtk_dialog_add_button (GTK_DIALOG (self), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); - join_button = gtk_dialog_add_button (GTK_DIALOG (self), - "Invite", GTK_RESPONSE_OK); - - gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE); - - gtk_widget_set_sensitive (join_button, FALSE); - g_signal_connect (priv->selector, "changed", - G_CALLBACK (invite_participant_enable_join), join_button); - - g_object_unref (manager); -} - -EmpathyContact * -empathy_invite_participant_dialog_dup_selected_contact ( - EmpathyInviteParticipantDialog *self) -{ - EmpathyInviteParticipantDialogPrivate *priv; - - g_return_val_if_fail (EMPATHY_IS_INVITE_PARTICIPANT_DIALOG (self), NULL); + gtk_box_pack_start (GTK_BOX (parent->vbox), label, FALSE, TRUE, 0); + /* move to the top -- wish there was a better way to do this */ + gtk_box_reorder_child (GTK_BOX (parent->vbox), label, 0); + gtk_widget_show (label); - priv = GET_PRIVATE (self); + parent->button_action = gtk_dialog_add_button (GTK_DIALOG (self), + "Invite", GTK_RESPONSE_ACCEPT); + gtk_widget_set_sensitive (parent->button_action, FALSE); - return empathy_contact_selector_dup_selected ( - EMPATHY_CONTACT_SELECTOR (priv->selector)); + gtk_window_set_title (GTK_WINDOW (self), _("Invite Participant")); + gtk_window_set_role (GTK_WINDOW (self), "invite_participant"); + empathy_contact_selector_dialog_set_show_account_chooser ( + EMPATHY_CONTACT_SELECTOR_DIALOG (self), FALSE); } GtkWidget * diff --git a/src/empathy-invite-participant-dialog.h b/src/empathy-invite-participant-dialog.h index 642733871..561e10738 100644 --- a/src/empathy-invite-participant-dialog.h +++ b/src/empathy-invite-participant-dialog.h @@ -14,6 +14,8 @@ #include +#include + G_BEGIN_DECLS #define EMPATHY_TYPE_INVITE_PARTICIPANT_DIALOG (empathy_invite_participant_dialog_get_type ()) @@ -28,18 +30,16 @@ typedef struct _EmpathyInviteParticipantDialogClass EmpathyInviteParticipantDial struct _EmpathyInviteParticipantDialog { - GtkDialog parent; + EmpathyContactSelectorDialog parent; }; struct _EmpathyInviteParticipantDialogClass { - GtkDialogClass parent_class; + EmpathyContactSelectorDialogClass parent_class; }; GType empathy_invite_participant_dialog_get_type (void); GtkWidget *empathy_invite_participant_dialog_new (GtkWindow *parent); -EmpathyContact *empathy_invite_participant_dialog_dup_selected_contact (EmpathyInviteParticipantDialog *self); - G_END_DECLS -- cgit v1.2.3 From 79074c4ba575f4b01782f6f498a3e9f91cd7ba21 Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Mon, 21 Dec 2009 10:21:11 +1100 Subject: Replace raw Tp call with existing abstraction in EmpathyTpChat --- src/empathy-chat-window.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 240dc4b68..5e0ad049c 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -873,7 +874,7 @@ got_contact_cb (EmpathyTpContactFactory *factory, gpointer user_data, GObject *object) { - TpChannel *channel = TP_CHANNEL (user_data); + EmpathyTpChat *tp_chat = EMPATHY_TP_CHAT (user_data); if (error != NULL) { @@ -882,13 +883,8 @@ got_contact_cb (EmpathyTpContactFactory *factory, } else { - TpHandle handle = empathy_contact_get_handle (contact); - GArray handles = {(gchar *) &handle, 1}; - - tp_cli_channel_interface_group_call_add_members ( - channel, -1, &handles, - _("Inviting to this room"), - NULL, NULL, NULL, NULL); + empathy_contact_list_add (EMPATHY_CONTACT_LIST (tp_chat), + contact, _("Inviting you to this room")); } } @@ -941,7 +937,7 @@ chat_window_invite_participant_activate_cb (GtkAction *action, factory = empathy_tp_contact_factory_dup_singleton (connection); empathy_tp_contact_factory_get_from_id (factory, id, - got_contact_cb, channel, NULL, NULL); + got_contact_cb, tp_chat, NULL, NULL); g_object_unref (factory); -- cgit v1.2.3 From 901c4d9b608d764a894c4a4a9df803c3e06a6ab3 Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Mon, 21 Dec 2009 11:04:39 +1100 Subject: [EmpathyContactMenu] Replace raw Tp call with existing abstraction This was the place I'd copied my code from. However it makes a lot of sense to use the same abstraction here too. --- libempathy-gtk/empathy-contact-menu.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c index 4e1adfa90..3d022a8b0 100644 --- a/libempathy-gtk/empathy-contact-menu.c +++ b/libempathy-gtk/empathy-contact-menu.c @@ -483,10 +483,7 @@ static void room_sub_menu_activate_cb (GtkWidget *item, RoomSubMenuData *data) { - TpHandle handle; - GArray handles = {(gchar *) &handle, 1}; EmpathyTpChat *chat; - TpChannel *channel; chat = empathy_chatroom_get_tp_chat (data->chatroom); if (chat == NULL) { @@ -495,10 +492,8 @@ room_sub_menu_activate_cb (GtkWidget *item, } /* send invitation */ - handle = empathy_contact_get_handle (data->contact); - channel = empathy_tp_chat_get_channel (chat); - tp_cli_channel_interface_group_call_add_members (channel, -1, &handles, - _("Inviting to this room"), NULL, NULL, NULL, NULL); + empathy_contact_list_add (EMPATHY_CONTACT_LIST (chat), data->contact, + _("Inviting you to this room")); } static GtkWidget * -- cgit v1.2.3 From eb36cae56aec0cd245d693ebf2bcb4ce20fb458b Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Mon, 21 Dec 2009 12:51:02 +1100 Subject: Refactor MUC upgrading to be a feature of TpChat->add() Add a method to be able to tell whether a given TpChat supports you calling add() on it. --- libempathy/empathy-tp-chat.c | 109 +++++++++++++++++++++++++++++++++++++------ libempathy/empathy-tp-chat.h | 1 + src/empathy-chat-window.c | 84 ++++----------------------------- 3 files changed, 107 insertions(+), 87 deletions(-) diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index e53caefec..381095efc 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -23,15 +23,15 @@ #include -#include -#include -#include -#include +#include + +#include #include "empathy-tp-chat.h" #include "empathy-tp-contact-factory.h" #include "empathy-contact-monitor.h" #include "empathy-contact-list.h" +#include "empathy-dispatcher.h" #include "empathy-marshal.h" #include "empathy-time.h" #include "empathy-utils.h" @@ -60,6 +60,7 @@ typedef struct { * (channel doesn't implement the Password interface) */ gboolean got_password_flags; gboolean ready; + gboolean can_upgrade_to_muc; } EmpathyTpChatPriv; static void tp_chat_iface_init (EmpathyContactListIface *iface); @@ -117,17 +118,54 @@ tp_chat_add (EmpathyContactList *list, const gchar *message) { EmpathyTpChatPriv *priv = GET_PRIV (list); - TpHandle handle; - GArray handles = {(gchar *) &handle, 1}; - g_return_if_fail (EMPATHY_IS_TP_CHAT (list)); - g_return_if_fail (EMPATHY_IS_CONTACT (contact)); + if (tp_proxy_has_interface_by_id (priv->channel, + TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP)) { + TpHandle handle; + GArray handles = {(gchar *) &handle, 1}; - handle = empathy_contact_get_handle (contact); - tp_cli_channel_interface_group_call_add_members (priv->channel, -1, - &handles, NULL, - NULL, NULL, NULL, - NULL); + g_return_if_fail (EMPATHY_IS_TP_CHAT (list)); + g_return_if_fail (EMPATHY_IS_CONTACT (contact)); + + handle = empathy_contact_get_handle (contact); + tp_cli_channel_interface_group_call_add_members (priv->channel, + -1, &handles, NULL, NULL, NULL, NULL, NULL); + } else if (priv->can_upgrade_to_muc) { + EmpathyDispatcher *dispatcher; + TpConnection *connection; + GHashTable *props; + const char *object_path; + GPtrArray channels = { (gpointer *) &object_path, 1 }; + const char *invitees[2] = { NULL, }; + + dispatcher = empathy_dispatcher_dup_singleton (); + connection = tp_channel_borrow_connection (priv->channel); + + invitees[0] = empathy_contact_get_id (contact); + object_path = tp_proxy_get_object_path (priv->channel); + + props = tp_asv_new ( + TP_IFACE_CHANNEL ".ChannelType", G_TYPE_STRING, + TP_IFACE_CHANNEL_TYPE_TEXT, + TP_IFACE_CHANNEL ".TargetHandleType", G_TYPE_UINT, + TP_HANDLE_TYPE_NONE, + EMP_IFACE_CHANNEL_INTERFACE_CONFERENCE ".InitialChannels", + TP_ARRAY_TYPE_OBJECT_PATH_LIST, &channels, + EMP_IFACE_CHANNEL_INTERFACE_CONFERENCE ".InitialInviteeIDs", + G_TYPE_STRV, invitees, + /* FIXME: InvitationMessage ? */ + NULL); + + /* Although this is a MUC, it's anonymous, so CreateChannel is + * valid. + * props now belongs to EmpathyDispatcher, don't free it */ + empathy_dispatcher_create_channel (dispatcher, connection, + props, NULL, NULL); + + g_object_unref (dispatcher); + } else { + g_warning ("Cannot add to this channel"); + } } static void @@ -1219,9 +1257,14 @@ tp_chat_constructor (GType type, handles->len, (TpHandle *) handles->data, tp_chat_got_added_contacts_cb, NULL, NULL, chat); + priv->can_upgrade_to_muc = FALSE; + g_signal_connect (priv->channel, "group-members-changed", G_CALLBACK (tp_chat_group_members_changed_cb), chat); } else { + EmpathyDispatcher *dispatcher = empathy_dispatcher_dup_singleton (); + GList *list, *ptr; + /* Get the self contact from the connection's self handle */ handle = tp_connection_get_self_handle (connection); empathy_tp_contact_factory_get_from_handle (priv->factory, @@ -1233,6 +1276,25 @@ tp_chat_constructor (GType type, empathy_tp_contact_factory_get_from_handle (priv->factory, handle, tp_chat_got_remote_contact_cb, NULL, NULL, chat); + + list = empathy_dispatcher_find_requestable_channel_classes ( + dispatcher, connection, + tp_channel_get_channel_type (priv->channel), + TP_HANDLE_TYPE_ROOM, NULL); + + for (ptr = list; ptr; ptr = ptr->next) { + GValueArray *array = ptr->data; + const char **oprops = g_value_get_boxed ( + g_value_array_get_nth (array, 1)); + + if (tp_strv_contains (oprops, EMP_IFACE_CHANNEL_INTERFACE_CONFERENCE ".InitialChannels")) { + priv->can_upgrade_to_muc = TRUE; + break; + } + } + + g_list_free (list); + g_object_unref (dispatcher); } if (tp_proxy_has_interface_by_id (priv->channel, @@ -1714,3 +1776,24 @@ empathy_tp_chat_provide_password_finish (EmpathyTpChat *self, return TRUE; } + +/** + * empathy_tp_chat_can_add_contact: + * + * Returns: %TRUE if empathy_contact_list_add() will work for this channel. + * That is if this chat is a 1-to-1 channel that can be upgraded to + * a MUC using the Conference interface or if the channel is a MUC. + */ +gboolean +empathy_tp_chat_can_add_contact (EmpathyTpChat *self) +{ + EmpathyTpChatPriv *priv; + + g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), FALSE); + + priv = GET_PRIV (self); + + return priv->can_upgrade_to_muc || + tp_proxy_has_interface_by_id (priv->channel, + TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP);; +} diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h index 940c36095..6b5fc8d0b 100644 --- a/libempathy/empathy-tp-chat.h +++ b/libempathy/empathy-tp-chat.h @@ -96,6 +96,7 @@ void empathy_tp_chat_provide_password_async (EmpathyTpChat *chat, gboolean empathy_tp_chat_provide_password_finish (EmpathyTpChat *chat, GAsyncResult *result, GError **error); +gboolean empathy_tp_chat_can_add_contact (EmpathyTpChat *self); G_END_DECLS diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 5e0ad049c..67bf7d9e7 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -39,7 +39,6 @@ #include #include -#include #include #include #include @@ -55,8 +54,6 @@ #include #include -#include - #include "empathy-chat-window.h" #include "empathy-about-dialog.h" #include "empathy-invite-participant-dialog.h" @@ -822,51 +819,6 @@ chat_window_contacts_toggled_cb (GtkToggleAction *toggle_action, empathy_chat_set_show_contacts (priv->current_chat, active); } -static void -chat_window_upgrade_to_muc (EmpathyChat *chat, - const char *id) -{ - EmpathyDispatcher *dispatcher = empathy_dispatcher_dup_singleton (); - EmpathyTpChat *tp_chat; - TpConnection *connection; - TpChannel *channel; - GHashTable *props; - GPtrArray *channels; - char *invitees[3] = { NULL, }; - - tp_chat = empathy_chat_get_tp_chat (chat); - connection = empathy_tp_chat_get_connection (tp_chat); - channel = empathy_tp_chat_get_channel (tp_chat); - - /* Ensure a MUC channel */ - channels = g_ptr_array_sized_new (1); - g_ptr_array_add (channels, (char *) tp_proxy_get_object_path (channel)); - - invitees[0] = (char *) tp_channel_get_identifier (channel); - invitees[1] = (char *) id; - - props = tp_asv_new ( - TP_IFACE_CHANNEL ".ChannelType", G_TYPE_STRING, - TP_IFACE_CHANNEL_TYPE_TEXT, - TP_IFACE_CHANNEL ".TargetHandleType", G_TYPE_UINT, - TP_HANDLE_TYPE_NONE, - EMP_IFACE_CHANNEL_INTERFACE_CONFERENCE ".InitialChannels", - TP_ARRAY_TYPE_OBJECT_PATH_LIST, channels, - EMP_IFACE_CHANNEL_INTERFACE_CONFERENCE ".InitialInviteeIDs", - G_TYPE_STRV, invitees, - /* FIXME: InvitationMessage ? */ - NULL); - - /* Although this is a MUC, it's anonymous, so CreateChannel is valid */ - /* props now belongs to EmpathyDispatcher, don't free it */ - empathy_dispatcher_create_channel (dispatcher, connection, - props, NULL, NULL); - - g_ptr_array_free (channels, TRUE); - - g_object_unref (dispatcher); -} - static void got_contact_cb (EmpathyTpContactFactory *factory, EmpathyContact *contact, @@ -876,13 +828,10 @@ got_contact_cb (EmpathyTpContactFactory *factory, { EmpathyTpChat *tp_chat = EMPATHY_TP_CHAT (user_data); - if (error != NULL) - { + if (error != NULL) { DEBUG ("Failed: %s", error->message); return; - } - else - { + } else { empathy_contact_list_add (EMPATHY_CONTACT_LIST (tp_chat), contact, _("Inviting you to this room")); } @@ -913,35 +862,22 @@ chat_window_invite_participant_activate_cb (GtkAction *action, response = gtk_dialog_run (GTK_DIALOG (dialog)); - if (response == GTK_RESPONSE_ACCEPT) - { + if (response == GTK_RESPONSE_ACCEPT) { + TpConnection *connection; + EmpathyTpContactFactory *factory; const char *id; - TpHandleType handle_type; id = empathy_contact_selector_dialog_get_selected ( EMPATHY_CONTACT_SELECTOR_DIALOG (dialog), NULL); if (EMP_STR_EMPTY (id)) goto out; - tp_channel_get_handle (channel, &handle_type); - - if (handle_type == TP_HANDLE_TYPE_CONTACT) - { - chat_window_upgrade_to_muc (priv->current_chat, id); - } - else - { - TpConnection *connection; - EmpathyTpContactFactory *factory; + connection = tp_channel_borrow_connection (channel); + factory = empathy_tp_contact_factory_dup_singleton (connection); - connection = tp_channel_borrow_connection (channel); - factory = empathy_tp_contact_factory_dup_singleton (connection); + empathy_tp_contact_factory_get_from_id (factory, id, + got_contact_cb, tp_chat, NULL, NULL); - empathy_tp_contact_factory_get_from_id (factory, id, - got_contact_cb, tp_chat, NULL, NULL); - - - g_object_unref (factory); - } + g_object_unref (factory); } out: -- cgit v1.2.3 From 2840411971e6e2a25a75b05a4ab0a0d8922b7fcb Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Mon, 21 Dec 2009 13:05:10 +1100 Subject: Make Invite Participant menu entry sensitive only when available --- src/empathy-chat-window.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 67bf7d9e7..6b0dc5d00 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -346,6 +346,32 @@ chat_window_menu_context_update (EmpathyChatWindowPriv *priv, gtk_action_set_sensitive (priv->menu_conv_insert_smiley, is_connected); } +static void +chat_window_conversation_menu_update (EmpathyChatWindowPriv *priv, + EmpathyChatWindow *self) +{ + EmpathyTpChat *tp_chat; + TpConnection *connection; + GtkAction *action; + gboolean sensitive = FALSE; + + g_return_if_fail (priv->current_chat != NULL); + + action = gtk_ui_manager_get_action (priv->ui_manager, + "/chats_menubar/menu_conv/menu_conv_invite_participant"); + tp_chat = empathy_chat_get_tp_chat (priv->current_chat); + + if (tp_chat != NULL) { + connection = empathy_tp_chat_get_connection (tp_chat); + + sensitive = empathy_tp_chat_can_add_contact (tp_chat) && + (tp_connection_get_status (connection, NULL) == + TP_CONNECTION_STATUS_CONNECTED); + } + + gtk_action_set_sensitive (action, sensitive); +} + static void chat_window_contact_menu_update (EmpathyChatWindowPriv *priv, EmpathyChatWindow *window) @@ -537,6 +563,8 @@ chat_window_update (EmpathyChatWindow *window) chat_window_menu_context_update (priv, num_pages); + chat_window_conversation_menu_update (priv, window); + chat_window_contact_menu_update (priv, window); -- cgit v1.2.3 From 72034a8daf617d2a02d80f8a19d05d8be792ce6d Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Tue, 22 Dec 2009 11:29:08 +1100 Subject: Remove unneeded private struct --- src/empathy-invite-participant-dialog.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c index f67a7fede..70332d1ff 100644 --- a/src/empathy-invite-participant-dialog.c +++ b/src/empathy-invite-participant-dialog.c @@ -13,30 +13,18 @@ #include "empathy-invite-participant-dialog.h" -#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_INVITE_PARTICIPANT_DIALOG, EmpathyInviteParticipantDialogPrivate)) - G_DEFINE_TYPE (EmpathyInviteParticipantDialog, empathy_invite_participant_dialog, EMPATHY_TYPE_CONTACT_SELECTOR_DIALOG); -typedef struct _EmpathyInviteParticipantDialogPrivate EmpathyInviteParticipantDialogPrivate; -struct _EmpathyInviteParticipantDialogPrivate -{ - int dum; -}; - static void empathy_invite_participant_dialog_class_init (EmpathyInviteParticipantDialogClass *klass) { - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (gobject_class, sizeof (EmpathyInviteParticipantDialogPrivate)); } static void empathy_invite_participant_dialog_init (EmpathyInviteParticipantDialog *self) { EmpathyContactSelectorDialog *parent = EMPATHY_CONTACT_SELECTOR_DIALOG (self); - // EmpathyInviteParticipantDialogPrivate *priv = GET_PRIVATE (self); GtkWidget *label; char *str; -- cgit v1.2.3 From d07d688e26fc68890ec6a640090ddece560bb495 Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Tue, 22 Dec 2009 14:03:17 +1100 Subject: [EmpathyContactSelectorDialog] add contact filtering support --- libempathy-gtk/empathy-contact-selector-dialog.c | 63 ++++++++++++++++++++---- libempathy-gtk/empathy-contact-selector-dialog.h | 2 + 2 files changed, 55 insertions(+), 10 deletions(-) diff --git a/libempathy-gtk/empathy-contact-selector-dialog.c b/libempathy-gtk/empathy-contact-selector-dialog.c index 58e0fff35..3c59061ae 100644 --- a/libempathy-gtk/empathy-contact-selector-dialog.c +++ b/libempathy-gtk/empathy-contact-selector-dialog.c @@ -50,6 +50,7 @@ typedef struct _EmpathyContactSelectorDialogPriv \ EmpathyContactSelectorDialogPriv; struct _EmpathyContactSelectorDialogPriv { + GtkListStore *store; GtkWidget *account_chooser_label; GtkWidget *account_chooser; GtkWidget *entry_id; @@ -81,13 +82,9 @@ contact_selector_dialog_account_changed_cb (GtkWidget *widget, EmpathyAccountChooser *chooser; TpConnection *connection; GList *members; - GtkListStore *store; - GtkEntryCompletion *completion; /* Remove completions */ - completion = gtk_entry_get_completion (GTK_ENTRY (priv->entry_id)); - store = GTK_LIST_STORE (gtk_entry_completion_get_model (completion)); - gtk_list_store_clear (store); + gtk_list_store_clear (priv->store); /* Get members of the new account */ chooser = EMPATHY_ACCOUNT_CHOOSER (priv->account_chooser); @@ -125,7 +122,7 @@ contact_selector_dialog_account_changed_cb (GtkWidget *widget, empathy_contact_get_name (contact), empathy_contact_get_id (contact)); - gtk_list_store_insert_with_values (store, &iter, -1, + gtk_list_store_insert_with_values (priv->store, &iter, -1, COMPLETION_COL_TEXT, tmpstr, COMPLETION_COL_ID, empathy_contact_get_id (contact), COMPLETION_COL_NAME, empathy_contact_get_name (contact), @@ -241,6 +238,28 @@ account_chooser_filter (TpAccount *account, return class->account_filter (self, account); } +static gboolean +contact_selector_dialog_filter_visible (GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) +{ + EmpathyContactSelectorDialog *self = EMPATHY_CONTACT_SELECTOR_DIALOG (data); + gboolean r; + char *id; + + gtk_tree_model_get (model, iter, + COMPLETION_COL_ID, &id, + -1); + + /* this must be non-NULL for this function to get called */ + r = EMPATHY_CONTACT_SELECTOR_DIALOG_GET_CLASS (self)->contact_filter ( + self, id); + + g_free (id); + + return r; +} + static void empathy_contact_selector_dialog_init (EmpathyContactSelectorDialog *dialog) { @@ -248,7 +267,6 @@ empathy_contact_selector_dialog_init (EmpathyContactSelectorDialog *dialog) GtkBuilder *gui; gchar *filename; GtkEntryCompletion *completion; - GtkListStore *model; GtkWidget *content_area; GtkWidget *table_contact; @@ -289,19 +307,20 @@ empathy_contact_selector_dialog_init (EmpathyContactSelectorDialog *dialog) gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); /* text completion */ + priv->store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); + 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, contact_selector_dialog_match_func, NULL, NULL); - gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (model)); + gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (priv->store)); gtk_entry_set_completion (GTK_ENTRY (priv->entry_id), completion); g_signal_connect (completion, "match-selected", G_CALLBACK (contact_selector_dialog_match_selected_cb), dialog); g_object_unref (completion); - g_object_unref (model); + g_object_unref (priv->store); empathy_builder_connect (gui, dialog, "entry_id", "changed", contact_selector_change_state_button_cb, @@ -369,6 +388,27 @@ empathy_contact_selector_dialog_set_property (GObject *self, } } +static void +empathy_contact_selector_dialog_constructed (GObject *dialog) +{ + EmpathyContactSelectorDialogPriv *priv = GET_PRIV (dialog); + + if (EMPATHY_CONTACT_SELECTOR_DIALOG_GET_CLASS (dialog)->contact_filter) + { + GtkEntryCompletion *completion; + GtkTreeModel *filter; + + completion = gtk_entry_get_completion (GTK_ENTRY (priv->entry_id)); + filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (priv->store), NULL); + + gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter), + contact_selector_dialog_filter_visible, dialog, NULL); + + gtk_entry_completion_set_model (completion, filter); + g_object_unref (filter); + } +} + static void empathy_contact_selector_dialog_dispose (GObject *object) { @@ -392,6 +432,9 @@ empathy_contact_selector_dialog_class_init ( g_type_class_add_private (class, sizeof (EmpathyContactSelectorDialogPriv)); + class->contact_filter = NULL; + + object_class->constructed = empathy_contact_selector_dialog_constructed; object_class->dispose = empathy_contact_selector_dialog_dispose; object_class->get_property = empathy_contact_selector_dialog_get_property; object_class->set_property = empathy_contact_selector_dialog_set_property; diff --git a/libempathy-gtk/empathy-contact-selector-dialog.h b/libempathy-gtk/empathy-contact-selector-dialog.h index d8a698ab5..87b2812f4 100644 --- a/libempathy-gtk/empathy-contact-selector-dialog.h +++ b/libempathy-gtk/empathy-contact-selector-dialog.h @@ -40,6 +40,8 @@ struct _EmpathyContactSelectorDialogClass { gboolean (*account_filter) (EmpathyContactSelectorDialog *self, TpAccount *account); + gboolean (*contact_filter) (EmpathyContactSelectorDialog *self, + const char *id); }; struct _EmpathyContactSelectorDialog { -- cgit v1.2.3 From fa658816077d8dfcd59978bcb69b00b789f12636 Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Tue, 22 Dec 2009 14:15:05 +1100 Subject: Remove FIXME --- src/empathy-chat-window.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 6b0dc5d00..5ad66fd26 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -882,8 +882,6 @@ chat_window_invite_participant_activate_cb (GtkAction *action, tp_chat = empathy_chat_get_tp_chat (priv->current_chat); channel = empathy_tp_chat_get_channel (tp_chat); - /* FIXME: should filter out the existing participants from the - * list */ dialog = empathy_invite_participant_dialog_new ( GTK_WINDOW (priv->dialog)); gtk_widget_show (dialog); -- cgit v1.2.3