gnome-control-center r9148 - in trunk: . capplets/appearance capplets/common capplets/keybindings capplets/keyboard capplets/sound shell typing-break

[jensg svn gnome org]

Author: jensg
Date: Thu Nov 20 18:43:38 2008
New Revision: 9148
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9148&view=rev

Log:
2008-11-20  Jens Granseuer  <jensgr gmx net>

	Patch by: Maxim Ermilov <zaspire rambler ru>

	capplets/sound/mixer-support.[ch]:
	capplets/appearance/*.[ch]:
	capplets/common/*.[ch]:
	capplets/keybindings/egg*.[ch]:
	capplets/keyboard/gnome-keyboard-properties-a11y.h:
	shell/control-center.c:
	typing-break/*.[ch]:
	only include top-level headers for glib and GTK+ (bug #561562)


Modified:
   trunk/ChangeLog
   trunk/capplets/appearance/gedit-message-area.h
   trunk/capplets/appearance/gnome-wp-item.h
   trunk/capplets/common/capplet-stock-icons.c
   trunk/capplets/common/capplet-stock-icons.h
   trunk/capplets/common/file-transfer-dialog.h
   trunk/capplets/keybindings/eggaccelerators.c
   trunk/capplets/keybindings/eggaccelerators.h
   trunk/capplets/keybindings/eggcellrendererkeys.h
   trunk/capplets/keyboard/gnome-keyboard-properties-a11y.h
   trunk/capplets/sound/mixer-support.c
   trunk/capplets/sound/mixer-support.h
   trunk/shell/control-center.c
   trunk/typing-break/drw-break-window.h
   trunk/typing-break/drw-monitor.c
   trunk/typing-break/drw-utils.h
   trunk/typing-break/drwright.c

Modified: trunk/capplets/appearance/gedit-message-area.h
==============================================================================
--- trunk/capplets/appearance/gedit-message-area.h	(original)
+++ trunk/capplets/appearance/gedit-message-area.h	Thu Nov 20 18:43:38 2008
@@ -31,7 +31,7 @@
 #ifndef __GEDIT_MESSAGE_AREA_H__
 #define __GEDIT_MESSAGE_AREA_H__
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/capplets/appearance/gnome-wp-item.h
==============================================================================
--- trunk/capplets/appearance/gnome-wp-item.h	(original)
+++ trunk/capplets/appearance/gnome-wp-item.h	Thu Nov 20 18:43:38 2008
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnomeui/gnome-desktop-thumbnail.h>
 #include <libgnomeui/gnome-bg.h>

Modified: trunk/capplets/common/capplet-stock-icons.c
==============================================================================
--- trunk/capplets/common/capplet-stock-icons.c	(original)
+++ trunk/capplets/common/capplet-stock-icons.c	Thu Nov 20 18:43:38 2008
@@ -23,8 +23,7 @@
  *	Taken bits of code from panel-stock-icons.c, Thanks Mark <mark skynet ie>
  */
 
-#include <gtk/gtkstock.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include "capplet-stock-icons.h"

Modified: trunk/capplets/common/capplet-stock-icons.h
==============================================================================
--- trunk/capplets/common/capplet-stock-icons.h	(original)
+++ trunk/capplets/common/capplet-stock-icons.h	Thu Nov 20 18:43:38 2008
@@ -26,8 +26,8 @@
 #ifndef __CAPPLET_STOCK_ICONS_H__
 #define __CAPPLET_STOCK_ICONS_H__
 
