GNOME.org
 

rhythmbox r6099 - in trunk: . lib plugins plugins/audiocd plugins/iradio plugins/mtpdevice podcast rhythmdb shell sources widgets widgets/libsexy

Author: jmatthew
Date: Mon Dec 15 13:19:50 2008
New Revision: 6099
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6099&view=rev

Log:
2008-12-15  Pedro Fragoso  <ember ubuntu com>

	* 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)


Modified:
   trunk/ChangeLog
   trunk/lib/eel-gconf-extensions.h
   trunk/lib/rb-tree-dnd.c
   trunk/lib/rb-tree-dnd.h
   trunk/lib/rb-util.h
   trunk/plugins/audiocd/sj-metadata-getter.h
   trunk/plugins/audiocd/sj-metadata-gvfs.c
   trunk/plugins/audiocd/sj-metadata-musicbrainz.c
   trunk/plugins/audiocd/sj-metadata.h
   trunk/plugins/audiocd/sj-structures.c
   trunk/plugins/audiocd/sj-structures.h
   trunk/plugins/iradio/rb-station-properties-dialog.h
   trunk/plugins/mtpdevice/rb-mtp-source.c
   trunk/plugins/rb-plugins-engine.c
   trunk/podcast/rb-feed-podcast-properties-dialog.c
   trunk/podcast/rb-podcast-properties-dialog.c
   trunk/podcast/rb-podcast-properties-dialog.h
   trunk/rhythmdb/rhythmdb-property-model.c
   trunk/rhythmdb/rhythmdb-property-model.h
   trunk/rhythmdb/rhythmdb-query-model.c
   trunk/rhythmdb/rhythmdb-tree.c
   trunk/rhythmdb/rhythmdb-tree.h
   trunk/shell/rb-history.c
   trunk/shell/rb-history.h
   trunk/shell/rb-shell-clipboard.c
   trunk/shell/rb-shell-clipboard.h
   trunk/shell/rb-shell-player.h
   trunk/shell/rb-shell-preferences.h
   trunk/shell/rb-source-header.h
   trunk/shell/rb-statusbar.h
   trunk/shell/rb-tray-icon.h
   trunk/sources/rb-browser-source.h
   trunk/sources/rb-library-source.h
   trunk/sources/rb-removable-media-source.c
   trunk/sources/rb-source.c
   trunk/sources/rb-source.h
   trunk/sources/rb-sourcelist-model.h
   trunk/sources/rb-sourcelist.h
   trunk/widgets/bacon-volume.h
   trunk/widgets/eggtrayicon.c
   trunk/widgets/eggtrayicon.h
   trunk/widgets/gedit-message-area.h
   trunk/widgets/gossip-cell-renderer-expander.c
   trunk/widgets/gossip-cell-renderer-expander.h
   trunk/widgets/libsexy/sexy-icon-entry.h
   trunk/widgets/libsexy/sexy-tooltip.h
   trunk/widgets/rb-cell-renderer-pixbuf.h
   trunk/widgets/rb-cell-renderer-rating.h
   trunk/widgets/rb-dialog.h
   trunk/widgets/rb-entry-view.c
   trunk/widgets/rb-entry-view.h
   trunk/widgets/rb-header.h
   trunk/widgets/rb-library-browser.h
   trunk/widgets/rb-property-view.h
   trunk/widgets/rb-query-creator-properties.c
   trunk/widgets/rb-query-creator.h
   trunk/widgets/rb-rating.h
   trunk/widgets/rb-search-entry.h
   trunk/widgets/rb-song-info.h
   trunk/widgets/rb-uri-dialog.h

Modified: trunk/lib/eel-gconf-extensions.h
==============================================================================
--- trunk/lib/eel-gconf-extensions.h	(original)
+++ trunk/lib/eel-gconf-extensions.h	Mon Dec 15 13:19:50 2008
@@ -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>
 

Modified: trunk/lib/rb-tree-dnd.c
==============================================================================
--- trunk/lib/rb-tree-dnd.c	(original)
+++ trunk/lib/rb-tree-dnd.c	Mon Dec 15 13:19:50 2008
@@ -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"

