gnome-applets r11126 - in trunk: accessx-status charpick cpufreq cpufreq/src geyes mini-commander mini-commander/src mixer multiload stickynotes trashapplet trashapplet/src

[callum svn gnome org]

Author: callum
Date: Fri Nov 14 03:34:37 2008
New Revision: 11126
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=11126&view=rev

Log:
 Patch from Maxim Ermilov to rationalise
GTK includes. See bug 560678.

Modified:
   trunk/accessx-status/ChangeLog
   trunk/accessx-status/applet.c
   trunk/accessx-status/applet.h
   trunk/charpick/ChangeLog
   trunk/charpick/properties.c
   trunk/cpufreq/ChangeLog
   trunk/cpufreq/src/cpufreq-applet.c
   trunk/cpufreq/src/cpufreq-popup.c
   trunk/cpufreq/src/cpufreq-prefs.h
   trunk/cpufreq/src/cpufreq-utils.c
   trunk/geyes/ChangeLog
   trunk/geyes/geyes.h
   trunk/geyes/themes.c
   trunk/mini-commander/ChangeLog
   trunk/mini-commander/src/preferences.h
   trunk/mixer/ChangeLog
   trunk/mixer/applet.c
   trunk/mixer/applet.h
   trunk/mixer/dock.c
   trunk/mixer/dock.h
   trunk/mixer/preferences.c
   trunk/mixer/preferences.h
   trunk/multiload/ChangeLog
   trunk/multiload/properties.c
   trunk/stickynotes/ChangeLog
   trunk/stickynotes/stickynotes_applet.c
   trunk/stickynotes/stickynotes_applet.h
   trunk/stickynotes/util.c
   trunk/stickynotes/util.h
   trunk/trashapplet/ChangeLog
   trunk/trashapplet/src/xstuff.h

Modified: trunk/accessx-status/applet.c
==============================================================================
--- trunk/accessx-status/applet.c	(original)
+++ trunk/accessx-status/applet.c	Fri Nov 14 03:34:37 2008
@@ -26,7 +26,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkaboutdialog.h>
 #include <libgnomeui/gnome-help.h>
 #include <panel-applet-gconf.h>
 #include <X11/XKBlib.h>

Modified: trunk/accessx-status/applet.h
==============================================================================
--- trunk/accessx-status/applet.h	(original)
+++ trunk/accessx-status/applet.h	Fri Nov 14 03:34:37 2008
@@ -20,8 +20,7 @@
 #ifndef __ACCESSX_APPLET_H__
 #define __ACCESSX_APPLET_H__
 
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #include <panel-applet.h>
 

Modified: trunk/charpick/properties.c
==============================================================================
--- trunk/charpick/properties.c	(original)
+++ trunk/charpick/properties.c	Fri Nov 14 03:34:37 2008
@@ -11,18 +11,7 @@
 #include <string.h>
 
 #include <atk/atkrelation.h>
-#include <gtk/gtkaccessible.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-help.h>
 
 #define CHARPICK_STOCK_EDIT "charpick-stock-edit"

Modified: trunk/cpufreq/src/cpufreq-applet.c
==============================================================================
--- trunk/cpufreq/src/cpufreq-applet.c	(original)
+++ trunk/cpufreq/src/cpufreq-applet.c	Fri Nov 14 03:34:37 2008
@@ -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>

Modified: trunk/cpufreq/src/cpufreq-popup.c
==============================================================================
--- trunk/cpufreq/src/cpufreq-popup.c	(original)
+++ trunk/cpufreq/src/cpufreq-popup.c	Fri Nov 14 03:34:37 2008
@@ -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>

Modified: trunk/cpufreq/src/cpufreq-prefs.h
==============================================================================
--- trunk/cpufreq/src/cpufreq-prefs.h	(original)
+++ trunk/cpufreq/src/cpufreq-prefs.h	Fri Nov 14 03:34:37 2008
@@ -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"
 

Modified: trunk/cpufreq/src/cpufreq-utils.c
==============================================================================
--- trunk/cpufreq/src/cpufreq-utils.c	(original)
+++ trunk/cpufreq/src/cpufreq-utils.c	Fri Nov 14 03:34:37 2008
@@ -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>

Modified: trunk/geyes/geyes.h
==============================================================================
--- trunk/geyes/geyes.h	(original)
+++ trunk/geyes/geyes.h	Fri Nov 14 03:34:37 2008
@@ -22,7 +22,7 @@
 
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <panel-applet.h>
 
 #define MAX_EYES 1000

Modified: trunk/geyes/themes.c
==============================================================================
--- trunk/geyes/themes.c	(original)
+++ trunk/geyes/themes.c	Fri Nov 14 03:34:37 2008
@@ -22,19 +22,7 @@
 #include <dirent.h>
 #include <limits.h>
 #include <ctype.h>
-
-#include <gtk/gtkbox.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkvbox.h>
-
+#include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 #include <panel-applet-gconf.h>
 #include <libgnomeui/gnome-help.h>

Modified: trunk/mini-commander/src/preferences.h
==============================================================================
--- trunk/mini-commander/src/preferences.h	(original)
+++ trunk/mini-commander/src/preferences.h	Fri Nov 14 03:34:37 2008
@@ -31,8 +31,7 @@
 #include <sys/types.h>
 #include <regex.h>
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 #include <bonobo/bonobo-ui-component.h>
 
 typedef struct {

Modified: trunk/mixer/applet.c
==============================================================================
--- trunk/mixer/applet.c	(original)
+++ trunk/mixer/applet.c	Fri Nov 14 03:34:37 2008
@@ -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>
 

Modified: trunk/mixer/applet.h
==============================================================================
--- trunk/mixer/applet.h	(original)
+++ trunk/mixer/applet.h	Fri Nov 14 03:34:37 2008
@@ -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>

Modified: trunk/mixer/dock.c
==============================================================================
--- trunk/mixer/dock.c	(original)
+++ trunk/mixer/dock.c	Fri Nov 14 03:34:37 2008
@@ -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"
 

Modified: trunk/mixer/dock.h
==============================================================================
--- trunk/mixer/dock.h	(original)
+++ trunk/mixer/dock.h	Fri Nov 14 03:34:37 2008
@@ -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
 

Modified: trunk/mixer/preferences.c
==============================================================================
--- trunk/mixer/preferences.c	(original)
+++ trunk/mixer/preferences.c	Fri Nov 14 03:34:37 2008
@@ -26,21 +26,9 @@
 #include <string.h>
 
 #include <glib/gi18n.h>
-#include <glib/gstring.h>
+#include <glib.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 <gtk/gtk.h>
 
 #ifdef HAVE_GST10
 #include <gst/interfaces/mixer.h>

Modified: trunk/mixer/preferences.h
==============================================================================
--- trunk/mixer/preferences.h	(original)
+++ trunk/mixer/preferences.h	Fri Nov 14 03:34:37 2008
@@ -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

Modified: trunk/multiload/properties.c
==============================================================================
--- trunk/multiload/properties.c	(original)
+++ trunk/multiload/properties.c	Fri Nov 14 03:34:37 2008
@@ -13,16 +13,7 @@
 
 #include <string.h>
 
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkcolorbutton.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtksizegroup.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 #include <gconf/gconf-client.h>
 #include <libgnomeui/gnome-help.h>

Modified: trunk/stickynotes/stickynotes_applet.c
==============================================================================
--- trunk/stickynotes/stickynotes_applet.c	(original)
+++ trunk/stickynotes/stickynotes_applet.c	Fri Nov 14 03:34:37 2008
@@ -23,7 +23,7 @@
 #include "stickynotes_applet_callbacks.h"
 #include "stickynotes.h"
 
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 #include <libgnomeui/gnome-client.h>
 #include <libgnomeui/gnome-icon-theme.h>
 #include <libgnomeui/gnome-window-icon.h>

Modified: trunk/stickynotes/stickynotes_applet.h
==============================================================================
--- trunk/stickynotes/stickynotes_applet.h	(original)
+++ trunk/stickynotes/stickynotes_applet.h	Fri Nov 14 03:34:37 2008
@@ -20,11 +20,9 @@
 #ifndef __STICKYNOTES_APPLET_H__
 #define __STICKYNOTES_APPLET_H__
 
-#include <gdk/gdkscreen.h>
+#include <gdk/gdk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkbuilder.h>
+#include <gtk/gtk.h>
 #include <panel-applet.h>
 #include <gconf/gconf-client.h>
 

Modified: trunk/stickynotes/util.c
==============================================================================
--- trunk/stickynotes/util.c	(original)
+++ trunk/stickynotes/util.c	Fri Nov 14 03:34:37 2008
@@ -26,7 +26,7 @@
 #include <X11/Xatom.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 /* Returns the current date in a customizable form, the default
  * looks like this: "Nov 30, '78" */

Modified: trunk/stickynotes/util.h
==============================================================================
--- trunk/stickynotes/util.h	(original)
+++ trunk/stickynotes/util.h	Fri Nov 14 03:34:37 2008
@@ -21,7 +21,7 @@
 #define __UTIL_H__
 
 #include <glib.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 gchar * get_current_date(const gchar *format);
 void	xstuff_change_workspace (GtkWindow *window,

Modified: trunk/trashapplet/src/xstuff.h
==============================================================================
--- trunk/trashapplet/src/xstuff.h	(original)
+++ trunk/trashapplet/src/xstuff.h	Fri Nov 14 03:34:37 2008
@@ -2,7 +2,7 @@
 #define __XSTUFF_H__
 
 #include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 void xstuff_delete_property		(GdkWindow *window,
 					 const char *name);