Commit 75d6ca16 authored by Wouter Bolsterlee's avatar Wouter Bolsterlee Committed by Wouter Bolsterlee

More #include cleanups. Again: reordering, single gtk.h includes and other

2008-08-03  Wouter Bolsterlee  <wbolster@svn.gnome.org>

	* backend/impress/impress-document.c:
	* backend/impress/render.h:
	* libdocument/ev-document-factory.c:
	* libdocument/ev-document-factory.h:
	* libdocument/ev-document-links.h:
	* libdocument/ev-document-misc.c:
	* libdocument/ev-document-misc.h:
	* properties/ev-properties-main.c:
	* properties/ev-properties-view.c:
	* properties/ev-properties-view.h:
	* shell/eggfindbar.c:
	* shell/eggfindbar.h:
	* shell/ev-application.c:
	* shell/ev-application.h:
	* shell/ev-jobs.h:
	* shell/ev-message-area.h:
	* shell/ev-navigation-action.c:
	* shell/ev-navigation-action.h:
	* shell/ev-open-recent-action.c:
	* shell/ev-open-recent-action.h:
	* shell/ev-page-action-widget.c:
	* shell/ev-page-action.c:
	* shell/ev-page-action.h:
	* shell/ev-page-cache.h:
	* shell/ev-password-view.h:
	* shell/ev-password.h:
	* shell/ev-pixbuf-cache.h:
	* shell/ev-properties-fonts.c:
	* shell/ev-sidebar-attachments.c:
	* shell/ev-sidebar-links.c:
	* shell/ev-sidebar-links.h:
	* shell/ev-sidebar-thumbnails.c:
	* shell/ev-sidebar-thumbnails.h:
	* shell/ev-sidebar.c:
	* shell/ev-sidebar.h:
	* shell/ev-stock-icons.c:
	* shell/ev-tooltip.h:
	* shell/ev-view.c:
	* shell/ev-view.h:
	* shell/ev-window.c:
	* shell/ev-window.h:
	* shell/main.c:

	More #include cleanups. Again: reordering, single gtk.h
	includes and other stuff.


