empathy r614 - in trunk: libempathy libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Sat Feb  9 21:07:02 2008
New Revision: 614
URL: http://svn.gnome.org/viewvc/empathy?rev=614&view=rev

Log:
Generate marshal.list thanks to gabble black magic.


Removed:
   trunk/libempathy/empathy-marshal.list
Modified:
   trunk/libempathy-gtk/.gitignore
   trunk/libempathy-gtk/Makefile.am
   trunk/libempathy-gtk/empathy-chat.c
   trunk/libempathy-gtk/empathy-contact-list-view.c
   trunk/libempathy/Makefile.am

Modified: trunk/libempathy-gtk/.gitignore
==============================================================================
--- trunk/libempathy-gtk/.gitignore	(original)
+++ trunk/libempathy-gtk/.gitignore	Sat Feb  9 21:07:02 2008
@@ -1 +1,2 @@
+empathy-gtk-marshal.*
 *.gladep

Modified: trunk/libempathy-gtk/Makefile.am
==============================================================================
--- trunk/libempathy-gtk/Makefile.am	(original)
+++ trunk/libempathy-gtk/Makefile.am	Sat Feb  9 21:07:02 2008
@@ -6,6 +6,9 @@
 	$(WARN_CFLAGS)
 
 BUILT_SOURCES = 					\
+	empathy-gtk-marshal.h				\
+	empathy-gtk-marshal.c				\
+	empathy-gtk-marshal.list			\
 	empathy-gtk-enum-types.h			\
 	empathy-gtk-enum-types.c
 
@@ -137,6 +140,24 @@
 	empathy-chat.glade			\
 	empathy-new-message-dialog.glade
 
+empathy-gtk-marshal.list: $(libempathy_gtk_la_SOURCES) Makefile.am
+	( cd $(srcdir) && \
+	sed -n -e 's/.*empathy_gtk_marshal_\([[:upper:]]*__[[:upper:]_]*\).*/\1/p' \
+	$(libempathy_gtk_la_SOURCES) ) \
+	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $  tmp
+	if cmp -s $  tmp $@; then \
+		rm $  tmp; \
+	else \
+		mv $  tmp $@; \
+	fi
+
+%-marshal.h: %-marshal.list Makefile
+	$(GLIB_GENMARSHAL) --header --prefix=_$(subst -,_,$*)_marshal $< > $*-marshal.h
+
+%-marshal.c: %-marshal.list Makefile
+	echo "#include \"empathy-gtk-marshal.h\"" > $@ && \
+	$(GLIB_GENMARSHAL) --body --prefix=_$(subst -,_,$*)_marshal $< >> $*-marshal.c
+
 empathy-gtk-enum-types.h: stamp-empathy-gtk-enum-types.h
 	@true
 stamp-empathy-gtk-enum-types.h: Makefile $(libempathy_gtk_headers)

Modified: trunk/libempathy-gtk/empathy-chat.c
==============================================================================
--- trunk/libempathy-gtk/empathy-chat.c	(original)
+++ trunk/libempathy-gtk/empathy-chat.c	Sat Feb  9 21:07:02 2008
@@ -40,7 +40,6 @@
 #include <libempathy/empathy-log-manager.h>
 #include <libempathy/empathy-debug.h>
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-marshal.h>
 
 #include "empathy-chat.h"
 #include "empathy-chat-window.h"
@@ -50,6 +49,7 @@
 #include "empathy-spell.h"
 #include "empathy-spell-dialog.h"
 #include "empathy-ui-utils.h"
+#include "empathy-gtk-marshal.h"
 
 #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_CHAT, EmpathyChatPriv))
 
@@ -279,7 +279,7 @@
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _empathy_marshal_VOID__OBJECT_BOOLEAN,
+			      _empathy_gtk_marshal_VOID__OBJECT_BOOLEAN,
 			      G_TYPE_NONE,
 			      2, EMPATHY_TYPE_MESSAGE, G_TYPE_BOOLEAN);
 

Modified: trunk/libempathy-gtk/empathy-contact-list-view.c
==============================================================================
--- trunk/libempathy-gtk/empathy-contact-list-view.c	(original)
+++ trunk/libempathy-gtk/empathy-contact-list-view.c	Sat Feb  9 21:07:02 2008
@@ -43,7 +43,6 @@
 #include <libempathy/empathy-contact-groups.h>
 #include <libempathy/empathy-debug.h>
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-marshal.h>
 
 #include "empathy-contact-list-view.h"
 #include "empathy-contact-list-store.h"
@@ -57,6 +56,7 @@
 //#include "empathy-ft-window.h"
 #include "empathy-log-window.h"
 #include "empathy-gtk-enum-types.h"
+#include "empathy-gtk-marshal.h"
 
 #define DEBUG_DOMAIN "ContactListView"
 
@@ -322,7 +322,7 @@
 			      G_SIGNAL_RUN_LAST,
 			      0,
 			      NULL, NULL,
-			      _empathy_marshal_VOID__OBJECT_STRING_STRING,
+			      _empathy_gtk_marshal_VOID__OBJECT_STRING_STRING,
 			      G_TYPE_NONE,
 			      3, EMPATHY_TYPE_CONTACT, G_TYPE_STRING, G_TYPE_STRING);
 

Modified: trunk/libempathy/Makefile.am
==============================================================================
--- trunk/libempathy/Makefile.am	(original)
+++ trunk/libempathy/Makefile.am	Sat Feb  9 21:07:02 2008
@@ -8,6 +8,7 @@
 BUILT_SOURCES = 					\
 	empathy-marshal.h				\
 	empathy-marshal.c				\
+	empathy-marshal.list				\
 	empathy-enum-types.h				\
 	empathy-enum-types.c				\
 	empathy-filter-glue.h				\
@@ -84,6 +85,17 @@
 	$(libempathy_headers)			\
 	empathy-enum-types.h
 
+empathy-marshal.list: $(libempathy_la_SOURCES) Makefile.am
+	( cd $(srcdir) && \
+	sed -n -e 's/.*empathy_marshal_\([[:upper:]]*__[[:upper:]_]*\).*/\1/p' \
+	$(libempathy_la_SOURCES) ) \
+	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $  tmp
+	if cmp -s $  tmp $@; then \
+		rm $  tmp; \
+	else \
+		mv $  tmp $@; \
+	fi
+
 %-marshal.h: %-marshal.list Makefile
 	$(GLIB_GENMARSHAL) --header --prefix=_$(subst -,_,$*)_marshal $< > $*-marshal.h