sound-juicer r2417 - in trunk: . libjuicer src

[rburton svn gnome org]

Author: rburton
Date: Sat Feb  7 17:53:07 2009
New Revision: 2417
URL: http://svn.gnome.org/viewvc/sound-juicer?rev=2417&view=rev

Log:
2009-01-26  Pedro Fragoso  <ember ubuntu com>

	* libjuicer/sj-extractor.c:
	* libjuicer/sj-extractor.h:
	* libjuicer/sj-metadata-cdtext.c:
	* libjuicer/sj-util.h:
	* src/gconf-bridge.c:
	* src/gconf-bridge.h:
	* src/gedit-message-area.h:
	* src/sj-about.c:
	* src/sj-about.h:
	* src/sj-extracting.c:
	* src/sj-extracting.h:
	* src/sj-main.h:
	* src/sj-play.c:
	* src/sj-play.h:
	* src/sound-juicer.h:
	GNOME Goal: Clean up GLib and GTK+ includes (Closes #563798)


Modified:
   trunk/ChangeLog
   trunk/libjuicer/sj-extractor.c
   trunk/libjuicer/sj-extractor.h
   trunk/libjuicer/sj-metadata-cdtext.c
   trunk/libjuicer/sj-util.h
   trunk/src/gconf-bridge.c
   trunk/src/gconf-bridge.h
   trunk/src/gedit-message-area.h
   trunk/src/sj-about.c
   trunk/src/sj-about.h
   trunk/src/sj-extracting.c
   trunk/src/sj-extracting.h
   trunk/src/sj-main.h
   trunk/src/sj-play.c
   trunk/src/sj-play.h
   trunk/src/sound-juicer.h

Modified: trunk/libjuicer/sj-extractor.c
==============================================================================
--- trunk/libjuicer/sj-extractor.c	(original)
+++ trunk/libjuicer/sj-extractor.c	Sat Feb  7 17:53:07 2009
@@ -25,8 +25,7 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <string.h>
-#include <glib/gerror.h>
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib/gi18n.h>
 #include <glib-object.h>
 #include <gst/gst.h>

Modified: trunk/libjuicer/sj-extractor.h
==============================================================================
--- trunk/libjuicer/sj-extractor.h	(original)
+++ trunk/libjuicer/sj-extractor.h	Sat Feb  7 17:53:07 2009
@@ -23,7 +23,7 @@
 #ifndef SJ_EXTRACTOR_H
 #define SJ_EXTRACTOR_H
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <gio/gio.h>
 #include <profiles/audio-profile.h>

Modified: trunk/libjuicer/sj-metadata-cdtext.c
==============================================================================
--- trunk/libjuicer/sj-metadata-cdtext.c	(original)
+++ trunk/libjuicer/sj-metadata-cdtext.c	Sat Feb  7 17:53:07 2009
@@ -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 <cdio/cdio.h>
 #include <cdio/cdtext.h>
 

Modified: trunk/libjuicer/sj-util.h
==============================================================================
--- trunk/libjuicer/sj-util.h	(original)
+++ trunk/libjuicer/sj-util.h	Sat Feb  7 17:53:07 2009
@@ -25,7 +25,7 @@
 
 #include <sys/types.h>
 #include <gio/gio.h>
-#include <gtk/gtkfilechooser.h>
+#include <gtk/gtk.h>
 
 gboolean make_directory_with_parents (GFile *uri, GCancellable  *cancellable, GError **error);
 

Modified: trunk/src/gconf-bridge.c
==============================================================================
--- trunk/src/gconf-bridge.c	(original)
+++ trunk/src/gconf-bridge.c	Sat Feb  7 17:53:07 2009
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include <glib/gi18n-lib.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 #include <string.h>
 
 #include "gconf-bridge.h"

Modified: trunk/src/gconf-bridge.h
==============================================================================
--- trunk/src/gconf-bridge.h	(original)
+++ trunk/src/gconf-bridge.h	Sat Feb  7 17:53:07 2009
@@ -23,8 +23,7 @@
 #define __GCONF_BRIDGE_H__
 
 #include <gconf/gconf-client.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/gedit-message-area.h
==============================================================================
--- trunk/src/gedit-message-area.h	(original)
+++ trunk/src/gedit-message-area.h	Sat Feb  7 17:53:07 2009
@@ -31,7 +31,7 @@
 #ifndef __GEDIT_MESSAGE_AREA_H__
 #define __GEDIT_MESSAGE_AREA_H__
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/sj-about.c
==============================================================================
--- trunk/src/sj-about.c	(original)
+++ trunk/src/sj-about.c	Sat Feb  7 17:53:07 2009
@@ -22,7 +22,7 @@
 
 #include "sound-juicer.h"
 
-#include <gtk/gtkaboutdialog.h>
+#include <gtk/gtk.h>
 #include <string.h>
 #include "sj-about.h"
 

Modified: trunk/src/sj-about.h
==============================================================================
--- trunk/src/sj-about.h	(original)
+++ trunk/src/sj-about.h	Sat Feb  7 17:53:07 2009
@@ -23,7 +23,7 @@
 #ifndef SJ_ABOUT_H
 #define SJ_ABOUT_H
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 void on_about_activate (void);
 

Modified: trunk/src/sj-extracting.c
==============================================================================
--- trunk/src/sj-extracting.c	(original)
+++ trunk/src/sj-extracting.c	Sat Feb  7 17:53:07 2009
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <limits.h>
 
-#include <glib/glist.h>
+#include <glib.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 

Modified: trunk/src/sj-extracting.h
==============================================================================
--- trunk/src/sj-extracting.h	(original)
+++ trunk/src/sj-extracting.h	Sat Feb  7 17:53:07 2009
@@ -23,7 +23,7 @@
 #ifndef SJ_EXTRACTING_H
 #define SJ_EXTRACTING_H
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "sj-structures.h"
 
 void on_extract_activate (GtkWidget *button, gpointer user_data);

Modified: trunk/src/sj-main.h
==============================================================================
--- trunk/src/sj-main.h	(original)
+++ trunk/src/sj-main.h	Sat Feb  7 17:53:07 2009
@@ -21,7 +21,7 @@
 #ifndef SJ_MAIN_H
 #define SJ_MAIN_H
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "sj-structures.h"
 
 void sj_stock_init (void);

Modified: trunk/src/sj-play.c
==============================================================================
--- trunk/src/sj-play.c	(original)
+++ trunk/src/sj-play.c	Sat Feb  7 17:53:07 2009
@@ -25,13 +25,7 @@
 #endif
 
 #include <gst/gst.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkrange.h>
-#include <gtk/gtkstatusbar.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 
 #include "sound-juicer.h"
 #include "sj-play.h"

Modified: trunk/src/sj-play.h
==============================================================================
--- trunk/src/sj-play.h	(original)
+++ trunk/src/sj-play.h	Sat Feb  7 17:53:07 2009
@@ -23,7 +23,7 @@
 #ifndef SJ_PLAY_H
 #define SJ_PLAY_H
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "sj-structures.h"
 
 void sj_play_init (void);

Modified: trunk/src/sound-juicer.h
==============================================================================
--- trunk/src/sound-juicer.h	(original)
+++ trunk/src/sound-juicer.h	Sat Feb  7 17:53:07 2009
@@ -32,9 +32,7 @@
 #include <gconf/gconf-client.h>
 #include <glade/glade-xml.h>
 #include <gio/gio.h>
-#include <gtk/gtkwidget.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkliststore.h>
 #include "sj-extractor.h"
 
 /**