libbonoboui r2672 - in trunk: . samples/canvdemo samples/compound-doc/container tests tools/browser

[kmaraas svn gnome org]

Author: kmaraas
Date: Tue Dec  9 11:39:19 2008
New Revision: 2672
URL: http://svn.gnome.org/viewvc/libbonoboui?rev=2672&view=rev

Log:
2008-12-09  Kjartan Maraas  <kmaraas gnome org>

	* samples/canvdemo/circle.c: (circle_control_new):
	* samples/canvdemo/square.c:
	* tests/test-filesel.c:
	* tools/browser/component-details.c:
	* tools/browser/component-details.h:
	* tools/browser/component-list.c:
	* tools/browser/component-list.h:
	More gtk+ include cleanups. Patch from PrzemysÅaw Grzegorczyk.
	Closes bug #563711.

Modified:
   trunk/ChangeLog
   trunk/samples/canvdemo/circle.c
   trunk/samples/canvdemo/square.c
   trunk/samples/compound-doc/container/ChangeLog
   trunk/samples/compound-doc/container/container-filesel.c
   trunk/samples/compound-doc/container/container-menu.c
   trunk/samples/compound-doc/container/container.c
   trunk/samples/compound-doc/container/doc-view.h
   trunk/tests/test-filesel.c
   trunk/tools/browser/component-details.c
   trunk/tools/browser/component-details.h
   trunk/tools/browser/component-list.c
   trunk/tools/browser/component-list.h

Modified: trunk/samples/canvdemo/circle.c
==============================================================================
--- trunk/samples/canvdemo/circle.c	(original)
+++ trunk/samples/canvdemo/circle.c	Tue Dec  9 11:39:19 2008
@@ -2,7 +2,7 @@
 #include "config.h"
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <bonobo/Bonobo.h>
@@ -126,7 +126,7 @@
         gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
         spin_label = gtk_label_new ("Speed:");
         gtk_box_pack_start (GTK_BOX (hbox), spin_label, FALSE, FALSE, 0);
-        adj = gtk_adjustment_new(100.0, 0.0, 1000.0, 1.0, 10.0, 10.0);
+        adj = gtk_adjustment_new(100.0, 0.0, 1000.0, 1.0, 10.0, 0.0);
         g_signal_connect(adj, "value_changed", G_CALLBACK(set_speed), com);
         spin = gtk_spin_button_new(GTK_ADJUSTMENT(adj), 0.0, 0);
         gtk_box_pack_start (GTK_BOX (hbox), spin, FALSE, FALSE, 0);

Modified: trunk/samples/canvdemo/square.c
==============================================================================
--- trunk/samples/canvdemo/square.c	(original)
+++ trunk/samples/canvdemo/square.c	Tue Dec  9 11:39:19 2008
@@ -7,7 +7,7 @@
 #define WITH_BONOBO
 
 #include <string.h>
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 

Modified: trunk/samples/compound-doc/container/container-filesel.c
==============================================================================
--- trunk/samples/compound-doc/container/container-filesel.c	(original)
+++ trunk/samples/compound-doc/container/container-filesel.c	Tue Dec  9 11:39:19 2008
@@ -1,6 +1,5 @@
 #include "config.h"
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 #include "container-filesel.h"
 #include "container.h"
 

Modified: trunk/samples/compound-doc/container/container-menu.c
==============================================================================
--- trunk/samples/compound-doc/container/container-menu.c	(original)
+++ trunk/samples/compound-doc/container/container-menu.c	Tue Dec  9 11:39:19 2008
@@ -2,7 +2,7 @@
 #include <bonobo/bonobo-ui-component.h>
 #include <bonobo/bonobo-selector.h>
 #include <bonobo/bonobo-window.h>
-#include <gtk/gtkfilechooser.h>
+#include <gtk/gtk.h>
 
 #include "container-menu.h"
 #include "container.h"

Modified: trunk/samples/compound-doc/container/container.c
==============================================================================
--- trunk/samples/compound-doc/container/container.c	(original)
+++ trunk/samples/compound-doc/container/container.c	Tue Dec  9 11:39:19 2008
@@ -1,7 +1,7 @@
 #include "config.h"
 #include <stdlib.h>
 #include <libbonoboui.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <libgnome/gnome-init.h>
 
 #include "container.h"

Modified: trunk/samples/compound-doc/container/doc-view.h
==============================================================================
--- trunk/samples/compound-doc/container/doc-view.h	(original)
+++ trunk/samples/compound-doc/container/doc-view.h	Tue Dec  9 11:39:19 2008
@@ -2,7 +2,7 @@
 #define _SAMPLE_DOC_VIEW_H
 
 #include <bonobo/Bonobo.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include "document.h"
 

Modified: trunk/tests/test-filesel.c
==============================================================================
--- trunk/tests/test-filesel.c	(original)
+++ trunk/tests/test-filesel.c	Tue Dec  9 11:39:19 2008
@@ -13,7 +13,7 @@
 #include <bonobo/bonobo-file-selector-util.h>
 #include <bonobo/bonobo-ui-main.h>
 
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 #include <glib/gi18n.h>
 

Modified: trunk/tools/browser/component-details.c
==============================================================================
--- trunk/tools/browser/component-details.c	(original)
+++ trunk/tools/browser/component-details.c	Tue Dec  9 11:39:19 2008
@@ -24,13 +24,7 @@
 
 #include "oaf-helper.h"
 #include "component-details.h"
-#include <gtk/gtknotebook.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
 
 #define PARENT_TYPE GTK_TYPE_VBOX
 

Modified: trunk/tools/browser/component-details.h
==============================================================================
--- trunk/tools/browser/component-details.h	(original)
+++ trunk/tools/browser/component-details.h	Tue Dec  9 11:39:19 2008
@@ -21,7 +21,7 @@
 #ifndef __COMPONENT_DETAILS_H__
 #define __COMPONENT_DETAILS_H__
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/tools/browser/component-list.c
==============================================================================
--- trunk/tools/browser/component-list.c	(original)
+++ trunk/tools/browser/component-list.c	Tue Dec  9 11:39:19 2008
@@ -24,17 +24,8 @@
 #include <config.h>
 #endif
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrendererpixbuf.h>
+#include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkiconfactory.h>
 
 #include "oaf-helper.h"
 #include "component-list.h"

Modified: trunk/tools/browser/component-list.h
==============================================================================
--- trunk/tools/browser/component-list.h	(original)
+++ trunk/tools/browser/component-list.h	Tue Dec  9 11:39:19 2008
@@ -23,7 +23,7 @@
 #ifndef __COMPONENT_LIST_H__
 #define __COMPONENT_LIST_H__
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS