gnome-terminal r2823 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Thu May 29 19:57:37 2008
New Revision: 2823
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2823&view=rev

Log:
Clean up the includes a bit.


Modified:
   trunk/src/encoding.h
   trunk/src/profile-editor.c
   trunk/src/terminal-app.c
   trunk/src/terminal-tabs-menu.c
   trunk/src/terminal-tabs-menu.h
   trunk/src/terminal-util.c
   trunk/src/terminal-window.c
   trunk/src/terminal-window.h
   trunk/src/terminal.c

Modified: trunk/src/encoding.h
==============================================================================
--- trunk/src/encoding.h	(original)
+++ trunk/src/encoding.h	Thu May 29 19:57:37 2008
@@ -22,7 +22,7 @@
 #ifndef TERMINAL_ENCODING_H
 #define TERMINAL_ENCODING_H
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 typedef struct
 {

Modified: trunk/src/profile-editor.c
==============================================================================
--- trunk/src/profile-editor.c	(original)
+++ trunk/src/profile-editor.c	Thu May 29 19:57:37 2008
@@ -29,7 +29,6 @@
 #include "profile-editor.h"
 #include "terminal-util.h"
 
-#include <libgnomeui/gnome-icon-entry.h>
 #include <libgnomeui/gnome-thumbnail.h>
 
 /* One slot in the ring buffer, plus the array which holds the data for

Modified: trunk/src/terminal-app.c
==============================================================================
--- trunk/src/terminal-app.c	(original)
+++ trunk/src/terminal-app.c	Thu May 29 19:57:37 2008
@@ -34,15 +34,12 @@
 #include <bonobo-activation/bonobo-activation-register.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-listener.h>
-#include <libgnome/gnome-program.h>
 #include <libgnome/gnome-help.h>
-#include <libgnomeui/gnome-ui-init.h>
 #include <libgnomeui/gnome-url.h>
 #include <libgnomeui/gnome-client.h>
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
-#include <gdk/gdkx.h>
 
 #define FALLBACK_PROFILE_ID "Default"
 

Modified: trunk/src/terminal-tabs-menu.c
==============================================================================
--- trunk/src/terminal-tabs-menu.c	(original)
+++ trunk/src/terminal-tabs-menu.c	Thu May 29 19:57:37 2008
@@ -16,26 +16,19 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- *  $Id$
  */
 
-#include "config.h"
+#include <config.h>
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <gtk/gtk.h>
 
 #include "terminal-tabs-menu.h"
 #include "terminal-screen.h"
 #include "terminal-screen-container.h"
-
 #include "terminal-intl.h"
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkaccelmap.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtktoggleaction.h>
-#include <gtk/gtkradioaction.h>
-#include <gtk/gtkuimanager.h>
-#include <string.h>
-#include <stdlib.h>
 
 #define LABEL_WIDTH_CHARS 32
 #define ACTION_VERB_FORMAT_PREFIX       "JmpTab"

Modified: trunk/src/terminal-tabs-menu.h
==============================================================================
--- trunk/src/terminal-tabs-menu.h	(original)
+++ trunk/src/terminal-tabs-menu.h	Thu May 29 19:57:37 2008
@@ -14,8 +14,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- *  $Id$
  */
 
 #ifndef TERMINAL_TABS_MENU_H

Modified: trunk/src/terminal-util.c
==============================================================================
--- trunk/src/terminal-util.c	(original)
+++ trunk/src/terminal-util.c	Thu May 29 19:57:37 2008
@@ -29,7 +29,6 @@
 
 #include <gio/gio.h>
 #include <gtk/gtk.h>
-//#include "gdk/gdkapplaunchcontext.h"
 
 #include <gconf/gconf-client.h>
 #include <libgnome/gnome-help.h>

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Thu May 29 19:57:37 2008
@@ -21,8 +21,7 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <libgnome/gnome-program.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
 #include <libsn/sn-launchee.h>

Modified: trunk/src/terminal-window.h
==============================================================================
--- trunk/src/terminal-window.h	(original)
+++ trunk/src/terminal-window.h	Thu May 29 19:57:37 2008
@@ -20,8 +20,8 @@
 #ifndef TERMINAL_WINDOW_H
 #define TERMINAL_WINDOW_H
 
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
+
 #include "terminal-screen.h"
 
 G_BEGIN_DECLS

Modified: trunk/src/terminal.c
==============================================================================
--- trunk/src/terminal.c	(original)
+++ trunk/src/terminal.c	Thu May 29 19:57:37 2008
@@ -36,10 +36,7 @@
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-listener.h>
 #include <libgnome/gnome-program.h>
-#include <libgnome/gnome-help.h>
 #include <libgnomeui/gnome-ui-init.h>
-#include <libgnomeui/gnome-url.h>
-#include <libgnomeui/gnome-client.h>
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>