tomboy r2251 - in trunk: . Tomboy/Addins/PrintNotes libtomboy

[sharm svn gnome org]

Author: sharm
Date: Mon Dec 15 01:31:35 2008
New Revision: 2251
URL: http://svn.gnome.org/viewvc/tomboy?rev=2251&view=rev

Log:
* tomboy/libtomboy/tomboyutil.c:
* tomboy/libtomboy/tomboyutil.h:
* tomboy/libtomboy/eggaccelerators.h:
* tomboy/libtomboy/tomboykeybinder.c:
* tomboy/libtomboy/tomboykeybinder.h:
* tomboy/Tomboy/Addins/PrintNotes/gedit-print.h:
* tomboy/Tomboy/Addins/PrintNotes/gedit-print.c:
* tomboy/Tomboy/Addins/PrintNotes/gtksourceprintjob.h:
* tomboy/Tomboy/Addins/PrintNotes/gtksourceprintjob.c: Cleaned up gtk
  and glib includes to use only toplevel headers. Fixes bug #564235,
  patch courtesy of PrzemysÅaw Grzegorczyk.

Modified:
   trunk/ChangeLog
   trunk/Tomboy/Addins/PrintNotes/gedit-print.c
   trunk/Tomboy/Addins/PrintNotes/gedit-print.h
   trunk/Tomboy/Addins/PrintNotes/gtksourceprintjob.c
   trunk/Tomboy/Addins/PrintNotes/gtksourceprintjob.h
   trunk/libtomboy/eggaccelerators.h
   trunk/libtomboy/tomboykeybinder.c
   trunk/libtomboy/tomboykeybinder.h
   trunk/libtomboy/tomboyutil.c
   trunk/libtomboy/tomboyutil.h

Modified: trunk/Tomboy/Addins/PrintNotes/gedit-print.c
==============================================================================
--- trunk/Tomboy/Addins/PrintNotes/gedit-print.c	(original)
+++ trunk/Tomboy/Addins/PrintNotes/gedit-print.c	Mon Dec 15 01:31:35 2008
@@ -39,14 +39,6 @@
 #include <string.h>	/* For strlen */
 
 #include <glib/gi18n.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkprogressbar.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkwindow.h>
 #include <libgnomeprintui/gnome-print-dialog.h>
 #include <libgnomeprintui/gnome-print-job-preview.h>
 

Modified: trunk/Tomboy/Addins/PrintNotes/gedit-print.h
==============================================================================
--- trunk/Tomboy/Addins/PrintNotes/gedit-print.h	(original)
+++ trunk/Tomboy/Addins/PrintNotes/gedit-print.h	Mon Dec 15 01:31:35 2008
@@ -30,7 +30,7 @@
 #ifndef __GEDIT_PRINT_H__
 #define __GEDIT_PRINT_H__
 
-#include <gtk/gtktextview.h>
+#include <gtk/gtk.h>
 
 void gedit_print 		(GtkTextView* view);
 void gedit_print_preview	(GtkTextView* view);

Modified: trunk/Tomboy/Addins/PrintNotes/gtksourceprintjob.c
==============================================================================
--- trunk/Tomboy/Addins/PrintNotes/gtksourceprintjob.c	(original)
+++ trunk/Tomboy/Addins/PrintNotes/gtksourceprintjob.c	Mon Dec 15 01:31:35 2008
@@ -36,8 +36,6 @@
 #include "gtksourceprintjob.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtktextview.h>
 #include <libgnomeprint/gnome-print-pango.h>
 
 #ifdef ENABLE_PROFILE

Modified: trunk/Tomboy/Addins/PrintNotes/gtksourceprintjob.h
==============================================================================
--- trunk/Tomboy/Addins/PrintNotes/gtksourceprintjob.h	(original)
+++ trunk/Tomboy/Addins/PrintNotes/gtksourceprintjob.h	Mon Dec 15 01:31:35 2008
@@ -26,7 +26,7 @@
 
 #include <libgnomeprint/gnome-print-config.h>
 #include <libgnomeprint/gnome-print-job.h>
-#include <gtk/gtktextbuffer.h>
+#include <gtk/gtk.h>
 //#include <gtksourceview/gtksourceview.h>
 
 G_BEGIN_DECLS

Modified: trunk/libtomboy/eggaccelerators.h
==============================================================================
--- trunk/libtomboy/eggaccelerators.h	(original)
+++ trunk/libtomboy/eggaccelerators.h	Mon Dec 15 01:31:35 2008
@@ -20,7 +20,7 @@
 #ifndef __EGG_ACCELERATORS_H__
 #define __EGG_ACCELERATORS_H__
 
-#include <gtk/gtkaccelgroup.h>
+#include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
 G_BEGIN_DECLS

Modified: trunk/libtomboy/tomboykeybinder.c
==============================================================================
--- trunk/libtomboy/tomboykeybinder.c	(original)
+++ trunk/libtomboy/tomboykeybinder.c	Mon Dec 15 01:31:35 2008
@@ -23,7 +23,6 @@
 #include <string.h>
 
 #include <gdk/gdk.h>
-#include <gdk/gdkwindow.h>
 #include <gdk/gdkx.h>
 #include <X11/Xlib.h>
 

Modified: trunk/libtomboy/tomboykeybinder.h
==============================================================================
--- trunk/libtomboy/tomboykeybinder.h	(original)
+++ trunk/libtomboy/tomboykeybinder.h	Mon Dec 15 01:31:35 2008
@@ -23,7 +23,7 @@
 #ifndef __TOMBOY_KEY_BINDER_H__
 #define __TOMBOY_KEY_BINDER_H__
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libtomboy/tomboyutil.c
==============================================================================
--- trunk/libtomboy/tomboyutil.c	(original)
+++ trunk/libtomboy/tomboyutil.c	Mon Dec 15 01:31:35 2008
@@ -22,7 +22,6 @@
  */
 
 #include <gdk/gdk.h>
-#include <gdk/gdkwindow.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <X11/Xlib.h>

Modified: trunk/libtomboy/tomboyutil.h
==============================================================================
--- trunk/libtomboy/tomboyutil.h	(original)
+++ trunk/libtomboy/tomboyutil.h	Mon Dec 15 01:31:35 2008
@@ -23,9 +23,8 @@
 #ifndef __TOMBOY_UTIL_H__
 #define __TOMBOY_UTIL_H__
 
-#include <gdk/gdkpixmap.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS