Commit 3d393990 authored by François Grisez's avatar François Grisez
Browse files

Simplify the friends list store

parent 10763330
......@@ -28,9 +28,7 @@ enum{
FRIEND_ID,
FRIEND_CHATROOM,
FRIEND_SIP_ADDRESS,
FRIEND_CALL,
FRIEND_CHAT,
FRIEND_ICON_SIZE,
FRIEND_LIST_NCOL
};
......@@ -711,9 +709,7 @@ void linphone_gtk_show_friends(void){
gtk_list_store_append(store,&iter);
gtk_list_store_set(store,&iter,FRIEND_NAME, display,FRIEND_ID,lf,
FRIEND_PRESENCE_IMG, send_subscribe ? status_to_icon_name(linphone_friend_get_status(lf)) : NULL,
FRIEND_CHAT,"linphone-chat-nothing",
FRIEND_CALL,"linphone-start-call2",
FRIEND_ICON_SIZE, GTK_ICON_SIZE_LARGE_TOOLBAR, -1);
FRIEND_CHAT,"linphone-chat-nothing", -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);
......
......@@ -30,37 +30,27 @@
<column type="gpointer"/>
<!-- column-name sip_address -->
<column type="gchararray"/>
<!-- column-name call_icon -->
<column type="gchararray"/>
<!-- column-name chat_icon -->
<column type="gchararray"/>
<!-- column-name icon_size -->
<column type="GtkIconSize"/>
</columns>
<data>
<row>
<col id="0">linphone-status-online</col>
<col id="1">Toto</col>
<col id="4">toto@sip.linphone.org</col>
<col id="5">linphone-call</col>
<col id="6">linphone-chat</col>
<col id="7">large-toolbar</col>
<col id="5">linphone-chat-nothing</col>
</row>
<row>
<col id="0">linphone-status-offline</col>
<col id="1">Toto2</col>
<col id="4">toto2@sip.linphone.org</col>
<col id="5">linphone-call</col>
<col id="6">linphone-chat</col>
<col id="7">large-toolbar</col>
<col id="5">linphone-chat-nothing</col>
</row>
<row>
<col id="0">linphone-status-offline</col>
<col id="1">Toto3</col>
<col id="4">toto3@sip.linphone.org</col>
<col id="5">linphone-call</col>
<col id="6">linphone-chat</col>
<col id="7">large-toolbar</col>
<col id="5">linphone-chat-nothing</col>
</row>
</data>
</object>
......@@ -486,7 +476,6 @@
<object class="GtkCellRendererPixbuf" id="status_img_cell"/>
<attributes>
<attribute name="icon-name">0</attribute>
<attribute name="stock-size">7</attribute>
</attributes>
</child>
</object>
......@@ -506,11 +495,9 @@
<child>
<object class="GtkTreeViewColumn" id="contact_call_column">
<child>
<object class="GtkCellRendererPixbuf" id="contact_call_renderer"/>
<attributes>
<attribute name="icon-name">5</attribute>
<attribute name="stock-size">7</attribute>
</attributes>
<object class="GtkCellRendererPixbuf" id="contact_call_renderer">
<property name="icon_name">linphone-start-call2</property>
</object>
</child>
</object>
</child>
......@@ -519,8 +506,7 @@
<child>
<object class="GtkCellRendererPixbuf" id="contact_chat_renderer"/>
<attributes>
<attribute name="icon-name">6</attribute>
<attribute name="stock-size">7</attribute>
<attribute name="icon-name">5</attribute>
</attributes>
</child>
</object>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment