* #7101: removed unused API, conference hangup still broken

gnome/src/actions.c

@@ -904,15 +904,6 @@ sflphone_detach_participant (const gchar* callID)
     dbus_detach_participant (selectedCall->_callID);
 }
 
-void
-sflphone_join_participant (const gchar* sel_callID, const gchar* drag_callID)
-{
-    DEBUG ("sflphone join participants %s and %s", sel_callID, drag_callID);
-
-    dbus_join_participant (sel_callID, drag_callID);
-}
-
-
 void
 sflphone_add_participant (const gchar* callID, const gchar* confID)
 {
@@ -936,20 +927,6 @@ sflphone_add_participant (const gchar* callID, const gchar* confID)
     dbus_add_participant (callID, confID);
 }
 
-void
-sflphone_add_conference()
-{
-    DEBUG ("sflphone add a conference to tree view");
-    // dbus_join_participant(selected_call, dragged_call);
-}
-
-void
-sflphone_join_conference (const gchar* sel_confID, const gchar* drag_confID)
-{
-    DEBUG ("sflphone join two conference");
-    dbus_join_conference (sel_confID, drag_confID);
-}
-
 void
 sflphone_add_main_participant (const conference_obj_t * c)
 {
@@ -957,21 +934,6 @@ sflphone_add_main_participant (const conference_obj_t * c)
     dbus_add_main_participant (c->_confID);
 }
 
