change unread messages picture

chnage time for time change

diff --git a/coreapi/message_storage.c b/coreapi/message_storage.c
index 0c41c20d078659712f4a7d954c143f38393ee342..8ba642b6877aecd0216177f057073b2bb435a248 100644 (file)
--- a/coreapi/message_storage.c
+++ b/coreapi/message_storage.c
@@ -66,6 +66,7 @@ static void create_chat_message(char **argv, void *data){
                for(j=0;j<12;j++) { \r
                        if(strcmp(tmp2,months[j])==0) ret.tm_mon=j; \r
                }\r
+               ret.tm_isdst=-1;\r
        }\r
        new_message->time=argv[5]!=NULL ? mktime(&ret) : time(NULL);\r
        new_message->state=atoi(argv[7]);\r

diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c
index 2ea0f9aff7303066f9433eb6dcbeb1a212cf647f..b86fc26e08738ad483982ebf03e97786ad6fe413 100644 (file)
--- a/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@ -1798,6 +1798,7 @@ static void text_received(Sal *sal, eXosip_event_t *ev){
                for(j=0;j<12;j++) { \r
                        if(strcmp(tmp2,months[j])==0) ret.tm_mon=j; \r
                }\r
+               ret.tm_isdst=-1;\r
        }else ms_warning("No date header in SIP MESSAGE, we don't know when it was sent.");\r
        \r
        content_type= osip_message_get_content_type(ev->request);\r

diff --git a/gtk/chat.c b/gtk/chat.c
index cf6d61c98f7ec8e6f6c578fb92c2717591222b4e..9bcf0bb8b98b20bc368e8b2a12dbb692aa89310f 100644 (file)
--- a/gtk/chat.c
+++ b/gtk/chat.c
@@ -168,10 +168,10 @@ void linphone_gtk_push_text(GtkWidget *w, const LinphoneAddress *from,
                case LinphoneChatMessageStateDelivered:
                {
                        tnow=time(NULL);
-                       tm=gmtime(&tnow);
+                       tm=localtime(&tnow);
                        tnow_day=tm->tm_yday;
                        tnow_year=tm->tm_year;
-                       tm=gmtime(&t);
+                       tm=localtime(&t);
                        if(tnow_day != tm->tm_yday || (tnow_day == tm->tm_yday && tnow_year != tm->tm_year)) {
                                strftime(buf,80,"%a %x, %H:%M",tm);
                        } else {
@@ -237,7 +237,7 @@ void update_chat_state_message(LinphoneChatMessageState state,LinphoneChatMessag
                        case LinphoneChatMessageStateDelivered:
                        {
                                time_t t=time(NULL);
-                               struct tm *tm=gmtime(&t);
+                               struct tm *tm=localtime(&t);
                                char buf[80];
                                strftime(buf,80,"%H:%M",tm);
                                result=buf;
@@ -450,10 +450,10 @@ void linphone_gtk_text_received(LinphoneCore *lc, LinphoneChatRoom *room,
     if(w!=NULL){
                char *from_chatview=(char *)g_object_get_data(G_OBJECT(friendlist),"from");
                if(g_strcmp0(from,from_chatview)==0){
+                       linphone_chat_room_mark_as_read(room);
                        send=TRUE;
                } else {
                        if(!linphone_gtk_friend_list_is_contact(linphone_chat_message_get_from(msg))){
-                               //linphone_gtk_load_chatroom(room,linphone_chat_message_get_from(msg),w);
                                linphone_gtk_chat_add_contact(linphone_chat_message_get_from(msg));
                        } 
                        send=FALSE;
@@ -461,7 +461,6 @@ void linphone_gtk_text_received(LinphoneCore *lc, LinphoneChatRoom *room,
     } else {
                send=FALSE;
                if(!linphone_gtk_friend_list_is_contact(linphone_chat_message_get_from(msg))){
-                               //linphone_gtk_load_chatroom(room,linphone_chat_message_get_from(msg),w);
                                linphone_gtk_chat_add_contact(linphone_chat_message_get_from(msg));
                        } 
         w=linphone_gtk_init_chatroom(room,linphone_chat_message_get_from(msg));
@@ -469,6 +468,7 @@ void linphone_gtk_text_received(LinphoneCore *lc, LinphoneChatRoom *room,
                g_object_set_data(G_OBJECT(friendlist),"from",from);
     }
        get_display_name(linphone_chat_message_get_from(msg));
+       
        #ifdef HAVE_GTK_OSXs
        /* Notified when a new message is sent */
        linphone_gtk_status_icon_set_blinking(TRUE);
@@ -491,5 +491,4 @@ void linphone_gtk_text_received(LinphoneCore *lc, LinphoneChatRoom *room,
        } else {
                linphone_gtk_show_friends();
        }
-       //linphone_gtk_update_chat_picture();
 }

diff --git a/pixmaps/active_chat.png b/pixmaps/active_chat.png
index e428845d55648e21ab59ad6c9d94e48b7e8a70ea..d82b7c595c8a90fddb3c313be4bd9c6c524b0af4 100644 (file)
Binary files a/pixmaps/active_chat.png and b/pixmaps/active_chat.png differ