[darcs-to-svn @ Handling /say msg and remove useless debug messages]

svn path=/trunk/; revision=19

diff --git a/libempathy-gtk/gossip-chat.c b/libempathy-gtk/gossip-chat.c
index 4414f5d261221120fb9307ce16651ea10cee36c4..d1e0369367d7439dcce71fe5e15299e093445a3c 100644 (file)
--- a/libempathy-gtk/gossip-chat.c
+++ b/libempathy-gtk/gossip-chat.c
@@ -507,7 +507,7 @@ chat_input_key_press_event_cb (GtkWidget   *widget,
        if (event->keyval == GDK_Tab && !(event->state & GDK_CONTROL_MASK)) {
                return TRUE;
        }
-g_print ("1\n");
+
        /* Catch ctrl+up/down so we can traverse messages we sent */
        if ((event->state & GDK_CONTROL_MASK) && 
            (event->keyval == GDK_Up || 
@@ -533,7 +533,6 @@ g_print ("1\n");
 
                return TRUE;    
        }
-g_print ("2\n");
 
        /* Catch enter but not ctrl/shift-enter */
        if (IS_ENTER (event->keyval) && !(event->state & GDK_SHIFT_MASK)) {
@@ -550,12 +549,10 @@ g_print ("2\n");
                        GTK_TEXT_VIEW (chat->input_text_view)->need_im_reset = TRUE;
                        return TRUE;
                }
-g_print ("3\n");
 
                chat_input_text_view_send (chat);
                return TRUE;
        }
-g_print ("4\n");
 
        text_view_sw = gtk_widget_get_parent (GTK_WIDGET (chat->view));
 
@@ -578,7 +575,6 @@ g_print ("4\n");
 
                return TRUE;
        }
-g_print ("5\n");
 
        return FALSE;
 }

diff --git a/libempathy/gossip-message.c b/libempathy/gossip-message.c
index f4c756dd9a7d9f7b1b56b249188e7227387b079d..c4844e655bc828857ec783a1638d9a957ffd4610 100644 (file)
--- a/libempathy/gossip-message.c
+++ b/libempathy/gossip-message.c
@@ -321,6 +321,9 @@ gossip_message_set_body (GossipMessage *message,
                type = GOSSIP_MESSAGE_TYPE_ACTION;
                body += 4;
        }
+       else if (g_str_has_prefix (body, "/say")) {
+               body += 5;
+       }
 
        if (body) {
                priv->body = g_strdup (body);