From 940f9b60e27fe79d64357c651525cbf50a936567 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sat, 10 Oct 2009 00:28:26 +0200 Subject: Fix topic not always shown, and add /topic command support. https://bugzilla.gnome.org/show_bug.cgi?id=573407 --- libempathy-gtk/empathy-chat.c | 51 +++++++++++++++++++++++++++--- libempathy/empathy-tp-chat.c | 73 +++++++++++++++++++++++++++++-------------- libempathy/empathy-tp-chat.h | 11 +++++++ 3 files changed, 108 insertions(+), 27 deletions(-) diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 3931115be..6c712a54e 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -393,6 +393,31 @@ chat_send (EmpathyChat *chat, if (strcmp (msg, "/clear") == 0) { empathy_chat_view_clear (chat->view); + return; + } else if (g_str_has_prefix (msg, "/topic")) { + EmpathyTpChatProperty *property; + GValue value = {0, }; + gchar *topic; + + property = empathy_tp_chat_get_property (priv->tp_chat, "subject"); + if (property == NULL) { + empathy_chat_view_append_event (chat->view, + _("This conversation does not have topic")); + return; + } + + if (!(property->flags & TP_PROPERTY_FLAG_WRITE)) { + empathy_chat_view_append_event (chat->view, + _("You need to be a channel operator to do that")); + return; + } + + topic = g_strstrip (g_strdup (msg + strlen ("/topic"))); + g_value_init (&value, G_TYPE_STRING); + g_value_take_string (&value, topic); + empathy_tp_chat_set_property (priv->tp_chat, "subject", &value); + g_value_unset (&value); + return; } @@ -1449,9 +1474,6 @@ chat_create_ui (EmpathyChat *chat) chat->input_text_view); gtk_widget_show (chat->input_text_view); - /* Create contact list */ - chat_update_contacts_visibility (chat); - /* Initialy hide the topic, will be shown if not empty */ gtk_widget_hide (priv->hbox_topic); @@ -1588,7 +1610,6 @@ chat_constructed (GObject *object) { EmpathyChat *chat = EMPATHY_CHAT (object); - chat_create_ui (chat); chat_add_logs (chat); show_pending_messages (chat); } @@ -1728,6 +1749,8 @@ empathy_chat_init (EmpathyChat *chat) /* Add nick name completion */ priv->completion = g_completion_new ((GCompletionFunc) empathy_contact_get_name); g_completion_set_compare (priv->completion, chat_contacts_completion_func); + + chat_create_ui (chat); } EmpathyChat * @@ -1752,6 +1775,7 @@ empathy_chat_set_tp_chat (EmpathyChat *chat, { EmpathyChatPriv *priv = GET_PRIV (chat); TpConnection *connection; + GPtrArray *properties; g_return_if_fail (EMPATHY_IS_CHAT (chat)); g_return_if_fail (EMPATHY_IS_TP_CHAT (tp_chat)); @@ -1794,6 +1818,25 @@ empathy_chat_set_tp_chat (EmpathyChat *chat, G_CALLBACK (chat_remote_contact_changed_cb), chat); + /* Get initial value of properties */ + properties = empathy_tp_chat_get_properties (priv->tp_chat); + if (properties != NULL) { + guint i; + + for (i = 0; i < properties->len; i++) { + EmpathyTpChatProperty *property; + + property = g_ptr_array_index (properties, i); + if (property->value == NULL) + continue; + + chat_property_changed_cb (priv->tp_chat, + property->name, + property->value, + chat); + } + } + chat_remote_contact_changed_cb (chat); if (chat->input_text_view) { diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 09077538a..83faaff39 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -58,13 +58,6 @@ typedef struct { gboolean ready; } EmpathyTpChatPriv; -typedef struct { - gchar *name; - guint id; - TpPropertyFlags flags; - GValue *value; -} TpChatProperty; - static void tp_chat_iface_init (EmpathyContactListIface *iface); enum { @@ -493,10 +486,10 @@ tp_chat_property_flags_changed_cb (TpProxy *proxy, } for (i = 0; i < properties->len; i++) { - GValueArray *prop_struct; - TpChatProperty *property; - guint id; - guint flags; + GValueArray *prop_struct; + EmpathyTpChatProperty *property; + guint id; + guint flags; prop_struct = g_ptr_array_index (properties, i); id = g_value_get_uint (g_value_array_get_nth (prop_struct, 0)); @@ -531,10 +524,10 @@ tp_chat_properties_changed_cb (TpProxy *proxy, } for (i = 0; i < properties->len; i++) { - GValueArray *prop_struct; - TpChatProperty *property; - guint id; - GValue *src_value; + GValueArray *prop_struct; + EmpathyTpChatProperty *property; + guint id; + GValue *src_value; prop_struct = g_ptr_array_index (properties, i); id = g_value_get_uint (g_value_array_get_nth (prop_struct, 0)); @@ -597,11 +590,11 @@ tp_chat_list_properties_cb (TpProxy *proxy, ids = g_array_sized_new (FALSE, FALSE, sizeof (guint), properties->len); priv->properties = g_ptr_array_sized_new (properties->len); for (i = 0; i < properties->len; i++) { - GValueArray *prop_struct; - TpChatProperty *property; + GValueArray *prop_struct; + EmpathyTpChatProperty *property; prop_struct = g_ptr_array_index (properties, i); - property = g_slice_new0 (TpChatProperty); + property = g_slice_new0 (EmpathyTpChatProperty); property->id = g_value_get_uint (g_value_array_get_nth (prop_struct, 0)); property->name = g_value_dup_string (g_value_array_get_nth (prop_struct, 1)); property->flags = g_value_get_uint (g_value_array_get_nth (prop_struct, 3)); @@ -628,9 +621,13 @@ empathy_tp_chat_set_property (EmpathyTpChat *chat, const gchar *name, const GValue *value) { - EmpathyTpChatPriv *priv = GET_PRIV (chat); - TpChatProperty *property; - guint i; + EmpathyTpChatPriv *priv = GET_PRIV (chat); + EmpathyTpChatProperty *property; + guint i; + + if (!priv->had_properties_list) { + return; + } for (i = 0; i < priv->properties->len; i++) { property = g_ptr_array_index (priv->properties, i); @@ -672,6 +669,36 @@ empathy_tp_chat_set_property (EmpathyTpChat *chat, } } +EmpathyTpChatProperty * +empathy_tp_chat_get_property (EmpathyTpChat *chat, + const gchar *name) +{ + EmpathyTpChatPriv *priv = GET_PRIV (chat); + EmpathyTpChatProperty *property; + guint i; + + if (!priv->had_properties_list) { + return NULL; + } + + for (i = 0; i < priv->properties->len; i++) { + property = g_ptr_array_index (priv->properties, i); + if (!tp_strdiff (property->name, name)) { + return property; + } + } + + return NULL; +} + +GPtrArray * +empathy_tp_chat_get_properties (EmpathyTpChat *chat) +{ + EmpathyTpChatPriv *priv = GET_PRIV (chat); + + return priv->properties; +} + static void tp_chat_dispose (GObject *object) { @@ -727,14 +754,14 @@ tp_chat_finalize (GObject *object) if (priv->properties) { for (i = 0; i < priv->properties->len; i++) { - TpChatProperty *property; + EmpathyTpChatProperty *property; property = g_ptr_array_index (priv->properties, i); g_free (property->name); if (property->value) { tp_g_value_slice_free (property->value); } - g_slice_free (TpChatProperty, property); + g_slice_free (EmpathyTpChatProperty, property); } g_ptr_array_free (priv->properties, TRUE); } diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h index f7d2b58a1..f07f0648f 100644 --- a/libempathy/empathy-tp-chat.h +++ b/libempathy/empathy-tp-chat.h @@ -52,6 +52,13 @@ struct _EmpathyTpChatClass { GObjectClass parent_class; }; +typedef struct { + gchar *name; + guint id; + TpPropertyFlags flags; + GValue *value; +} EmpathyTpChatProperty; + GType empathy_tp_chat_get_type (void) G_GNUC_CONST; EmpathyTpChat *empathy_tp_chat_new (TpChannel *channel); void empathy_tp_chat_close (EmpathyTpChat *chat); @@ -67,6 +74,10 @@ void empathy_tp_chat_set_state (EmpathyTpChat *chat, void empathy_tp_chat_set_property (EmpathyTpChat *chat, const gchar *name, const GValue *value); +EmpathyTpChatProperty * + empathy_tp_chat_get_property (EmpathyTpChat *chat, + const gchar *name); +GPtrArray * empathy_tp_chat_get_properties (EmpathyTpChat *chat); /* Returns a read-only list of pending messages (should be a copy maybe ?) */ const GList * empathy_tp_chat_get_pending_messages (EmpathyTpChat *chat); -- cgit v1.2.3 From d283411b3f1ba3685b329a7a41d59ae153bd15ba Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sat, 10 Oct 2009 09:48:23 +0200 Subject: Add support for /join command https://bugzilla.gnome.org/show_bug.cgi?id=573407 --- libempathy-gtk/empathy-chat.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 6c712a54e..a8bddde3d 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -376,12 +376,27 @@ chat_sent_message_get_last (EmpathyChat *chat) return g_slist_nth_data (priv->sent_messages, priv->sent_messages_index); } +static void +chat_join_command_cb (EmpathyDispatchOperation *dispatch, + const GError *error, + gpointer user_data) +{ + EmpathyChat *chat = user_data; + + if (error != NULL) { + DEBUG ("Error: %s", error->message); + empathy_chat_view_append_event (chat->view, + _("Failed to join chatroom")); + } +} + static void chat_send (EmpathyChat *chat, const gchar *msg) { EmpathyChatPriv *priv; EmpathyMessage *message; + gchar *join = NULL; if (EMP_STR_EMPTY (msg)) { return; @@ -394,7 +409,7 @@ chat_send (EmpathyChat *chat, if (strcmp (msg, "/clear") == 0) { empathy_chat_view_clear (chat->view); return; - } else if (g_str_has_prefix (msg, "/topic")) { + } else if (g_str_has_prefix (msg, "/topic ")) { EmpathyTpChatProperty *property; GValue value = {0, }; gchar *topic; @@ -412,12 +427,25 @@ chat_send (EmpathyChat *chat, return; } - topic = g_strstrip (g_strdup (msg + strlen ("/topic"))); + topic = g_strstrip (g_strdup (msg + strlen ("/topic "))); g_value_init (&value, G_TYPE_STRING); g_value_take_string (&value, topic); empathy_tp_chat_set_property (priv->tp_chat, "subject", &value); g_value_unset (&value); + return; + } else if (g_str_has_prefix (msg, "/join ")) { + join = g_strstrip (g_strdup (msg + strlen ("/join "))); + } else if (g_str_has_prefix (msg, "/j ")) { + join = g_strstrip (g_strdup (msg + strlen ("/j "))); + } + if (join != NULL) { + TpConnection *connection; + + connection = empathy_tp_chat_get_connection (priv->tp_chat); + empathy_dispatcher_join_muc (connection, join, + chat_join_command_cb, chat); + g_free (join); return; } -- cgit v1.2.3 From a24f350a5e3423913f3456ddf7d5f5c6d3ad3300 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sat, 10 Oct 2009 09:57:10 +0200 Subject: Add support for /query command https://bugzilla.gnome.org/show_bug.cgi?id=573407 --- libempathy-gtk/empathy-chat.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index a8bddde3d..8c38e5bf7 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -390,6 +390,20 @@ chat_join_command_cb (EmpathyDispatchOperation *dispatch, } } +static void +chat_query_command_cb (EmpathyDispatchOperation *dispatch, + const GError *error, + gpointer user_data) +{ + EmpathyChat *chat = user_data; + + if (error != NULL) { + DEBUG ("Error: %s", error->message); + empathy_chat_view_append_event (chat->view, + _("Failed to query contact")); + } +} + static void chat_send (EmpathyChat *chat, const gchar *msg) @@ -438,7 +452,21 @@ chat_send (EmpathyChat *chat, join = g_strstrip (g_strdup (msg + strlen ("/join "))); } else if (g_str_has_prefix (msg, "/j ")) { join = g_strstrip (g_strdup (msg + strlen ("/j "))); + } else if (g_str_has_prefix (msg, "/query ")) { + TpConnection *connection; + gchar *id; + + /* FIXME: We should probably search in members alias. But this + * is enough for IRC */ + id = g_strstrip (g_strdup (msg + strlen ("/query "))); + connection = empathy_tp_chat_get_connection (priv->tp_chat); + empathy_dispatcher_chat_with_contact_id (connection, id, + chat_query_command_cb, + chat); + g_free (id); + return; } + if (join != NULL) { TpConnection *connection; -- cgit v1.2.3 From 06f81e690da1a60ee385c9486bf59e221259fd1a Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sun, 11 Oct 2009 15:25:52 +0200 Subject: Add support for /msg command https://bugzilla.gnome.org/show_bug.cgi?id=573407 --- libempathy-gtk/empathy-chat.c | 76 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 74 insertions(+), 2 deletions(-) diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 8c38e5bf7..b598afb38 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -404,12 +404,57 @@ chat_query_command_cb (EmpathyDispatchOperation *dispatch, } } +typedef struct { + EmpathyChat *chat; + gchar *msg; +} ChatMsgCommandData; + +static void +chat_msg_command_cb (EmpathyDispatchOperation *dispatch, + const GError *error, + gpointer user_data) +{ + ChatMsgCommandData *data = user_data; + EmpathyTpChat *tpchat; + + if (error != NULL) { + empathy_chat_view_append_event (data->chat->view, + _("Failed to msg contact")); + goto OUT; + } + + tpchat = EMPATHY_TP_CHAT ( + empathy_dispatch_operation_get_channel_wrapper (dispatch)); + + if (empathy_dispatch_operation_claim (dispatch)) { + EmpathyMessage *message; + gchar *event; + + message = empathy_message_new (data->msg); + empathy_tp_chat_send (tpchat, message); + g_object_unref (message); + + event = g_strdup_printf (_("[%s]: %s"), + empathy_tp_chat_get_id (tpchat), + data->msg); + empathy_chat_view_append_event (data->chat->view, event); + g_free (event); + + empathy_tp_chat_close (tpchat); + } + +OUT: + g_free (data->msg); + g_slice_free (ChatMsgCommandData, data); +} + static void chat_send (EmpathyChat *chat, const gchar *msg) { EmpathyChatPriv *priv; EmpathyMessage *message; + TpConnection *connection; gchar *join = NULL; if (EMP_STR_EMPTY (msg)) { @@ -420,6 +465,7 @@ chat_send (EmpathyChat *chat, chat_sent_message_add (chat, msg); + connection = empathy_tp_chat_get_connection (priv->tp_chat); if (strcmp (msg, "/clear") == 0) { empathy_chat_view_clear (chat->view); return; @@ -453,18 +499,44 @@ chat_send (EmpathyChat *chat, } else if (g_str_has_prefix (msg, "/j ")) { join = g_strstrip (g_strdup (msg + strlen ("/j "))); } else if (g_str_has_prefix (msg, "/query ")) { - TpConnection *connection; gchar *id; /* FIXME: We should probably search in members alias. But this * is enough for IRC */ id = g_strstrip (g_strdup (msg + strlen ("/query "))); - connection = empathy_tp_chat_get_connection (priv->tp_chat); empathy_dispatcher_chat_with_contact_id (connection, id, chat_query_command_cb, chat); g_free (id); return; + } else if (g_str_has_prefix (msg, "/msg ")) { + gchar *id, *index; + ChatMsgCommandData *data; + + id = g_strstrip (g_strdup (msg + strlen ("/msg "))); + index = strchr (id, ' '); + if (index != NULL) { + *index = '\0'; + g_strstrip (++index); + } + + if (EMP_STR_EMPTY (id) || EMP_STR_EMPTY (index)) { + empathy_chat_view_append_event (chat->view, + _("Usage: /msg pseudo message")); + g_free (id); + return; + } + + /* FIXME: We should probably search in members alias. But this + * is enough for IRC */ + data = g_slice_new (ChatMsgCommandData); + data->chat = chat; + data->msg = g_strdup (index); + empathy_dispatcher_chat_with_contact_id (connection, id, + chat_msg_command_cb, + data); + g_free (id); + return; } if (join != NULL) { -- cgit v1.2.3 From 104502ee87c5eb9de5accb96fb837f6c73f889f4 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sun, 11 Oct 2009 21:49:47 +0200 Subject: Refactor chat commands. https://bugzilla.gnome.org/show_bug.cgi?id=573407 --- libempathy-gtk/empathy-chat.c | 212 +++++++++++++++++++++++++----------------- 1 file changed, 127 insertions(+), 85 deletions(-) diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index b598afb38..71b19b771 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -377,7 +377,7 @@ chat_sent_message_get_last (EmpathyChat *chat) } static void -chat_join_command_cb (EmpathyDispatchOperation *dispatch, +chat_command_join_cb (EmpathyDispatchOperation *dispatch, const GError *error, gpointer user_data) { @@ -391,7 +391,7 @@ chat_join_command_cb (EmpathyDispatchOperation *dispatch, } static void -chat_query_command_cb (EmpathyDispatchOperation *dispatch, +chat_command_query_cb (EmpathyDispatchOperation *dispatch, const GError *error, gpointer user_data) { @@ -407,14 +407,14 @@ chat_query_command_cb (EmpathyDispatchOperation *dispatch, typedef struct { EmpathyChat *chat; gchar *msg; -} ChatMsgCommandData; +} ChatCommandMsgData; static void -chat_msg_command_cb (EmpathyDispatchOperation *dispatch, +chat_command_msg_cb (EmpathyDispatchOperation *dispatch, const GError *error, gpointer user_data) { - ChatMsgCommandData *data = user_data; + ChatCommandMsgData *data = user_data; EmpathyTpChat *tpchat; if (error != NULL) { @@ -445,110 +445,152 @@ chat_msg_command_cb (EmpathyDispatchOperation *dispatch, OUT: g_free (data->msg); - g_slice_free (ChatMsgCommandData, data); + g_slice_free (ChatCommandMsgData, data); } static void -chat_send (EmpathyChat *chat, - const gchar *msg) +chat_command_clear (EmpathyChat *chat, + const gchar *str) { - EmpathyChatPriv *priv; - EmpathyMessage *message; - TpConnection *connection; - gchar *join = NULL; + empathy_chat_view_clear (chat->view); +} - if (EMP_STR_EMPTY (msg)) { +static void +chat_command_topic (EmpathyChat *chat, + const gchar *str) +{ + EmpathyChatPriv *priv = GET_PRIV (chat); + EmpathyTpChatProperty *property; + GValue value = {0, }; + + property = empathy_tp_chat_get_property (priv->tp_chat, "subject"); + if (property == NULL) { + empathy_chat_view_append_event (chat->view, + _("This conversation does not have topic")); return; } - priv = GET_PRIV (chat); + if (!(property->flags & TP_PROPERTY_FLAG_WRITE)) { + empathy_chat_view_append_event (chat->view, + _("You need to be a channel operator to do that")); + return; + } - chat_sent_message_add (chat, msg); + g_value_init (&value, G_TYPE_STRING); + g_value_set_string (&value, str); + empathy_tp_chat_set_property (priv->tp_chat, "subject", &value); + g_value_unset (&value); +} - connection = empathy_tp_chat_get_connection (priv->tp_chat); - if (strcmp (msg, "/clear") == 0) { - empathy_chat_view_clear (chat->view); - return; - } else if (g_str_has_prefix (msg, "/topic ")) { - EmpathyTpChatProperty *property; - GValue value = {0, }; - gchar *topic; - - property = empathy_tp_chat_get_property (priv->tp_chat, "subject"); - if (property == NULL) { - empathy_chat_view_append_event (chat->view, - _("This conversation does not have topic")); - return; - } +static void +chat_command_join (EmpathyChat *chat, + const gchar *str) +{ + EmpathyChatPriv *priv = GET_PRIV (chat); + TpConnection *connection; - if (!(property->flags & TP_PROPERTY_FLAG_WRITE)) { - empathy_chat_view_append_event (chat->view, - _("You need to be a channel operator to do that")); - return; - } + connection = empathy_tp_chat_get_connection (priv->tp_chat); + empathy_dispatcher_join_muc (connection, str, + chat_command_join_cb, + chat); +} - topic = g_strstrip (g_strdup (msg + strlen ("/topic "))); - g_value_init (&value, G_TYPE_STRING); - g_value_take_string (&value, topic); - empathy_tp_chat_set_property (priv->tp_chat, "subject", &value); - g_value_unset (&value); +static void +chat_command_query (EmpathyChat *chat, + const gchar *str) +{ + EmpathyChatPriv *priv = GET_PRIV (chat); + TpConnection *connection; - return; - } else if (g_str_has_prefix (msg, "/join ")) { - join = g_strstrip (g_strdup (msg + strlen ("/join "))); - } else if (g_str_has_prefix (msg, "/j ")) { - join = g_strstrip (g_strdup (msg + strlen ("/j "))); - } else if (g_str_has_prefix (msg, "/query ")) { - gchar *id; - - /* FIXME: We should probably search in members alias. But this - * is enough for IRC */ - id = g_strstrip (g_strdup (msg + strlen ("/query "))); - empathy_dispatcher_chat_with_contact_id (connection, id, - chat_query_command_cb, - chat); - g_free (id); - return; - } else if (g_str_has_prefix (msg, "/msg ")) { - gchar *id, *index; - ChatMsgCommandData *data; - - id = g_strstrip (g_strdup (msg + strlen ("/msg "))); - index = strchr (id, ' '); - if (index != NULL) { - *index = '\0'; - g_strstrip (++index); - } + /* FIXME: We should probably search in members alias. But this + * is enough for IRC */ + connection = empathy_tp_chat_get_connection (priv->tp_chat); + empathy_dispatcher_chat_with_contact_id (connection, str, + chat_command_query_cb, + chat); +} - if (EMP_STR_EMPTY (id) || EMP_STR_EMPTY (index)) { - empathy_chat_view_append_event (chat->view, - _("Usage: /msg pseudo message")); - g_free (id); - return; +static void +chat_command_msg (EmpathyChat *chat, + const gchar *str) +{ + EmpathyChatPriv *priv = GET_PRIV (chat); + TpConnection *connection; + ChatCommandMsgData *data; + gchar *id, *msg = NULL; + + id = g_strdup (str); + if (id != NULL) { + msg = strchr (id, ' '); + if (msg != NULL) { + *msg = '\0'; + g_strstrip (++msg); } + } - /* FIXME: We should probably search in members alias. But this - * is enough for IRC */ - data = g_slice_new (ChatMsgCommandData); - data->chat = chat; - data->msg = g_strdup (index); - empathy_dispatcher_chat_with_contact_id (connection, id, - chat_msg_command_cb, - data); + if (EMP_STR_EMPTY (id) || EMP_STR_EMPTY (msg)) { + empathy_chat_view_append_event (chat->view, + _("Usage: /msg pseudo message")); g_free (id); return; } - if (join != NULL) { - TpConnection *connection; + /* FIXME: We should probably search in members alias. But this + * is enough for IRC */ + data = g_slice_new (ChatCommandMsgData); + data->chat = chat; + data->msg = g_strdup (msg); + connection = empathy_tp_chat_get_connection (priv->tp_chat); + empathy_dispatcher_chat_with_contact_id (connection, id, + chat_command_msg_cb, + data); + g_free (id); +} - connection = empathy_tp_chat_get_connection (priv->tp_chat); - empathy_dispatcher_join_muc (connection, join, - chat_join_command_cb, chat); - g_free (join); +typedef void (*ChatCommandFunc) (EmpathyChat *chat, const gchar *str); + +typedef struct { + const gchar *str; + ChatCommandFunc func; +} ChatCommandItem; + +static ChatCommandItem commands[] = { + {"/clear", chat_command_clear}, + {"/topic ", chat_command_topic}, + {"/join ", chat_command_join}, + {"/j ", chat_command_join}, + {"/query ", chat_command_query}, + {"/msg ", chat_command_msg}, + {NULL, NULL} +}; + +static void +chat_send (EmpathyChat *chat, + const gchar *msg) +{ + EmpathyChatPriv *priv; + EmpathyMessage *message; + guint i; + + if (EMP_STR_EMPTY (msg)) { return; } + priv = GET_PRIV (chat); + + chat_sent_message_add (chat, msg); + + for (i = 0; commands[i].str != NULL; i++) { + if (g_str_has_prefix (msg, commands[i].str)) { + gchar *str; + + str = g_strstrip (g_strdup (msg + strlen (commands[i].str))); + commands[i].func (chat, str); + g_free (str); + return; + } + } + message = empathy_message_new_from_entry (msg); if (message == NULL) { -- cgit v1.2.3 From 894adf8d1f1763c6334c026fb46f7780a49405a3 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sun, 25 Oct 2009 19:20:16 +0100 Subject: Add support for /help command and fix review comments https://bugzilla.gnome.org/show_bug.cgi?id=573407 --- libempathy-gtk/empathy-chat.c | 256 +++++++++++++++++++++++++++--------------- 1 file changed, 165 insertions(+), 91 deletions(-) diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 71b19b771..2e0251603 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -390,74 +390,51 @@ chat_command_join_cb (EmpathyDispatchOperation *dispatch, } } -static void -chat_command_query_cb (EmpathyDispatchOperation *dispatch, - const GError *error, - gpointer user_data) -{ - EmpathyChat *chat = user_data; - - if (error != NULL) { - DEBUG ("Error: %s", error->message); - empathy_chat_view_append_event (chat->view, - _("Failed to query contact")); - } -} - typedef struct { EmpathyChat *chat; - gchar *msg; + gchar *message; } ChatCommandMsgData; static void chat_command_msg_cb (EmpathyDispatchOperation *dispatch, - const GError *error, - gpointer user_data) + const GError *error, + gpointer user_data) { ChatCommandMsgData *data = user_data; - EmpathyTpChat *tpchat; if (error != NULL) { empathy_chat_view_append_event (data->chat->view, - _("Failed to msg contact")); + _("Failed to open private chat")); goto OUT; } - tpchat = EMPATHY_TP_CHAT ( - empathy_dispatch_operation_get_channel_wrapper (dispatch)); - - if (empathy_dispatch_operation_claim (dispatch)) { + if (!EMP_STR_EMPTY (data->message)) { + EmpathyTpChat *tpchat; EmpathyMessage *message; - gchar *event; - message = empathy_message_new (data->msg); + tpchat = EMPATHY_TP_CHAT ( + empathy_dispatch_operation_get_channel_wrapper (dispatch)); + + message = empathy_message_new (data->message); empathy_tp_chat_send (tpchat, message); g_object_unref (message); - - event = g_strdup_printf (_("[%s]: %s"), - empathy_tp_chat_get_id (tpchat), - data->msg); - empathy_chat_view_append_event (data->chat->view, event); - g_free (event); - - empathy_tp_chat_close (tpchat); } OUT: - g_free (data->msg); + g_free (data->message); g_slice_free (ChatCommandMsgData, data); } static void chat_command_clear (EmpathyChat *chat, - const gchar *str) + GStrv strv) { empathy_chat_view_clear (chat->view); } static void chat_command_topic (EmpathyChat *chat, - const gchar *str) + GStrv strv) { EmpathyChatPriv *priv = GET_PRIV (chat); EmpathyTpChatProperty *property; @@ -466,104 +443,182 @@ chat_command_topic (EmpathyChat *chat, property = empathy_tp_chat_get_property (priv->tp_chat, "subject"); if (property == NULL) { empathy_chat_view_append_event (chat->view, - _("This conversation does not have topic")); + _("Topic not supported on this conversation")); return; } if (!(property->flags & TP_PROPERTY_FLAG_WRITE)) { empathy_chat_view_append_event (chat->view, - _("You need to be a channel operator to do that")); + _("You are not allowed to change the topic")); return; } g_value_init (&value, G_TYPE_STRING); - g_value_set_string (&value, str); + g_value_set_string (&value, strv[1]); empathy_tp_chat_set_property (priv->tp_chat, "subject", &value); g_value_unset (&value); } static void chat_command_join (EmpathyChat *chat, - const gchar *str) + GStrv strv) { EmpathyChatPriv *priv = GET_PRIV (chat); TpConnection *connection; connection = empathy_tp_chat_get_connection (priv->tp_chat); - empathy_dispatcher_join_muc (connection, str, + empathy_dispatcher_join_muc (connection, strv[1], chat_command_join_cb, chat); } static void -chat_command_query (EmpathyChat *chat, - const gchar *str) +chat_command_msg_internal (EmpathyChat *chat, + const gchar *contact_id, + const gchar *message) { EmpathyChatPriv *priv = GET_PRIV (chat); TpConnection *connection; + ChatCommandMsgData *data; - /* FIXME: We should probably search in members alias. But this - * is enough for IRC */ + data = g_slice_new (ChatCommandMsgData); + data->chat = chat; + data->message = g_strdup (message); connection = empathy_tp_chat_get_connection (priv->tp_chat); - empathy_dispatcher_chat_with_contact_id (connection, str, - chat_command_query_cb, - chat); + empathy_dispatcher_chat_with_contact_id (connection, contact_id, + chat_command_msg_cb, + data); } static void -chat_command_msg (EmpathyChat *chat, - const gchar *str) +chat_command_query (EmpathyChat *chat, + GStrv strv) { - EmpathyChatPriv *priv = GET_PRIV (chat); - TpConnection *connection; - ChatCommandMsgData *data; - gchar *id, *msg = NULL; - - id = g_strdup (str); - if (id != NULL) { - msg = strchr (id, ' '); - if (msg != NULL) { - *msg = '\0'; - g_strstrip (++msg); - } - } + gchar *msg = NULL; - if (EMP_STR_EMPTY (id) || EMP_STR_EMPTY (msg)) { - empathy_chat_view_append_event (chat->view, - _("Usage: /msg pseudo message")); - g_free (id); - return; + /* message part is optional, check if we have one */ + msg = strchr (strv[1], ' '); + if (msg != NULL) { + msg[0] = '\0'; + msg++; + g_strstrip (msg + 1); + g_strstrip (strv[1]); } /* FIXME: We should probably search in members alias. But this * is enough for IRC */ - data = g_slice_new (ChatCommandMsgData); - data->chat = chat; - data->msg = g_strdup (msg); - connection = empathy_tp_chat_get_connection (priv->tp_chat); - empathy_dispatcher_chat_with_contact_id (connection, id, - chat_command_msg_cb, - data); - g_free (id); + chat_command_msg_internal (chat, strv[1], msg); +} + +static void +chat_command_msg (EmpathyChat *chat, + GStrv strv) +{ + /* FIXME: We should probably search in members alias. But this + * is enough for IRC */ + chat_command_msg_internal (chat, strv[1], strv[2]); } -typedef void (*ChatCommandFunc) (EmpathyChat *chat, const gchar *str); +static void chat_command_help (EmpathyChat *chat, GStrv strv); + +typedef void (*ChatCommandFunc) (EmpathyChat *chat, GStrv strv); typedef struct { - const gchar *str; + const gchar *prefix; + guint n_parts; ChatCommandFunc func; + const gchar *help; } ChatCommandItem; static ChatCommandItem commands[] = { - {"/clear", chat_command_clear}, - {"/topic ", chat_command_topic}, - {"/join ", chat_command_join}, - {"/j ", chat_command_join}, - {"/query ", chat_command_query}, - {"/msg ", chat_command_msg}, - {NULL, NULL} + {"clear", 1, chat_command_clear, + N_("Usage: /clear, clear all messages from the current conversation")}, + + {"topic", 2, chat_command_topic, + N_("Usage: /topic , set the topic of the current conversation")}, + + {"join", 2, chat_command_join, + N_("Usage: /join , join a new chatroom")}, + + {"j", 2, chat_command_join, + N_("Usage: /j , join a new chatroom")}, + + {"query", 2, chat_command_query, + N_("Usage: /query [], open a private chat")}, + + {"msg", 3, chat_command_msg, + N_("Usage: /msg , open a private chat")}, + + {"help", 2, chat_command_help, + N_("Usage: /help , show usage of the command")}, }; +static void +chat_command_show_help (EmpathyChat *chat, + ChatCommandItem *item) +{ + empathy_chat_view_append_event (chat->view, gettext (item->help)); +} + +static void +chat_command_help (EmpathyChat *chat, + GStrv strv) +{ + guint i; + + for (i = 0; i < G_N_ELEMENTS (commands); i++) { + if (!tp_strdiff (strv[1], commands[i].prefix)) { + chat_command_show_help (chat, &commands[i]); + return; + } + } +} + +static GStrv +chat_command_parse (const gchar *text, guint n_parts) +{ + GPtrArray *array; + gchar *item; + + DEBUG ("Parse command, parts=%d text=\"%s\":", n_parts, text); + + array = g_ptr_array_sized_new (n_parts + 1); + while (n_parts > 1) { + const gchar *end; + + /* Skip white spaces */ + while (*text == ' ') { + text++; + } + + end = strchr (text, ' '); + if (end == NULL) { + break; + } + + item = g_strndup (text, end - text); + g_ptr_array_add (array, item); + DEBUG ("\tITEM: \"%s\"", item); + + text = end; + n_parts--; + } + + /* Append last part if not empty */ + item = g_strstrip (g_strdup (text)); + if (!EMP_STR_EMPTY (item)) { + g_ptr_array_add (array, item); + DEBUG ("\tITEM: \"%s\"", item); + } else { + g_free (item); + } + + /* Make the array NULL-terminated */ + g_ptr_array_add (array, NULL); + + return (GStrv) g_ptr_array_free (array, FALSE); +} + static void chat_send (EmpathyChat *chat, const gchar *msg) @@ -580,13 +635,32 @@ chat_send (EmpathyChat *chat, chat_sent_message_add (chat, msg); - for (i = 0; commands[i].str != NULL; i++) { - if (g_str_has_prefix (msg, commands[i].str)) { - gchar *str; + if (msg[0] == '/') { + for (i = 0; i < G_N_ELEMENTS (commands); i++) { + GStrv strv; - str = g_strstrip (g_strdup (msg + strlen (commands[i].str))); - commands[i].func (chat, str); - g_free (str); + if (!g_str_has_prefix (msg + 1, commands[i].prefix)) { + continue; + } + + /* We can't use g_strsplit here because it does + * not deal correctly if we have more than one space + * between args */ + strv = chat_command_parse (msg + 1, commands[i].n_parts); + + if (tp_strdiff (strv[0], commands[i].prefix)) { + g_strfreev (strv); + continue; + } + + if (g_strv_length (strv) != commands[i].n_parts) { + chat_command_show_help (chat, &commands[i]); + g_strfreev (strv); + return; + } + + commands[i].func (chat, strv); + g_strfreev (strv); return; } } -- cgit v1.2.3 From a732461a6458478703b769b3ab5c6fb5d30c90a4 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 27 Oct 2009 13:22:41 +0100 Subject: Add support for /help command without arg, to list all available commands. Also improve a bit the support for optional args. --- libempathy-gtk/empathy-chat.c | 86 +++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 39 deletions(-) diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 2e0251603..df76a02fc 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -481,6 +481,8 @@ chat_command_msg_internal (EmpathyChat *chat, TpConnection *connection; ChatCommandMsgData *data; + /* FIXME: We should probably search in members alias. But this + * is enough for IRC */ data = g_slice_new (ChatCommandMsgData); data->chat = chat; data->message = g_strdup (message); @@ -494,28 +496,15 @@ static void chat_command_query (EmpathyChat *chat, GStrv strv) { - gchar *msg = NULL; - - /* message part is optional, check if we have one */ - msg = strchr (strv[1], ' '); - if (msg != NULL) { - msg[0] = '\0'; - msg++; - g_strstrip (msg + 1); - g_strstrip (strv[1]); - } - - /* FIXME: We should probably search in members alias. But this - * is enough for IRC */ - chat_command_msg_internal (chat, strv[1], msg); + /* If part is not defined, + * strv[2] will be the terminal NULL */ + chat_command_msg_internal (chat, strv[1], strv[2]); } static void chat_command_msg (EmpathyChat *chat, GStrv strv) { - /* FIXME: We should probably search in members alias. But this - * is enough for IRC */ chat_command_msg_internal (chat, strv[1], strv[2]); } @@ -525,39 +514,45 @@ typedef void (*ChatCommandFunc) (EmpathyChat *chat, GStrv strv); typedef struct { const gchar *prefix; - guint n_parts; + guint min_parts; + guint max_parts; ChatCommandFunc func; const gchar *help; } ChatCommandItem; static ChatCommandItem commands[] = { - {"clear", 1, chat_command_clear, - N_("Usage: /clear, clear all messages from the current conversation")}, + {"clear", 1, 1, chat_command_clear, + N_("/clear, clear all messages from the current conversation")}, - {"topic", 2, chat_command_topic, - N_("Usage: /topic , set the topic of the current conversation")}, + {"topic", 2, 2, chat_command_topic, + N_("/topic , set the topic of the current conversation")}, - {"join", 2, chat_command_join, - N_("Usage: /join , join a new chatroom")}, + {"join", 2, 2, chat_command_join, + N_("/join , join a new chatroom")}, - {"j", 2, chat_command_join, - N_("Usage: /j , join a new chatroom")}, + {"j", 2, 2, chat_command_join, + N_("/j , join a new chatroom")}, - {"query", 2, chat_command_query, - N_("Usage: /query [], open a private chat")}, + {"query", 2, 3, chat_command_query, + N_("/query [], open a private chat")}, - {"msg", 3, chat_command_msg, - N_("Usage: /msg , open a private chat")}, + {"msg", 3, 3, chat_command_msg, + N_("/msg , open a private chat")}, - {"help", 2, chat_command_help, - N_("Usage: /help , show usage of the command")}, + {"help", 1, 2, chat_command_help, + N_("/help [], show all supported commands. " + "If is defined, show its usage.")}, }; static void chat_command_show_help (EmpathyChat *chat, ChatCommandItem *item) { - empathy_chat_view_append_event (chat->view, gettext (item->help)); + gchar *str; + + str = g_strdup_printf (_("Usage: %s"), _(item->help)); + empathy_chat_view_append_event (chat->view, str); + g_free (str); } static void @@ -566,6 +561,16 @@ chat_command_help (EmpathyChat *chat, { guint i; + /* If part is not defined, + * strv[1] will be the terminal NULL */ + if (strv[1] == NULL) { + for (i = 0; i < G_N_ELEMENTS (commands); i++) { + empathy_chat_view_append_event (chat->view, + _(commands[i].help)); + } + return; + } + for (i = 0; i < G_N_ELEMENTS (commands); i++) { if (!tp_strdiff (strv[1], commands[i].prefix)) { chat_command_show_help (chat, &commands[i]); @@ -575,15 +580,15 @@ chat_command_help (EmpathyChat *chat, } static GStrv -chat_command_parse (const gchar *text, guint n_parts) +chat_command_parse (const gchar *text, guint max_parts) { GPtrArray *array; gchar *item; - DEBUG ("Parse command, parts=%d text=\"%s\":", n_parts, text); + DEBUG ("Parse command, parts=%d text=\"%s\":", max_parts, text); - array = g_ptr_array_sized_new (n_parts + 1); - while (n_parts > 1) { + array = g_ptr_array_sized_new (max_parts + 1); + while (max_parts > 1) { const gchar *end; /* Skip white spaces */ @@ -601,7 +606,7 @@ chat_command_parse (const gchar *text, guint n_parts) DEBUG ("\tITEM: \"%s\"", item); text = end; - n_parts--; + max_parts--; } /* Append last part if not empty */ @@ -638,6 +643,7 @@ chat_send (EmpathyChat *chat, if (msg[0] == '/') { for (i = 0; i < G_N_ELEMENTS (commands); i++) { GStrv strv; + guint strv_len; if (!g_str_has_prefix (msg + 1, commands[i].prefix)) { continue; @@ -646,14 +652,16 @@ chat_send (EmpathyChat *chat, /* We can't use g_strsplit here because it does * not deal correctly if we have more than one space * between args */ - strv = chat_command_parse (msg + 1, commands[i].n_parts); + strv = chat_command_parse (msg + 1, commands[i].max_parts); if (tp_strdiff (strv[0], commands[i].prefix)) { g_strfreev (strv); continue; } - if (g_strv_length (strv) != commands[i].n_parts) { + strv_len = g_strv_length (strv); + if (strv_len < commands[i].min_parts || + strv_len > commands[i].max_parts) { chat_command_show_help (chat, &commands[i]); g_strfreev (strv); return; -- cgit v1.2.3 From 018af67a500b8bab6b8b374c32a887f399339834 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 27 Oct 2009 14:26:14 +0100 Subject: Move /me and /say support from EmpathyMessage to EmpathyChat. Also make commands not case sensitive and use g_ascii_isspace to detect spaces. --- libempathy-gtk/empathy-chat.c | 83 +++++++++++++++++++++++++++++++++++-------- libempathy/empathy-message.c | 56 ----------------------------- libempathy/empathy-message.h | 1 - 3 files changed, 69 insertions(+), 71 deletions(-) diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index df76a02fc..c2a88b2d5 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -508,6 +508,31 @@ chat_command_msg (EmpathyChat *chat, chat_command_msg_internal (chat, strv[1], strv[2]); } +static void +chat_command_me (EmpathyChat *chat, + GStrv strv) +{ + EmpathyChatPriv *priv = GET_PRIV (chat); + EmpathyMessage *message; + + message = empathy_message_new (strv[1]); + empathy_message_set_tptype (message, TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION); + empathy_tp_chat_send (priv->tp_chat, message); + g_object_unref (message); +} + +static void +chat_command_say (EmpathyChat *chat, + GStrv strv) +{ + EmpathyChatPriv *priv = GET_PRIV (chat); + EmpathyMessage *message; + + message = empathy_message_new (strv[1]); + empathy_tp_chat_send (priv->tp_chat, message); + g_object_unref (message); +} + static void chat_command_help (EmpathyChat *chat, GStrv strv); typedef void (*ChatCommandFunc) (EmpathyChat *chat, GStrv strv); @@ -539,6 +564,14 @@ static ChatCommandItem commands[] = { {"msg", 3, 3, chat_command_msg, N_("/msg , open a private chat")}, + {"me", 2, 2, chat_command_me, + N_("/me , send an ACTION message to the current conversation")}, + + {"say", 2, 2, chat_command_say, + N_("/say , send to the current conversation. " + "This is used to send a message starting with a '/'. For example: " + "\"/say /join is used to join a new chatroom\"")}, + {"help", 1, 2, chat_command_help, N_("/help [], show all supported commands. " "If is defined, show its usage.")}, @@ -572,7 +605,7 @@ chat_command_help (EmpathyChat *chat, } for (i = 0; i < G_N_ELEMENTS (commands); i++) { - if (!tp_strdiff (strv[1], commands[i].prefix)) { + if (g_ascii_strcasecmp (strv[1], commands[i].prefix) == 0) { chat_command_show_help (chat, &commands[i]); return; } @@ -592,12 +625,13 @@ chat_command_parse (const gchar *text, guint max_parts) const gchar *end; /* Skip white spaces */ - while (*text == ' ') { + while (g_ascii_isspace (*text)) { text++; } - end = strchr (text, ' '); - if (end == NULL) { + /* Search the end of this part, until first space. */ + for (end = text; *end != '\0' && !g_ascii_isspace (*end); end++); + if (*end == '\0') { break; } @@ -624,6 +658,13 @@ chat_command_parse (const gchar *text, guint max_parts) return (GStrv) g_ptr_array_free (array, FALSE); } +static gboolean +has_prefix_case (const gchar *s, + const gchar *prefix) +{ + return g_ascii_strncasecmp (s, prefix, strlen (prefix)) == 0; +} + static void chat_send (EmpathyChat *chat, const gchar *msg) @@ -641,11 +682,14 @@ chat_send (EmpathyChat *chat, chat_sent_message_add (chat, msg); if (msg[0] == '/') { + gboolean second_slash = FALSE; + const gchar *iter = msg + 1; + for (i = 0; i < G_N_ELEMENTS (commands); i++) { GStrv strv; guint strv_len; - if (!g_str_has_prefix (msg + 1, commands[i].prefix)) { + if (!has_prefix_case (msg + 1, commands[i].prefix)) { continue; } @@ -654,7 +698,7 @@ chat_send (EmpathyChat *chat, * between args */ strv = chat_command_parse (msg + 1, commands[i].max_parts); - if (tp_strdiff (strv[0], commands[i].prefix)) { + if (g_ascii_strcasecmp (strv[0], commands[i].prefix) != 0) { g_strfreev (strv); continue; } @@ -671,17 +715,28 @@ chat_send (EmpathyChat *chat, g_strfreev (strv); return; } - } - message = empathy_message_new_from_entry (msg); + /* Also allow messages with two slashes before the + * first space, so it is possible to send a /unix/path. + * This heuristic is kind of crap. */ + while (*iter != '\0' && !g_ascii_isspace (*iter)) { + if (*iter == '/') { + second_slash = TRUE; + break; + } + iter++; + } - if (message == NULL) { - empathy_chat_view_append_event (chat->view, - _("Unsupported command")); - } else { - empathy_tp_chat_send (priv->tp_chat, message); - g_object_unref (message); + if (!second_slash) { + empathy_chat_view_append_event (chat->view, + _("Unsupported command")); + return; + } } + + message = empathy_message_new (msg); + empathy_tp_chat_send (priv->tp_chat, message); + g_object_unref (message); } static void diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c index a403766e4..705bd224b 100644 --- a/libempathy/empathy-message.c +++ b/libempathy/empathy-message.c @@ -234,62 +234,6 @@ message_set_property (GObject *object, }; } -static gboolean -has_prefix_case (const gchar *s, - const gchar *prefix) -{ - return g_ascii_strncasecmp (s, prefix, strlen (prefix)) == 0; -} - -/* - * Constructs an EmpathyMessage based on user input, which may include "/me" - * and friends. - * - * Returns: an #EmpathyMessage if @message could be parsed, or %NULL if - * @message was an unknown command. - */ -EmpathyMessage * -empathy_message_new_from_entry (const gchar *message) -{ - TpChannelTextMessageType t = TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL; - - g_return_val_if_fail (message != NULL, NULL); - - if (message[0] == '/') { - if (g_ascii_strcasecmp (message, "/me") == 0) { - message = ""; - t = TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION; - } else if (has_prefix_case (message, "/me ")) { - message += strlen ("/me "); - t = TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION; - } else if (has_prefix_case (message, "/say ")) { - message += strlen ("/say "); - } else { - /* Also allow messages with two slashes before the - * first space, so it is possible to send a /unix/path. - * This heuristic is kind of crap. - */ - gboolean second_slash = FALSE; - const gchar *m = message + 1; - - while (!second_slash && *m != '\0' && *m != ' ') { - if (*m == '/') - second_slash = TRUE; - - m++; - } - - if (!second_slash) - return NULL; - } - } - - return g_object_new (EMPATHY_TYPE_MESSAGE, - "type", t, - "body", message, - NULL); -} - EmpathyMessage * empathy_message_new (const gchar *body) { diff --git a/libempathy/empathy-message.h b/libempathy/empathy-message.h index 7ca624031..09175e625 100644 --- a/libempathy/empathy-message.h +++ b/libempathy/empathy-message.h @@ -52,7 +52,6 @@ struct _EmpathyMessageClass { }; GType empathy_message_get_type (void) G_GNUC_CONST; -EmpathyMessage * empathy_message_new_from_entry (const gchar *message); EmpathyMessage * empathy_message_new (const gchar *body); TpChannelTextMessageType empathy_message_get_tptype (EmpathyMessage *message); void empathy_message_set_tptype (EmpathyMessage *message, -- cgit v1.2.3 From af69bde2866b6d219ae2f88bef748be2526c1604 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sun, 1 Nov 2009 15:41:45 +0100 Subject: In case of unknown command, suggest /help --- libempathy-gtk/empathy-chat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index c2a88b2d5..81d0d0722 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -729,7 +729,8 @@ chat_send (EmpathyChat *chat, if (!second_slash) { empathy_chat_view_append_event (chat->view, - _("Unsupported command")); + _("Unknown command, see /help for the available" + " commands")); return; } } -- cgit v1.2.3 From 59e8855f553fdcd3d23d3f0788ec6628192f0892 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 3 Nov 2009 17:10:06 +0100 Subject: Make clear that for(foo); does nothing. --- libempathy-gtk/empathy-chat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 81d0d0722..d8acd3b4e 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -630,7 +630,8 @@ chat_command_parse (const gchar *text, guint max_parts) } /* Search the end of this part, until first space. */ - for (end = text; *end != '\0' && !g_ascii_isspace (*end); end++); + for (end = text; *end != '\0' && !g_ascii_isspace (*end); end++) + /* Do nothing */; if (*end == '\0') { break; } -- cgit v1.2.3 From e31c0e3f3b9a12dcf280a1ec05fc58463a020d71 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 3 Nov 2009 17:11:07 +0100 Subject: Optimisation: Remove of the duplicated check for the command prefix. --- libempathy-gtk/empathy-chat.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index d8acd3b4e..cfeb0073b 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -690,7 +690,8 @@ chat_send (EmpathyChat *chat, GStrv strv; guint strv_len; - if (!has_prefix_case (msg + 1, commands[i].prefix)) { + if (!has_prefix_case (msg + 1, commands[i].prefix) || + !g_ascii_isspace (msg + 1 + strlen (commands[i].prefix))) { continue; } @@ -699,11 +700,6 @@ chat_send (EmpathyChat *chat, * between args */ strv = chat_command_parse (msg + 1, commands[i].max_parts); - if (g_ascii_strcasecmp (strv[0], commands[i].prefix) != 0) { - g_strfreev (strv); - continue; - } - strv_len = g_strv_length (strv); if (strv_len < commands[i].min_parts || strv_len > commands[i].max_parts) { -- cgit v1.2.3