Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Makefile.am

@@ -178,6 +178,7 @@ Portfile-devel:	$(top_srcdir)/scripts/Portfile-devel.tmpl dist
 	  -e 's/\@LINPHONE_MD5\@/$(GEN_MD5)/' < $< > $@
 
 MACAPPNAME=Linphone.app
+MACAPPZIP=$(PACKAGE)-$(VERSION).app.zip
 BUNDLEDIR=$(shell echo "$$HOME/Desktop/$(MACAPPNAME)")
 LIBICONV_HACK=$(top_builddir)/build/macos/libiconv.2.dylib
 
@@ -192,10 +193,10 @@ bundle: $(LIBICONV_HACK)
 	LINPHONE_INSTALL_PREFIX=$(INSTALLDIR_WITH_PREFIX) \
 	LIBLINPHONE_INSTALL_PREFIX=$(INSTALLDIR_WITH_PREFIX) \
 	ige-mac-bundler $(PACKAGE_BUNDLE_FILE)
-	/bin/echo -n "[Pango]\nModuleFiles=./etc/pango/pango.modules" \
+	printf "[Pango]\nModuleFiles=./etc/pango/pango.modules\n" \
 	> $(BUNDLEDIR)/Contents/Resources/etc/pango/pangorc 
 	cp -f $(LIBICONV_HACK) $(BUNDLEDIR)/Contents/Resources/lib/.
-	cd $(BUNDLEDIR)/.. && zip -r $(PACKAGE)-$(VERSION).app.zip $(MACAPPNAME)
+	cd $(BUNDLEDIR)/.. && rm -f $(MACAPPZIP) && zip -r $(MACAPPZIP) $(MACAPPNAME)
 
 
 

README.macos

@@ -11,7 +11,7 @@ You need:
  $ port install automake autoconf libtool intltool
 
 - Install some linphone dependencies with macports
- $ port install speex-dev
+ $ port install speex
  $ port install osip2
  $ port install eXosip2
  $ port install ffmpeg-devel
@@ -33,7 +33,7 @@ When this version will be integrated into macports, only this will be necessary:
  $ port install sdl-devel
 
 - Install gtk. It is recommended to use the quartz backend for better integration.
- $ port install gtk2 +no_x11
+ $ port install gtk2 +quartz +no_x11
  $ port install ige-mac-integration
  $ port install hicolor-icon-theme
 
@@ -43,7 +43,7 @@ If you got the source code from git, run ./autogen.sh first.
 
 Then or otherwise, do:
 	
- $ PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./configure --prefix=/opt/local --with-readline=/opt/local --disable-strict --disable-x11 && make
+ $ ./configure --prefix=/opt/local --with-readline=/opt/local --disable-strict --disable-x11 && make
 
 Install to /opt/local
 
@@ -52,13 +52,16 @@ Install to /opt/local
 Done.
 
 If you want to generate a portable bundle, then install ige-mac-bundler.
-The version in macports doesn't work at all.
+The macport package of ige-mac-bundler doesn't work at all.
 Use git:
  $ git clone https://github.com/jralls/ige-mac-bundler.git
  $ cd ige-mac-bundler && make install
  $ export PATH=$PATH:~/.local/bin
 
 Then run, inside linphone source tree:
+ 1. Run configure as told before but with "--enable-relativeprefix" appended.
+ 
+ $ make
  $ make bundle
 
 The resulting bundle is located in ~/Desktop, together with a zipped version.
@@ -71,6 +74,6 @@ For a better appearance, you can install the gtk-quartz-engine (a gtk theme) tha
  $ ./configure --prefix=/opt/local && make 
  $ sudo make install
 
-Generate a new bundle to have it packaged.
+Generate a new bundle to have it included.
 
 

build/macos/linphone.bundle

@@ -12,11 +12,10 @@
          defined by jhbuild, so it you are not using jhbuild you can
          either define your own or just hardcode the path here.
     -->
-    <prefix name="default">${env:JHBUILD_PREFIX}</prefix>
+    <prefix name="default">/opt/local</prefix>
     <prefix name="linphone">${env:LINPHONE_INSTALL_PREFIX}</prefix>
     <prefix name="liblinphone">${env:LINPHONE_INSTALL_PREFIX}</prefix>
     <prefix name="macports">/opt/local</prefix>
-    <prefix name="usrlocal">/usr/local</prefix>
     <!-- The project directory is the default location of the created
          app. If you leave out the path, the current directory is
          used. Note the usage of an environment variable here again.
@@ -72,10 +71,6 @@
     ${prefix:macports}/lib/libeXosip.*.dylib
   </binary>
 
-  <binary>
-    ${prefix:usrlocal}/lib/libSDLi-*.dylib
-  </binary>
-
   <!-- Copy in GTK+ modules.  Note the ${gtkdir} macro, which expands
        to the correct library subdirectory for the specified gtk
        version.
@@ -88,6 +83,10 @@
      ${prefix}/lib/gdk-pixbuf-2.0
   </binary>
 
+  <binary>
+    ${prefix}/share/mime/globs
+  </binary>
+
   <binary>
     ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/*.so
   </binary>

gtk/main.c

@@ -114,6 +114,7 @@ static GOptionEntry linphone_options[]={
 };
 
 #define INSTALLED_XML_DIR PACKAGE_DATA_DIR "/linphone"
+#define RELATIVE_XML_DIR 
 #define BUILD_TREE_XML_DIR "gtk"
 
 #ifndef WIN32
@@ -258,7 +259,7 @@ static int get_ui_file(const char *name, char *path, int pathsize){
 	if (access(path,F_OK)!=0){
 		snprintf(path,pathsize,"%s/%s.ui",INSTALLED_XML_DIR,name);
 		if (access(path,F_OK)!=0){
-			g_error("Could not locate neither %s/%s.ui and %s/%s.ui .",BUILD_TREE_XML_DIR,name,
+			g_error("Could not locate neither %s/%s.ui nor %s/%s.ui",BUILD_TREE_XML_DIR,name,
 				INSTALLED_XML_DIR,name);
 			return -1;
 		}
@@ -1277,6 +1278,17 @@ gboolean linphone_gtk_close(GtkWidget *mw){
 	return TRUE;
 }
 
+static gboolean on_window_state_event(GtkWidget *w, GdkEventWindowState *event){
+        if ((event->new_window_state & GDK_WINDOW_STATE_ICONIFIED) ||(event->new_window_state & GDK_WINDOW_STATE_WITHDRAWN) ){
+                linphone_core_enable_video_preview(linphone_gtk_get_core(),FALSE);
+        }else{
+                linphone_core_enable_video_preview(linphone_gtk_get_core(),
+		linphone_gtk_get_ui_config_int("videoselfview",VIDEOSELFVIEW_DEFAULT));
+        }
+        return FALSE;
+}
+
+
 static void linphone_gtk_init_main_window(){
 	GtkWidget *main_window;
 
@@ -1306,6 +1318,7 @@ static void linphone_gtk_init_main_window(){
 		gtk_widget_hide(menubar);
 		gtk_osxapplication_ready(theMacApp);
 	}
+	g_signal_connect(G_OBJECT(main_window), "window-state-event",G_CALLBACK(on_window_state_event), NULL);
 #endif
 	linphone_gtk_check_menu_items();
 }

mediastreamer2

@@ -1 +1 @@
-Subproject commit 45067312fd5296d01ea66c851a0f87f9a993b52b
+Subproject commit 7c091db48e2ac5b785ced3964a386ec51f695a60