Modified: trunk/lib/rb-tree-dnd.h
==============================================================================
--- trunk/lib/rb-tree-dnd.h	(original)
+++ trunk/lib/rb-tree-dnd.h	Mon Dec 15 13:19:50 2008
@@ -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
 

Modified: trunk/lib/rb-util.h
==============================================================================
--- trunk/lib/rb-util.h	(original)
+++ trunk/lib/rb-util.h	Mon Dec 15 13:19:50 2008
@@ -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
 

Modified: trunk/plugins/audiocd/sj-metadata-getter.h
==============================================================================
--- trunk/plugins/audiocd/sj-metadata-getter.h	(original)
+++ trunk/plugins/audiocd/sj-metadata-getter.h	Mon Dec 15 13:19:50 2008
@@ -22,7 +22,7 @@
 #define SJ_METADATA_GETTER_H
 
 #include <glib-object.h>
-#include <glib/gerror.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/plugins/audiocd/sj-metadata-gvfs.c
==============================================================================
--- trunk/plugins/audiocd/sj-metadata-gvfs.c	(original)
+++ trunk/plugins/audiocd/sj-metadata-gvfs.c	Mon Dec 15 13:19:50 2008
@@ -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"

Modified: trunk/plugins/audiocd/sj-metadata-musicbrainz.c
==============================================================================
--- trunk/plugins/audiocd/sj-metadata-musicbrainz.c	(original)
+++ trunk/plugins/audiocd/sj-metadata-musicbrainz.c	Mon Dec 15 13:19:50 2008
@@ -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>

Modified: trunk/plugins/audiocd/sj-metadata.h
==============================================================================
--- trunk/plugins/audiocd/sj-metadata.h	(original)
+++ trunk/plugins/audiocd/sj-metadata.h	Mon Dec 15 13:19:50 2008
@@ -22,7 +22,7 @@
 #define SJ_METADATA_H
 
 #include <glib-object.h>
-#include <glib/gerror.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/plugins/audiocd/sj-structures.c
==============================================================================
--- trunk/plugins/audiocd/sj-structures.c	(original)
+++ trunk/plugins/audiocd/sj-structures.c	Mon Dec 15 13:19:50 2008
@@ -22,8 +22,7 @@
  */
 
 #include "sj-structures.h"
-#include <glib/gmessages.h>
-#include <glib/glist.h>
+#include <glib.h>
 
 /**
  * Free a TrackDetails*

Modified: trunk/plugins/audiocd/sj-structures.h
==============================================================================
--- trunk/plugins/audiocd/sj-structures.h	(original)
+++ trunk/plugins/audiocd/sj-structures.h	Mon Dec 15 13:19:50 2008
@@ -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;
 

Modified: trunk/plugins/iradio/rb-station-properties-dialog.h
==============================================================================
--- trunk/plugins/iradio/rb-station-properties-dialog.h	(original)
+++ trunk/plugins/iradio/rb-station-properties-dialog.h	Mon Dec 15 13:19:50 2008
@@ -27,7 +27,7 @@
  *
  */
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include "rb-entry-view.h"
 #include "rb-plugin.h"
 

Modified: trunk/plugins/mtpdevice/rb-mtp-source.c
==============================================================================
--- trunk/plugins/mtpdevice/rb-mtp-source.c	(original)
+++ trunk/plugins/mtpdevice/rb-mtp-source.c	Mon Dec 15 13:19:50 2008
@@ -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"

Modified: trunk/plugins/rb-plugins-engine.c
==============================================================================
--- trunk/plugins/rb-plugins-engine.c	(original)
+++ trunk/plugins/rb-plugins-engine.c	Mon Dec 15 13:19:50 2008
@@ -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"

Modified: trunk/podcast/rb-feed-podcast-properties-dialog.c
==============================================================================
--- trunk/podcast/rb-feed-podcast-properties-dialog.c	(original)
+++ trunk/podcast/rb-feed-podcast-properties-dialog.c	Mon Dec 15 13:19:50 2008
@@ -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"

Modified: trunk/podcast/rb-podcast-properties-dialog.c
==============================================================================
--- trunk/podcast/rb-podcast-properties-dialog.c	(original)
+++ trunk/podcast/rb-podcast-properties-dialog.c	Mon Dec 15 13:19:50 2008
@@ -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"

