Skip to content
Snippets Groups Projects
Commit f48c1519 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

[#2176] Add conference lock

parent ec67cf46
No related branches found
No related tags found
No related merge requests found
...@@ -47,6 +47,7 @@ typedef struct { ...@@ -47,6 +47,7 @@ typedef struct {
conference_state_t _state; // The state of the call conference_state_t _state; // The state of the call
gchar* _confID; // The call ID gchar* _confID; // The call ID
gboolean _conference_secured // the security state of the conference
} conference_obj_t; } conference_obj_t;
......
...@@ -876,7 +876,7 @@ void calltree_add_history_entry (callable_obj_t * c) ...@@ -876,7 +876,7 @@ void calltree_add_history_entry (callable_obj_t * c)
} }
void calltree_add_conference (calltab_t* tab, const conference_obj_t* conf) void calltree_add_conference (calltab_t* tab, conference_obj_t* conf)
{ {
DEBUG("calltree_add_conference conf->_confID %s\n", conf->_confID); DEBUG("calltree_add_conference conf->_confID %s\n", conf->_confID);
...@@ -927,6 +927,8 @@ void calltree_add_conference (calltab_t* tab, const conference_obj_t* conf) ...@@ -927,6 +927,8 @@ void calltree_add_conference (calltab_t* tab, const conference_obj_t* conf)
WARN ("Conferences cannot be added in this widget - This is a bug in the application."); WARN ("Conferences cannot be added in this widget - This is a bug in the application.");
} }
DEBUG("PIXWITH: %i\n", gdk_pixbuf_get_width(pixbuf)); DEBUG("PIXWITH: %i\n", gdk_pixbuf_get_width(pixbuf));
//Resize it //Resize it
if(pixbuf) if(pixbuf)
...@@ -937,6 +939,37 @@ void calltree_add_conference (calltab_t* tab, const conference_obj_t* conf) ...@@ -937,6 +939,37 @@ void calltree_add_conference (calltab_t* tab, const conference_obj_t* conf)
} }
} }
/*
conf->_conference_secured = TRUE;
if(participant)
{
for (pl = participant; *participant; participant++)
{
call_id = (gchar*)(*participant);
call = calllist_get (tab, call_id);
if(call->_srtp_state == 0)
{
conf->_conference_secured = FALSE;
break;
}
}
}
if(conf->_conference_secured)
{
pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_confirmed.svg", NULL);
}
else
{
pixbuf_security = gdk_pixbuf_new_from_file(ICONS_DIR "/lock_off.svg", NULL);
}
*/
gtk_tree_store_set(tab->store, &iter, gtk_tree_store_set(tab->store, &iter,
0, pixbuf, // Icon 0, pixbuf, // Icon
1, description, // Description 1, description, // Description
...@@ -954,6 +987,7 @@ void calltree_add_conference (calltab_t* tab, const conference_obj_t* conf) ...@@ -954,6 +987,7 @@ void calltree_add_conference (calltab_t* tab, const conference_obj_t* conf)
for (pl = participant; *participant; participant++) for (pl = participant; *participant; participant++)
{ {
call_id = (gchar*)(*participant); call_id = (gchar*)(*participant);
call = calllist_get (tab, call_id); call = calllist_get (tab, call_id);
// create_new_call_from_details (conf_id, conference_details, &c); // create_new_call_from_details (conf_id, conference_details, &c);
......
...@@ -72,7 +72,7 @@ void ...@@ -72,7 +72,7 @@ void
calltree_add_history_entry (callable_obj_t * c); calltree_add_history_entry (callable_obj_t * c);
void void
calltree_add_conference (calltab_t* tab, const conference_obj_t* conf); calltree_add_conference (calltab_t* tab, conference_obj_t* conf);
void void
calltree_update_conference (calltab_t* tab, const gchar* confID); calltree_update_conference (calltab_t* tab, const gchar* confID);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment