diff options
| author | Callum McKenzie <callum@src.gnome.org> | 2008-11-14 03:34:37 +0000 |
|---|---|---|
| committer | Callum McKenzie <callum@src.gnome.org> | 2008-11-14 03:34:37 +0000 |
| commit | 22a41c9ce9ef56fd17cda37ae88f4d66f9c9e534 (patch) | |
| tree | 7c2ee65bb3f4b776956f74119461502702a561ff /mixer | |
| parent | 050ed8da4b77363766c8cc5872bfac991515bebb (diff) | |
Patch from Maxim Ermilov to rationalise
GTK includes. See bug 560678.
svn path=/trunk/; revision=11126
Diffstat (limited to 'mixer')
| -rw-r--r-- | mixer/ChangeLog | 7 | ||||
| -rw-r--r-- | mixer/applet.c | 8 | ||||
| -rw-r--r-- | mixer/applet.h | 3 | ||||
| -rw-r--r-- | mixer/dock.c | 9 | ||||
| -rw-r--r-- | mixer/dock.h | 4 | ||||
| -rw-r--r-- | mixer/preferences.c | 18 | ||||
| -rw-r--r-- | mixer/preferences.h | 2 |
7 files changed, 15 insertions, 36 deletions
diff --git a/mixer/ChangeLog b/mixer/ChangeLog index 9a8310dc6..5d0fe6e41 100644 --- a/mixer/ChangeLog +++ b/mixer/ChangeLog @@ -1,3 +1,10 @@ +2008-11-14 Callum McKenzie <callum@spooky-possum.org> + + * preferences.[ch]: + * dock.[ch]: + * applet.[ch]: Patch from Maxim Ermilov to rationalise + GTK includes. See bug 560678. + 2008-11-07 Mario Blättermann <mariobl@svngnome.org> * docs/de/de.po: Added German translation diff --git a/mixer/applet.c b/mixer/applet.c index c4fa558e6..30756eeb2 100644 --- a/mixer/applet.c +++ b/mixer/applet.c @@ -32,13 +32,7 @@ #include <glib-object.h> #include <gdk/gdkkeysyms.h> -#include <gtk/gtkaboutdialog.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkicontheme.h> -#include <gtk/gtkmain.h> -#include <gtk/gtkmessagedialog.h> -#include <gtk/gtkrange.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include <gconf/gconf-client.h> diff --git a/mixer/applet.h b/mixer/applet.h index c524f5e4a..c8551f602 100644 --- a/mixer/applet.h +++ b/mixer/applet.h @@ -25,8 +25,7 @@ #include <glib.h> -#include <gtk/gtkicontheme.h> -#include <gtk/gtkimage.h> +#include <gtk/gtk.h> #include <gconf/gconf-client.h> #include <panel-applet-gconf.h> #include <gst/gst.h> diff --git a/mixer/dock.c b/mixer/dock.c index 8a2edf4f6..0fb9a600b 100644 --- a/mixer/dock.c +++ b/mixer/dock.c @@ -25,14 +25,7 @@ #include <glib-object.h> #include <glib/gi18n.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkframe.h> -#include <gtk/gtkrange.h> -#include <gtk/gtkhscale.h> -#include <gtk/gtktable.h> -#include <gtk/gtkvscale.h> -#include <gtk/gtkwidget.h> - +#include <gtk/gtk.h> #include "dock.h" diff --git a/mixer/dock.h b/mixer/dock.h index c28890cf3..1c7e9ece5 100644 --- a/mixer/dock.h +++ b/mixer/dock.h @@ -24,9 +24,7 @@ #include <glib.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkrange.h> -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/mixer/preferences.c b/mixer/preferences.c index 02b738022..ea79f3a63 100644 --- a/mixer/preferences.c +++ b/mixer/preferences.c @@ -26,21 +26,9 @@ #include <string.h> #include <glib/gi18n.h> -#include <glib/gstring.h> - -#include <gtk/gtkbox.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkcelllayout.h> -#include <gtk/gtkcombobox.h> -#include <gtk/gtkdialog.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkliststore.h> -#include <gtk/gtkmisc.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtkstock.h> -#include <gtk/gtktreemodel.h> -#include <gtk/gtktreeselection.h> -#include <gtk/gtkvbox.h> +#include <glib.h> + +#include <gtk/gtk.h> #ifdef HAVE_GST10 #include <gst/interfaces/mixer.h> diff --git a/mixer/preferences.h b/mixer/preferences.h index 45744a336..424b65145 100644 --- a/mixer/preferences.h +++ b/mixer/preferences.h @@ -23,7 +23,7 @@ #define __GVA_PREFERENCES_H__ #include <glib.h> -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include <panel-applet.h> #include <panel-applet-gconf.h> #ifdef HAVE_GST10 |