Commit ae42ec41 authored by smorlat's avatar smorlat

rename PortFile-->Portfile

allow to answer/decline calls from main interface (not only the popup window).

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@700 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
parent 863f4326
......@@ -138,9 +138,12 @@ newdate:
cd gtk-glade && $(MAKE) newdate
PortFile: $(top_srcdir)/scripts/PortFile.tmpl dist
Portfile: $(top_srcdir)/scripts/Portfile.tmpl dist
sed -e 's/\@VERSION\@/$(LINPHONE_VERSION)/g' \
-e 's/\@LINPHONE_MD5\@/$(shell md5sum linphone-$(VERSION).tar.gz | awk {'print $$1'})/' < $< > PortFile
-e 's/\@LINPHONE_MD5\@/$(shell md5sum linphone-$(VERSION).tar.gz | awk {'print $$1'})/' < $< > $@
Portfile-devel: $(top_srcdir)/scripts/Portfile-devel.tmpl dist
sed -e 's/\@VERSION\@/$(LINPHONE_VERSION)/g' \
-e 's/\@LINPHONE_MD5\@/$(shell md5sum linphone-$(VERSION).tar.gz | awk {'print $$1'})/' < $< > $@
......@@ -559,9 +559,32 @@ static gboolean linphone_gtk_start_call_do(GtkWidget *uri_bar){
return FALSE;
}
static void _linphone_gtk_accept_call(){
LinphoneCore *lc=linphone_gtk_get_core();
GtkWidget *mw=linphone_gtk_get_main_window();
GtkWidget *icw=GTK_WIDGET(g_object_get_data(G_OBJECT(mw),"incoming_call"));
if (icw!=NULL){
g_object_set_data(G_OBJECT(mw),"incoming_call",NULL);
gtk_widget_destroy(icw);
}
linphone_core_accept_call(lc,NULL);
linphone_gtk_call_started(linphone_gtk_get_main_window());
if (linphone_gtk_use_in_call_view()){
linphone_gtk_in_call_view_set_in_call();
linphone_gtk_show_in_call_view();
}
linphone_gtk_enable_mute_button(
GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(linphone_gtk_get_main_window(),"main_mute"))
,TRUE);
}
void linphone_gtk_start_call(GtkWidget *w){
LinphoneCore *lc=linphone_gtk_get_core();
if (linphone_core_inc_invite_pending(lc) || linphone_core_in_call(lc)) {
if (linphone_core_inc_invite_pending(lc)){
/*accept the call*/
_linphone_gtk_accept_call();
}else if (linphone_core_in_call(lc)) {
/*already in call */
}else{
/*change into in-call mode, then do the work later as it might block a bit */
......@@ -595,18 +618,7 @@ void linphone_gtk_decline_call(GtkWidget *button){
}
void linphone_gtk_accept_call(GtkWidget *button){
LinphoneCore *lc=linphone_gtk_get_core();
linphone_core_accept_call(lc,NULL);
g_object_set_data(G_OBJECT(linphone_gtk_get_main_window()),"incoming_call",NULL);
gtk_widget_destroy(gtk_widget_get_toplevel(button));
linphone_gtk_call_started(linphone_gtk_get_main_window());
if (linphone_gtk_use_in_call_view()){
linphone_gtk_in_call_view_set_in_call();
linphone_gtk_show_in_call_view();
}
linphone_gtk_enable_mute_button(
GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(linphone_gtk_get_main_window(),"main_mute"))
,TRUE);
_linphone_gtk_accept_call();
}
static gboolean linphone_gtk_auto_answer(GtkWidget *incall_window){
......
EXTRA_DIST=builder-mingw.mk PortFile.tmpl
EXTRA_DIST=builder-mingw.mk Portfile.tmpl Portfile-devel.tmpl
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