Modified: trunk/podcast/rb-podcast-properties-dialog.h
==============================================================================
--- trunk/podcast/rb-podcast-properties-dialog.h	(original)
+++ trunk/podcast/rb-podcast-properties-dialog.h	Mon Dec 15 13:19:50 2008
@@ -27,7 +27,7 @@
  *
  */
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include "rb-entry-view.h"
 
 #ifndef __RB_PODCAST_PROPERTIES_DIALOG_H

Modified: trunk/rhythmdb/rhythmdb-property-model.c
==============================================================================
--- trunk/rhythmdb/rhythmdb-property-model.c	(original)
+++ trunk/rhythmdb/rhythmdb-property-model.c	Mon Dec 15 13:19:50 2008
@@ -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"

Modified: trunk/rhythmdb/rhythmdb-property-model.h
==============================================================================
--- trunk/rhythmdb/rhythmdb-property-model.h	(original)
+++ trunk/rhythmdb/rhythmdb-property-model.h	Mon Dec 15 13:19:50 2008
@@ -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"

Modified: trunk/rhythmdb/rhythmdb-query-model.c
==============================================================================
--- trunk/rhythmdb/rhythmdb-query-model.c	(original)
+++ trunk/rhythmdb/rhythmdb-query-model.c	Mon Dec 15 13:19:50 2008
@@ -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"

Modified: trunk/rhythmdb/rhythmdb-tree.c
==============================================================================
--- trunk/rhythmdb/rhythmdb-tree.c	(original)
+++ trunk/rhythmdb/rhythmdb-tree.c	Mon Dec 15 13:19:50 2008
@@ -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>

Modified: trunk/rhythmdb/rhythmdb-tree.h
==============================================================================
--- trunk/rhythmdb/rhythmdb-tree.h	(original)
+++ trunk/rhythmdb/rhythmdb-tree.h	Mon Dec 15 13:19:50 2008
@@ -32,7 +32,7 @@
 
 #include "rhythmdb-private.h"
 #include <glib-object.h>
-#include <glib/gatomic.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/shell/rb-history.c
==============================================================================
--- trunk/shell/rb-history.c	(original)
+++ trunk/shell/rb-history.c	Mon Dec 15 13:19:50 2008
@@ -31,7 +31,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gsequence.h>
 
 #include "rb-history.h"
 

Modified: trunk/shell/rb-history.h
==============================================================================
--- trunk/shell/rb-history.h	(original)
+++ trunk/shell/rb-history.h	Mon Dec 15 13:19:50 2008
@@ -27,7 +27,7 @@
  *
  */
 
-#include <glib/glist.h>
+#include <glib.h>
 #include "rhythmdb.h"
 #include "rb-shell-player.h"
 

Modified: trunk/shell/rb-shell-clipboard.c
==============================================================================
--- trunk/shell/rb-shell-clipboard.c	(original)
+++ trunk/shell/rb-shell-clipboard.c	Mon Dec 15 13:19:50 2008
@@ -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"

Modified: trunk/shell/rb-shell-clipboard.h
==============================================================================
--- trunk/shell/rb-shell-clipboard.h	(original)
+++ trunk/shell/rb-shell-clipboard.h	Mon Dec 15 13:19:50 2008
@@ -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

Modified: trunk/shell/rb-shell-player.h
==============================================================================
--- trunk/shell/rb-shell-player.h	(original)
+++ trunk/shell/rb-shell-player.h	Mon Dec 15 13:19:50 2008
@@ -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"

Modified: trunk/shell/rb-shell-preferences.h
==============================================================================
--- trunk/shell/rb-shell-preferences.h	(original)
+++ trunk/shell/rb-shell-preferences.h	Mon Dec 15 13:19:50 2008
@@ -27,7 +27,7 @@
  *
  */
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include "rb-preferences.h"
 
 #ifndef __RB_SHELL_PREFERENCES_H

Modified: trunk/shell/rb-source-header.h
==============================================================================
--- trunk/shell/rb-source-header.h	(original)
+++ trunk/shell/rb-source-header.h	Mon Dec 15 13:19:50 2008
@@ -27,8 +27,7 @@
  *
  */
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 
 #include "rb-source.h"
 

