From f5c26281b73b52aaec8d6a8c059237b0016d65ca Mon Sep 17 00:00:00 2001 From: Jens Granseuer Date: Thu, 20 Nov 2008 18:43:38 +0000 Subject: [PATCH] Patch by: Maxim Ermilov 2008-11-20 Jens Granseuer Patch by: Maxim Ermilov 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) svn path=/trunk/; revision=9148 --- ChangeLog | 13 +++++++++++++ capplets/appearance/gedit-message-area.h | 2 +- capplets/appearance/gnome-wp-item.h | 2 +- capplets/common/capplet-stock-icons.c | 3 +-- capplets/common/capplet-stock-icons.h | 4 ++-- capplets/common/file-transfer-dialog.h | 2 +- capplets/keybindings/eggaccelerators.c | 2 +- capplets/keybindings/eggaccelerators.h | 2 +- capplets/keybindings/eggcellrendererkeys.h | 2 +- capplets/keyboard/gnome-keyboard-properties-a11y.h | 2 +- capplets/sound/mixer-support.c | 4 ++-- capplets/sound/mixer-support.h | 2 +- shell/control-center.c | 8 -------- typing-break/drw-break-window.h | 2 +- typing-break/drw-monitor.c | 2 +- typing-break/drw-utils.h | 2 +- typing-break/drwright.c | 1 - 17 files changed, 29 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01a5484da..11dcfbd4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2008-11-20 Jens Granseuer + + Patch by: Maxim Ermilov + + 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) + 2008-11-18 Jens Granseuer * font-viewer/font-view.c: (add_face_info), (set_icon): diff --git a/capplets/appearance/gedit-message-area.h b/capplets/appearance/gedit-message-area.h index 24c060c91..fb1fff905 100644 --- a/capplets/appearance/gedit-message-area.h +++ b/capplets/appearance/gedit-message-area.h @@ -31,7 +31,7 @@ #ifndef __GEDIT_MESSAGE_AREA_H__ #define __GEDIT_MESSAGE_AREA_H__ -#include +#include G_BEGIN_DECLS diff --git a/capplets/appearance/gnome-wp-item.h b/capplets/appearance/gnome-wp-item.h index 635e081a1..756202127 100644 --- a/capplets/appearance/gnome-wp-item.h +++ b/capplets/appearance/gnome-wp-item.h @@ -21,7 +21,7 @@ #include #include #include -#include +#include #define GNOME_DESKTOP_USE_UNSTABLE_API #include #include diff --git a/capplets/common/capplet-stock-icons.c b/capplets/common/capplet-stock-icons.c index 18587b342..29b440f57 100644 --- a/capplets/common/capplet-stock-icons.c +++ b/capplets/common/capplet-stock-icons.c @@ -23,8 +23,7 @@ * Taken bits of code from panel-stock-icons.c, Thanks Mark */ -#include -#include +#include #include #include "capplet-stock-icons.h" diff --git a/capplets/common/capplet-stock-icons.h b/capplets/common/capplet-stock-icons.h index 1c316c8ff..cd39afbdb 100644 --- a/capplets/common/capplet-stock-icons.h +++ b/capplets/common/capplet-stock-icons.h @@ -26,8 +26,8 @@ #ifndef __CAPPLET_STOCK_ICONS_H__ #define __CAPPLET_STOCK_ICONS_H__ -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/capplets/common/file-transfer-dialog.h b/capplets/common/file-transfer-dialog.h index 4c453fd92..d192aaedd 100644 --- a/capplets/common/file-transfer-dialog.h +++ b/capplets/common/file-transfer-dialog.h @@ -24,7 +24,7 @@ #ifndef __FILE_TRANSFER_DIALOG_H__ #define __FILE_TRANSFER_DIALOG_H__ -#include +#include G_BEGIN_DECLS diff --git a/capplets/keybindings/eggaccelerators.c b/capplets/keybindings/eggaccelerators.c index f112821dd..0728229d1 100644 --- a/capplets/keybindings/eggaccelerators.c +++ b/capplets/keybindings/eggaccelerators.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include enum { diff --git a/capplets/keybindings/eggaccelerators.h b/capplets/keybindings/eggaccelerators.h index b5302f882..9e22fc8da 100644 --- a/capplets/keybindings/eggaccelerators.h +++ b/capplets/keybindings/eggaccelerators.h @@ -21,7 +21,7 @@ #ifndef __EGG_ACCELERATORS_H__ #define __EGG_ACCELERATORS_H__ -#include +#include #include G_BEGIN_DECLS diff --git a/capplets/keybindings/eggcellrendererkeys.h b/capplets/keybindings/eggcellrendererkeys.h index 5f1eb10be..ed3451d2f 100644 --- a/capplets/keybindings/eggcellrendererkeys.h +++ b/capplets/keybindings/eggcellrendererkeys.h @@ -20,7 +20,7 @@ #ifndef __EGG_CELL_RENDERER_KEYS_H__ #define __EGG_CELL_RENDERER_KEYS_H__ -#include +#include #include "eggaccelerators.h" G_BEGIN_DECLS diff --git a/capplets/keyboard/gnome-keyboard-properties-a11y.h b/capplets/keyboard/gnome-keyboard-properties-a11y.h index 23813812b..bdce927c9 100644 --- a/capplets/keyboard/gnome-keyboard-properties-a11y.h +++ b/capplets/keyboard/gnome-keyboard-properties-a11y.h @@ -25,7 +25,7 @@ #define __GNOME_KEYBOARD_PROPERTY_A11Y_H #include -#include +#include #include extern void setup_a11y_tabs (GladeXML * dialog, GConfChangeSet * changeset); diff --git a/capplets/sound/mixer-support.c b/capplets/sound/mixer-support.c index 949275166..228f4f7a0 100644 --- a/capplets/sound/mixer-support.c +++ b/capplets/sound/mixer-support.c @@ -24,11 +24,11 @@ #include -#include +#include #include #include -#include +#include #include "mixer-support.h" diff --git a/capplets/sound/mixer-support.h b/capplets/sound/mixer-support.h index bea5a78f1..ef540c00d 100644 --- a/capplets/sound/mixer-support.h +++ b/capplets/sound/mixer-support.h @@ -22,7 +22,7 @@ #ifndef __GNOME_SETTINGS_MIXER_SUPPORT__ #define __GNOME_SETTINGS_MIXER_SUPPORT__ -#include +#include #include G_BEGIN_DECLS diff --git a/shell/control-center.c b/shell/control-center.c index f0d0b6312..8aefac4ec 100644 --- a/shell/control-center.c +++ b/shell/control-center.c @@ -23,14 +23,6 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include diff --git a/typing-break/drw-break-window.h b/typing-break/drw-break-window.h index 18b131724..a856cd3fd 100644 --- a/typing-break/drw-break-window.h +++ b/typing-break/drw-break-window.h @@ -22,7 +22,7 @@ #ifndef __DRW_BREAK_WINDOW_H__ #define __DRW_BREAK_WINDOW_H__ -#include +#include G_BEGIN_DECLS diff --git a/typing-break/drw-monitor.c b/typing-break/drw-monitor.c index cd6a7ac73..5f0270c0d 100644 --- a/typing-break/drw-monitor.c +++ b/typing-break/drw-monitor.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/typing-break/drw-utils.h b/typing-break/drw-utils.h index 30bacad70..9ef75bb79 100644 --- a/typing-break/drw-utils.h +++ b/typing-break/drw-utils.h @@ -21,7 +21,7 @@ #ifndef __DRW_UTILS_H__ #define __DRW_UTILS_H__ -#include +#include void drw_setup_background (GtkWidget *window); diff --git a/typing-break/drwright.c b/typing-break/drwright.c index c4ccbde25..0284c668c 100644 --- a/typing-break/drwright.c +++ b/typing-break/drwright.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include