-void
-sflphone_conference_on_hold (const conference_obj_t * c)
-{
-    DEBUG ("sflphone_conference_on_hold");
-    dbus_hold_conference (c);
-}
-
-void
-sflphone_conference_off_hold (const conference_obj_t * c)
-{
-    DEBUG ("sflphone_conference_off_hold");
-    dbus_unhold_conference (c);
-}
-
-
 void
 sflphone_rec_call()
 {

gnome/src/actions.h

@@ -203,11 +203,6 @@ void sflphone_fill_history (void);
 
 void sflphone_save_history (void);
 
-/**
- * Action called when two single call are dragged on together to create a new conference
- */
-void sflphone_join_participant (const gchar* sel_callID, const gchar* drag_callID);
-
 /**
  * Action called when a new participant is dragged in
  */
@@ -218,12 +213,6 @@ void sflphone_add_participant (const gchar* callID, const gchar* confID);
  */
 void sflphone_detach_participant (const gchar* callID);
 
-/**
- * Action called when two conference are merged together
- */
-void sflphone_join_conference (const gchar* sel_confID, const gchar* drag_confID);
-
-
 /**
  * Nofity that the communication is
  * now secured using SRTP/SDES.
@@ -277,12 +266,8 @@ void sflphone_call_state_changed (callable_obj_t * c, const gchar * description,
 
 void sflphone_add_main_participant (const conference_obj_t * c);
 
-void sflphone_conference_off_hold (const conference_obj_t * c);
-
 void sflphone_srtp_sdes_off (callable_obj_t * c);
 
 void sflphone_fill_conference_list (void);
 
-void sflphone_conference_on_hold (const conference_obj_t * c);
-
 #endif

gnome/src/contacts/calltree.c

@@ -247,7 +247,7 @@ row_activated (GtkTreeView       *tree_view UNUSED,
                         break;
                     case CONFERENCE_STATE_HOLD:
                     case CONFERENCE_STATE_HOLD_RECORD:
-                        sflphone_conference_off_hold (selectedConf);
+                        dbus_unhold_conference(selectedConf);
                         break;
                     case CONFERENCE_STATE_ACTIVE_ATTACHED:
                     case CONFERENCE_STATE_ACTIVE_ATTACHED_RECORD:
@@ -1195,7 +1195,7 @@ void calltree_remove_conference_recursive(calltab_t* tab, const conference_obj_t
                     }
                 }
                 DEBUG ("CallTree: Remove conference %s", conf->_confID);
-                gtk_tree_store_remove (tab->store, &iter_parent);
+                gtk_tree_store_remove(tab->store, &iter_parent);
             }
         }
     }
@@ -1461,8 +1461,8 @@ static void drag_end_cb (GtkWidget * widget UNUSED, GdkDragContext * context UNU
                     if (!calltree_dragged_conf)
                         DEBUG ("Error: dragged conference is null while joining 2 conference");
 
-                    DEBUG ("Joined two conference %s, %s!\n", calltree_dragged_path, calltree_selected_path);
-                    sflphone_join_conference (calltree_selected_conf->_confID, calltree_dragged_conf->_confID);
+                    DEBUG ("Joined conferences %s and %s!\n", calltree_dragged_path, calltree_selected_path);
+                    dbus_join_conference(calltree_selected_conf->_confID, calltree_dragged_conf->_confID);
                 }
             }
 
@@ -1659,8 +1659,8 @@ void drag_data_received_cb (GtkWidget *widget, GdkDragContext *context UNUSED, g
 static void menuitem_response( gchar *string )
 {
     if (g_strcmp0(string, SFL_CREATE_CONFERENCE) == 0)
-        sflphone_join_participant (calltree_selected_call->_callID,
-                calltree_dragged_call->_callID);
+        dbus_join_participant (calltree_selected_call->_callID,
+                               calltree_dragged_call->_callID);
     else if (g_strcmp0(string, SFL_TRANSFER_CALL) == 0) {
         DEBUG("Calltree: Transfering call %s, to %s",
               calltree_selected_call->_peer_number,

gnome/src/uimanager.c

@@ -544,22 +544,22 @@ call_hold(void* foo UNUSED)
         switch (selectedConf->_state) {
             case CONFERENCE_STATE_HOLD:
                 selectedConf->_state = CONFERENCE_STATE_ACTIVE_ATTACHED;
-                sflphone_conference_off_hold(selectedConf);
+                dbus_unhold_conference(selectedConf);
                 break;
             case CONFERENCE_STATE_HOLD_RECORD:
                 selectedConf->_state = CONFERENCE_STATE_ACTIVE_ATTACHED_RECORD;
-                sflphone_conference_off_hold(selectedConf);
+                dbus_unhold_conference(selectedConf);
                 break;
 
             case CONFERENCE_STATE_ACTIVE_ATTACHED:
             case CONFERENCE_STATE_ACTIVE_DETACHED:
                 selectedConf->_state = CONFERENCE_STATE_HOLD;
-                sflphone_conference_on_hold(selectedConf);
+                dbus_hold_conference(selectedConf);
                 break;
             case CONFERENCE_STATE_ACTIVE_ATTACHED_RECORD:
             case CONFERENCE_STATE_ACTIVE_DETACHED_RECORD:
               selectedConf->_state = CONFERENCE_STATE_HOLD_RECORD;
-              sflphone_conference_on_hold(selectedConf);
+              dbus_hold_conference(selectedConf);
               break;
             default:
                 break;
@@ -603,21 +603,21 @@ conference_hold(void* foo UNUSED)
     switch (selectedConf->_state) {
         case CONFERENCE_STATE_HOLD:
             selectedConf->_state = CONFERENCE_STATE_ACTIVE_ATTACHED;
-            sflphone_conference_off_hold(selectedConf);
+            dbus_unhold_conference(selectedConf);
             break;
         case CONFERENCE_STATE_HOLD_RECORD:
             selectedConf->_state = CONFERENCE_STATE_ACTIVE_ATTACHED_RECORD;
-            sflphone_conference_off_hold(selectedConf);
+            dbus_unhold_conference(selectedConf);
             break;
         case CONFERENCE_STATE_ACTIVE_ATTACHED:
         case CONFERENCE_STATE_ACTIVE_DETACHED:
             selectedConf->_state = CONFERENCE_STATE_HOLD;
-            sflphone_conference_on_hold(selectedConf);
+            dbus_hold_conference(selectedConf);
             break;
         case CONFERENCE_STATE_ACTIVE_ATTACHED_RECORD:
         case CONFERENCE_STATE_ACTIVE_DETACHED_RECORD:
             selectedConf->_state = CONFERENCE_STATE_HOLD_RECORD;
-            sflphone_conference_on_hold(selectedConf);
+            dbus_hold_conference(selectedConf);
         default:
             break;
     }