svn path=/trunk/; revision=3095
parent 3e7d5f82
2008-08-03 Wouter Bolsterlee <wbolster@svn.gnome.org>
* backend/impress/impress-document.c:
* backend/impress/render.h:
* libdocument/ev-document-factory.c:
* libdocument/ev-document-factory.h:
* libdocument/ev-document-links.h:
* libdocument/ev-document-misc.c:
* libdocument/ev-document-misc.h:
* properties/ev-properties-main.c:
* properties/ev-properties-view.c:
* properties/ev-properties-view.h:
* shell/eggfindbar.c:
* shell/eggfindbar.h:
* shell/ev-application.c:
* shell/ev-application.h:
* shell/ev-jobs.h:
* shell/ev-message-area.h:
* shell/ev-navigation-action.c:
* shell/ev-navigation-action.h:
* shell/ev-open-recent-action.c:
* shell/ev-open-recent-action.h:
* shell/ev-page-action-widget.c:
* shell/ev-page-action.c:
* shell/ev-page-action.h:
* shell/ev-page-cache.h:
* shell/ev-password-view.h:
* shell/ev-password.h:
* shell/ev-pixbuf-cache.h:
* shell/ev-properties-fonts.c:
* shell/ev-sidebar-attachments.c:
* shell/ev-sidebar-links.c:
* shell/ev-sidebar-links.h:
* shell/ev-sidebar-thumbnails.c:
* shell/ev-sidebar-thumbnails.h:
* shell/ev-sidebar.c:
* shell/ev-sidebar.h:
* shell/ev-stock-icons.c:
* shell/ev-tooltip.h:
* shell/ev-view.c:
* shell/ev-view.h:
* shell/ev-window.c:
* shell/ev-window.h:
* shell/main.c:
More #include cleanups. Again: reordering, single gtk.h
includes and other stuff.
2008-08-03 Wouter Bolsterlee <wbolster@svn.gnome.org>
* shell/eggfindbar.c:
......
......@@ -20,15 +20,16 @@
#include "config.h"
#include <config.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <string.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include "imposter.h"
#include "impress-document.h"
#include "ev-document-thumbnails.h"
#include "ev-document-misc.h"
#include "ev-document-thumbnails.h"
struct _ImpressDocumentClass
{
......
......@@ -9,7 +9,7 @@
#ifndef OO_RENDER_H
#define OO_RENDER_H
#include <gtk/gtkdrawingarea.h>
#include <gtk/gtk.h>
#define OO_TYPE_RENDER (oo_render_get_type())
#define OO_RENDER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), OO_TYPE_RENDER , OORender))
......
......@@ -23,6 +23,7 @@
#endif
#include <string.h>
#include <gio/gio.h>
#include <glib/gstdio.h>
#include <glib/gi18n.h>
......
......@@ -22,6 +22,7 @@
#define EV_DOCUMENT_FACTORY_H
#include <gtk/gtk.h>
#include "ev-document.h"
G_BEGIN_DECLS
......
......@@ -33,7 +33,6 @@
G_BEGIN_DECLS
#define EV_TYPE_DOCUMENT_LINKS (ev_document_links_get_type ())
#define EV_DOCUMENT_LINKS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EV_TYPE_DOCUMENT_LINKS, EvDocumentLinks))
#define EV_DOCUMENT_LINKS_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EV_TYPE_DOCUMENT_LINKS, EvDocumentLinksIface))
......
......@@ -18,10 +18,13 @@
*/
#include <config.h>
#include "ev-document-misc.h"
#include <string.h>
#include <gtk/gtk.h>
#include "ev-document-misc.h"
/* Returns a new GdkPixbuf that is suitable for placing in the thumbnail view.
* It is four pixels wider and taller than the source. If source_pixbuf is not
* NULL, then it will fill the return pixbuf with the contents of
......
......@@ -22,14 +22,13 @@
#ifndef EV_DOCUMENT_MISC_H
#define EV_DOCUMENT_MISC_H
#include <cairo.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtkstyle.h>
#include <cairo.h>
G_BEGIN_DECLS
GdkPixbuf *ev_document_misc_get_thumbnail_frame (int width,
int height,
GdkPixbuf *source_pixbuf);
......
......@@ -27,17 +27,20 @@
*
*/
#include "ev-properties-view.h"
#include "ev-backends-manager.h"
#include "ev-document-factory.h"
#include <config.h>
#include <string.h>
#include <glib/gi18n-lib.h>
#include <gtk/gtklabel.h>
#include <gtk/gtk.h>
#include <libnautilus-extension/nautilus-extension-types.h>
#include <libnautilus-extension/nautilus-property-page-provider.h>
#include "ev-properties-view.h"
#include "ev-backends-manager.h"
#include "ev-document-factory.h"
static GType epp_type = 0;
static void property_page_provider_iface_init
(NautilusPropertyPageProviderIface *iface);
......
......@@ -18,25 +18,23 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "ev-properties-view.h"
#include "ev-document-fonts.h"
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gtk/gtkversion.h>
#include <glade/glade.h>
#include <time.h>
#include <sys/time.h>
#include <string.h>
#include <sys/time.h>
#include <time.h>
#ifdef HAVE__NL_MEASUREMENT_MEASUREMENT
#include <langinfo.h>
#endif
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
#include "ev-properties-view.h"
#include "ev-document-fonts.h"
typedef enum
{
TITLE_PROPERTY,
......
......@@ -21,9 +21,9 @@
#ifndef __EV_PROPERTIES_VIEW_H__
#define __EV_PROPERTIES_VIEW_H__
#include "ev-document-info.h"
#include <gtk/gtk.h>
#include <gtk/gtkwidget.h>
#include "ev-document-info.h"
G_BEGIN_DECLS
......
......@@ -16,15 +16,15 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include <config.h>
#include "config.h"
#include "eggfindbar.h"
#include <string.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <string.h>
#include "eggfindbar.h"
struct _EggFindBarPrivate
{
......
......@@ -19,7 +19,7 @@ Boston, MA 02111-1307, USA.
#ifndef __EGG_FIND_BAR_H__
#define __EGG_FIND_BAR_H__
#include <gtk/gtktoolbar.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
......
......@@ -22,6 +22,8 @@
#include <config.h>
#include <string.h>
#include <glib.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
......@@ -30,22 +32,22 @@
#include <libgnomeui/gnome-client.h>
#endif
#include "totem-scrsaver.h"
#include "ev-application.h"
#include "ev-utils.h"
#include "ev-file-helpers.h"
#include "ev-document-factory.h"
#include "ev-file-helpers.h"
#include "ev-utils.h"
#ifdef ENABLE_DBUS
#include "ev-media-player-keys.h"
#endif /* ENABLE_DBUS */
#include "totem-scrsaver.h"
#ifdef ENABLE_DBUS
#include "ev-application-service.h"
#include <dbus/dbus-glib-bindings.h>
#include "ev-application-service.h"
#endif
#include <string.h>
static void ev_application_add_icon_path_for_screen (GdkScreen *screen);
struct _EvApplication {
......
......@@ -27,14 +27,13 @@
#include "config.h"
#endif
#include <glib/gerror.h>
#include <glib-object.h>
#include <gtk/gtkprintsettings.h>
#include "ev-window.h"
#include <glib.h>
#include <gtk/gtk.h>
#include "egg-toolbars-model.h"
#include "ev-window.h"
G_BEGIN_DECLS
typedef struct _EvApplication EvApplication;
......
......@@ -21,12 +21,12 @@
#ifndef __EV_JOBS_H__
#define __EV_JOBS_H__
#include <gtk/gtk.h>
#include <gio/gio.h>
#include <gtk/gtk.h>
#include "ev-document.h"
#include "ev-window.h"
#include "ev-selection.h"
#include "ev-window.h"
G_BEGIN_DECLS
......
......@@ -24,7 +24,7 @@
#ifndef EV_MESSAGE_AREA_H
#define EV_MESSAGE_AREA_H
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtk.h>
#include "gedit-message-area.h"
......
......@@ -26,6 +26,7 @@
#include "ev-navigation-action.h"
#include "ev-navigation-action-widget.h"
enum
{
WIDGET_ACTIVATE_LINK,
......
......@@ -21,7 +21,7 @@
#ifndef EV_NAVIGATION_ACTION_H
#define EV_NAVIGATION_ACTION_H
#include <gtk/gtkaction.h>
#include <gtk/gtk.h>
#include "ev-history.h"
#include "ev-link.h"
......
......@@ -24,6 +24,7 @@
#include "ev-open-recent-action.h"
enum {
ITEM_ACTIVATED,
N_SIGNALS
......
......@@ -20,8 +20,7 @@
#ifndef EV_OPEN_RECENT_ACTION_H
#define EV_OPEN_RECENT_ACTION_H
#include <gtk/gtkaction.h>
#include <gtk/gtkmenutoolbutton.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
......
......@@ -24,12 +24,12 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include "ev-document-links.h"
#include "ev-marshal.h"
#include "ev-page-action.h"
#include "ev-page-action-widget.h"
#include "ev-page-cache.h"
#include "ev-window.h"
#include "ev-document-links.h"
#include "ev-page-action-widget.h"
#include "ev-marshal.h"
/* Widget we pass back */
static void ev_page_action_widget_init (EvPageActionWidget *action_widget);
......
......@@ -24,6 +24,7 @@
#include <string.h>
#include <stdlib.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
......
......@@ -21,8 +21,8 @@
#ifndef EV_PAGE_ACTION_H
#define EV_PAGE_ACTION_H
#include <gtk/gtkaction.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtk.h>
#include <ev-document.h>
#include "ev-link.h"
......
......@@ -20,7 +20,8 @@
#ifndef __EV_PAGE_CACHE_H__
#define __EV_PAGE_CACHE_H__
#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#include "ev-document.h"
G_BEGIN_DECLS
......
......@@ -20,7 +20,8 @@
#ifndef __EV_PASSWORD_VIEW_H__
#define __EV_PASSWORD_VIEW_H__
#include <gtk/gtkviewport.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
#define EV_TYPE_PASSWORD_VIEW (ev_password_view_get_type ())
......
......@@ -20,7 +20,7 @@
#ifndef __EV_PASSWORD_H__
#define __EV_PASSWORD_H__
#include <gtk/gtkdialog.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
......
......@@ -24,7 +24,8 @@
#ifndef __EV_PIXBUF_CACHE_H__
#define __EV_PIXBUF_CACHE_H__
#include <gtk/gtkwidget.h>
#include <gtk/gtk.h>
#include "ev-document.h"
#include "ev-selection.h"
......
......@@ -26,10 +26,10 @@
#include <gtk/gtk.h>
#include <glade/glade.h>
#include "ev-properties-fonts.h"
#include "ev-document-fonts.h"
#include "ev-jobs.h"
#include "ev-job-scheduler.h"
#include "ev-jobs.h"
#include "ev-properties-fonts.h"
struct _EvPropertiesFonts {
GtkVBox base_instance;
......
......@@ -26,6 +26,7 @@
#endif
#include <string.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
#include <gtk/gtk.h>
......
......@@ -25,13 +25,14 @@
#endif
#include <string.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include "ev-sidebar-page.h"
#include "ev-sidebar-links.h"
#include "ev-job-scheduler.h"
#include "ev-document-links.h"
#include "ev-job-scheduler.h"
#include "ev-sidebar-links.h"
#include "ev-sidebar-page.h"
#include "ev-window.h"
struct _EvSidebarLinksPrivate {
......
......@@ -24,7 +24,8 @@
#ifndef __EV_SIDEBAR_LINKS_H__
#define __EV_SIDEBAR_LINKS_H__
#include <gtk/gtkvbox.h>
#include <gtk/gtk.h>
#include "ev-document.h"
#include "ev-link.h"
#include "ev-utils.h"
......
......@@ -27,16 +27,17 @@
#endif
#include <string.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include "ev-sidebar-page.h"
#include "ev-sidebar-thumbnails.h"
#include "ev-document-thumbnails.h"
#include "ev-document-misc.h"
#include "ev-document-thumbnails.h"
#include "ev-job-scheduler.h"
#include "ev-window.h"
#include "ev-sidebar-page.h"
#include "ev-sidebar-thumbnails.h"
#include "ev-utils.h"
#include "ev-window.h"
#define THUMBNAIL_WIDTH 100
......
......@@ -24,7 +24,7 @@
#ifndef __EV_SIDEBAR_THUMBNAILS_H__
#define __EV_SIDEBAR_THUMBNAILS_H__
#include <gtk/gtkvbox.h>
#include <gtk/gtk.h>
#include "ev-document.h"
......
......@@ -25,6 +25,7 @@
#endif
#include <string.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
......
......@@ -24,7 +24,8 @@
#ifndef __EV_SIDEBAR_H__
#define __EV_SIDEBAR_H__
#include <gtk/gtkvbox.h>
#include <gtk/gtk.h>
#include "ev-document.h"
G_BEGIN_DECLS
......
......@@ -22,11 +22,12 @@
*/
#include <config.h>
#include "ev-stock-icons.h"
#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include "ev-stock-icons.h"
typedef struct {
char *stock_id;
char *icon;
......
......@@ -24,7 +24,7 @@
#ifndef __EV_TOOLTIP_H__
#define __EV_TOOLTIP_H__
#include <gtk/gtkwindow.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
......
......@@ -23,33 +23,34 @@
#include <stdlib.h>
#include <math.h>
#include <string.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "ev-marshal.h"
#include "ev-view.h"
#include "ev-view-private.h"
#include "ev-utils.h"
#include "ev-document-links.h"
#include "ev-document-images.h"
#include "ev-application.h"
#include "ev-document-find.h"
#include "ev-document-transition.h"
#include "ev-document-forms.h"
#include "ev-document-images.h"
#include "ev-document-links.h"
#include "ev-document-misc.h"
#include "ev-document-transition.h"
#include "ev-marshal.h"
#include "ev-page-cache.h"
#include "ev-pixbuf-cache.h"
#include "ev-transition-animation.h"
#include "ev-utils.h"
#include "ev-view.h"
#include "ev-view-private.h"
#if !GTK_CHECK_VERSION (2, 11, 7)
#include "ev-tooltip.h"
#endif
#include "ev-application.h"
#define EV_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EV_TYPE_VIEW, EvViewClass))
#define EV_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EV_TYPE_VIEW))
#define EV_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EV_TYPE_VIEW, EvViewClass))
enum {
PROP_0,
PROP_FIND_STATUS,
......
......@@ -20,9 +20,7 @@
#ifndef __EV_VIEW_H__
#define __EV_VIEW_H__
#include <gtk/gtkwidget.h>
#include <gtk/gtklayout.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtk.h>
#include "ev-document.h"
#include "ev-link.h"
......
......@@ -40,46 +40,49 @@
#include <gtk/gtkprintunixdialog.h>
#include <gconf/gconf-client.h>
#include "ev-window.h"
#include "ev-window-title.h"
#include "ev-navigation-action.h"
#include "ev-page-action.h"
#include "ev-open-recent-action.h"
#include "ev-sidebar.h"
#include "ev-sidebar-links.h"
#include "ev-sidebar-attachments.h"
#include "ev-sidebar-thumbnails.h"
#include "ev-view.h"
#include "ev-password.h"
#include "ev-password-view.h"
#include "ev-properties-dialog.h"
#include "ev-file-exporter.h"
#include "ev-document-thumbnails.h"
#include "ev-document-links.h"
#include "ev-document-fonts.h"
#include "ev-document-find.h"
#include "ev-document-images.h"
#include "ev-document-security.h"
#include "ev-document-factory.h"
#include "ev-job-scheduler.h"
#include "ev-jobs.h"
#include "ev-sidebar-page.h"
#include "eggfindbar.h"
#include "egg-toolbar-editor.h"
#include "egg-editable-toolbar.h"
#include "egg-toolbar-editor.h"
#include "egg-toolbars-model.h"
#include "ephy-zoom.h"
#include "eggfindbar.h"
#include "ephy-zoom-action.h"
#include "ephy-zoom.h"
#include "ev-application.h"
#include "ev-stock-icons.h"
#include "ev-metadata-manager.h"
#include "ev-document-factory.h"
#include "ev-document-find.h"
#include "ev-document-fonts.h"
#include "ev-document-images.h"
#include "ev-document-links.h"
#include "ev-document-security.h"
#include "ev-document-thumbnails.h"
#include "ev-file-exporter.h"
#include "ev-file-helpers.h"
#include "ev-utils.h"
#include "ev-file-monitor.h"
#include "ev-history.h"
#include "ev-image.h"
#include "ev-job-scheduler.h"
#include "ev-jobs.h"
#include "ev-message-area.h"
#include "ev-metadata-manager.h"
#include "ev-mount-operation.h"
#include "ev-file-monitor.h"
#include "ev-navigation-action.h"
#include "ev-open-recent-action.h"
#include "ev-page-action.h"
#include "ev-password.h"
#include "ev-password-view.h"
#include "ev-properties-dialog.h"
#include "ev-sidebar-attachments.h"
#include "ev-sidebar.h"
#include "ev-sidebar-links.h"
#include "ev-sidebar-page.h"
#include "ev-sidebar-thumbnails.h"
#include "ev-stock-icons.h"
#include "ev-utils.h"
#include "ev-view.h"
#include "ev-window.h"
#include "ev-window-title.h"
#ifdef ENABLE_DBUS
#include "ev-media-player-keys.h"
......
......@@ -23,9 +23,8 @@
#ifndef EV_WINDOW_H
#define EV_WINDOW_H
#include <glib-object.h>
#include <gtk/gtkwindow.h>
#include <gtk/gtkscrolledwindow.h>
#include <glib.h>
#include <gtk/gtk.h>
#include "ev-link.h"
#include "ev-page-cache.h"
......
......@@ -21,6 +21,7 @@
#include <stdlib.h>
#include <string.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment