update chat state message changed

[linphone] / gtk / chat.c

diff --git a/gtk/chat.c b/gtk/chat.c
index 58f1a23ce6586d2f723641189e830eb30b914c7d..2cba0754fe48772caa9932cfb9edaf6db70ccaa9 100644 (file)
--- a/gtk/chat.c
+++ b/gtk/chat.c
@@ -61,12 +61,19 @@ void linphone_gtk_quit_chatroom(LinphoneChatRoom *cr) {
        GtkWidget *nb=linphone_gtk_get_widget(main_window,"viewswitch");
        GtkWidget *friendlist=linphone_gtk_get_widget(main_window,"contact_list");
        GtkWidget *w=g_object_get_data(G_OBJECT(friendlist),"chatview");
+       gchar *from;
+       GHashTable *table=g_object_get_data(G_OBJECT(w),"table");
        
        g_return_if_fail(w!=NULL);
        gtk_notebook_remove_page(GTK_NOTEBOOK(nb),gtk_notebook_page_num(GTK_NOTEBOOK(nb),w));
        linphone_gtk_friend_list_update_chat_picture();
        g_object_set_data(G_OBJECT(friendlist),"chatview",NULL);
-       g_object_set_data(G_OBJECT(w),"from_message",NULL);     
+       from=g_object_get_data(G_OBJECT(w),"from_message");
+       if (from){
+               g_object_set_data(G_OBJECT(w),"from_message",NULL);
+               g_free(from);
+       }
+       g_hash_table_destroy(table);
        g_object_set_data(G_OBJECT(w),"cr",NULL);
        g_object_set_data(G_OBJECT(friendlist),"from",NULL);
        gtk_widget_destroy(w);
@@ -128,8 +135,8 @@ void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from,
        GtkTextIter iter,begin;
        int off;
        char *from_str=linphone_address_as_string_uri_only(from);
-       char *from_message=(char *)g_object_get_data(G_OBJECT(w),"from_message");
-       GList *list=g_object_get_data(G_OBJECT(w),"list");
+       gchar *from_message=(gchar *)g_object_get_data(G_OBJECT(w),"from_message");
+       GHashTable *table=(GHashTable*)g_object_get_data(G_OBJECT(w),"table");
        time_t t;
        char buf[80];
        time_t tnow;
@@ -148,8 +155,8 @@ void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from,
                gtk_text_buffer_insert_with_tags_by_name(buffer,&iter," : ",-1,"bold",me ? "bg":NULL,NULL);
                gtk_text_buffer_get_end_iter(buffer,&iter);
                gtk_text_buffer_insert(buffer,&iter,"\n",-1);
-               ms_free(from_message);
-               g_object_set_data(G_OBJECT(w),"from_message",from_str);
+               g_free(from_message);
+               g_object_set_data(G_OBJECT(w),"from_message",g_strdup(from_str));
        }
        gtk_text_buffer_get_end_iter(buffer,&iter);
        gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,linphone_chat_message_get_text(msg),-1,"margin",me ? "bg":NULL,NULL);
