gtranslator r3899 - in trunk: . plugins/dictionary plugins/open-tran plugins/subversion src src/dialogs src/plugin-system

[psanxiao svn gnome org]

Author: psanxiao
Date: Wed Dec 24 11:54:03 2008
New Revision: 3899
URL: http://svn.gnome.org/viewvc/gtranslator?rev=3899&view=rev

Log:

	    Patch by Tal Benavidor.
	    
	    * plugins/subversion/subversion-utils.h:
	    * plugins/open-tran/open-tran-plugin.c:
	    * plugins/dictionary/gdict-sidebar.c:
	    * plugins/dictionary/gdict-sidebar.h:
	    * src/message-area.h:
	    * src/utils.h:
	    * src/actions.h:
	    * src/io-error-message-area.h:
	    * src/plugin-system/plugin-info.c:
	    * src/dialogs/close-confirmation-dialog.h:
	    * src/message-table-model.c:
	    * src/message-table-model.h:
	    * src/statusbar.h:
	    * src/actions-help.c:
	    Cleaned up GLib and GTK+ includes. (Fixes bug #564468)


Modified:
   trunk/ChangeLog
   trunk/plugins/dictionary/gdict-sidebar.c
   trunk/plugins/dictionary/gdict-sidebar.h
   trunk/plugins/open-tran/open-tran-plugin.c
   trunk/plugins/subversion/subversion-utils.h
   trunk/src/actions-help.c
   trunk/src/actions.h
   trunk/src/dialogs/close-confirmation-dialog.h
   trunk/src/io-error-message-area.h
   trunk/src/message-area.h
   trunk/src/message-table-model.c
   trunk/src/message-table-model.h
   trunk/src/plugin-system/plugin-info.c
   trunk/src/statusbar.h
   trunk/src/utils.h

Modified: trunk/plugins/dictionary/gdict-sidebar.c
==============================================================================
--- trunk/plugins/dictionary/gdict-sidebar.c	(original)
+++ trunk/plugins/dictionary/gdict-sidebar.c	Wed Dec 24 11:54:03 2008
@@ -32,7 +32,7 @@
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkbindings.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include "gdict-sidebar.h"

Modified: trunk/plugins/dictionary/gdict-sidebar.h
==============================================================================
--- trunk/plugins/dictionary/gdict-sidebar.h	(original)
+++ trunk/plugins/dictionary/gdict-sidebar.h	Wed Dec 24 11:54:03 2008
@@ -24,7 +24,7 @@
 #ifndef __GDICT_SIDEBAR_H__
 #define __GDICT_SIDEBAR_H__
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 #define GDICT_TYPE_SIDEBAR		(gdict_sidebar_get_type ())
 #define GDICT_SIDEBAR(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GDICT_TYPE_SIDEBAR, GdictSidebar))

Modified: trunk/plugins/open-tran/open-tran-plugin.c
==============================================================================
--- trunk/plugins/open-tran/open-tran-plugin.c	(original)
+++ trunk/plugins/open-tran/open-tran-plugin.c	Wed Dec 24 11:54:03 2008
@@ -26,8 +26,7 @@
 
 #include <glib/gi18n-lib.h>
 #include <gconf/gconf-client.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
  
 #include "application.h"
 #include "window.h"

Modified: trunk/plugins/subversion/subversion-utils.h
==============================================================================
--- trunk/plugins/subversion/subversion-utils.h	(original)
+++ trunk/plugins/subversion/subversion-utils.h	Wed Dec 24 11:54:03 2008
@@ -22,8 +22,7 @@
 #ifndef GTR_SUBVERSION_UTILS_H
 #define GTR_SUBVERSION_UTILS_H 1
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <gio/gio.h>
 #include "window.h"
 #include "command.h"

Modified: trunk/src/actions-help.c
==============================================================================
--- trunk/src/actions-help.c	(original)
+++ trunk/src/actions-help.c	Wed Dec 24 11:54:03 2008
@@ -28,7 +28,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <gtk/gtkaboutdialog.h>
+#include <gtk/gtk.h>
 
 /*
  * Show the user's guide for gtranslator

Modified: trunk/src/actions.h
==============================================================================
--- trunk/src/actions.h	(original)
+++ trunk/src/actions.h	Wed Dec 24 11:54:03 2008
@@ -19,7 +19,7 @@
 #ifndef __ACTIONS_H__
 #define __ACTIONS_H__
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 #include <gio/gio.h>
 #include "window.h"
 

Modified: trunk/src/dialogs/close-confirmation-dialog.h
==============================================================================
--- trunk/src/dialogs/close-confirmation-dialog.h	(original)
+++ trunk/src/dialogs/close-confirmation-dialog.h	Wed Dec 24 11:54:03 2008
@@ -30,8 +30,7 @@
 #define __GTR_CLOSE_CONFIRMATION_DIALOG_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 #include "po.h"
 

Modified: trunk/src/io-error-message-area.h
==============================================================================
--- trunk/src/io-error-message-area.h	(original)
+++ trunk/src/io-error-message-area.h	Wed Dec 24 11:54:03 2008
@@ -20,7 +20,7 @@
 #define __IO_ERROR_MESSAGE_AREA_H__
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/message-area.h
==============================================================================
--- trunk/src/message-area.h	(original)
+++ trunk/src/message-area.h	Wed Dec 24 11:54:03 2008
@@ -31,7 +31,7 @@
 #ifndef __GTR_MESSAGE_AREA_H__
 #define __GTR_MESSAGE_AREA_H__
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/message-table-model.c
==============================================================================
--- trunk/src/message-table-model.c	(original)
+++ trunk/src/message-table-model.c	Wed Dec 24 11:54:03 2008
@@ -26,7 +26,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 
 #define G_LIST(x) ((GList *) x)
 

Modified: trunk/src/message-table-model.h
==============================================================================
--- trunk/src/message-table-model.h	(original)
+++ trunk/src/message-table-model.h	Wed Dec 24 11:54:03 2008
@@ -22,7 +22,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include "msg.h"
 
 G_BEGIN_DECLS

Modified: trunk/src/plugin-system/plugin-info.c
==============================================================================
--- trunk/src/plugin-system/plugin-info.c	(original)
+++ trunk/src/plugin-system/plugin-info.c	Wed Dec 24 11:54:03 2008
@@ -35,7 +35,7 @@
 
 #include <string.h>
 #include <glib/gi18n.h>
-#include <glib/gkeyfile.h>
+#include <glib.h>
 
 #include "plugin-info.h"
 #include "plugin-info-priv.h"

Modified: trunk/src/statusbar.h
==============================================================================
--- trunk/src/statusbar.h	(original)
+++ trunk/src/statusbar.h	Wed Dec 24 11:54:03 2008
@@ -21,7 +21,7 @@
 #ifndef GTR_STATUSBAR_H
 #define GTR_STATUSBAR_H
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/utils.h
==============================================================================
--- trunk/src/utils.h	(original)
+++ trunk/src/utils.h	Wed Dec 24 11:54:03 2008
@@ -24,10 +24,7 @@
 #ifndef GTR_UTILS_H
 #define GTR_UTILS_H 1
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkaboutdialog.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include <libxml/tree.h>
 #include <gio/gio.h>