Modified: trunk/shell/rb-statusbar.h
==============================================================================
--- trunk/shell/rb-statusbar.h	(original)
+++ trunk/shell/rb-statusbar.h	Mon Dec 15 13:19:50 2008
@@ -27,8 +27,7 @@
  *
  */
 
-#include <gtk/gtkstatusbar.h>
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 
 #include "rb-source.h"
 #include "rhythmdb.h"

Modified: trunk/shell/rb-tray-icon.h
==============================================================================
--- trunk/shell/rb-tray-icon.h	(original)
+++ trunk/shell/rb-tray-icon.h	Mon Dec 15 13:19:50 2008
@@ -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"

Modified: trunk/sources/rb-browser-source.h
==============================================================================
--- trunk/sources/rb-browser-source.h	(original)
+++ trunk/sources/rb-browser-source.h	Mon Dec 15 13:19:50 2008
@@ -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"

Modified: trunk/sources/rb-library-source.h
==============================================================================
--- trunk/sources/rb-library-source.h	(original)
+++ trunk/sources/rb-library-source.h	Mon Dec 15 13:19:50 2008
@@ -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"

Modified: trunk/sources/rb-removable-media-source.c
==============================================================================
--- trunk/sources/rb-removable-media-source.c	(original)
+++ trunk/sources/rb-removable-media-source.c	Mon Dec 15 13:19:50 2008
@@ -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"

Modified: trunk/sources/rb-source.c
==============================================================================
--- trunk/sources/rb-source.c	(original)
+++ trunk/sources/rb-source.c	Mon Dec 15 13:19:50 2008
@@ -35,7 +35,7 @@
 #include <string.h>
 
 #include <glib/gi18n.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 
 #include "rb-cut-and-paste-code.h"
 #include "rb-debug.h"

Modified: trunk/sources/rb-source.h
==============================================================================
--- trunk/sources/rb-source.h	(original)
+++ trunk/sources/rb-source.h	Mon Dec 15 13:19:50 2008
@@ -31,8 +31,7 @@
 #ifndef __RB_SOURCE_H
 #define __RB_SOURCE_H
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 
 #include "rb-source-group.h"
 #include "rb-entry-view.h"

Modified: trunk/sources/rb-sourcelist-model.h
==============================================================================
--- trunk/sources/rb-sourcelist-model.h	(original)
+++ trunk/sources/rb-sourcelist-model.h	Mon Dec 15 13:19:50 2008
@@ -31,7 +31,7 @@
 #ifndef __RB_SOURCELIST_MODEL_H
 #define __RB_SOURCELIST_MODEL_H
 
-#include <gtk/gtktreemodelfilter.h>
+#include <gtk/gtk.h>
 
 #include "rb-source.h"
 

Modified: trunk/sources/rb-sourcelist.h
==============================================================================
--- trunk/sources/rb-sourcelist.h	(original)
+++ trunk/sources/rb-sourcelist.h	Mon Dec 15 13:19:50 2008
@@ -31,7 +31,7 @@
 #ifndef __RB_SOURCELIST_H
 #define __RB_SOURCELIST_H
 
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 
 #include "rb-source.h"
 #include "rb-shell.h"

Modified: trunk/widgets/bacon-volume.h
==============================================================================
--- trunk/widgets/bacon-volume.h	(original)
+++ trunk/widgets/bacon-volume.h	Mon Dec 15 13:19:50 2008
@@ -21,8 +21,7 @@
 #define __BACON_VOLUME_BUTTON_H__
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/widgets/eggtrayicon.c
==============================================================================
--- trunk/widgets/eggtrayicon.c	(original)
+++ trunk/widgets/eggtrayicon.c	Mon Dec 15 13:19:50 2008
@@ -27,7 +27,7 @@
 #include "rb-file-helpers.h"
 
 #include <gdkconfig.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 #if defined (GDK_WINDOWING_X11)
 #include <gdk/gdkx.h>
 #include <X11/Xatom.h>

Modified: trunk/widgets/eggtrayicon.h
==============================================================================
--- trunk/widgets/eggtrayicon.h	(original)
+++ trunk/widgets/eggtrayicon.h	Mon Dec 15 13:19:50 2008
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include <gtk/gtkplug.h>
+#include <gtk/gtk.h>
 #ifdef GDK_WINDOWING_X11
 #include <gdk/gdkx.h>
 #endif

