totem r5353 - in trunk: . src

[hadess svn gnome org]

Author: hadess
Date: Wed Apr  9 10:30:53 2008
New Revision: 5353
URL: http://svn.gnome.org/viewvc/totem?rev=5353&view=rev

Log:
2008-04-09  Bastien Nocera  <hadess hadess net>

	* src/bacon-message-connection.c:
	* src/bacon-message-connection.h: Re-add exception lost in rev 2122
	(Closes: #525856)



Modified:
   trunk/ChangeLog
   trunk/src/bacon-message-connection.c
   trunk/src/bacon-message-connection.h

Modified: trunk/src/bacon-message-connection.c
==============================================================================
--- trunk/src/bacon-message-connection.c	(original)
+++ trunk/src/bacon-message-connection.c	Wed Apr  9 10:30:53 2008
@@ -15,16 +15,23 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
+ * The Totem project hereby grant permission for non-gpl compatible GStreamer
+ * plugins to be used and distributed together with GStreamer and Totem. This
+ * permission are above and beyond the permissions granted by the GPL license
+ * Totem is covered by.
+ *
+ * Monday 7th February 2005: Christian Schaller: Add excemption clause.
+ * See license_change file for details.
+ *
  */
 
-#include "config.h"
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <errno.h>

Modified: trunk/src/bacon-message-connection.h
==============================================================================
--- trunk/src/bacon-message-connection.h	(original)
+++ trunk/src/bacon-message-connection.h	Wed Apr  9 10:30:53 2008
@@ -15,6 +15,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
+ * The Totem project hereby grant permission for non-gpl compatible GStreamer
+ * plugins to be used and distributed together with GStreamer and Totem. This
+ * permission are above and beyond the permissions granted by the GPL license
+ * Totem is covered by.
+ *
+ * Monday 7th February 2005: Christian Schaller: Add excemption clause.
+ * See license_change file for details.
+ *
  */
 
 #ifndef BACON_MESSAGE_CONNECTION_H