From 4ac4e2096cc873fb5c96ca0e4f44ebf11eab36b5 Mon Sep 17 00:00:00 2001 From: smorlat Date: Sun, 21 Sep 2008 19:43:16 +0000 Subject: [PATCH] several fixes git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@27 3f6dc0c8-ddfe-455d-9043-3cd528dc4637 --- linphone/coreapi/misc.c | 1 - linphone/gtk-glade/linphone.iss | 58 ++++++++++----------- linphone/mediastreamer2/tests/mediastream.c | 4 +- 3 files changed, 31 insertions(+), 32 deletions(-) diff --git a/linphone/coreapi/misc.c b/linphone/coreapi/misc.c index 3efa59f99..b08d67960 100644 --- a/linphone/coreapi/misc.c +++ b/linphone/coreapi/misc.c @@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include #include diff --git a/linphone/gtk-glade/linphone.iss b/linphone/gtk-glade/linphone.iss index c5808db71..2ea023889 100755 --- a/linphone/gtk-glade/linphone.iss +++ b/linphone/gtk-glade/linphone.iss @@ -10,8 +10,8 @@ AppSupportURL=http://www.linphone.org AppUpdatesURL=http://www.linphone.org DefaultDirName={pf}\Linphone DefaultGroupName=Linphone -LicenseFile=C:\Documents and Settings\simorl.EMEA\cvs\linphone\COPYING -InfoBeforeFile=C:\Documents and Settings\simorl.EMEA\cvs\linphone\README +LicenseFile=..\COPYING +InfoBeforeFile=..\README OutputBaseFilename=setup Compression=lzma SolidCompression=yes @@ -23,11 +23,33 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone\gtk-glade\linphone.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone\mediastreamer2\build\win32native\mediastream.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone\gtk-glade\*.glade"; DestDir: "{app}/linphone"; Flags: ignoreversion -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone\pixmaps\*.png"; DestDir: "{app}/linphone"; Flags: ignoreversion -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone\pixmaps\*.png"; DestDir: "{app}/pixmaps"; Flags: ignoreversion +Source: "linphone.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\mediastreamer2\build\win32native\mediastream.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "*.glade"; DestDir: "{app}/linphone"; Flags: ignoreversion +Source: "..\pixmaps\*.png"; DestDir: "{app}/linphone"; Flags: ignoreversion +Source: "*.png"; DestDir: "{app}/linphone"; Flags: ignoreversion +Source: "..\mediastreamer2\src\nowebcamCIF.jpg"; DestDir: "{app}\images"; Flags: ignoreversion +;;internal linphone dlls: +Source: "..\..\linphone-deps\bin\osipparser2.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\linphone-deps\bin\osip2.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\linphone-deps\bin\exosip2.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\linphone-deps\bin\libogg.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\linphone-deps\bin\speex.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\linphone-deps\bin\avcodec.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\linphone-deps\bin\avutil.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\mediastreamer2\build\win32native\mediastreamer2.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\oRTP\build\win32native\ortp.dll"; DestDir: "{app}"; Flags: ignoreversion +;;Sound files: +Source: "..\COPYING"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\share\ringback.wav"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\share\rings\orig.wav"; DestDir: "{app}\rings"; Flags: ignoreversion +Source: "..\share\rings\bigben.wav"; DestDir: "{app}\rings"; Flags: ignoreversion +Source: "..\share\rings\toy.wav"; DestDir: "{app}\rings"; Flags: ignoreversion +Source: "..\share\rings\tapping.wav"; DestDir: "{app}\rings"; Flags: ignoreversion +Source: "..\share\rings\oldphone.wav"; DestDir: "{app}\rings"; Flags: ignoreversion + + +;;GTK stuff: Source: "C:\Dev-Cpp\gtk+2.12\bin\*.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "C:\Dev-Cpp\gtk+2.12\etc\gtk-2.0\*"; DestDir: "{app}\etc\gtk-2.0\"; Flags: ignoreversion Source: "C:\Dev-Cpp\libxml2-2.6.32+.win32\bin\*.dll"; DestDir: "{app}"; Flags: ignoreversion @@ -35,28 +57,6 @@ Source: "C:\Dev-Cpp\iconv-1.9.2.win32\bin\*.dll"; DestDir: "{app}"; Flags: ignor Source: "C:\Dev-Cpp\gtk+2.12\lib\gtk-2.0\2.10.0\engines\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Flags: ignoreversion Source: "C:\Dev-Cpp\gtk+2.12\lib\gtk-2.0\2.10.0\loaders\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\loaders"; Flags: ignoreversion Source: "C:\Dev-Cpp\gtk+2.12\lib\gtk-2.0\2.10.0\immodules\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\immodules"; Flags: ignoreversion -; all icons: -;Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone\win32\linphonec.exe"; DestDir: "{app}"; Flags: ignoreversion -;Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone\win32\linphonec-remote.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone\mediastreamer2\src\nowebcamCIF.jpg"; DestDir: "{app}\images"; Flags: ignoreversion - -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone\COPYING"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone\share\ringback.wav"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone\share\rings\orig.wav"; DestDir: "{app}\rings"; Flags: ignoreversion -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone\share\rings\bigben.wav"; DestDir: "{app}\rings"; Flags: ignoreversion -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone\share\rings\toy.wav"; DestDir: "{app}\rings"; Flags: ignoreversion -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone\share\rings\tapping.wav"; DestDir: "{app}\rings"; Flags: ignoreversion -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone\share\rings\oldphone.wav"; DestDir: "{app}\rings"; Flags: ignoreversion - -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone-deps\bin\osipparser2.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone-deps\bin\osip2.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone-deps\bin\exosip2.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone-deps\bin\libogg.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone-deps\bin\speex.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone-deps\bin\avcodec.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone-deps\bin\avutil.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone\mediastreamer2\build\win32native\mediastreamer2.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "C:\Documents and Settings\simorl.EMEA\cvs\linphone\oRTP\build\win32native\ortp.dll"; DestDir: "{app}"; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files diff --git a/linphone/mediastreamer2/tests/mediastream.c b/linphone/mediastreamer2/tests/mediastream.c index 17ebef068..8b1a10f0d 100644 --- a/linphone/mediastreamer2/tests/mediastream.c +++ b/linphone/mediastreamer2/tests/mediastream.c @@ -45,10 +45,10 @@ static void stop_handler(int signum) static bool_t parse_addr(const char *addr, char *ip, int len, int *port) { - char *semicolon=NULL; + const char *semicolon=NULL; int iplen; int slen; - char *p; + const char *p; *port=0; semicolon=strchr(addr,':');