Changeset 712:c1cfbaa00139 in mediastreamer2

Timestamp:

Oct 5, 2009 4:50:34 PM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

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

Location:

linphone

Files:

• Makefile.am (modified) (1 diff)
• gtk-glade/main.c (modified) (2 diffs)
• scripts/Makefile.am (modified) (1 diff)
• scripts/PortFile-devel.tmpl (deleted)
• scripts/PortFile.tmpl (deleted)
• scripts/Portfile-devel.tmpl (added)
• scripts/Portfile.tmpl (added)

linphone/Makefile.am

@@ -139 +139 @@
 
 
-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'})/' < $< > $@
 
 
-

linphone/gtk-glade/main.c

@@ -560 +560 @@
 }
 
+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{
@@ -596 +619 @@
 
 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();
 }
 

linphone/scripts/Makefile.am

@@ -1 @@
-EXTRA_DIST=builder-mingw.mk PortFile.tmpl
+EXTRA_DIST=builder-mingw.mk Portfile.tmpl Portfile-devel.tmpl