diff options
Diffstat (limited to 'stickynotes')
| -rw-r--r-- | stickynotes/ChangeLog | 6 | ||||
| -rw-r--r-- | stickynotes/stickynotes_applet.c | 2 | ||||
| -rw-r--r-- | stickynotes/stickynotes_applet.h | 6 | ||||
| -rw-r--r-- | stickynotes/util.c | 2 | ||||
| -rw-r--r-- | stickynotes/util.h | 2 |
5 files changed, 11 insertions, 7 deletions
diff --git a/stickynotes/ChangeLog b/stickynotes/ChangeLog index 5afce70bc..21b5e8ae1 100644 --- a/stickynotes/ChangeLog +++ b/stickynotes/ChangeLog @@ -1,3 +1,9 @@ +2008-11-14 Callum McKenzie <callum@spooky-possum.org> + + * util.[ch]: + * stickynotes_applet.[ch]: Patch from Maxim Ermilov to rationalise + GTK includes. See bug 560678. + 2008-11-09 Mario Blättermann <mariobl@svn.gnome.org> * docs/de/de.po: Updated German translation diff --git a/stickynotes/stickynotes_applet.c b/stickynotes/stickynotes_applet.c index cc5ed457f..7b868492a 100644 --- a/stickynotes/stickynotes_applet.c +++ b/stickynotes/stickynotes_applet.c @@ -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> diff --git a/stickynotes/stickynotes_applet.h b/stickynotes/stickynotes_applet.h index 55fc25834..92a64283e 100644 --- a/stickynotes/stickynotes_applet.h +++ b/stickynotes/stickynotes_applet.h @@ -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> diff --git a/stickynotes/util.c b/stickynotes/util.c index cb3f1c4f9..7238553fa 100644 --- a/stickynotes/util.c +++ b/stickynotes/util.c @@ -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" */ diff --git a/stickynotes/util.h b/stickynotes/util.h index 2ec111ef6..6ffe823af 100644 --- a/stickynotes/util.h +++ b/stickynotes/util.h @@ -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, |