From 1d4ed0487376bedeb2012773dc1765ffca95c4de Mon Sep 17 00:00:00 2001 From: Pedro Fragoso Date: Mon, 15 Dec 2008 13:19:50 +0000 Subject: [PATCH] GNOME Goal: Clean up GLib and GTK+ includes (Closes: #564000) 2008-12-15 Pedro Fragoso * lib/eel-gconf-extensions.h: * lib/rb-tree-dnd.c: * lib/rb-tree-dnd.h: * lib/rb-util.h: * plugins/audiocd/sj-metadata-getter.h: * plugins/audiocd/sj-metadata-gvfs.c: * plugins/audiocd/sj-metadata-musicbrainz.c: * plugins/audiocd/sj-metadata.h: * plugins/audiocd/sj-structures.c: * plugins/audiocd/sj-structures.h: * plugins/iradio/rb-station-properties-dialog.h: * plugins/mtpdevice/rb-mtp-source.c: * plugins/rb-plugins-engine.c: * podcast/rb-feed-podcast-properties-dialog.c: * podcast/rb-podcast-properties-dialog.c: * podcast/rb-podcast-properties-dialog.h: * rhythmdb/rhythmdb-property-model.c: * rhythmdb/rhythmdb-property-model.h: * rhythmdb/rhythmdb-query-model.c: * rhythmdb/rhythmdb-tree.c: * rhythmdb/rhythmdb-tree.h: * shell/rb-shell-clipboard.c: * shell/rb-shell-clipboard.h: * shell/rb-shell-player.h: * shell/rb-shell-preferences.h: * shell/rb-source-header.h: * shell/rb-statusbar.h: * shell/rb-tray-icon.h: * sources/rb-browser-source.h: * sources/rb-library-source.h: * sources/rb-removable-media-source.c: * sources/rb-source.c: * sources/rb-source.h: * sources/rb-sourcelist-model.h: * sources/rb-sourcelist.h: * widgets/bacon-volume.h: * widgets/eggtrayicon.c: * widgets/eggtrayicon.h: * widgets/gedit-message-area.h: * widgets/gossip-cell-renderer-expander.c: * widgets/gossip-cell-renderer-expander.h: * widgets/libsexy/sexy-icon-entry.h: * widgets/libsexy/sexy-tooltip.h: * widgets/rb-cell-renderer-pixbuf.h: * widgets/rb-cell-renderer-rating.h: * widgets/rb-dialog.h: * widgets/rb-entry-view.c: * widgets/rb-entry-view.h: * widgets/rb-header.h: * widgets/rb-library-browser.h: * widgets/rb-property-view.h: * widgets/rb-query-creator-properties.c: * widgets/rb-query-creator.h: * widgets/rb-rating.h: * widgets/rb-search-entry.h: * widgets/rb-song-info.h: * widgets/rb-uri-dialog.h: GNOME Goal: Clean up GLib and GTK+ includes (Closes: #564000) svn path=/trunk/; revision=6099 --- ChangeLog | 61 +++++++++++++++++++ lib/eel-gconf-extensions.h | 2 +- lib/rb-tree-dnd.c | 6 +- lib/rb-tree-dnd.h | 4 +- lib/rb-util.h | 4 +- plugins/audiocd/sj-metadata-getter.h | 2 +- plugins/audiocd/sj-metadata-gvfs.c | 5 +- plugins/audiocd/sj-metadata-musicbrainz.c | 5 +- plugins/audiocd/sj-metadata.h | 2 +- plugins/audiocd/sj-structures.c | 3 +- plugins/audiocd/sj-structures.h | 3 +- plugins/iradio/rb-station-properties-dialog.h | 2 +- plugins/mtpdevice/rb-mtp-source.c | 2 +- plugins/rb-plugins-engine.c | 2 +- podcast/rb-feed-podcast-properties-dialog.c | 2 +- podcast/rb-podcast-properties-dialog.c | 2 +- podcast/rb-podcast-properties-dialog.h | 2 +- rhythmdb/rhythmdb-property-model.c | 2 +- rhythmdb/rhythmdb-property-model.h | 2 +- rhythmdb/rhythmdb-query-model.c | 4 +- rhythmdb/rhythmdb-tree.c | 4 +- rhythmdb/rhythmdb-tree.h | 2 +- shell/rb-history.c | 1 - shell/rb-history.h | 2 +- shell/rb-shell-clipboard.c | 1 - shell/rb-shell-clipboard.h | 2 +- shell/rb-shell-player.h | 4 +- shell/rb-shell-preferences.h | 2 +- shell/rb-source-header.h | 3 +- shell/rb-statusbar.h | 3 +- shell/rb-tray-icon.h | 3 +- sources/rb-browser-source.h | 3 +- sources/rb-library-source.h | 3 +- sources/rb-removable-media-source.c | 4 +- sources/rb-source.c | 2 +- sources/rb-source.h | 3 +- sources/rb-sourcelist-model.h | 2 +- sources/rb-sourcelist.h | 2 +- widgets/bacon-volume.h | 3 +- widgets/eggtrayicon.c | 2 +- widgets/eggtrayicon.h | 2 +- widgets/gedit-message-area.h | 2 +- widgets/gossip-cell-renderer-expander.c | 2 +- widgets/gossip-cell-renderer-expander.h | 2 +- widgets/libsexy/sexy-icon-entry.h | 3 +- widgets/libsexy/sexy-tooltip.h | 2 +- widgets/rb-cell-renderer-pixbuf.h | 2 +- widgets/rb-cell-renderer-rating.h | 2 +- widgets/rb-dialog.h | 3 +- widgets/rb-entry-view.c | 2 +- widgets/rb-entry-view.h | 4 +- widgets/rb-header.h | 2 +- widgets/rb-library-browser.h | 2 +- widgets/rb-property-view.h | 3 +- widgets/rb-query-creator-properties.c | 2 +- widgets/rb-query-creator.h | 2 +- widgets/rb-rating.h | 2 +- widgets/rb-search-entry.h | 2 +- widgets/rb-song-info.h | 2 +- widgets/rb-uri-dialog.h | 2 +- 60 files changed, 120 insertions(+), 93 deletions(-) diff --git a/ChangeLog b/ChangeLog index c677f4293..0f18f1962 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,64 @@ +2008-12-15 Pedro Fragoso + + * lib/eel-gconf-extensions.h: + * lib/rb-tree-dnd.c: + * lib/rb-tree-dnd.h: + * lib/rb-util.h: + * plugins/audiocd/sj-metadata-getter.h: + * plugins/audiocd/sj-metadata-gvfs.c: + * plugins/audiocd/sj-metadata-musicbrainz.c: + * plugins/audiocd/sj-metadata.h: + * plugins/audiocd/sj-structures.c: + * plugins/audiocd/sj-structures.h: + * plugins/iradio/rb-station-properties-dialog.h: + * plugins/mtpdevice/rb-mtp-source.c: + * plugins/rb-plugins-engine.c: + * podcast/rb-feed-podcast-properties-dialog.c: + * podcast/rb-podcast-properties-dialog.c: + * podcast/rb-podcast-properties-dialog.h: + * rhythmdb/rhythmdb-property-model.c: + * rhythmdb/rhythmdb-property-model.h: + * rhythmdb/rhythmdb-query-model.c: + * rhythmdb/rhythmdb-tree.c: + * rhythmdb/rhythmdb-tree.h: + * shell/rb-shell-clipboard.c: + * shell/rb-shell-clipboard.h: + * shell/rb-shell-player.h: + * shell/rb-shell-preferences.h: + * shell/rb-source-header.h: + * shell/rb-statusbar.h: + * shell/rb-tray-icon.h: + * sources/rb-browser-source.h: + * sources/rb-library-source.h: + * sources/rb-removable-media-source.c: + * sources/rb-source.c: + * sources/rb-source.h: + * sources/rb-sourcelist-model.h: + * sources/rb-sourcelist.h: + * widgets/bacon-volume.h: + * widgets/eggtrayicon.c: + * widgets/eggtrayicon.h: + * widgets/gedit-message-area.h: + * widgets/gossip-cell-renderer-expander.c: + * widgets/gossip-cell-renderer-expander.h: + * widgets/libsexy/sexy-icon-entry.h: + * widgets/libsexy/sexy-tooltip.h: + * widgets/rb-cell-renderer-pixbuf.h: + * widgets/rb-cell-renderer-rating.h: + * widgets/rb-dialog.h: + * widgets/rb-entry-view.c: + * widgets/rb-entry-view.h: + * widgets/rb-header.h: + * widgets/rb-library-browser.h: + * widgets/rb-property-view.h: + * widgets/rb-query-creator-properties.c: + * widgets/rb-query-creator.h: + * widgets/rb-rating.h: + * widgets/rb-search-entry.h: + * widgets/rb-song-info.h: + * widgets/rb-uri-dialog.h: + GNOME Goal: Clean up GLib and GTK+ includes (Closes: #564000) + 2008-12-15 Jonathan Matthew * backends/gstreamer/rb-player-gst-xfade.c: (create_stream): diff --git a/lib/eel-gconf-extensions.h b/lib/eel-gconf-extensions.h index fde1b9ba2..1ac7faed8 100644 --- a/lib/eel-gconf-extensions.h +++ b/lib/eel-gconf-extensions.h @@ -25,7 +25,7 @@ #ifndef EEL_GCONF_EXTENSIONS_H #define EEL_GCONF_EXTENSIONS_H -#include +#include #include #include diff --git a/lib/rb-tree-dnd.c b/lib/rb-tree-dnd.c index 3cc0b7e58..a9ca3ce26 100644 --- a/lib/rb-tree-dnd.c +++ b/lib/rb-tree-dnd.c @@ -20,11 +20,7 @@ #include "config.h" #include -#include -#include -#include -#include -#include +#include #include "rb-tree-dnd.h" #include "rb-debug.h" diff --git a/lib/rb-tree-dnd.h b/lib/rb-tree-dnd.h index ab303cd97..ecfdaf882 100644 --- a/lib/rb-tree-dnd.h +++ b/lib/rb-tree-dnd.h @@ -20,9 +20,7 @@ #ifndef __RB_TREE_DND_H__ #define __RB_TREE_DND_H__ -#include -#include -#include +#include G_BEGIN_DECLS diff --git a/lib/rb-util.h b/lib/rb-util.h index 384bfc4e5..f9f8f3cc1 100644 --- a/lib/rb-util.h +++ b/lib/rb-util.h @@ -32,9 +32,7 @@ #include #include -#include -#include -#include +#include G_BEGIN_DECLS diff --git a/plugins/audiocd/sj-metadata-getter.h b/plugins/audiocd/sj-metadata-getter.h index 05b93a47f..7aed0f881 100644 --- a/plugins/audiocd/sj-metadata-getter.h +++ b/plugins/audiocd/sj-metadata-getter.h @@ -22,7 +22,7 @@ #define SJ_METADATA_GETTER_H #include -#include +#include G_BEGIN_DECLS diff --git a/plugins/audiocd/sj-metadata-gvfs.c b/plugins/audiocd/sj-metadata-gvfs.c index 6e4d23a89..fcf68c363 100644 --- a/plugins/audiocd/sj-metadata-gvfs.c +++ b/plugins/audiocd/sj-metadata-gvfs.c @@ -25,10 +25,7 @@ #include #include #include -#include -#include -#include -#include +#include #include #include "sj-metadata-gvfs.h" diff --git a/plugins/audiocd/sj-metadata-musicbrainz.c b/plugins/audiocd/sj-metadata-musicbrainz.c index 2a793be7a..59721fff7 100644 --- a/plugins/audiocd/sj-metadata-musicbrainz.c +++ b/plugins/audiocd/sj-metadata-musicbrainz.c @@ -25,10 +25,7 @@ #include #include #include -#include -#include -#include -#include +#include #include #include #include diff --git a/plugins/audiocd/sj-metadata.h b/plugins/audiocd/sj-metadata.h index b0e264ae9..f7a58d204 100644 --- a/plugins/audiocd/sj-metadata.h +++ b/plugins/audiocd/sj-metadata.h @@ -22,7 +22,7 @@ #define SJ_METADATA_H #include -#include +#include G_BEGIN_DECLS diff --git a/plugins/audiocd/sj-structures.c b/plugins/audiocd/sj-structures.c index 21b924ddf..fab922ca5 100644 --- a/plugins/audiocd/sj-structures.c +++ b/plugins/audiocd/sj-structures.c @@ -22,8 +22,7 @@ */ #include "sj-structures.h" -#include -#include +#include /** * Free a TrackDetails* diff --git a/plugins/audiocd/sj-structures.h b/plugins/audiocd/sj-structures.h index 6da6e5ba5..07ccc60ee 100644 --- a/plugins/audiocd/sj-structures.h +++ b/plugins/audiocd/sj-structures.h @@ -24,8 +24,7 @@ #ifndef SJ_STRUCTURES_H #define SJ_STRUCTURES_H -#include -#include +#include typedef enum _MetadataSource MetadataSource; diff --git a/plugins/iradio/rb-station-properties-dialog.h b/plugins/iradio/rb-station-properties-dialog.h index 63438a0c4..6d37f900a 100644 --- a/plugins/iradio/rb-station-properties-dialog.h +++ b/plugins/iradio/rb-station-properties-dialog.h @@ -27,7 +27,7 @@ * */ -#include +#include #include "rb-entry-view.h" #include "rb-plugin.h" diff --git a/plugins/mtpdevice/rb-mtp-source.c b/plugins/mtpdevice/rb-mtp-source.c index 4aeda2914..686e657a9 100644 --- a/plugins/mtpdevice/rb-mtp-source.c +++ b/plugins/mtpdevice/rb-mtp-source.c @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include "rhythmdb.h" diff --git a/plugins/rb-plugins-engine.c b/plugins/rb-plugins-engine.c index 0c58e7792..c0cc3b884 100644 --- a/plugins/rb-plugins-engine.c +++ b/plugins/rb-plugins-engine.c @@ -35,8 +35,8 @@ #include +#include #include -#include #include "eel-gconf-extensions.h" #include "rb-file-helpers.h" diff --git a/podcast/rb-feed-podcast-properties-dialog.c b/podcast/rb-feed-podcast-properties-dialog.c index 31b9ede66..4993ceaaa 100644 --- a/podcast/rb-feed-podcast-properties-dialog.c +++ b/podcast/rb-feed-podcast-properties-dialog.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include "rb-feed-podcast-properties-dialog.h" #include "rb-file-helpers.h" diff --git a/podcast/rb-podcast-properties-dialog.c b/podcast/rb-podcast-properties-dialog.c index 35dbfde66..112ec68b3 100644 --- a/podcast/rb-podcast-properties-dialog.c +++ b/podcast/rb-podcast-properties-dialog.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include "rb-podcast-properties-dialog.h" #include "rb-file-helpers.h" diff --git a/podcast/rb-podcast-properties-dialog.h b/podcast/rb-podcast-properties-dialog.h index 5c6c6f4d7..fadd708df 100644 --- a/podcast/rb-podcast-properties-dialog.h +++ b/podcast/rb-podcast-properties-dialog.h @@ -27,7 +27,7 @@ * */ -#include +#include #include "rb-entry-view.h" #ifndef __RB_PODCAST_PROPERTIES_DIALOG_H diff --git a/rhythmdb/rhythmdb-property-model.c b/rhythmdb/rhythmdb-property-model.c index d112ba43a..599a0668a 100644 --- a/rhythmdb/rhythmdb-property-model.c +++ b/rhythmdb/rhythmdb-property-model.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "rhythmdb-property-model.h" #include "rb-debug.h" diff --git a/rhythmdb/rhythmdb-property-model.h b/rhythmdb/rhythmdb-property-model.h index cbbc89704..f26b3b957 100644 --- a/rhythmdb/rhythmdb-property-model.h +++ b/rhythmdb/rhythmdb-property-model.h @@ -30,7 +30,7 @@ #include "config.h" #include #include -#include +#include #include "rhythmdb.h" #include "rhythmdb-query-model.h" diff --git a/rhythmdb/rhythmdb-query-model.c b/rhythmdb/rhythmdb-query-model.c index 517e626d8..2fc14a84e 100644 --- a/rhythmdb/rhythmdb-query-model.c +++ b/rhythmdb/rhythmdb-query-model.c @@ -35,9 +35,9 @@ #include #include #include -#include +#include -#include +#include #include "rhythmdb-query-model.h" #include "rb-debug.h" diff --git a/rhythmdb/rhythmdb-tree.c b/rhythmdb/rhythmdb-tree.c index bfda4db0e..1a86faf24 100644 --- a/rhythmdb/rhythmdb-tree.c +++ b/rhythmdb/rhythmdb-tree.c @@ -43,9 +43,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/rhythmdb/rhythmdb-tree.h b/rhythmdb/rhythmdb-tree.h index df737c013..18c0a2cf5 100644 --- a/rhythmdb/rhythmdb-tree.h +++ b/rhythmdb/rhythmdb-tree.h @@ -32,7 +32,7 @@ #include "rhythmdb-private.h" #include -#include +#include G_BEGIN_DECLS diff --git a/shell/rb-history.c b/shell/rb-history.c index c56142f2e..8add62dfc 100644 --- a/shell/rb-history.c +++ b/shell/rb-history.c @@ -31,7 +31,6 @@ #include "config.h" #include -#include #include "rb-history.h" diff --git a/shell/rb-history.h b/shell/rb-history.h index 47859fd26..7d6b84890 100644 --- a/shell/rb-history.h +++ b/shell/rb-history.h @@ -27,7 +27,7 @@ * */ -#include +#include #include "rhythmdb.h" #include "rb-shell-player.h" diff --git a/shell/rb-shell-clipboard.c b/shell/rb-shell-clipboard.c index 456696ff9..ee1b8ab1d 100644 --- a/shell/rb-shell-clipboard.c +++ b/shell/rb-shell-clipboard.c @@ -50,7 +50,6 @@ #include #include -#include #include "rb-shell-clipboard.h" #include "rb-playlist-manager.h" diff --git a/shell/rb-shell-clipboard.h b/shell/rb-shell-clipboard.h index 66afbd8a4..2d8fc529f 100644 --- a/shell/rb-shell-clipboard.h +++ b/shell/rb-shell-clipboard.h @@ -29,7 +29,7 @@ #include "rb-source.h" -#include +#include #ifndef __RB_SHELL_CLIPBOARD_H #define __RB_SHELL_CLIPBOARD_H diff --git a/shell/rb-shell-player.h b/shell/rb-shell-player.h index 9ecf28698..e8351b893 100644 --- a/shell/rb-shell-player.h +++ b/shell/rb-shell-player.h @@ -28,9 +28,7 @@ * */ -#include -#include -#include +#include #include "rb-source.h" #include "rhythmdb.h" diff --git a/shell/rb-shell-preferences.h b/shell/rb-shell-preferences.h index 8227b1387..0b52bc548 100644 --- a/shell/rb-shell-preferences.h +++ b/shell/rb-shell-preferences.h @@ -27,7 +27,7 @@ * */ -#include +#include #include "rb-preferences.h" #ifndef __RB_SHELL_PREFERENCES_H diff --git a/shell/rb-source-header.h b/shell/rb-source-header.h index bdad92aa7..f2a2d3efc 100644 --- a/shell/rb-source-header.h +++ b/shell/rb-source-header.h @@ -27,8 +27,7 @@ * */ -#include -#include +#include #include "rb-source.h" diff --git a/shell/rb-statusbar.h b/shell/rb-statusbar.h index eab0915c1..a8da69cb7 100644 --- a/shell/rb-statusbar.h +++ b/shell/rb-statusbar.h @@ -27,8 +27,7 @@ * */ -#include -#include +#include #include "rb-source.h" #include "rhythmdb.h" diff --git a/shell/rb-tray-icon.h b/shell/rb-tray-icon.h index c999818cd..e876601f0 100644 --- a/shell/rb-tray-icon.h +++ b/shell/rb-tray-icon.h @@ -27,8 +27,7 @@ * */ -#include -#include +#include #include "eggtrayicon.h" #include "rhythmdb.h" #include "rb-shell.h" diff --git a/sources/rb-browser-source.h b/sources/rb-browser-source.h index f9c124691..974ea706c 100644 --- a/sources/rb-browser-source.h +++ b/sources/rb-browser-source.h @@ -30,8 +30,7 @@ #ifndef __RB_BROWSER_SOURCE_H #define __RB_BROWSER_SOURCE_H -#include -#include +#include #include "rb-shell.h" #include "rb-source.h" diff --git a/sources/rb-library-source.h b/sources/rb-library-source.h index 9eb87211d..920e427bd 100644 --- a/sources/rb-library-source.h +++ b/sources/rb-library-source.h @@ -30,8 +30,7 @@ #ifndef __RB_LIBRARY_SOURCE_H #define __RB_LIBRARY_SOURCE_H -#include -#include +#include #include "rb-shell.h" #include "rb-browser-source.h" diff --git a/sources/rb-removable-media-source.c b/sources/rb-removable-media-source.c index 85c511ead..225a9903d 100644 --- a/sources/rb-removable-media-source.c +++ b/sources/rb-removable-media-source.c @@ -34,9 +34,7 @@ #include #include -#include -#include -#include +#include #include "rhythmdb.h" #include "eel-gconf-extensions.h" diff --git a/sources/rb-source.c b/sources/rb-source.c index 0662a86fe..d9849403a 100644 --- a/sources/rb-source.c +++ b/sources/rb-source.c @@ -35,7 +35,7 @@ #include #include -#include +#include #include "rb-cut-and-paste-code.h" #include "rb-debug.h" diff --git a/sources/rb-source.h b/sources/rb-source.h index a3b7f1556..705a6fc3e 100644 --- a/sources/rb-source.h +++ b/sources/rb-source.h @@ -31,8 +31,7 @@ #ifndef __RB_SOURCE_H #define __RB_SOURCE_H -#include -#include +#include #include "rb-source-group.h" #include "rb-entry-view.h" diff --git a/sources/rb-sourcelist-model.h b/sources/rb-sourcelist-model.h index b0a2a6e5a..f6969c522 100644 --- a/sources/rb-sourcelist-model.h +++ b/sources/rb-sourcelist-model.h @@ -31,7 +31,7 @@ #ifndef __RB_SOURCELIST_MODEL_H #define __RB_SOURCELIST_MODEL_H -#include +#include #include "rb-source.h" diff --git a/sources/rb-sourcelist.h b/sources/rb-sourcelist.h index 803172cc3..46e795c9f 100644 --- a/sources/rb-sourcelist.h +++ b/sources/rb-sourcelist.h @@ -31,7 +31,7 @@ #ifndef __RB_SOURCELIST_H #define __RB_SOURCELIST_H -#include +#include #include "rb-source.h" #include "rb-shell.h" diff --git a/widgets/bacon-volume.h b/widgets/bacon-volume.h index 60ae878d6..f62480573 100644 --- a/widgets/bacon-volume.h +++ b/widgets/bacon-volume.h @@ -21,8 +21,7 @@ #define __BACON_VOLUME_BUTTON_H__ #include -#include -#include +#include G_BEGIN_DECLS diff --git a/widgets/eggtrayicon.c b/widgets/eggtrayicon.c index b27a9f37d..5ab5f36fc 100644 --- a/widgets/eggtrayicon.c +++ b/widgets/eggtrayicon.c @@ -27,7 +27,7 @@ #include "rb-file-helpers.h" #include -#include +#include #if defined (GDK_WINDOWING_X11) #include #include diff --git a/widgets/eggtrayicon.h b/widgets/eggtrayicon.h index 7c4623e46..bf55c2ffa 100644 --- a/widgets/eggtrayicon.h +++ b/widgets/eggtrayicon.h @@ -23,7 +23,7 @@ #include -#include +#include #ifdef GDK_WINDOWING_X11 #include #endif diff --git a/widgets/gedit-message-area.h b/widgets/gedit-message-area.h index 18c1cb955..33f7892e8 100644 --- a/widgets/gedit-message-area.h +++ b/widgets/gedit-message-area.h @@ -39,7 +39,7 @@ #ifndef __GEDIT_MESSAGE_AREA_H__ #define __GEDIT_MESSAGE_AREA_H__ -#include +#include G_BEGIN_DECLS diff --git a/widgets/gossip-cell-renderer-expander.c b/widgets/gossip-cell-renderer-expander.c index d28e73b7d..784bc748d 100644 --- a/widgets/gossip-cell-renderer-expander.c +++ b/widgets/gossip-cell-renderer-expander.c @@ -29,7 +29,7 @@ #include "config.h" -#include +#include #include "gossip-cell-renderer-expander.h" diff --git a/widgets/gossip-cell-renderer-expander.h b/widgets/gossip-cell-renderer-expander.h index 1e8ace4df..79cdbcf66 100644 --- a/widgets/gossip-cell-renderer-expander.h +++ b/widgets/gossip-cell-renderer-expander.h @@ -21,7 +21,7 @@ #ifndef __GOSSIP_CELL_RENDERER_EXPANDER_H__ #define __GOSSIP_CELL_RENDERER_EXPANDER_H__ -#include +#include G_BEGIN_DECLS diff --git a/widgets/libsexy/sexy-icon-entry.h b/widgets/libsexy/sexy-icon-entry.h index 382f2fb68..2655ae3c2 100644 --- a/widgets/libsexy/sexy-icon-entry.h +++ b/widgets/libsexy/sexy-icon-entry.h @@ -25,8 +25,7 @@ typedef struct _SexyIconEntry SexyIconEntry; typedef struct _SexyIconEntryClass SexyIconEntryClass; typedef struct _SexyIconEntryPriv SexyIconEntryPriv; -#include -#include +#include #define SEXY_TYPE_ICON_ENTRY (sexy_icon_entry_get_type()) #define SEXY_ICON_ENTRY(obj) \ diff --git a/widgets/libsexy/sexy-tooltip.h b/widgets/libsexy/sexy-tooltip.h index c8e58e26a..0b0c8bdc1 100644 --- a/widgets/libsexy/sexy-tooltip.h +++ b/widgets/libsexy/sexy-tooltip.h @@ -25,7 +25,7 @@ typedef struct _SexyTooltip SexyTooltip; typedef struct _SexyTooltipClass SexyTooltipClass; typedef struct _SexyTooltipPriv SexyTooltipPriv; -#include +#include #define SEXY_TYPE_TOOLTIP (sexy_tooltip_get_type()) #define SEXY_TOOLTIP(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SEXY_TYPE_TOOLTIP, SexyTooltip)) diff --git a/widgets/rb-cell-renderer-pixbuf.h b/widgets/rb-cell-renderer-pixbuf.h index cfc2388a5..570f9974a 100644 --- a/widgets/rb-cell-renderer-pixbuf.h +++ b/widgets/rb-cell-renderer-pixbuf.h @@ -24,7 +24,7 @@ #ifndef __RB_CELL_RENDERER_PIXBUF_H__ #define __RB_CELL_RENDERER_PIXBUF_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/widgets/rb-cell-renderer-rating.h b/widgets/rb-cell-renderer-rating.h index 7dada2e4d..a9b627988 100644 --- a/widgets/rb-cell-renderer-rating.h +++ b/widgets/rb-cell-renderer-rating.h @@ -24,7 +24,7 @@ #ifndef __RB_CELL_RENDERER_RATING_H #define __RB_CELL_RENDERER_RATING_H -#include +#include G_BEGIN_DECLS diff --git a/widgets/rb-dialog.h b/widgets/rb-dialog.h index e120d3e4c..34dcfa51f 100644 --- a/widgets/rb-dialog.h +++ b/widgets/rb-dialog.h @@ -31,8 +31,7 @@ #ifndef __RB_DIALOG_H #define __RB_DIALOG_H -#include -#include +#include #include G_BEGIN_DECLS diff --git a/widgets/rb-entry-view.c b/widgets/rb-entry-view.c index 6f25cf53c..5455458bc 100644 --- a/widgets/rb-entry-view.c +++ b/widgets/rb-entry-view.c @@ -72,7 +72,7 @@ #include #include -#include +#include #include "rb-tree-dnd.h" #include "rb-entry-view.h" diff --git a/widgets/rb-entry-view.h b/widgets/rb-entry-view.h index c8c84057a..6b0fa9325 100644 --- a/widgets/rb-entry-view.h +++ b/widgets/rb-entry-view.h @@ -31,9 +31,7 @@ #ifndef __RB_ENTRY_VIEW_H #define __RB_ENTRY_VIEW_H -#include -#include -#include +#include #include "rhythmdb.h" #include "rhythmdb-query-model.h" diff --git a/widgets/rb-header.h b/widgets/rb-header.h index 630af645d..29a605018 100644 --- a/widgets/rb-header.h +++ b/widgets/rb-header.h @@ -31,7 +31,7 @@ #ifndef __RB_HEADER_H #define __RB_HEADER_H -#include +#include #include "rhythmdb.h" #include "rb-shell-player.h" diff --git a/widgets/rb-library-browser.h b/widgets/rb-library-browser.h index 803b57390..5ea5c080a 100644 --- a/widgets/rb-library-browser.h +++ b/widgets/rb-library-browser.h @@ -30,7 +30,7 @@ #ifndef __RB_LIBRARY_BROWSER_H #define __RB_LIBRARY_BROWSER_H -#include +#include #include "rhythmdb.h" #include "rhythmdb-query-model.h" diff --git a/widgets/rb-property-view.h b/widgets/rb-property-view.h index dc86339e7..770be667f 100644 --- a/widgets/rb-property-view.h +++ b/widgets/rb-property-view.h @@ -31,8 +31,7 @@ #ifndef __RB_PROPERTY_VIEW_H #define __RB_PROPERTY_VIEW_H -#include -#include +#include #include "rhythmdb.h" #include "rhythmdb-property-model.h" diff --git a/widgets/rb-query-creator-properties.c b/widgets/rb-query-creator-properties.c index e8b39a39b..cba589e5f 100644 --- a/widgets/rb-query-creator-properties.c +++ b/widgets/rb-query-creator-properties.c @@ -31,7 +31,7 @@ #include "config.h" #include -#include +#include #include #include "rhythmdb.h" diff --git a/widgets/rb-query-creator.h b/widgets/rb-query-creator.h index a0f31d853..5b1a614e4 100644 --- a/widgets/rb-query-creator.h +++ b/widgets/rb-query-creator.h @@ -27,7 +27,7 @@ * */ -#include +#include #include "rhythmdb.h" #include "rhythmdb-query-model.h" diff --git a/widgets/rb-rating.h b/widgets/rb-rating.h index 3d0e1fcd8..c2e8943a2 100644 --- a/widgets/rb-rating.h +++ b/widgets/rb-rating.h @@ -30,7 +30,7 @@ #ifndef RB_RATING_H #define RB_RATING_H -#include +#include G_BEGIN_DECLS diff --git a/widgets/rb-search-entry.h b/widgets/rb-search-entry.h index bad03d455..82ad03ba8 100644 --- a/widgets/rb-search-entry.h +++ b/widgets/rb-search-entry.h @@ -30,7 +30,7 @@ #ifndef __RB_SEARCH_ENTRY_H #define __RB_SEARCH_ENTRY_H -#include +#include G_BEGIN_DECLS diff --git a/widgets/rb-song-info.h b/widgets/rb-song-info.h index 4c1281d21..53d05a0ad 100644 --- a/widgets/rb-song-info.h +++ b/widgets/rb-song-info.h @@ -27,7 +27,7 @@ * */ -#include +#include #include "rb-entry-view.h" #include "rhythmdb.h" #include "rb-source.h" diff --git a/widgets/rb-uri-dialog.h b/widgets/rb-uri-dialog.h index 03af09a00..38ba50ad1 100644 --- a/widgets/rb-uri-dialog.h +++ b/widgets/rb-uri-dialog.h @@ -28,7 +28,7 @@ * */ -#include +#include #ifndef __RB_URI_DIALOG_H #define __RB_URI_DIALOG_H