@@ -160,10 +167,10 @@ void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from,
        switch (linphone_chat_message_get_state (msg)){
                case LinphoneChatMessageStateInProgress:
                {
-                       list=g_list_append(list,GINT_TO_POINTER(gtk_text_iter_get_line(&iter)));
+                       g_hash_table_insert(table,(gpointer)msg,GINT_TO_POINTER(gtk_text_iter_get_line(&iter)));
                        gtk_text_buffer_insert_with_tags_by_name(buffer,&iter,"Sending .. ",-1,                                                                 
                                                "right","small","italic","font_grey","bg",NULL);
-                       g_object_set_data(G_OBJECT(w),"list",list);
+                       g_object_set_data(G_OBJECT(w),"table",table);
                        break;
                }
                case LinphoneChatMessageStateDelivered:
@@ -193,6 +200,7 @@ void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from,
        gtk_text_buffer_insert(buffer,&iter,"\n",-1);
        GtkTextMark *mark=gtk_text_buffer_create_mark(buffer,NULL,&iter,FALSE);
        gtk_text_view_scroll_mark_onscreen(text,mark); 
+       ms_free(from_str);
 }
 
 const LinphoneAddress* linphone_gtk_get_used_identity(){
@@ -207,7 +215,7 @@ void update_chat_state_message(LinphoneChatMessageState state,LinphoneChatMessag
        GtkWidget *main_window=linphone_gtk_get_main_window();
        GtkWidget *friendlist=linphone_gtk_get_widget(main_window,"contact_list");
        GtkWidget *page=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview");
-       GList *list=g_object_get_data(G_OBJECT(page),"list");
+       GHashTable *table=(GHashTable*)g_object_get_data(G_OBJECT(page),"table");
        
        if(page!=NULL){
                GtkTextView *text=GTK_TEXT_VIEW(linphone_gtk_get_widget(page,"textview"));
@@ -216,21 +224,20 @@ void update_chat_state_message(LinphoneChatMessageState state,LinphoneChatMessag
                GtkTextIter end;
                GtkTextIter start;
                gchar *result;
+               gint line;
+               line=GPOINTER_TO_INT(g_hash_table_lookup(table,msg));
 
-               gtk_text_buffer_get_iter_at_line(b,&iter,
-                                          GPOINTER_TO_INT(g_list_nth_data(list,0)));
+               gtk_text_buffer_get_iter_at_line(b,&iter,line);
                if(gtk_text_iter_get_chars_in_line(&iter) >0) {
-                       gtk_text_buffer_get_iter_at_line_offset(b,&start,
-                                                       GPOINTER_TO_INT(g_list_nth_data(list,0)),
-                                           gtk_text_iter_get_chars_in_line(&iter)-1);
+                       gtk_text_buffer_get_iter_at_line_offset(b,&start,line,
+                                       gtk_text_iter_get_chars_in_line(&iter)-1);
                }else{
-                       gtk_text_buffer_get_iter_at_line_offset(b,&start,
-                                               GPOINTER_TO_INT(g_list_nth_data(list,0)),0);
+                       gtk_text_buffer_get_iter_at_line_offset(b,&start,line,0);
                }
-               gtk_text_buffer_get_iter_at_line_offset(b,&end,
-                                           GPOINTER_TO_INT(g_list_nth_data(list,0)),0);
+               gtk_text_buffer_get_iter_at_line_offset(b,&end,line,0);
                gtk_text_buffer_delete(b,&start,&end);
-               gtk_text_buffer_get_iter_at_line(b,&iter,GPOINTER_TO_INT(g_list_nth_data(list,0)));
+               gtk_text_buffer_get_iter_at_line(b,&iter,line);
+
                switch (state) {
                        case LinphoneChatMessageStateInProgress:
                                result="Sending ";
@@ -245,14 +252,14 @@ void update_chat_state_message(LinphoneChatMessageState state,LinphoneChatMessag
                                break;
                        }
                        case  LinphoneChatMessageStateNotDelivered:
-                               result="Error ";
+                               result="Message not sent";
                                break;
                        default : result="Sending ..";
                }
                gtk_text_buffer_insert_with_tags_by_name(b,&iter,result,-1,
                                                                                                "right","small","italic","font_grey","bg",NULL);
-               list=g_list_remove(list,g_list_nth_data(list,0));
-               g_object_set_data(G_OBJECT(page),"list",list);
+               g_hash_table_remove(table,msg);
+               g_object_set_data(G_OBJECT(page),"table",table);
        } 
 }
 
@@ -292,6 +299,7 @@ void display_history_message(GtkWidget *chat_view,MSList *messages,const Linphon
                MSList *it;
                char *from_str;
                char *with_str;
+               gchar *tmp;
                for(it=messages;it!=NULL;it=it->next){
                        LinphoneChatMessage *msg=(LinphoneChatMessage *)it->data;
                        from_str=linphone_address_as_string_uri_only(linphone_chat_message_get_from(msg));
@@ -301,7 +309,11 @@ void display_history_message(GtkWidget *chat_view,MSList *messages,const Linphon
                                                        strcmp(from_str,with_str)==0? FALSE : TRUE,
                                                linphone_chat_message_get_chat_room(msg),msg,TRUE);
                }
-               g_object_set_data(G_OBJECT(chat_view),"from_message",NULL);
+               tmp=g_object_get_data(G_OBJECT(chat_view),"from_message");
+               if (tmp){
+                       g_object_set_data(G_OBJECT(chat_view),"from_message",NULL);
+                       g_free(tmp);
+               }
                ms_free(from_str);
                ms_free(with_str);
                linphone_gtk_free_list(messages);
@@ -309,7 +321,6 @@ void display_history_message(GtkWidget *chat_view,MSList *messages,const Linphon
 }
 
 void linphone_gtk_chat_add_contact(const LinphoneAddress *addr){
-       //LinphoneAddress *addr=(LinphoneAddress *)data;
        LinphoneFriend *lf=NULL;
        char *uri=linphone_address_as_string(addr);
        lf=linphone_friend_new_with_addr(uri);
@@ -341,8 +352,8 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres
        int idx;
        GtkWidget *button;
        GtkWidget *entry;
-       GList *list=NULL;
        MSList *messages;
+       GHashTable *table;
        char *with_str;
 
        color.red = 32512;
@@ -361,9 +372,10 @@ GtkWidget* linphone_gtk_init_chatroom(LinphoneChatRoom *cr, const LinphoneAddres
        idx = gtk_notebook_page_num(notebook, chat_view);
        gtk_notebook_set_current_page(notebook, idx);
        gtk_widget_show(chat_view);
+       table=g_hash_table_new_full(g_direct_hash,g_direct_equal,NULL,NULL);
        g_object_set_data(G_OBJECT(chat_view),"cr",cr);
        g_object_set_data(G_OBJECT(chat_view),"from_message",NULL);
-       g_object_set_data(G_OBJECT(chat_view),"list",list);
+       g_object_set_data(G_OBJECT(chat_view),"table",table);
        gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),
                                "right","justification", GTK_JUSTIFY_RIGHT,NULL);
        gtk_text_buffer_create_tag(gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)),
@@ -420,7 +432,7 @@ void linphone_gtk_load_chatroom(LinphoneChatRoom *cr,const LinphoneAddress *uri,
                g_object_set_data(G_OBJECT(chat_view),"cr",cr);
                g_object_set_data(G_OBJECT(linphone_gtk_get_widget(main_window,"contact_list")),"chatview",(gpointer)chat_view);
                messages=linphone_chat_room_get_history(cr,NB_MSG_HIST);
-               g_object_set_data(G_OBJECT(chat_view),"from_message",uri_str);
+               g_object_set_data(G_OBJECT(chat_view),"from_message",g_strdup(uri_str));
                display_history_message(chat_view,messages,uri);
        }
        ms_free(from_str);