FRIEND_ICON,
FRIEND_CALL,
FRIEND_CHAT,
- FRIEND_CHAT_CONVERSATION,
FRIEND_LIST_NCOL
};
return pixbuf;
}
-static GdkPixbuf *create_chat_picture(){
+static GdkPixbuf *create_unread_msg(){
GdkPixbuf *pixbuf;
- pixbuf = create_pixbuf("chat.png");
+ pixbuf = create_pixbuf("active_chat.png");
return pixbuf;
}
-static GdkPixbuf *create_active_chat_picture(){
+static GdkPixbuf *create_chat_picture(){
GdkPixbuf *pixbuf;
- pixbuf = create_pixbuf("active_chat.png");
+ pixbuf = create_pixbuf("chat.png");
return pixbuf;
}
+
/*
void linphone_gtk_set_friend_status(GtkWidget *friendlist , LinphoneFriend * fid, const gchar *url, const gchar *status, const gchar *img){
GtkTreeIter iter;
}
}
*/
+
+gboolean linphone_gtk_friend_list_is_contact(const LinphoneAddress *addr){
+ LinphoneFriend *lf;
+ char *addr_str=linphone_address_as_string(addr);
+ lf=linphone_core_get_friend_by_address(linphone_gtk_get_core(),addr_str);
+ if(lf == NULL){
+ return FALSE;
+ } return TRUE;
+}
+
static void linphone_gtk_set_selection_to_uri_bar(GtkTreeView *treeview){
GtkTreeSelection *select;
GtkTreeIter iter;
GtkTreeIter iter;
GtkTreeModel *model;
LinphoneFriend *lf=NULL;
+ LinphoneChatRoom *cr=NULL;
select = gtk_tree_view_get_selection(GTK_TREE_VIEW(linphone_gtk_get_widget(w,"contact_list")));
if (gtk_tree_selection_get_selected (select, &model, &iter))
{
gtk_tree_model_get (model, &iter,FRIEND_ID , &lf, -1);
linphone_core_remove_friend(linphone_gtk_get_core(),lf);
+ gtk_tree_model_get (model, &iter,FRIEND_CHATROOM , &cr, -1);
+ linphone_chat_room_delete_history(cr);
+ linphone_gtk_show_friends();
+ }
+}
+
+void linphone_gtk_delete_history(GtkWidget *button){
+ GtkWidget *w=linphone_gtk_get_main_window();
+ GtkTreeSelection *select;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ GtkWidget *chat_view;
+ LinphoneFriend *lf=NULL;
+ GtkWidget *friendlist;
+
+ friendlist=linphone_gtk_get_widget(w,"contact_list");
+ chat_view=(GtkWidget *)g_object_get_data(G_OBJECT(friendlist),"chatview");
+ select = gtk_tree_view_get_selection(GTK_TREE_VIEW(friendlist));
+ if (gtk_tree_selection_get_selected (select, &model, &iter))
+ {
+ LinphoneChatRoom *cr;
+ gtk_tree_model_get (model, &iter,FRIEND_ID , &lf, -1);
+ gtk_tree_model_get (model, &iter,FRIEND_CHATROOM , &cr, -1);
+ linphone_chat_room_delete_history(cr);
+ if(chat_view!=NULL){
+ char *from=g_object_get_data(G_OBJECT(friendlist),"from");
+ char *addr=linphone_address_as_string(linphone_friend_get_address(lf));
+ if(g_strcmp0(from,addr)==0){
+ GtkTextView *text_view=GTK_TEXT_VIEW(linphone_gtk_get_widget(chat_view,"textview"));
+ GtkTextIter start;
+ GtkTextIter end;
+ GtkTextBuffer *text_buffer;
+
+ text_buffer=gtk_text_view_get_buffer(text_view);
+ gtk_text_buffer_get_bounds(text_buffer, &start, &end);
+ gtk_text_buffer_delete (text_buffer, &start, &end);
+ g_object_set_data(G_OBJECT(chat_view),"from_message",NULL);
+ }
+ }
linphone_gtk_show_friends();
}
}
"start_call"));
}
-void linphone_gtk_update_chat_picture(gboolean active){
+void linphone_gtk_friend_list_update_chat_picture(){
GtkTreeIter iter;
GtkWidget *w = linphone_gtk_get_main_window();
GtkWidget *friendlist=linphone_gtk_get_widget(w,"contact_list");
GtkTreeModel *model=gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist));
+ LinphoneChatRoom *cr=NULL;
+ int nbmsg=0;
if (gtk_tree_model_get_iter_first(model,&iter)) {
do{
- if(!active){
- gtk_list_store_set(GTK_LIST_STORE(model),&iter,FRIEND_CHAT,create_chat_picture(),-1);
+ gtk_tree_model_get (model, &iter,FRIEND_CHATROOM , &cr, -1);
+ nbmsg=linphone_chat_room_get_unread_messages_count(cr);
+ if(nbmsg != 0){
+ gtk_list_store_set(GTK_LIST_STORE(model),&iter,FRIEND_CHAT,create_unread_msg(),-1);
} else {
- gtk_list_store_set(GTK_LIST_STORE(model),&iter,FRIEND_CHAT,create_active_chat_picture(),-1);
+ gtk_list_store_set(GTK_LIST_STORE(model),&iter,FRIEND_CHAT,create_chat_picture(),-1);
}
}while(gtk_tree_model_iter_next(model,&iter));
}
return FALSE;
}
+void linphone_gtk_friend_list_set_chat_conversation(const LinphoneAddress *la){
+ GtkTreeIter iter;
+ GtkListStore *store=NULL;
+ GtkWidget *w = linphone_gtk_get_main_window();
+ GtkWidget *friendlist=linphone_gtk_get_widget(w,"contact_list");
+ GtkTreeModel *model=gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist));
+ GtkWidget *chat_view=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview");
+ LinphoneFriend *lf=NULL;
+ LinphoneChatRoom *cr=NULL;
+ GtkNotebook *notebook=(GtkNotebook *)linphone_gtk_get_widget(w,"viewswitch");
+ char *la_str=linphone_address_as_string(la);
+
+ lf=linphone_core_get_friend_by_address(linphone_gtk_get_core(),la_str);
+ if(lf==NULL){
+ cr=linphone_gtk_create_chatroom(la);
+ g_object_set_data(G_OBJECT(friendlist),"from",la_str);
+ if(chat_view==NULL){
+ chat_view=linphone_gtk_init_chatroom(cr,la);
+ g_object_set_data(G_OBJECT(friendlist),"chatview",(gpointer)chat_view);
+ } else {
+ linphone_gtk_load_chatroom(cr,la,chat_view);
+ }
+ gtk_notebook_set_current_page(notebook,gtk_notebook_page_num(notebook,chat_view));
+ linphone_gtk_friend_list_update_chat_picture();
+ g_idle_add((GSourceFunc)grab_focus,linphone_gtk_get_widget(chat_view,"text_entry"));
+ } else {
+ store=GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist)));
+ if (gtk_tree_model_get_iter_first(model,&iter)) {
+ do{
+ const LinphoneAddress *uri;
+ char *lf_str;
+ gtk_tree_model_get(model, &iter,FRIEND_ID , &lf, -1);
+ uri=linphone_friend_get_address(lf);
+ lf_str=linphone_address_as_string(uri);
+ if( g_strcmp0(lf_str,la_str)==0){
+ gtk_tree_model_get (model, &iter,FRIEND_CHATROOM , &cr, -1);
+ if(cr==NULL){
+ cr=linphone_gtk_create_chatroom(uri);
+ gtk_list_store_set(store,&iter,FRIEND_CHATROOM,cr,-1);
+ }
+ g_object_set_data(G_OBJECT(friendlist),"from",linphone_address_as_string(uri));
+ if(chat_view==NULL){
+ chat_view=linphone_gtk_init_chatroom(cr,uri);
+ g_object_set_data(G_OBJECT(friendlist),"chatview",(gpointer)chat_view);
+ } else {
+ linphone_gtk_load_chatroom(cr,uri,chat_view);
+ }
+ gtk_notebook_set_current_page(notebook,gtk_notebook_page_num(notebook,chat_view));
+ linphone_gtk_friend_list_update_chat_picture();
+ g_idle_add((GSourceFunc)grab_focus,linphone_gtk_get_widget(chat_view,"text_entry"));
+ break;
+ }
+ }while(gtk_tree_model_iter_next(model,&iter));
+ }
+ }
+}
+
+void linphone_gtk_notebook_tab_select(GtkNotebook *notebook,GtkWidget *page,guint page_num, gpointer data){
+ GtkWidget *w=linphone_gtk_get_main_window();
+ GtkWidget *friendlist=linphone_gtk_get_widget(w,"contact_list");
+ GtkWidget *chat_view;
+ LinphoneChatRoom *cr=NULL;
+ chat_view=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview");
+ if(page != NULL){
+ notebook=(GtkNotebook *)linphone_gtk_get_widget(w,"viewswitch");
+ if(gtk_notebook_page_num(notebook,page)==gtk_notebook_page_num(notebook,chat_view)){
+ cr=g_object_get_data(G_OBJECT(chat_view),"cr");
+ if(cr!=NULL){
+ linphone_chat_room_mark_as_read(cr);
+ linphone_gtk_show_friends();
+ }
+ }
+ }
+}
+
void linphone_gtk_chat_selected(GtkWidget *item){
GtkWidget *w=gtk_widget_get_toplevel(item);
GtkTreeSelection *select;
store=GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(item)));
if (gtk_tree_selection_get_selected (select, &model, &iter)){
GtkNotebook *notebook=(GtkNotebook *)linphone_gtk_get_widget(w,"viewswitch");
- gtk_tree_model_get(model,&iter,FRIEND_CHATROOM,&cr,-1);
const LinphoneAddress *uri;
gtk_tree_model_get (model, &iter,FRIEND_ID , &lf, -1);
+ gtk_tree_model_get (model, &iter,FRIEND_CHATROOM , &cr, -1);
uri=linphone_friend_get_address(lf);
- if(cr == NULL){
+ if(cr==NULL){
cr=linphone_gtk_create_chatroom(uri);
- gtk_list_store_set(store,&iter, FRIEND_CHATROOM,cr,-1);
- gtk_list_store_set(store,&iter, FRIEND_CHAT_CONVERSATION,NULL,-1);
+ gtk_list_store_set(store,&iter,FRIEND_CHATROOM,cr,-1);
}
page=(GtkWidget*)g_object_get_data(G_OBJECT(friendlist),"chatview");
+ g_object_set_data(G_OBJECT(friendlist),"from",linphone_address_as_string(uri));
if(page==NULL){
page=linphone_gtk_init_chatroom(cr,uri);
g_object_set_data(G_OBJECT(friendlist),"chatview",(gpointer)page);
linphone_gtk_load_chatroom(cr,uri,page);
}
gtk_notebook_set_current_page(notebook,gtk_notebook_page_num(notebook,page));
- linphone_gtk_update_chat_picture(FALSE);
+ linphone_gtk_friend_list_update_chat_picture();
g_idle_add((GSourceFunc)grab_focus,linphone_gtk_get_widget(page,"text_entry"));
- gtk_list_store_set(store,&iter,FRIEND_CHAT,create_active_chat_picture(),-1);
}
}
gboolean ret=TRUE;
gtk_tree_model_get(model,iter,FRIEND_NAME,&name,-1);
if (name!=NULL){
- ret=strstr(name,key)==NULL;
+ gchar *uname=g_utf8_casefold(name,-1); /* need that to perform case-insensitive search in utf8 */
+ gchar *ukey=g_utf8_casefold(key,-1);
+ ret=strstr(uname,ukey)==NULL;
+ g_free(uname);
+ g_free(ukey);
g_free(name);
}
return ret;
linphone_gtk_init_bookmark_icon();
store = gtk_list_store_new(FRIEND_LIST_NCOL,GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER,
- G_TYPE_POINTER, G_TYPE_STRING, GDK_TYPE_PIXBUF, GDK_TYPE_PIXBUF, GDK_TYPE_PIXBUF, G_TYPE_STRING);
+ G_TYPE_POINTER, G_TYPE_STRING, GDK_TYPE_PIXBUF, GDK_TYPE_PIXBUF, GDK_TYPE_PIXBUF);
gtk_tree_view_set_model(GTK_TREE_VIEW(friendlist),GTK_TREE_MODEL(store));
g_object_unref(G_OBJECT(store));
gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(friendlist),friend_search_func,NULL,NULL);
gtk_tree_view_set_search_column(GTK_TREE_VIEW(friendlist),FRIEND_NAME);
gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(store),FRIEND_NAME,friend_sort,NULL,NULL);
-
+
/*Name and presence column*/
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("Presence status"),
g_signal_connect_swapped(G_OBJECT(column),"clicked",(GCallback)on_presence_column_clicked,GTK_TREE_MODEL(store));
gtk_tree_view_column_set_clickable(column,TRUE);
gtk_tree_view_column_set_visible(column,linphone_gtk_get_ui_config_int("friendlist_status",1));
+ gtk_tree_view_column_set_min_width(column,50);
renderer = gtk_cell_renderer_pixbuf_new();
gtk_tree_view_column_pack_start(column,renderer,TRUE);
column = gtk_tree_view_column_new_with_attributes (_("Call"),renderer,"pixbuf",FRIEND_CALL,NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (friendlist), column);
- /* chat column*/
+ /* Chat column*/
renderer = gtk_cell_renderer_pixbuf_new();
column = gtk_tree_view_column_new_with_attributes (_("Chat"),renderer,"pixbuf",FRIEND_CHAT,NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (friendlist), column);
gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(friendlist),FRIEND_SIP_ADDRESS);
#endif
- gtk_widget_set_size_request(friendlist,200,100);
+ gtk_widget_set_size_request(friendlist,200,120);
/*gtk_combo_box_set_active(GTK_COMBO_BOX(linphone_gtk_get_widget(
gtk_widget_get_toplevel(friendlist),"show_category")),0);*/
}
//const gchar *search=NULL;
//gboolean lookup=FALSE;
MSList *sorted;
+ LinphoneChatRoom *cr=NULL;
linphone_gtk_show_directory_search();
-
if (gtk_tree_view_get_model(GTK_TREE_VIEW(friendlist))==NULL){
linphone_gtk_friend_list_init(friendlist);
}
const char *name=linphone_address_get_display_name(f_uri);
const char *display=name;
char *escaped=NULL;
+ //char buf[26]={0};
+ int nbmsg=0;
+
/*if (lookup){
if (strstr(uri,search)==NULL){
ms_free(uri);
gtk_list_store_append(store,&iter);
gtk_list_store_set(store,&iter,FRIEND_NAME, display,FRIEND_ID,lf,
FRIEND_PRESENCE_IMG, send_subscribe ? create_status_picture(linphone_friend_get_status(lf)) : NULL,
- -1);
-
- gtk_list_store_set(store,&iter,FRIEND_CALL,create_call_picture(),-1);
- gtk_list_store_set(store,&iter,FRIEND_CHAT,create_chat_picture(),-1);
-
+ FRIEND_CHAT,create_chat_picture(),FRIEND_CALL,create_call_picture(),-1);
+ cr=linphone_gtk_create_chatroom(f_uri);
+ gtk_list_store_set(store,&iter,FRIEND_CHATROOM,cr,-1);
+ nbmsg=linphone_chat_room_get_unread_messages_count(cr);
+ if(nbmsg != 0){
+ gtk_list_store_set(store,&iter,FRIEND_CHAT,create_unread_msg(),-1);
+ }
escaped=g_markup_escape_text(uri,-1);
gtk_list_store_set(store,&iter,FRIEND_SIP_ADDRESS,escaped,-1);
g_free(escaped);
void linphone_gtk_contact_ok(GtkWidget *button){
GtkWidget *w=gtk_widget_get_toplevel(button);
LinphoneFriend *lf=(LinphoneFriend*)g_object_get_data(G_OBJECT(w),"friend_ref");
+ LinphoneFriend *lf2;
char *fixed_uri=NULL;
gboolean show_presence=FALSE,allow_presence=FALSE;
const gchar *name,*uri;
+ LinphoneAddress* friend_address;
if (lf==NULL){
lf=linphone_friend_new();
if (linphone_gtk_get_ui_config_int("use_subscribe_notify",1)==1){
linphone_gtk_display_something(GTK_MESSAGE_WARNING,_("Invalid sip contact !"));
return ;
}
- LinphoneAddress* friend_address = linphone_address_new(fixed_uri);
+ friend_address = linphone_address_new(fixed_uri);
linphone_address_set_display_name(friend_address,name);
linphone_friend_set_addr(lf,friend_address);
- ms_free(fixed_uri);
linphone_address_destroy(friend_address);
linphone_friend_send_subscribe(lf,show_presence);
linphone_friend_set_inc_subscribe_policy(lf,allow_presence==TRUE ? LinphoneSPAccept : LinphoneSPDeny);
if (linphone_friend_in_list(lf)) {
linphone_friend_done(lf);
- }else{
- linphone_core_add_friend(linphone_gtk_get_core(),lf);
+ } else {
+ lf2=linphone_core_get_friend_by_address(linphone_gtk_get_core(),fixed_uri);
+ if(lf2==NULL){
+ linphone_friend_set_name(lf,name);
+ linphone_core_add_friend(linphone_gtk_get_core(),lf);
+ }
}
+ ms_free(fixed_uri);
linphone_gtk_show_friends();
gtk_widget_destroy(w);
}
gchar *text_label=NULL;
gchar *edit_label=NULL;
gchar *delete_label=NULL;
+ gchar *delete_hist_label=NULL;
gchar *name=NULL;
GtkTreeSelection *select;
GtkTreeIter iter;
text_label=g_strdup_printf(_("Send text to %s"),name);
edit_label=g_strdup_printf(_("Edit contact '%s'"),name);
delete_label=g_strdup_printf(_("Delete contact '%s'"),name);
+ delete_hist_label=g_strdup_printf(_("Delete chat history of '%s'"),name);
g_free(name);
}
if (call_label){
g_signal_connect_swapped(G_OBJECT(menu_item),"activate",(GCallback)linphone_gtk_remove_contact,contact_list);
}
+ if (delete_hist_label){
+ menu_item=gtk_image_menu_item_new_with_label(delete_hist_label);
+ image=gtk_image_new_from_stock(GTK_STOCK_CLEAR,GTK_ICON_SIZE_MENU);
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),image);
+ gtk_widget_show(image);
+ gtk_widget_show(menu_item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu),menu_item);
+ g_signal_connect_swapped(G_OBJECT(menu_item),"activate",(GCallback)linphone_gtk_delete_history,contact_list);
+ }
if (ssc && (sip_setup_context_get_capabilities(ssc) & SIP_SETUP_CAP_BUDDY_LOOKUP)) {
gchar *tmp=g_strdup_printf(_("Add new contact from %s directory"),linphone_proxy_config_get_domain(cfg));
}
gint get_col_number_from_tree_view_column (GtkTreeViewColumn *col){
- GList *cols;
- gint num;
- g_return_val_if_fail ( col != NULL, -1 );
- g_return_val_if_fail ( col->tree_view != NULL, -1 );
- cols = gtk_tree_view_get_columns(GTK_TREE_VIEW(col->tree_view));
- num = g_list_index(cols, (gpointer) col);
- g_list_free(cols);
-
- return num;
-}
-
-int longueur_list (GtkTreeView *tree_view){
- GtkTreeIter iter;
- int i=0;
- GtkTreeModel *model=gtk_tree_view_get_model(tree_view);
- if (gtk_tree_model_get_iter_first(model,&iter)) {
- do{
- i++;
- }while(gtk_tree_model_iter_next(model,&iter));
- }
- return i;
+ GList *cols;
+ gint num;
+ g_return_val_if_fail ( col != NULL, -1 );
+ g_return_val_if_fail ( col->tree_view != NULL, -1 );
+ cols = gtk_tree_view_get_columns(GTK_TREE_VIEW(col->tree_view));
+ num = g_list_index(cols, (gpointer) col);
+ g_list_free(cols);
+
+ return num;
}
static gint tree_view_get_cell_from_pos(GtkTreeView *view, guint x, guint y){
GtkTreeViewColumn *col = NULL;
GList *node, *columns;
gint colx = 0;
- gint coly = longueur_list(view);
- gint height=0;
+ GtkTreePath *path;
+ GtkTreeViewDropPosition pos;
g_return_val_if_fail ( view != NULL, 0 );
columns = gtk_tree_view_get_columns(view);
- for (node = columns; node != NULL && col == NULL; node = node->next){
- GtkTreeViewColumn *checkcol = (GtkTreeViewColumn*) node->data;
- gtk_tree_view_column_cell_get_size(checkcol,NULL,NULL,NULL,NULL,&height);
- if (x >= colx && x < (colx + checkcol->width) && y < height*coly){
- col = checkcol;
- gint num = get_col_number_from_tree_view_column(col);
+ gtk_tree_view_get_dest_row_at_pos(view,x,y,&path,&pos);
+ if(path != NULL){
+ for (node = columns; node != NULL && col == NULL; node = node->next){
+ GtkTreeViewColumn *checkcol = (GtkTreeViewColumn*) node->data;
+ if (x >= colx && x < (colx + checkcol->width)){
+ col = checkcol;
+ gint num = get_col_number_from_tree_view_column(col);
return num;
- }
- else {
- colx += checkcol->width;
+ } else {
+ colx += checkcol->width;
}
- }
- g_list_free(columns);
+ }
+ }
+ g_list_free(columns);
return 0;
}
void linphone_gtk_buddy_info_updated(LinphoneCore *lc, LinphoneFriend *lf){
/*refresh the entire list*/
linphone_gtk_show_friends();
-}
-
-
+}
\ No newline at end of file
projects / linphone / blobdiff