Modified: trunk/widgets/gedit-message-area.h
==============================================================================
--- trunk/widgets/gedit-message-area.h	(original)
+++ trunk/widgets/gedit-message-area.h	Mon Dec 15 13:19:50 2008
@@ -39,7 +39,7 @@
 #ifndef __GEDIT_MESSAGE_AREA_H__
 #define __GEDIT_MESSAGE_AREA_H__
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/widgets/gossip-cell-renderer-expander.c
==============================================================================
--- trunk/widgets/gossip-cell-renderer-expander.c	(original)
+++ trunk/widgets/gossip-cell-renderer-expander.c	Mon Dec 15 13:19:50 2008
@@ -29,7 +29,7 @@
 
 #include "config.h"
 
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 #include "gossip-cell-renderer-expander.h"
 

Modified: trunk/widgets/gossip-cell-renderer-expander.h
==============================================================================
--- trunk/widgets/gossip-cell-renderer-expander.h	(original)
+++ trunk/widgets/gossip-cell-renderer-expander.h	Mon Dec 15 13:19:50 2008
@@ -21,7 +21,7 @@
 #ifndef __GOSSIP_CELL_RENDERER_EXPANDER_H__
 #define __GOSSIP_CELL_RENDERER_EXPANDER_H__
 
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/widgets/libsexy/sexy-icon-entry.h
==============================================================================
--- trunk/widgets/libsexy/sexy-icon-entry.h	(original)
+++ trunk/widgets/libsexy/sexy-icon-entry.h	Mon Dec 15 13:19:50 2008
@@ -25,8 +25,7 @@
 typedef struct _SexyIconEntryClass SexyIconEntryClass;
 typedef struct _SexyIconEntryPriv  SexyIconEntryPriv;
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 
 #define SEXY_TYPE_ICON_ENTRY (sexy_icon_entry_get_type())
 #define SEXY_ICON_ENTRY(obj) \

Modified: trunk/widgets/libsexy/sexy-tooltip.h
==============================================================================
--- trunk/widgets/libsexy/sexy-tooltip.h	(original)
+++ trunk/widgets/libsexy/sexy-tooltip.h	Mon Dec 15 13:19:50 2008
@@ -25,7 +25,7 @@
 typedef struct _SexyTooltipClass SexyTooltipClass;
 typedef struct _SexyTooltipPriv  SexyTooltipPriv;
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #define SEXY_TYPE_TOOLTIP            (sexy_tooltip_get_type())
 #define SEXY_TOOLTIP(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), SEXY_TYPE_TOOLTIP, SexyTooltip))

Modified: trunk/widgets/rb-cell-renderer-pixbuf.h
==============================================================================
--- trunk/widgets/rb-cell-renderer-pixbuf.h	(original)
+++ trunk/widgets/rb-cell-renderer-pixbuf.h	Mon Dec 15 13:19:50 2008
@@ -24,7 +24,7 @@
 #ifndef __RB_CELL_RENDERER_PIXBUF_H__
 #define __RB_CELL_RENDERER_PIXBUF_H__
 
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: trunk/widgets/rb-cell-renderer-rating.h
==============================================================================
--- trunk/widgets/rb-cell-renderer-rating.h	(original)
+++ trunk/widgets/rb-cell-renderer-rating.h	Mon Dec 15 13:19:50 2008
@@ -24,7 +24,7 @@
 #ifndef __RB_CELL_RENDERER_RATING_H
 #define __RB_CELL_RENDERER_RATING_H
 
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/widgets/rb-dialog.h
==============================================================================
--- trunk/widgets/rb-dialog.h	(original)
+++ trunk/widgets/rb-dialog.h	Mon Dec 15 13:19:50 2008
@@ -31,8 +31,7 @@
 #ifndef __RB_DIALOG_H
 #define __RB_DIALOG_H
 
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkfilechooserdialog.h>
+#include <gtk/gtk.h>
 #include <stdarg.h>
 
 G_BEGIN_DECLS

Modified: trunk/widgets/rb-entry-view.c
==============================================================================
--- trunk/widgets/rb-entry-view.c	(original)
+++ trunk/widgets/rb-entry-view.c	Mon Dec 15 13:19:50 2008
@@ -72,7 +72,7 @@
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <glib/gurifuncs.h>
+#include <glib.h>
 
 #include "rb-tree-dnd.h"
 #include "rb-entry-view.h"

