gnomemm r1888 - in clutter-gtkmm/trunk: . clutter-gtk/src tools/extra_defs_gen

[daniel svn gnome org]

Author: daniel
Date: Fri Dec 19 14:46:34 2008
New Revision: 1888
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1888&view=rev

Log:
* tools/extra_defs_gen/generate_defs_clutter_gtk.cc: Fix to obey the
single central header policy of clutter 0.9.
* clutter-gtk/src/embed.ccg: ditto.

Modified:
   clutter-gtkmm/trunk/ChangeLog
   clutter-gtkmm/trunk/clutter-gtk/src/embed.ccg
   clutter-gtkmm/trunk/tools/extra_defs_gen/generate_defs_clutter_gtk.cc

Modified: clutter-gtkmm/trunk/clutter-gtk/src/embed.ccg
==============================================================================
--- clutter-gtkmm/trunk/clutter-gtk/src/embed.ccg	(original)
+++ clutter-gtkmm/trunk/clutter-gtk/src/embed.ccg	Fri Dec 19 14:46:34 2008
@@ -15,13 +15,12 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
 
 namespace Clutter
 {
 namespace Gtk
 {
 
-} //namespace Gtk
-} //namespace Clutter
-
+} // namespace Gtk
+} // namespace Clutter

Modified: clutter-gtkmm/trunk/tools/extra_defs_gen/generate_defs_clutter_gtk.cc
==============================================================================
--- clutter-gtkmm/trunk/tools/extra_defs_gen/generate_defs_clutter_gtk.cc	(original)
+++ clutter-gtkmm/trunk/tools/extra_defs_gen/generate_defs_clutter_gtk.cc	Fri Dec 19 14:46:34 2008
@@ -17,15 +17,14 @@
 
 #include "glibmm_generate_extra_defs/generate_extra_defs.h"
 #include <clutter/clutter.h>
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
 #include <iostream>
 
-
-int main (int argc, char *argv[])
+int main(int argc, char** argv)
 {
-  clutter_init(&argc, &argv) ;
+  clutter_init(&argc, &argv);
 
-  std::cout 
+  std::cout
     << get_defs(GTK_TYPE_CLUTTER_EMBED)
     ;