gconf-editor r1401 - in trunk: . src

[cosimoc svn gnome org]

Author: cosimoc
Date: Wed Sep 24 22:28:14 2008
New Revision: 1401
URL: http://svn.gnome.org/viewvc/gconf-editor?rev=1401&view=rev

Log:
2008-09-25  Cosimo Cecchi  <cosimoc gnome org>

	* src/*: Use single GTK+ includes.


Modified:
   trunk/ChangeLog
   trunk/src/gconf-bookmarks-dialog.c
   trunk/src/gconf-bookmarks-dialog.h
   trunk/src/gconf-bookmarks.c
   trunk/src/gconf-bookmarks.h
   trunk/src/gconf-cell-renderer.c
   trunk/src/gconf-cell-renderer.h
   trunk/src/gconf-editor-application.c
   trunk/src/gconf-editor-application.h
   trunk/src/gconf-editor-window.c
   trunk/src/gconf-editor-window.h
   trunk/src/gconf-key-editor.c
   trunk/src/gconf-key-editor.h
   trunk/src/gconf-list-model.h
   trunk/src/gconf-search-dialog.c
   trunk/src/gconf-search-dialog.h
   trunk/src/gconf-search.c
   trunk/src/gconf-search.h
   trunk/src/gconf-stock-icons.c
   trunk/src/gconf-stock-icons.h
   trunk/src/gconf-tree-model.h
   trunk/src/gedit-output-window.h
   trunk/src/main.c

Modified: trunk/src/gconf-bookmarks-dialog.c
==============================================================================
--- trunk/src/gconf-bookmarks-dialog.c	(original)
+++ trunk/src/gconf-bookmarks-dialog.c	Wed Sep 24 22:28:14 2008
@@ -19,18 +19,7 @@
 #include "gconf-bookmarks-dialog.h"
 #include <gconf/gconf-client.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtkvbox.h>
-#include <libintl.h>
+#include <gtk/gtk.h>
 
 #include "gconf-stock-icons.h"
 

Modified: trunk/src/gconf-bookmarks-dialog.h
==============================================================================
--- trunk/src/gconf-bookmarks-dialog.h	(original)
+++ trunk/src/gconf-bookmarks-dialog.h	Wed Sep 24 22:28:14 2008
@@ -20,8 +20,7 @@
 #ifndef __GCONF_BOOKMARKS_DIALOG_H__
 #define __GCONF_BOOKMARKS_DIALOG_H__
 
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #define GCONF_TYPE_BOOKMARKS_DIALOG		  (gconf_bookmarks_dialog_get_type ())
 #define GCONF_BOOKMARKS_DIALOG(obj)		  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GCONF_TYPE_BOOKMARKS_DIALOG, GConfBookmarksDialog))

Modified: trunk/src/gconf-bookmarks.c
==============================================================================
--- trunk/src/gconf-bookmarks.c	(original)
+++ trunk/src/gconf-bookmarks.c	Wed Sep 24 22:28:14 2008
@@ -22,13 +22,7 @@
 #include "gconf-stock-icons.h"
 #include "gconf-tree-model.h"
 #include <gconf/gconf-client.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtktreemodelsort.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 

Modified: trunk/src/gconf-bookmarks.h
==============================================================================
--- trunk/src/gconf-bookmarks.h	(original)
+++ trunk/src/gconf-bookmarks.h	Wed Sep 24 22:28:14 2008
@@ -21,7 +21,7 @@
 #define __GCONF_BOOKMARKS_H__
 
 #include "gconf-editor-window.h"
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 void gconf_bookmarks_hook_up_menu (GConfEditorWindow *window,
 				   GtkWidget         *menu,

Modified: trunk/src/gconf-cell-renderer.c
==============================================================================
--- trunk/src/gconf-cell-renderer.c	(original)
+++ trunk/src/gconf-cell-renderer.c	Wed Sep 24 22:28:14 2008
@@ -20,10 +20,7 @@
 #include <config.h>
 #include "gconf-cell-renderer.h"
 
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include "gconf-util.h"

Modified: trunk/src/gconf-cell-renderer.h
==============================================================================
--- trunk/src/gconf-cell-renderer.h	(original)
+++ trunk/src/gconf-cell-renderer.h	Wed Sep 24 22:28:14 2008
@@ -20,7 +20,7 @@
 #ifndef __GCONF_CELL_RENDERER_H__
 #define __GCONF_CELL_RENDERER_H__
 
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 #include <gconf/gconf-value.h>
 
 #define GCONF_TYPE_CELL_RENDERER	    (gconf_cell_renderer_get_type ())

Modified: trunk/src/gconf-editor-application.c
==============================================================================
--- trunk/src/gconf-editor-application.c	(original)
+++ trunk/src/gconf-editor-application.c	Wed Sep 24 22:28:14 2008
@@ -23,7 +23,7 @@
 #include "gconf-editor-window.h"
 #include "gconf-tree-model.h"
 #include "gconf-list-model.h"
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 
 static GSList *editor_windows = NULL;

Modified: trunk/src/gconf-editor-application.h
==============================================================================
--- trunk/src/gconf-editor-application.h	(original)
+++ trunk/src/gconf-editor-application.h	Wed Sep 24 22:28:14 2008
@@ -20,8 +20,7 @@
 #ifndef __GCONF_EDITOR_APPLICATION_H__
 #define __GCONF_EDITOR_APPLICATION_H__
 
-#include <gtk/gtkwidget.h>
-#include <gnome.h>
+#include <gtk/gtk.h>
 
 GtkWidget *gconf_editor_application_create_editor_window (int type);
 

Modified: trunk/src/gconf-editor-window.c
==============================================================================
--- trunk/src/gconf-editor-window.c	(original)
+++ trunk/src/gconf-editor-window.c	Wed Sep 24 22:28:14 2008
@@ -18,6 +18,8 @@
 
 #include <config.h>
 
+#include <gnome.h>
+
 #include "gconf-editor-window.h"
 
 #include "gconf-bookmarks.h"

Modified: trunk/src/gconf-editor-window.h
==============================================================================
--- trunk/src/gconf-editor-window.h	(original)
+++ trunk/src/gconf-editor-window.h	Wed Sep 24 22:28:14 2008
@@ -20,12 +20,7 @@
 #ifndef __GCONF_EDITOR_WINDOW_H__
 #define __GCONF_EDITOR_WINDOW_H__
 
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 
 #define GCONF_TYPE_EDITOR_WINDOW		  (gconf_editor_window_get_type ())

Modified: trunk/src/gconf-key-editor.c
==============================================================================
--- trunk/src/gconf-key-editor.c	(original)
+++ trunk/src/gconf-key-editor.c	Wed Sep 24 22:28:14 2008
@@ -25,25 +25,8 @@
 #include "gconf-cell-renderer.h"
 #include "gconf-key-editor.h"
 
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtksizegroup.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkvbbox.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libintl.h>
 #include <string.h>
 
 enum

Modified: trunk/src/gconf-key-editor.h
==============================================================================
--- trunk/src/gconf-key-editor.h	(original)
+++ trunk/src/gconf-key-editor.h	Wed Sep 24 22:28:14 2008
@@ -20,8 +20,7 @@
 #ifndef __GCONF_KEY_EDITOR_H__
 #define __GCONF_KEY_EDITOR_H__
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 #include <gconf/gconf.h>
 
 #define GCONF_TYPE_KEY_EDITOR		  (gconf_key_editor_get_type ())

Modified: trunk/src/gconf-list-model.h
==============================================================================
--- trunk/src/gconf-list-model.h	(original)
+++ trunk/src/gconf-list-model.h	Wed Sep 24 22:28:14 2008
@@ -20,7 +20,7 @@
 #ifndef __GCONF_LIST_MODEL_H__
 #define __GCONF_LIST_MODEL_H__
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 
 #define GCONF_TYPE_LIST_MODEL		  (gconf_list_model_get_type ())

Modified: trunk/src/gconf-search-dialog.c
==============================================================================
--- trunk/src/gconf-search-dialog.c	(original)
+++ trunk/src/gconf-search-dialog.c	Wed Sep 24 22:28:14 2008
@@ -25,7 +25,6 @@
 #include <gconf/gconf-client.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <libintl.h>
 #include <string.h>
 
 #include "gconf-stock-icons.h"

Modified: trunk/src/gconf-search-dialog.h
==============================================================================
--- trunk/src/gconf-search-dialog.h	(original)
+++ trunk/src/gconf-search-dialog.h	Wed Sep 24 22:28:14 2008
@@ -20,9 +20,7 @@
 #ifndef __GCONF_SEARCH_DIALOG_H__
 #define __GCONF_SEARCH_DIALOG_H__
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkradiobutton.h>
+#include <gtk/gtk.h>
 
 #define GCONF_TYPE_SEARCH_DIALOG		  (gconf_search_dialog_get_type ())
 #define GCONF_SEARCH_DIALOG(obj)		  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GCONF_TYPE_SEARCH_DIALOG, GConfSearchDialog))

Modified: trunk/src/gconf-search.c
==============================================================================
--- trunk/src/gconf-search.c	(original)
+++ trunk/src/gconf-search.c	Wed Sep 24 22:28:14 2008
@@ -17,7 +17,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 #include "gconf-search.h"
 #include "gconf-search-dialog.h"

Modified: trunk/src/gconf-search.h
==============================================================================
--- trunk/src/gconf-search.h	(original)
+++ trunk/src/gconf-search.h	Wed Sep 24 22:28:14 2008
@@ -24,7 +24,7 @@
 #include "gedit-output-window.h"
 #include "gconf-tree-model.h"
 #include "gconf-list-model.h"
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 typedef struct _SearchIter SearchIter;
 

Modified: trunk/src/gconf-stock-icons.c
==============================================================================
--- trunk/src/gconf-stock-icons.c	(original)
+++ trunk/src/gconf-stock-icons.c	Wed Sep 24 22:28:14 2008
@@ -20,7 +20,7 @@
 
 #include "gconf-stock-icons.h"
 
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 
 
 static const char *icon_theme_items[] =

Modified: trunk/src/gconf-stock-icons.h
==============================================================================
--- trunk/src/gconf-stock-icons.h	(original)
+++ trunk/src/gconf-stock-icons.h	Wed Sep 24 22:28:14 2008
@@ -20,7 +20,7 @@
 #ifndef __GCONF_STOCK_ICONS_H__
 #define __GCONF_STOCK_ICONS_H__
 
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #define STOCK_BOOKMARK		"stock_bookmark"
 #define STOCK_ADD_BOOKMARK	"bookmark-new"

Modified: trunk/src/gconf-tree-model.h
==============================================================================
--- trunk/src/gconf-tree-model.h	(original)
+++ trunk/src/gconf-tree-model.h	Wed Sep 24 22:28:14 2008
@@ -20,7 +20,7 @@
 #ifndef __GCONF_TREE_MODEL_H__
 #define __GCONF_TREE_MODEL_H__
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 
 #define GCONF_TYPE_TREE_MODEL		  (gconf_tree_model_get_type ())

Modified: trunk/src/gedit-output-window.h
==============================================================================
--- trunk/src/gedit-output-window.h	(original)
+++ trunk/src/gedit-output-window.h	Wed Sep 24 22:28:14 2008
@@ -31,7 +31,7 @@
 #ifndef __GEDIT_OUTPUT_WINDOW_H__
 #define __GEDIT_OUTPUT_WINDOW_H__
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 #define GEDIT_TYPE_OUTPUT_WINDOW		(gedit_output_window_get_type ())
 #define GEDIT_OUTPUT_WINDOW(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GEDIT_TYPE_OUTPUT_WINDOW, GeditOutputWindow))

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Wed Sep 24 22:28:14 2008
@@ -18,8 +18,8 @@
 
 #include <config.h>
 
+#include <gnome.h>
 #include <gconf/gconf.h>
-#include <libintl.h>
 
 #include "gconf-editor-application.h"
 #include "gconf-stock-icons.h"