Modified: trunk/widgets/rb-entry-view.h
==============================================================================
--- trunk/widgets/rb-entry-view.h	(original)
+++ trunk/widgets/rb-entry-view.h	Mon Dec 15 13:19:50 2008
@@ -31,9 +31,7 @@
 #ifndef __RB_ENTRY_VIEW_H
 #define __RB_ENTRY_VIEW_H
 
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>
 
 #include "rhythmdb.h"
 #include "rhythmdb-query-model.h"

Modified: trunk/widgets/rb-header.h
==============================================================================
--- trunk/widgets/rb-header.h	(original)
+++ trunk/widgets/rb-header.h	Mon Dec 15 13:19:50 2008
@@ -31,7 +31,7 @@
 #ifndef __RB_HEADER_H
 #define __RB_HEADER_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 #include "rhythmdb.h"
 #include "rb-shell-player.h"

Modified: trunk/widgets/rb-library-browser.h
==============================================================================
--- trunk/widgets/rb-library-browser.h	(original)
+++ trunk/widgets/rb-library-browser.h	Mon Dec 15 13:19:50 2008
@@ -30,7 +30,7 @@
 #ifndef __RB_LIBRARY_BROWSER_H
 #define __RB_LIBRARY_BROWSER_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 #include "rhythmdb.h"
 #include "rhythmdb-query-model.h"

Modified: trunk/widgets/rb-property-view.h
==============================================================================
--- trunk/widgets/rb-property-view.h	(original)
+++ trunk/widgets/rb-property-view.h	Mon Dec 15 13:19:50 2008
@@ -31,8 +31,7 @@
 #ifndef __RB_PROPERTY_VIEW_H
 #define __RB_PROPERTY_VIEW_H
 
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>
 
 #include "rhythmdb.h"
 #include "rhythmdb-property-model.h"

Modified: trunk/widgets/rb-query-creator-properties.c
==============================================================================
--- trunk/widgets/rb-query-creator-properties.c	(original)
+++ trunk/widgets/rb-query-creator-properties.c	Mon Dec 15 13:19:50 2008
@@ -31,7 +31,7 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-#include <glib/gurifuncs.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 
 #include "rhythmdb.h"

Modified: trunk/widgets/rb-query-creator.h
==============================================================================
--- trunk/widgets/rb-query-creator.h	(original)
+++ trunk/widgets/rb-query-creator.h	Mon Dec 15 13:19:50 2008
@@ -27,7 +27,7 @@
  *
  */
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #include "rhythmdb.h"
 #include "rhythmdb-query-model.h"

Modified: trunk/widgets/rb-rating.h
==============================================================================
--- trunk/widgets/rb-rating.h	(original)
+++ trunk/widgets/rb-rating.h	Mon Dec 15 13:19:50 2008
@@ -30,7 +30,7 @@
 #ifndef RB_RATING_H
 #define RB_RATING_H
 
-#include <gtk/gtkeventbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/widgets/rb-search-entry.h
==============================================================================
--- trunk/widgets/rb-search-entry.h	(original)
+++ trunk/widgets/rb-search-entry.h	Mon Dec 15 13:19:50 2008
@@ -30,7 +30,7 @@
 #ifndef __RB_SEARCH_ENTRY_H
 #define __RB_SEARCH_ENTRY_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/widgets/rb-song-info.h
==============================================================================
--- trunk/widgets/rb-song-info.h	(original)
+++ trunk/widgets/rb-song-info.h	Mon Dec 15 13:19:50 2008
@@ -27,7 +27,7 @@
  *
  */
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 #include "rb-entry-view.h"
 #include "rhythmdb.h"
 #include "rb-source.h"

Modified: trunk/widgets/rb-uri-dialog.h
==============================================================================
--- trunk/widgets/rb-uri-dialog.h	(original)
+++ trunk/widgets/rb-uri-dialog.h	Mon Dec 15 13:19:50 2008
@@ -28,7 +28,7 @@
  *
  */
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #ifndef __RB_URI_DIALOG_H
 #define __RB_URI_DIALOG_H
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]