GNOME Goal: Clean up GLib and GTK+ includes (Closes: #564000)

2008-12-15  Pedro Fragoso  <[email protected]>

	* 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

@@ -1,3 +1,64 @@
+2008-12-15  Pedro Fragoso  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* backends/gstreamer/rb-player-gst-xfade.c: (create_stream):

lib/eel-gconf-extensions.h

@@ -25,7 +25,7 @@
 #ifndef EEL_GCONF_EXTENSIONS_H
 #define EEL_GCONF_EXTENSIONS_H
 
-#include <glib/gerror.h>
+#include <glib.h>
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 

lib/rb-tree-dnd.c

@@ -20,11 +20,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtktreednd.h>
+#include <gtk/gtk.h>
 #include "rb-tree-dnd.h"
 
 #include "rb-debug.h"

lib/rb-tree-dnd.h

@@ -20,9 +20,7 @@
 #ifndef __RB_TREE_DND_H__
 #define __RB_TREE_DND_H__
 
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

lib/rb-util.h

@@ -32,9 +32,7 @@
 
 #include <stdarg.h>
 #include <glib.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

plugins/audiocd/sj-metadata-getter.h

@@ -22,7 +22,7 @@
 #define SJ_METADATA_GETTER_H
 
 #include <glib-object.h>
-#include <glib/gerror.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

plugins/audiocd/sj-metadata-gvfs.c

@@ -25,10 +25,7 @@
 #include <string.h>
 #include <glib-object.h>
 #include <glib/gi18n.h>
-#include <glib/gerror.h>
-#include <glib/glist.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <gio/gio.h>
 
 #include "sj-metadata-gvfs.h"

plugins/audiocd/sj-metadata-musicbrainz.c

@@ -25,10 +25,7 @@
 #include <string.h>
 #include <glib-object.h>
 #include <glib/gi18n.h>
-#include <glib/gerror.h>
-#include <glib/glist.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 #include <gconf/gconf-client.h>
 #include <musicbrainz/queries.h>
 #include <musicbrainz/mb_c.h>

plugins/audiocd/sj-metadata.h

@@ -22,7 +22,7 @@
 #define SJ_METADATA_H
 
 #include <glib-object.h>
-#include <glib/gerror.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

plugins/audiocd/sj-structures.c

@@ -22,8 +22,7 @@
  */
 
 #include "sj-structures.h"
-#include <glib/gmessages.h>
-#include <glib/glist.h>
+#include <glib.h>
 
 /**
  * Free a TrackDetails*

plugins/audiocd/sj-structures.h

@@ -24,8 +24,7 @@
 #ifndef SJ_STRUCTURES_H
 #define SJ_STRUCTURES_H
 
-#include <glib/glist.h>
-#include <glib/gdate.h>
+#include <glib.h>
 
 typedef enum _MetadataSource MetadataSource;
 

plugins/iradio/rb-station-properties-dialog.h

@@ -27,7 +27,7 @@
  *
  */
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include "rb-entry-view.h"
 #include "rb-plugin.h"
 

plugins/mtpdevice/rb-mtp-source.c

@@ -30,7 +30,7 @@
 #include <config.h>
 
 #include <string.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include "rhythmdb.h"

plugins/rb-plugins-engine.c

@@ -35,8 +35,8 @@
 
 #include <string.h>
 
+#include <glib.h>
 #include <glib/gi18n.h>
-#include <glib/gkeyfile.h>
 
 #include "eel-gconf-extensions.h"
 #include "rb-file-helpers.h"

podcast/rb-feed-podcast-properties-dialog.c

@@ -36,7 +36,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <glib/gurifuncs.h>
+#include <glib.h>
 
 #include "rb-feed-podcast-properties-dialog.h"
 #include "rb-file-helpers.h"

podcast/rb-podcast-properties-dialog.c

@@ -36,7 +36,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <glib/gurifuncs.h>
+#include <glib.h>
 
 #include "rb-podcast-properties-dialog.h"
 #include "rb-file-helpers.h"

podcast/rb-podcast-properties-dialog.h

@@ -27,7 +27,7 @@
  *
  */
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include "rb-entry-view.h"
 
 #ifndef __RB_PODCAST_PROPERTIES_DIALOG_H

rhythmdb/rhythmdb-property-model.c

@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib/gi18n.h>
-#include <glib/gsequence.h>
+#include <glib.h>
 
 #include "rhythmdb-property-model.h"
 #include "rb-debug.h"

rhythmdb/rhythmdb-property-model.h

@@ -30,7 +30,7 @@
 #include "config.h"
 #include <glib-object.h>
 #include <glib.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 #include "rhythmdb.h"
 #include "rhythmdb-query-model.h"

rhythmdb/rhythmdb-query-model.c

@@ -35,9 +35,9 @@
 #include <string.h>
 #include <stdio.h>
 #include <math.h>
-#include <glib/gsequence.h>
+#include <glib.h>
 
-#include <gtk/gtktreednd.h>
+#include <gtk/gtk.h>
 
 #include "rhythmdb-query-model.h"
 #include "rb-debug.h"

rhythmdb/rhythmdb-tree.c

@@ -43,9 +43,9 @@
 #include <string.h>
 #include <math.h>
 #include <glib/gprintf.h>
-#include <glib/gatomic.h>
+#include <glib.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 #include <libxml/entities.h>
 #include <libxml/SAX.h>
 #include <libxml/parserInternals.h>

rhythmdb/rhythmdb-tree.h

@@ -32,7 +32,7 @@
 
 #include "rhythmdb-private.h"
 #include <glib-object.h>
-#include <glib/gatomic.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

shell/rb-history.c

@@ -31,7 +31,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gsequence.h>
 
 #include "rb-history.h"
 

shell/rb-history.h

@@ -27,7 +27,7 @@
  *
  */
 
-#include <glib/glist.h>
+#include <glib.h>
 #include "rhythmdb.h"
 #include "rb-shell-player.h"
 

shell/rb-shell-clipboard.c

@@ -50,7 +50,6 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkstock.h>
 
 #include "rb-shell-clipboard.h"
 #include "rb-playlist-manager.h"

shell/rb-shell-clipboard.h

@@ -29,7 +29,7 @@
 
 #include "rb-source.h"
 
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 
 #ifndef __RB_SHELL_CLIPBOARD_H
 #define __RB_SHELL_CLIPBOARD_H

shell/rb-shell-player.h

@@ -28,9 +28,7 @@
  *
  */
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 
 #include "rb-source.h"
 #include "rhythmdb.h"

shell/rb-shell-preferences.h

@@ -27,7 +27,7 @@
  *
  */
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include "rb-preferences.h"
 
 #ifndef __RB_SHELL_PREFERENCES_H

shell/rb-source-header.h

@@ -27,8 +27,7 @@
  *
  */
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 
 #include "rb-source.h"
 

shell/rb-statusbar.h

@@ -27,8 +27,7 @@
  *
  */
 
-#include <gtk/gtkstatusbar.h>
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 
 #include "rb-source.h"
 #include "rhythmdb.h"

shell/rb-tray-icon.h

@@ -27,8 +27,7 @@
  *
  */
 
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 #include "eggtrayicon.h"
 #include "rhythmdb.h"
 #include "rb-shell.h"

sources/rb-browser-source.h

@@ -30,8 +30,7 @@
 #ifndef __RB_BROWSER_SOURCE_H
 #define __RB_BROWSER_SOURCE_H
 
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 
 #include "rb-shell.h"
 #include "rb-source.h"

sources/rb-library-source.h

@@ -30,8 +30,7 @@
 #ifndef __RB_LIBRARY_SOURCE_H
 #define __RB_LIBRARY_SOURCE_H
 
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 
 #include "rb-shell.h"
 #include "rb-browser-source.h"

sources/rb-removable-media-source.c

@@ -34,9 +34,7 @@
 #include <string.h>
 
 #include <glib/gi18n.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 
 #include "rhythmdb.h"
 #include "eel-gconf-extensions.h"