diff --git a/linphone/console/linphonec.c b/linphone/console/linphonec.c index 079444b66..48f88a3f5 100644 --- a/linphone/console/linphonec.c +++ b/linphone/console/linphonec.c @@ -364,7 +364,7 @@ char *linphonec_readline(char *prompt){ start_prompt_reader(); prompt_reader_started=TRUE; } - fprintf(stdout,prompt); + fprintf(stdout,"%s",prompt); fflush(stdout); while(1){ ms_mutex_lock(&prompt_mutex); @@ -836,7 +836,7 @@ linphonec_parse_cmdline(int argc, char **argv) argv[arg_num]); exit(EXIT_FAILURE); } - snprintf(configfile_name, PATH_MAX, argv[arg_num]); + snprintf(configfile_name, PATH_MAX, "%s", argv[arg_num]); } else if (strncmp ("-s", argv[arg_num], 2) == 0) { @@ -988,7 +988,7 @@ copy_file(const char *from, const char *to) { snprintf(message, 255, "Can't open %s for reading: %s\n", from, strerror(errno)); - fprintf(stderr, message); + fprintf(stderr, "%s", message); return 0; } @@ -998,7 +998,7 @@ copy_file(const char *from, const char *to) { snprintf(message, 255, "Can't open %s for writing: %s\n", to, strerror(errno)); - fprintf(stderr, message); + fprintf(stderr, "%s", message); return 0; } diff --git a/linphone/gtk-glade/main.c b/linphone/gtk-glade/main.c index 689a9d5e2..fbb06e315 100644 --- a/linphone/gtk-glade/main.c +++ b/linphone/gtk-glade/main.c @@ -187,6 +187,7 @@ void linphone_gtk_display_something(GtkMessageType type,const gchar *message){ GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, + "%s", (const gchar*)message); /* connect to some callback : REVISIT */ /* @@ -203,6 +204,7 @@ void linphone_gtk_display_something(GtkMessageType type,const gchar *message){ GTK_DIALOG_DESTROY_WITH_PARENT, type, GTK_BUTTONS_CLOSE, + "%s", (const gchar*)message); /* Destroy the dialog when the user responds to it (e.g. clicks a button) */ g_signal_connect_swapped (G_OBJECT (dialog), "response", @@ -326,12 +328,12 @@ static void linphone_gtk_call_started(GtkWidget *mw){ gtk_widget_show(linphone_gtk_get_widget(mw,"terminate_call")); } -void linphone_gtk_start_call(GtkWidget *button){ +void linphone_gtk_start_call(GtkWidget *w){ LinphoneCore *lc=linphone_gtk_get_core(); if (linphone_core_inc_invite_pending(lc)){ /*already in call */ }else{ - GtkWidget *uri_bar=linphone_gtk_get_widget(gtk_widget_get_toplevel(button),"uribar"); + GtkWidget *uri_bar=linphone_gtk_get_widget(gtk_widget_get_toplevel(w),"uribar"); const char *entered=gtk_entry_get_text(GTK_ENTRY(uri_bar)); if (linphone_core_invite(lc,entered)==0) { linphone_gtk_call_started(linphone_gtk_get_main_window()); @@ -340,6 +342,11 @@ void linphone_gtk_start_call(GtkWidget *button){ } } +void linphone_gtk_uri_bar_activate(GtkWidget *w){ + linphone_gtk_start_call(w); +} + + static void linphone_gtk_call_terminated(GtkWidget *mw){ gtk_widget_hide(linphone_gtk_get_widget(mw,"terminate_call")); gtk_widget_show(linphone_gtk_get_widget(mw,"start_call")); @@ -441,6 +448,7 @@ static void linphone_gtk_new_unknown_subscriber(LinphoneCore *lc, LinphoneFriend GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, + "%s", message); g_free(message); g_signal_connect(G_OBJECT (dialog), "response", diff --git a/linphone/gtk-glade/main.glade b/linphone/gtk-glade/main.glade index b5925dc95..7b945f6e7 100644 --- a/linphone/gtk-glade/main.glade +++ b/linphone/gtk-glade/main.glade @@ -1,6 +1,6 @@ - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -162,6 +162,7 @@ True True + @@ -397,175 +398,77 @@ Online users 4 True - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - D + 1 0 - 3 - 4 - 3 - 4 - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - # - 0 - - - 2 - 3 - 3 - 4 - - - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 0 + 2 0 1 2 - 3 - 4 - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - * - 0 - - - 3 - 4 - - - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - C - 0 - - - 3 - 4 - 2 - 3 - - - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 9 + 3 0 2 3 - 2 - 3 - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 8 - 0 - - - 1 - 2 - 2 - 3 - - - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 7 - 0 - - - 2 - 3 - - - - - - - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - B + A 0 3 4 - 1 - 2 - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 + 4 0 - 2 - 3 1 2 @@ -591,15 +494,17 @@ Online users - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 4 + 6 0 + 2 + 3 1 2 @@ -607,63 +512,159 @@ Online users - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - A + B 0 3 4 + 1 + 2 - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 + 7 0 - 2 - 3 + 2 + 3 - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 2 + 8 0 1 2 + 2 + 3 - + True True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 1 + 9 0 + 2 + 3 + 2 + 3 + + + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + C + 0 + + + 3 + 4 + 2 + 3 + + + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + * + 0 + + + 3 + 4 + + + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + + + 1 + 2 + 3 + 4 + + + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + # + 0 + + + 2 + 3 + 3 + 4 + + + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + D + 0 + + + 3 + 4 + 3 + 4 diff --git a/linphone/mediastreamer2/src/oss.c b/linphone/mediastreamer2/src/oss.c index bca032fd7..9a4cd0b47 100644 --- a/linphone/mediastreamer2/src/oss.c +++ b/linphone/mediastreamer2/src/oss.c @@ -302,8 +302,6 @@ static void oss_detect(MSSndCardManager *m){ if (access(DSP_NAME,F_OK)==0){ MSSndCard *card=oss_card_new(DSP_NAME,MIXER_NAME); ms_snd_card_manager_add_card(m,card); - card=oss_card_new(DSP_NAME,MIXER_NAME); - ms_snd_card_manager_add_card(m,card); } for(i=0;i<10;i++){ snprintf(pcmdev,sizeof(pcmdev),"%s%i",DSP_NAME,i); diff --git a/linphone/oRTP/src/tests/mrtprecv.c b/linphone/oRTP/src/tests/mrtprecv.c index a5b9de280..22f5fdff7 100644 --- a/linphone/oRTP/src/tests/mrtprecv.c +++ b/linphone/oRTP/src/tests/mrtprecv.c @@ -82,13 +82,13 @@ int main(int argc, char *argv[]) char *filename; if (argc<4){ - printf(help); + printf("%s",help); return -1; } channels=atoi(argv[3]); if (channels==0){ - printf(help); + printf("%s",help); return -1; } diff --git a/linphone/oRTP/src/tests/mrtpsend.c b/linphone/oRTP/src/tests/mrtpsend.c index 1cb0a9e38..0e221bba3 100644 --- a/linphone/oRTP/src/tests/mrtpsend.c +++ b/linphone/oRTP/src/tests/mrtpsend.c @@ -59,13 +59,13 @@ int main(int argc, char *argv[]) SessionSet *set; if (argc<5){ - printf(help); + printf("%s",help); return -1; } channels=atoi(argv[4]); if (channels==0){ - printf(help); + printf("%s",help); return -1; } @@ -78,7 +78,7 @@ int main(int argc, char *argv[]) packet_size=atoi(argv[i+1]); } else { - printf(help); + printf("%s",help); return -1; } if (packet_size==0) { @@ -94,7 +94,7 @@ int main(int argc, char *argv[]) ts_inc=atoi(argv[i+1]); } else { - printf(help); + printf("%s",help); return -1; } if (ts_inc==0) { diff --git a/linphone/oRTP/src/tests/rtpmemtest.c b/linphone/oRTP/src/tests/rtpmemtest.c index b8cea3d86..a81a2632c 100644 --- a/linphone/oRTP/src/tests/rtpmemtest.c +++ b/linphone/oRTP/src/tests/rtpmemtest.c @@ -85,13 +85,13 @@ int main(int argc, char *argv[]) argv[3]="100"; if (argc<4){ - printf(help); + printf("%s",help); return -1; } channels=atoi(argv[3]); if (channels==0){ - printf(help); + printf("%s",help); return -1; } diff --git a/linphone/oRTP/src/tests/rtprecv.c b/linphone/oRTP/src/tests/rtprecv.c index 6836c2193..1861592fc 100644 --- a/linphone/oRTP/src/tests/rtprecv.c +++ b/linphone/oRTP/src/tests/rtprecv.c @@ -90,12 +90,12 @@ int main(int argc, char*argv[]) /* init the lib */ if (argc<3){ - printf(help); + printf("%s",help); return -1; } local_port=atoi(argv[2]); if (local_port<=0) { - printf(help); + printf("%s",help); return -1; } for (i=3;i=argc) { - printf(help); + printf("%s", help); return -1; } clockslide=atoi(argv[i]); @@ -63,7 +63,7 @@ int main(int argc, char *argv[]) ortp_message("Jitter will be added to outgoing stream."); i++; if (i>=argc) { - printf(help); + printf("%s", help); return -1; } jitter=atoi(argv[i]); diff --git a/linphone/oRTP/src/tests/rtpsend_stupid.c b/linphone/oRTP/src/tests/rtpsend_stupid.c index 0758ceaee..80db79a28 100644 --- a/linphone/oRTP/src/tests/rtpsend_stupid.c +++ b/linphone/oRTP/src/tests/rtpsend_stupid.c @@ -50,14 +50,14 @@ int main(int argc, char *argv[]) int clockslide=0; int jitter=0; if (argc<4){ - printf(help); + printf("%s",help); return -1; } for(i=4;i=argc) { - printf(help); + printf("%s",help); return -1; } clockslide=atoi(argv[i]); @@ -66,7 +66,7 @@ int main(int argc, char *argv[]) ortp_message("Ptime related jitter will be added to outgoing stream."); i++; if (i>=argc) { - printf(help); + printf("%s",help); return -1; } jitter=atoi(argv[i]); diff --git a/linphone/oRTP/src/tests/tevmrtprecv.c b/linphone/oRTP/src/tests/tevmrtprecv.c index b306d2057..023bec798 100644 --- a/linphone/oRTP/src/tests/tevmrtprecv.c +++ b/linphone/oRTP/src/tests/tevmrtprecv.c @@ -97,13 +97,13 @@ int main(int argc, char *argv[]) char *filename; if (argc<4){ - printf(help); + printf("%s",help); return -1; } channels=atoi(argv[3]); if (channels==0){ - printf(help); + printf("%s",help); return -1; } diff --git a/linphone/oRTP/src/tests/tevrtprecv.c b/linphone/oRTP/src/tests/tevrtprecv.c index 2eda73ae1..d5ef8c10a 100644 --- a/linphone/oRTP/src/tests/tevrtprecv.c +++ b/linphone/oRTP/src/tests/tevrtprecv.c @@ -60,7 +60,7 @@ int main(int argc, char *argv[]) int have_more; if (argc<3){ - printf(help); + printf("%s",help); return -1; } diff --git a/linphone/oRTP/src/tests/tevrtpsend.c b/linphone/oRTP/src/tests/tevrtpsend.c index c064f6c64..185db8ff0 100644 --- a/linphone/oRTP/src/tests/tevrtpsend.c +++ b/linphone/oRTP/src/tests/tevrtpsend.c @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) int tel=0; if (argc<4){ - printf(help); + printf("%s",help); return -1; }