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 /cpufreq | |
| parent | 050ed8da4b77363766c8cc5872bfac991515bebb (diff) | |
Patch from Maxim Ermilov to rationalise
GTK includes. See bug 560678.
svn path=/trunk/; revision=11126
Diffstat (limited to 'cpufreq')
| -rw-r--r-- | cpufreq/ChangeLog | 8 | ||||
| -rw-r--r-- | cpufreq/src/cpufreq-applet.c | 9 | ||||
| -rw-r--r-- | cpufreq/src/cpufreq-popup.c | 5 | ||||
| -rw-r--r-- | cpufreq/src/cpufreq-prefs.h | 2 | ||||
| -rw-r--r-- | cpufreq/src/cpufreq-utils.c | 2 |
5 files changed, 12 insertions, 14 deletions
diff --git a/cpufreq/ChangeLog b/cpufreq/ChangeLog index 9155cb214..d8530c341 100644 --- a/cpufreq/ChangeLog +++ b/cpufreq/ChangeLog @@ -1,3 +1,11 @@ +2008-11-14 Callum McKenzie <callum@spooky-possum.org> + + * cpufreq-utils.c: + * cpufreq-popup.c: + * cpufreq-prefs.h: + * cpufreq-applet.c: Patch from Maxim Ermilov to rationalise + GTK includes. See bug 560678. + ==================== 2.24.0.1 ==================== 2008-08-20 Philipp Kerling <k.philipp@gmail.com> diff --git a/cpufreq/src/cpufreq-applet.c b/cpufreq/src/cpufreq-applet.c index 26a104491..8a72333f6 100644 --- a/cpufreq/src/cpufreq-applet.c +++ b/cpufreq/src/cpufreq-applet.c @@ -23,14 +23,7 @@ #include "config.h" #endif -#include <gtk/gtklabel.h> -#include <gtk/gtkbox.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkimage.h> -#include <gtk/gtkaccessible.h> -#include <gtk/gtkalignment.h> -#include <gtk/gtkaboutdialog.h> +#include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <libgnomeui/gnome-help.h> #include <panel-applet.h> diff --git a/cpufreq/src/cpufreq-popup.c b/cpufreq/src/cpufreq-popup.c index 105b126d9..806f604fa 100644 --- a/cpufreq/src/cpufreq-popup.c +++ b/cpufreq/src/cpufreq-popup.c @@ -21,10 +21,7 @@ #include <glib/gi18n.h> -#include <gtk/gtkaction.h> -#include <gtk/gtktoggleaction.h> -#include <gtk/gtkradioaction.h> -#include <gtk/gtkuimanager.h> +#include <gtk/gtk.h> #include <gdk/gdkx.h> #include <stdlib.h> #include <string.h> diff --git a/cpufreq/src/cpufreq-prefs.h b/cpufreq/src/cpufreq-prefs.h index 49725eabe..324ab7f91 100644 --- a/cpufreq/src/cpufreq-prefs.h +++ b/cpufreq/src/cpufreq-prefs.h @@ -22,7 +22,7 @@ #ifndef CPUFREQ_PREFS_H #define CPUFREQ_PREFS_H -#include <gdk/gdkscreen.h> +#include <gdk/gdk.h> #include <glib-object.h> #include "cpufreq-applet.h" diff --git a/cpufreq/src/cpufreq-utils.c b/cpufreq/src/cpufreq-utils.c index 05a0a8da2..944906642 100644 --- a/cpufreq/src/cpufreq-utils.c +++ b/cpufreq/src/cpufreq-utils.c @@ -29,7 +29,7 @@ #endif #include <glib.h> -#include <gtk/gtkmessagedialog.h> +#include <gtk/gtk.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> |