diff options
43 files changed, 185 insertions, 117 deletions
@@ -1,5 +1,53 @@ 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: * shell/ev-application.c: * shell/ev-message-area.c: diff --git a/backend/impress/impress-document.c b/backend/impress/impress-document.c index 2e3c39b..79cbf51 100644 --- a/backend/impress/impress-document.c +++ b/backend/impress/impress-document.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 { diff --git a/backend/impress/render.h b/backend/impress/render.h index 64c994c..74d67b7 100644 --- a/backend/impress/render.h +++ b/backend/impress/render.h @@ -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)) diff --git a/libdocument/ev-document-factory.c b/libdocument/ev-document-factory.c index e7c76b9..a920be6 100644 --- a/libdocument/ev-document-factory.c +++ b/libdocument/ev-document-factory.c @@ -23,6 +23,7 @@ #endif #include <string.h> + #include <gio/gio.h> #include <glib/gstdio.h> #include <glib/gi18n.h> diff --git a/libdocument/ev-document-factory.h b/libdocument/ev-document-factory.h index 55c59e4..82e47a2 100644 --- a/libdocument/ev-document-factory.h +++ b/libdocument/ev-document-factory.h @@ -22,6 +22,7 @@ #define EV_DOCUMENT_FACTORY_H #include <gtk/gtk.h> + #include "ev-document.h" G_BEGIN_DECLS diff --git a/libdocument/ev-document-links.h b/libdocument/ev-document-links.h index a9208f4..f6a6a48 100644 --- a/libdocument/ev-document-links.h +++ b/libdocument/ev-document-links.h @@ -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)) diff --git a/libdocument/ev-document-misc.c b/libdocument/ev-document-misc.c index 7898a8c..889e4a8 100644 --- a/libdocument/ev-document-misc.c +++ b/libdocument/ev-document-misc.c @@ -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 diff --git a/libdocument/ev-document-misc.h b/libdocument/ev-document-misc.h index b58af18..5fdb670 100644 --- a/libdocument/ev-document-misc.h +++ b/libdocument/ev-document-misc.h @@ -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); diff --git a/properties/ev-properties-main.c b/properties/ev-properties-main.c index c20abed..b25df9e 100644 --- a/properties/ev-properties-main.c +++ b/properties/ev-properties-main.c @@ -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); diff --git a/properties/ev-properties-view.c b/properties/ev-properties-view.c index 4162fdd..6a1eb41 100644 --- a/properties/ev-properties-view.c +++ b/properties/ev-properties-view.c @@ -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, diff --git a/properties/ev-properties-view.h b/properties/ev-properties-view.h index a3501d1..41e6277 100644 --- a/properties/ev-properties-view.h +++ b/properties/ev-properties-view.h @@ -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 diff --git a/shell/eggfindbar.c b/shell/eggfindbar.c index 3c8cb61..bfa9e12 100644 --- a/shell/eggfindbar.c +++ b/shell/eggfindbar.c @@ -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 { diff --git a/shell/eggfindbar.h b/shell/eggfindbar.h index 4b8c537..eef5561 100644 --- a/shell/eggfindbar.h +++ b/shell/eggfindbar.h @@ -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 diff --git a/shell/ev-application.c b/shell/ev-application.c index bdcdfcd..9dee998 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -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 { diff --git a/shell/ev-application.h b/shell/ev-application.h index efaf0b6..8454665 100644 --- a/shell/ev-application.h +++ b/shell/ev-application.h @@ -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; diff --git a/shell/ev-jobs.h b/shell/ev-jobs.h index af113d0..336567b 100644 --- a/shell/ev-jobs.h +++ b/shell/ev-jobs.h @@ -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 diff --git a/shell/ev-message-area.h b/shell/ev-message-area.h index bb29545..ca403db 100644 --- a/shell/ev-message-area.h +++ b/shell/ev-message-area.h @@ -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" diff --git a/shell/ev-navigation-action.c b/shell/ev-navigation-action.c index 5670a04..a2dc636 100644 --- a/shell/ev-navigation-action.c +++ b/shell/ev-navigation-action.c @@ -26,6 +26,7 @@ #include "ev-navigation-action.h" #include "ev-navigation-action-widget.h" + enum { WIDGET_ACTIVATE_LINK, diff --git a/shell/ev-navigation-action.h b/shell/ev-navigation-action.h index 2ac5848..1b73e26 100644 --- a/shell/ev-navigation-action.h +++ b/shell/ev-navigation-action.h @@ -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" diff --git a/shell/ev-open-recent-action.c b/shell/ev-open-recent-action.c index 0a4f309..1c6c9ce 100644 --- a/shell/ev-open-recent-action.c +++ b/shell/ev-open-recent-action.c @@ -24,6 +24,7 @@ #include "ev-open-recent-action.h" + enum { ITEM_ACTIVATED, N_SIGNALS diff --git a/shell/ev-open-recent-action.h b/shell/ev-open-recent-action.h index 70bce0e..0492d76 100644 --- a/shell/ev-open-recent-action.h +++ b/shell/ev-open-recent-action.h @@ -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 diff --git a/shell/ev-page-action-widget.c b/shell/ev-page-action-widget.c index 482615a..7a6ad3b 100644 --- a/shell/ev-page-action-widget.c +++ b/shell/ev-page-action-widget.c @@ -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); diff --git a/shell/ev-page-action.c b/shell/ev-page-action.c index 1d4151f..ef87e75 100644 --- a/shell/ev-page-action.c +++ b/shell/ev-page-action.c @@ -24,6 +24,7 @@ #include <string.h> #include <stdlib.h> + #include <glib/gi18n.h> #include <gtk/gtk.h> diff --git a/shell/ev-page-action.h b/shell/ev-page-action.h index 82f3ac8..6337bde 100644 --- a/shell/ev-page-action.h +++ b/shell/ev-page-action.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" diff --git a/shell/ev-page-cache.h b/shell/ev-page-cache.h index e20068b..43f4553 100644 --- a/shell/ev-page-cache.h +++ b/shell/ev-page-cache.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 diff --git a/shell/ev-password-view.h b/shell/ev-password-view.h index e167916..d59d62b 100644 --- a/shell/ev-password-view.h +++ b/shell/ev-password-view.h @@ -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 ()) diff --git a/shell/ev-password.h b/shell/ev-password.h index 048cf47..af76d3d 100644 --- a/shell/ev-password.h +++ b/shell/ev-password.h @@ -20,7 +20,7 @@ #ifndef __EV_PASSWORD_H__ #define __EV_PASSWORD_H__ -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/shell/ev-pixbuf-cache.h b/shell/ev-pixbuf-cache.h index 0b65bf8..5e48f28 100644 --- a/shell/ev-pixbuf-cache.h +++ b/shell/ev-pixbuf-cache.h @@ -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" diff --git a/shell/ev-properties-fonts.c b/shell/ev-properties-fonts.c index bb634ef..783a565 100644 --- a/shell/ev-properties-fonts.c +++ b/shell/ev-properties-fonts.c @@ -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; diff --git a/shell/ev-sidebar-attachments.c b/shell/ev-sidebar-attachments.c index 1130533..1b2be06 100644 --- a/shell/ev-sidebar-attachments.c +++ b/shell/ev-sidebar-attachments.c @@ -26,6 +26,7 @@ #endif #include <string.h> + #include <glib/gi18n.h> #include <glib/gstdio.h> #include <gtk/gtk.h> diff --git a/shell/ev-sidebar-links.c b/shell/ev-sidebar-links.c index 1389edd..623753c 100644 --- a/shell/ev-sidebar-links.c +++ b/shell/ev-sidebar-links.c @@ -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 { diff --git a/shell/ev-sidebar-links.h b/shell/ev-sidebar-links.h index f1a6b87..8814c10 100644 --- a/shell/ev-sidebar-links.h +++ b/shell/ev-sidebar-links.h @@ -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" diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c index 690c7de..0a97e5f 100644 --- a/shell/ev-sidebar-thumbnails.c +++ b/shell/ev-sidebar-thumbnails.c @@ -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 diff --git a/shell/ev-sidebar-thumbnails.h b/shell/ev-sidebar-thumbnails.h index 11e7458..5a3ddda 100644 --- a/shell/ev-sidebar-thumbnails.h +++ b/shell/ev-sidebar-thumbnails.h @@ -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" diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c index 06a29c7..2d97381 100644 --- a/shell/ev-sidebar.c +++ b/shell/ev-sidebar.c @@ -25,6 +25,7 @@ #endif #include <string.h> + #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> diff --git a/shell/ev-sidebar.h b/shell/ev-sidebar.h index 1c4a7a8..5f01132 100644 --- a/shell/ev-sidebar.h +++ b/shell/ev-sidebar.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 diff --git a/shell/ev-stock-icons.c b/shell/ev-stock-icons.c index 09536ca..003253c 100644 --- a/shell/ev-stock-icons.c +++ b/shell/ev-stock-icons.c @@ -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; diff --git a/shell/ev-tooltip.h b/shell/ev-tooltip.h index 89d064c..7f37c9a 100644 --- a/shell/ev-tooltip.h +++ b/shell/ev-tooltip.h @@ -24,7 +24,7 @@ #ifndef __EV_TOOLTIP_H__ #define __EV_TOOLTIP_H__ -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/shell/ev-view.c b/shell/ev-view.c index 1def7fb..2524d11 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -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, diff --git a/shell/ev-view.h b/shell/ev-view.h index 0c6d608..cbcf768 100644 --- a/shell/ev-view.h +++ b/shell/ev-view.h @@ -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" diff --git a/shell/ev-window.c b/shell/ev-window.c index 5768b7c..cf65611 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -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" diff --git a/shell/ev-window.h b/shell/ev-window.h index ebaff35..2957c44 100644 --- a/shell/ev-window.h +++ b/shell/ev-window.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" diff --git a/shell/main.c b/shell/main.c index b0c26ca..72c43df 100644 --- a/shell/main.c +++ b/shell/main.c @@ -21,6 +21,7 @@ #include <stdlib.h> #include <string.h> + #include <glib/gi18n.h> #include <gtk/gtk.h> #include <gdk/gdkx.h> |