-#include <glib/gmacros.h>
-#include <gtk/gtkenums.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/capplets/common/file-transfer-dialog.h
==============================================================================
--- trunk/capplets/common/file-transfer-dialog.h	(original)
+++ trunk/capplets/common/file-transfer-dialog.h	Thu Nov 20 18:43:38 2008
@@ -24,7 +24,7 @@
 #ifndef __FILE_TRANSFER_DIALOG_H__
 #define __FILE_TRANSFER_DIALOG_H__
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/capplets/keybindings/eggaccelerators.c
==============================================================================
--- trunk/capplets/keybindings/eggaccelerators.c	(original)
+++ trunk/capplets/keybindings/eggaccelerators.c	Thu Nov 20 18:43:38 2008
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkaccelgroup.h>
+#include <gtk/gtk.h>
 
 enum
 {

Modified: trunk/capplets/keybindings/eggaccelerators.h
==============================================================================
--- trunk/capplets/keybindings/eggaccelerators.h	(original)
+++ trunk/capplets/keybindings/eggaccelerators.h	Thu Nov 20 18:43:38 2008
@@ -21,7 +21,7 @@
 #ifndef __EGG_ACCELERATORS_H__
 #define __EGG_ACCELERATORS_H__
 
-#include <gtk/gtkaccelgroup.h>
+#include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
 G_BEGIN_DECLS

Modified: trunk/capplets/keybindings/eggcellrendererkeys.h
==============================================================================
--- trunk/capplets/keybindings/eggcellrendererkeys.h	(original)
+++ trunk/capplets/keybindings/eggcellrendererkeys.h	Thu Nov 20 18:43:38 2008
@@ -20,7 +20,7 @@
 #ifndef __EGG_CELL_RENDERER_KEYS_H__
 #define __EGG_CELL_RENDERER_KEYS_H__
 
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
 #include "eggaccelerators.h"
 
 G_BEGIN_DECLS

Modified: trunk/capplets/keyboard/gnome-keyboard-properties-a11y.h
==============================================================================
--- trunk/capplets/keyboard/gnome-keyboard-properties-a11y.h	(original)
+++ trunk/capplets/keyboard/gnome-keyboard-properties-a11y.h	Thu Nov 20 18:43:38 2008
@@ -25,7 +25,7 @@
 #define __GNOME_KEYBOARD_PROPERTY_A11Y_H
 
 #include <gconf/gconf-changeset.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <glade/glade.h>
 
 extern void setup_a11y_tabs (GladeXML * dialog, GConfChangeSet * changeset);

Modified: trunk/capplets/sound/mixer-support.c
==============================================================================
--- trunk/capplets/sound/mixer-support.c	(original)
+++ trunk/capplets/sound/mixer-support.c	Thu Nov 20 18:43:38 2008
@@ -24,11 +24,11 @@
 
 #include <string.h>
 
-#include <glib/glist.h>
+#include <glib.h>
 #include <glib/gi18n.h>
 #include <gst/audio/mixerutils.h>
 
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 #include "mixer-support.h"
 

Modified: trunk/capplets/sound/mixer-support.h
==============================================================================
--- trunk/capplets/sound/mixer-support.h	(original)
+++ trunk/capplets/sound/mixer-support.h	Thu Nov 20 18:43:38 2008
@@ -22,7 +22,7 @@
 #ifndef __GNOME_SETTINGS_MIXER_SUPPORT__
 #define __GNOME_SETTINGS_MIXER_SUPPORT__
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <gst/interfaces/mixer.h>
 
 G_BEGIN_DECLS

Modified: trunk/shell/control-center.c
==============================================================================
--- trunk/shell/control-center.c	(original)
+++ trunk/shell/control-center.c	Thu Nov 20 18:43:38 2008
@@ -23,14 +23,6 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkentry.h>
 #include <panel-applet.h>
 #include <libgnome/gnome-desktop-item.h>
 #include <libgnomeui/libgnomeui.h>

Modified: trunk/typing-break/drw-break-window.h
==============================================================================
--- trunk/typing-break/drw-break-window.h	(original)
+++ trunk/typing-break/drw-break-window.h	Thu Nov 20 18:43:38 2008
@@ -22,7 +22,7 @@
 #ifndef __DRW_BREAK_WINDOW_H__
 #define __DRW_BREAK_WINDOW_H__
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/typing-break/drw-monitor.c
==============================================================================
--- trunk/typing-break/drw-monitor.c	(original)
+++ trunk/typing-break/drw-monitor.c	Thu Nov 20 18:43:38 2008
@@ -22,7 +22,7 @@
 #include <config.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
-#include <gtk/gtkinvisible.h>
+#include <gtk/gtk.h>
 #include <math.h>
 #include <unistd.h>
 #include <sys/ioctl.h>

Modified: trunk/typing-break/drw-utils.h
==============================================================================
--- trunk/typing-break/drw-utils.h	(original)
+++ trunk/typing-break/drw-utils.h	Thu Nov 20 18:43:38 2008
@@ -21,7 +21,7 @@
 #ifndef __DRW_UTILS_H__
 #define __DRW_UTILS_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 void drw_setup_background (GtkWidget *window);
 

Modified: trunk/typing-break/drwright.c
==============================================================================
--- trunk/typing-break/drwright.c	(original)
+++ trunk/typing-break/drwright.c	Thu Nov 20 18:43:38 2008
@@ -27,7 +27,6 @@
 #include <glib/gi18n.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gdk/gdkspawn.h>
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>