fix memory leak in gtk

fix indentation (had spaces instead of tabs)
update ms2

diff --git a/gtk/chat.c b/gtk/chat.c
index 4fa1c917c440d32458dbd22d3a001e3bafcf560b..58f1a23ce6586d2f723641189e830eb30b914c7d 100644 (file)
--- a/gtk/chat.c
+++ b/gtk/chat.c
@@ -148,12 +148,13 @@ 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);
        }
-       gtk_text_buffer_get_end_iter(buffer,&iter);                     
+       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);
-       gtk_text_buffer_get_end_iter(buffer,&iter);     
-       gtk_text_buffer_insert(buffer,&iter,"\n",-1);;  
+       gtk_text_buffer_get_end_iter(buffer,&iter);
+       gtk_text_buffer_insert(buffer,&iter,"\n",-1);
        gtk_text_buffer_get_end_iter(buffer,&iter);
        t=linphone_chat_message_get_time(msg);
        switch (linphone_chat_message_get_state (msg)){
@@ -260,9 +261,9 @@ static void on_chat_state_changed(LinphoneChatMessage *msg, LinphoneChatMessageS
 }
 
 void linphone_gtk_send_text(){
-    GtkWidget *main_window=linphone_gtk_get_main_window();
+       GtkWidget *main_window=linphone_gtk_get_main_window();
        GtkWidget *friendlist=linphone_gtk_get_widget(main_window,"contact_list");
-    GtkWidget *w=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview");
+       GtkWidget *w=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview");
        GtkWidget *entry=linphone_gtk_get_widget(w,"text_entry");
        const gchar *entered;
        LinphoneChatRoom *cr=g_object_get_data(G_OBJECT(w),"cr");
@@ -271,7 +272,7 @@ void linphone_gtk_send_text(){
                LinphoneChatMessage *msg;
                msg=linphone_chat_room_create_message(cr,entered);
                linphone_chat_room_send_message2(cr,msg,on_chat_state_changed,NULL);
-               linphone_gtk_push_text(w,linphone_gtk_get_used_identity(),
+               linphone_gtk_push_text(w,linphone_chat_message_get_from(msg),
                                TRUE,cr,msg,FALSE);
                gtk_entry_set_text(GTK_ENTRY(entry),"");
        }
@@ -438,58 +439,57 @@ void linphone_gtk_chat_close(GtkWidget *button){
 }
 
 
-void linphone_gtk_text_received(LinphoneCore *lc, LinphoneChatRoom *room, 
-                               LinphoneChatMessage *msg){
+void linphone_gtk_text_received ( LinphoneCore *lc, LinphoneChatRoom *room,
+                                                                 LinphoneChatMessage *msg ) {
        GtkWidget *main_window=linphone_gtk_get_main_window();
-       GtkWidget *friendlist=linphone_gtk_get_widget(main_window,"contact_list");
-    GtkWidget *w;      
+       GtkWidget *friendlist=linphone_gtk_get_widget ( main_window,"contact_list" );
+       GtkWidget *w;
        gboolean send=TRUE;
-       GtkNotebook *notebook=(GtkNotebook *)linphone_gtk_get_widget(main_window,"viewswitch");
-       char *from=linphone_address_as_string(linphone_chat_message_get_from(msg));
-       
-    w=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview");
-    if(w!=NULL){
-               char *from_chatview=(char *)g_object_get_data(G_OBJECT(friendlist),"from");
-               if(g_strcmp0(from,from_chatview)==0){
+       GtkNotebook *notebook= ( GtkNotebook * ) linphone_gtk_get_widget ( main_window,"viewswitch" );
+       char *from=linphone_address_as_string ( linphone_chat_message_get_from ( msg ) );
+
+       w= ( GtkWidget* ) g_object_get_data ( G_OBJECT ( friendlist ),"chatview" );
+       if ( w!=NULL ) {
+               char *from_chatview= ( char * ) g_object_get_data ( G_OBJECT ( friendlist ),"from" );
+               if ( g_strcmp0 ( from,from_chatview ) ==0 ) {
                        send=TRUE;
                } else {
-                       if(!linphone_gtk_friend_list_is_contact(linphone_chat_message_get_from(msg))){
-                               linphone_gtk_chat_add_contact(linphone_chat_message_get_from(msg));
-                       } 
+                       if ( !linphone_gtk_friend_list_is_contact ( linphone_chat_message_get_from ( msg ) ) ) {
+                               linphone_gtk_chat_add_contact ( linphone_chat_message_get_from ( msg ) );
+                       }
                        send=FALSE;
-               }       
-    } else {
+               }
+       } else {
                send=FALSE;
-               if(!linphone_gtk_friend_list_is_contact(linphone_chat_message_get_from(msg))){
-                               linphone_gtk_chat_add_contact(linphone_chat_message_get_from(msg));
-                       } 
-        w=linphone_gtk_init_chatroom(room,linphone_chat_message_get_from(msg));
-        g_object_set_data(G_OBJECT(friendlist),"chatview",(gpointer)w);
-               g_object_set_data(G_OBJECT(friendlist),"from",from);
-    }
-       get_display_name(linphone_chat_message_get_from(msg));
-       
-       #ifdef HAVE_GTK_OSXs
+               if ( !linphone_gtk_friend_list_is_contact ( linphone_chat_message_get_from ( msg ) ) ) {
+                       linphone_gtk_chat_add_contact ( linphone_chat_message_get_from ( msg ) );
+               }
+               w=linphone_gtk_init_chatroom ( room,linphone_chat_message_get_from ( msg ) );
+               g_object_set_data ( G_OBJECT ( friendlist ),"chatview", ( gpointer ) w );
+               g_object_set_data ( G_OBJECT ( friendlist ),"from",from );
+       }
+
+#ifdef HAVE_GTK_OSXs
        /* Notified when a new message is sent */
-       linphone_gtk_status_icon_set_blinking(TRUE);
-       #else
-       if(!gtk_window_is_active(GTK_WINDOW(main_window))){
-               if(!GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w),"is_notified"))){
-                       linphone_gtk_notify(NULL,linphone_chat_message_get_text(msg));
-                       g_object_set_data(G_OBJECT(w),"is_notified",GINT_TO_POINTER(TRUE));
+       linphone_gtk_status_icon_set_blinking ( TRUE );
+#else
+       if ( !gtk_window_is_active ( GTK_WINDOW ( main_window ) ) ) {
+               if ( !GPOINTER_TO_INT ( g_object_get_data ( G_OBJECT ( w ),"is_notified" ) ) ) {
+                       linphone_gtk_notify ( NULL,linphone_chat_message_get_text ( msg ) );
+                       g_object_set_data ( G_OBJECT ( w ),"is_notified",GINT_TO_POINTER ( TRUE ) );
                } else {
-                       g_object_set_data(G_OBJECT(w),"is_notified",GINT_TO_POINTER(FALSE));
+                       g_object_set_data ( G_OBJECT ( w ),"is_notified",GINT_TO_POINTER ( FALSE ) );
                }
        }
-       #endif
-       if(send){
-               if(gtk_notebook_get_current_page(notebook)!=gtk_notebook_page_num(notebook,w)){
+#endif
+       if ( send ) {
+               if ( gtk_notebook_get_current_page ( notebook ) !=gtk_notebook_page_num ( notebook,w ) ) {
                        linphone_gtk_show_friends();
                } else {
-                       linphone_chat_room_mark_as_read(room);
+                       linphone_chat_room_mark_as_read ( room );
                }
-               linphone_gtk_push_text(w,linphone_chat_message_get_from(msg),
-                             FALSE,room,msg,FALSE);
+               linphone_gtk_push_text ( w,linphone_chat_message_get_from ( msg ),
+                                                                FALSE,room,msg,FALSE );
        } else {
                linphone_gtk_show_friends();
        }

diff --git a/mediastreamer2 b/mediastreamer2
index 4f93003c1eade1442fdedd8dee10f18c98ec47c3..25b0496dbc62183f195528481fe44c73e0d201e9 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 4f93003c1eade1442fdedd8dee10f18c98ec47c3
+Subproject commit 25b0496dbc62183f195528481fe44c73e0d201e9