[Xfce4-commits] [apps/ristretto] 01/01: Organize includes

noreply at xfce.org noreply at xfce.org
Mon Oct 10 17:28:50 CEST 2016 

This is an automated email from the git hooks/post-receive script.

f2404 pushed a commit to branch master
in repository apps/ristretto.

commit 1f2eb311148ffa80f1a347e1e34f41be4053ed59
Author: Igor <f2404 at yandex.ru>
Date:   Mon Oct 10 18:28:45 2016 +0300

    Organize includes
---
 src/app_menu_item.c           | 1 -
 src/app_menu_item.h           | 2 ++
 src/file.c                    | 5 -----
 src/file.h                    | 5 +++++
 src/gnome_wallpaper_manager.c | 5 -----
 src/gnome_wallpaper_manager.h | 4 ++++
 src/icon_bar.c                | 3 ---
 src/image_list.c              | 3 ---
 src/image_list.h              | 4 ++++
 src/image_viewer.c            | 3 ---
 src/image_viewer.h            | 5 ++++-
 src/main_window.c             | 2 --
 src/main_window.h             | 4 ++++
 src/mime_db.c                 | 1 -
 src/mime_db.h                 | 3 ++-
 src/monitor_chooser.c         | 1 -
 src/monitor_chooser.h         | 2 ++
 src/preferences_dialog.c      | 2 --
 src/preferences_dialog.h      | 2 ++
 src/privacy_dialog.c          | 2 --
 src/privacy_dialog.h          | 2 ++
 src/properties_dialog.c       | 3 ---
 src/properties_dialog.h       | 2 ++
 src/settings.c                | 1 -
 src/settings.h                | 2 ++
 src/thumbnailer.c             | 1 -
 src/thumbnailer.h             | 2 ++
 src/util.c                    | 1 -
 src/util.h                    | 2 ++
 src/wallpaper_manager.c       | 2 --
 src/wallpaper_manager.h       | 4 ++++
 src/xfce_wallpaper_manager.c  | 2 --
 src/xfce_wallpaper_manager.h  | 4 ++++
 33 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/src/app_menu_item.c b/src/app_menu_item.c
index 5bd534d..b8febbf 100644
--- a/src/app_menu_item.c
+++ b/src/app_menu_item.c
@@ -19,7 +19,6 @@
 
 #include <config.h>
 #include <gio/gio.h>
-#include <gtk/gtk.h>
 #include <string.h>
 
 #include "app_menu_item.h"
diff --git a/src/app_menu_item.h b/src/app_menu_item.h
index fd447fa..b26abc9 100644
--- a/src/app_menu_item.h
+++ b/src/app_menu_item.h
@@ -20,6 +20,8 @@
 #ifndef __RISTRETTO_APP_MENU_ITEM_H__
 #define __RISTRETTO_APP_MENU_ITEM_H__
 
+#include <gtk/gtk.h>
+
 G_BEGIN_DECLS
 
 #define RSTTO_TYPE_APP_MENU_ITEM rstto_app_menu_item_get_type()
diff --git a/src/file.c b/src/file.c
index 648ce6a..3a352a5 100644
--- a/src/file.c
+++ b/src/file.c
@@ -19,15 +19,10 @@
 
 #include <config.h>
 
-#include <glib.h>
 #include <gio/gio.h>
-#include <gtk/gtk.h>
-
-#include <libexif/exif-data.h>
 
 #include <libxfce4util/libxfce4util.h>
 
-#include "util.h"
 #include "file.h"
 #include "thumbnailer.h"
 
diff --git a/src/file.h b/src/file.h
index 844ab98..eb53340 100644
--- a/src/file.h
+++ b/src/file.h
@@ -20,6 +20,11 @@
 #ifndef __RISTRETTO_FILE_H__
 #define __RISTRETTO_FILE_H__
 
+#include <gtk/gtk.h>
+#include <libexif/exif-data.h>
+
+#include "util.h"
+
 G_BEGIN_DECLS
 
 #define RSTTO_TYPE_FILE rstto_file_get_type()
diff --git a/src/gnome_wallpaper_manager.c b/src/gnome_wallpaper_manager.c
index 5341c99..69a7456 100644
--- a/src/gnome_wallpaper_manager.c
+++ b/src/gnome_wallpaper_manager.c
@@ -19,8 +19,6 @@
 
 #include <config.h>
 
-#include <glib.h>
-#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <X11/Xlib.h>
 #include <xfconf/xfconf.h>
@@ -28,14 +26,11 @@
 #include <libxfce4ui/libxfce4ui.h>
 #include <gio/gio.h>
 
-
 #include <libexif/exif-data.h>
 
 #include "util.h"
 #include "file.h"
-
 #include "monitor_chooser.h"
-#include "wallpaper_manager.h"
 #include "gnome_wallpaper_manager.h"
 
 enum MonitorStyle
diff --git a/src/gnome_wallpaper_manager.h b/src/gnome_wallpaper_manager.h
index ddbe3ab..553010f 100644
--- a/src/gnome_wallpaper_manager.h
+++ b/src/gnome_wallpaper_manager.h
@@ -20,6 +20,10 @@
 #ifndef __RISTRETTO_GNOME_WALLPAPER_MANAGER_H__
 #define __RISTRETTO_GNOME_WALLPAPER_MANAGER_H__
 
+#include <gtk/gtk.h>
+
+#include "wallpaper_manager.h"
+
 G_BEGIN_DECLS
 
 #define RSTTO_TYPE_GNOME_WALLPAPER_MANAGER rstto_gnome_wallpaper_manager_get_type()
diff --git a/src/icon_bar.c b/src/icon_bar.c
index 39e5ac4..ff9eada 100644
--- a/src/icon_bar.c
+++ b/src/icon_bar.c
@@ -25,9 +25,6 @@
 #include <config.h>
 #endif
 
-#include <glib.h>
-#include <gtk/gtk.h>
-
 #include <libxfce4util/libxfce4util.h>
 
 #include <libexif/exif-data.h>
diff --git a/src/image_list.c b/src/image_list.c
index f65a2ef..b2cc0d8 100644
--- a/src/image_list.c
+++ b/src/image_list.c
@@ -22,15 +22,12 @@
 
 #include <config.h>
 
-#include <gtk/gtk.h>
-
 #include <stdlib.h>
 #include <string.h>
 
 #include <libexif/exif-data.h>
 
 #include "util.h"
-#include "file.h"
 #include "image_list.h"
 #include "thumbnailer.h"
 #include "settings.h"
diff --git a/src/image_list.h b/src/image_list.h
index ec0e0bf..4b14b31 100644
--- a/src/image_list.h
+++ b/src/image_list.h
@@ -20,6 +20,10 @@
 #ifndef __RISTRETTO_IMAGE_LIST_H__
 #define __RISTRETTO_IMAGE_LIST_H__
 
+#include <gtk/gtk.h>
+
+#include "file.h"
+
 G_BEGIN_DECLS
 
 #define RSTTO_TYPE_IMAGE_LIST rstto_image_list_get_type()
diff --git a/src/image_viewer.c b/src/image_viewer.c
index 27c7aad..43cfd8b 100644
--- a/src/image_viewer.c
+++ b/src/image_viewer.c
@@ -18,7 +18,6 @@
  */
 
 #include <config.h>
-#include <gtk/gtk.h>
 #include <string.h>
 #include <gio/gio.h>
 #include <libxfce4ui/libxfce4ui.h>
@@ -27,8 +26,6 @@
 #include <math.h>
 
 #include "util.h"
-
-#include "file.h"
 #include "image_viewer.h"
 #include "settings.h"
 #include "marshal.h"
diff --git a/src/image_viewer.h b/src/image_viewer.h
index d3343b8..e4665a6 100644
--- a/src/image_viewer.h
+++ b/src/image_viewer.h
@@ -20,8 +20,11 @@
 #ifndef __RISTRETTO_IMAGE_VIEWER_H__
 #define __RISTRETTO_IMAGE_VIEWER_H__
 
-G_BEGIN_DECLS
+#include <gtk/gtk.h>
+
+#include "file.h"
 
+G_BEGIN_DECLS
 
 #define RSTTO_TYPE_IMAGE_VIEWER rstto_image_viewer_get_type()
 
diff --git a/src/main_window.c b/src/main_window.c
index 69f4642..2db3f77 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -18,7 +18,6 @@
  */
 
 #include <config.h>
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <X11/Xlib.h>
 #include <string.h>
@@ -39,7 +38,6 @@
 #include "file.h"
 #include "icon_bar.h"
 #include "thumbnailer.h"
-#include "image_list.h"
 #include "image_viewer.h"
 #include "main_window.h"
 #include "main_window_ui.h"
diff --git a/src/main_window.h b/src/main_window.h
index 006ddc8..19b97cf 100644
--- a/src/main_window.h
+++ b/src/main_window.h
@@ -20,6 +20,10 @@
 #ifndef __RISTRETTO_MAIN_WINDOW_H__
 #define __RISTRETTO_MAIN_WINDOW_H__
 
+#include <gtk/gtk.h>
+
+#include "image_list.h"
+
 G_BEGIN_DECLS
 
 #define RSTTO_TYPE_MAIN_WINDOW rstto_main_window_get_type()
diff --git a/src/mime_db.c b/src/mime_db.c
index 838140b..505b6d8 100644
--- a/src/mime_db.c
+++ b/src/mime_db.c
@@ -24,7 +24,6 @@
 #include <sys/types.h>
 #include <sys/mman.h>
 
-
 #include <glib.h>
 #include <gio/gio.h>
 #include <locale.h>
diff --git a/src/mime_db.h b/src/mime_db.h
index b04cec6..449668f 100644
--- a/src/mime_db.h
+++ b/src/mime_db.h
@@ -20,8 +20,9 @@
 #ifndef __RISTRETTO_MIME_DB_H__
 #define __RISTRETTO_MIME_DB_H__
 
-G_BEGIN_DECLS
+#include <gtk/gtk.h>
 
+G_BEGIN_DECLS
 
 #define RSTTO_TYPE_MIME_DB rstto_mime_db_get_type()
 
diff --git a/src/monitor_chooser.c b/src/monitor_chooser.c
index 1832aff..504fafb 100644
--- a/src/monitor_chooser.c
+++ b/src/monitor_chooser.c
@@ -18,7 +18,6 @@
  */
 
 #include <config.h>
-#include <gtk/gtk.h>
 #include <string.h>
 #include <math.h>
 
diff --git a/src/monitor_chooser.h b/src/monitor_chooser.h
index 4753126..4610e3e 100644
--- a/src/monitor_chooser.h
+++ b/src/monitor_chooser.h
@@ -20,6 +20,8 @@
 #ifndef __RISTRETTO_MONITOR_CHOOSER_H__
 #define __RISTRETTO_MONITOR_CHOOSER_H__
 
+#include <gtk/gtk.h>
+
 G_BEGIN_DECLS
 
 #define RSTTO_TYPE_MONITOR_CHOOSER rstto_monitor_chooser_get_type()
diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c
index cf1dcdc..6faebba 100644
--- a/src/preferences_dialog.c
+++ b/src/preferences_dialog.c
@@ -18,8 +18,6 @@
  */
 
 #include <config.h>
-#include <gtk/gtk.h>
-#include <libxfce4ui/libxfce4ui.h>
 #include <libxfce4util/libxfce4util.h>
 
 #include "util.h"
diff --git a/src/preferences_dialog.h b/src/preferences_dialog.h
index 56db380..e5f28f7 100644
--- a/src/preferences_dialog.h
+++ b/src/preferences_dialog.h
@@ -20,6 +20,8 @@
 #ifndef __RISTRETTO_PREFERENCES_DIALOG_H__
 #define __RISTRETTO_PREFERENCES_DIALOG_H__
 
+#include <libxfce4ui/libxfce4ui.h>
+
 G_BEGIN_DECLS
 
 #define RSTTO_TYPE_PREFERENCES_DIALOG rstto_preferences_dialog_get_type()
diff --git a/src/privacy_dialog.c b/src/privacy_dialog.c
index 82f3410..0be7f7b 100644
--- a/src/privacy_dialog.c
+++ b/src/privacy_dialog.c
@@ -18,8 +18,6 @@
  */
 
 #include <config.h>
-#include <gtk/gtk.h>
-#include <libxfce4ui/libxfce4ui.h>
 #include <libxfce4util/libxfce4util.h>
 
 #include "settings.h"
diff --git a/src/privacy_dialog.h b/src/privacy_dialog.h
index 50e6df4..e05cce4 100644
--- a/src/privacy_dialog.h
+++ b/src/privacy_dialog.h
@@ -20,6 +20,8 @@
 #ifndef __RISTRETTO_PRIVACY_DIALOG_H__
 #define __RISTRETTO_PRIVACY_DIALOG_H__
 
+#include <libxfce4ui/libxfce4ui.h>
+
 G_BEGIN_DECLS
 
 #define RSTTO_TYPE_PRIVACY_DIALOG rstto_privacy_dialog_get_type()
diff --git a/src/properties_dialog.c b/src/properties_dialog.c
index cf6cf73..386065f 100644
--- a/src/properties_dialog.c
+++ b/src/properties_dialog.c
@@ -19,11 +19,8 @@
 
 #include <config.h>
 
-#include <gtk/gtk.h>
-
 #include <libexif/exif-data.h>
 
-#include <libxfce4ui/libxfce4ui.h>
 #include <libxfce4util/libxfce4util.h>
 
 #include "settings.h"
diff --git a/src/properties_dialog.h b/src/properties_dialog.h
index b06ee29..7779193 100644
--- a/src/properties_dialog.h
+++ b/src/properties_dialog.h
@@ -20,6 +20,8 @@
 #ifndef __RISTRETTO_PROPERTIES_DIALOG_H__
 #define __RISTRETTO_PROPERTIES_DIALOG_H__
 
+#include <libxfce4ui/libxfce4ui.h>
+
 G_BEGIN_DECLS
 
 #define RSTTO_TYPE_PROPERTIES_DIALOG rstto_properties_dialog_get_type()
diff --git a/src/settings.c b/src/settings.c
index b4d3cc8..768267e 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -20,7 +20,6 @@
 #include <config.h>
 
 #include <glib.h>
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <xfconf/xfconf.h>
 #include <libxfce4util/libxfce4util.h>
diff --git a/src/settings.h b/src/settings.h
index 661c312..d3f4bea 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -20,6 +20,8 @@
 #ifndef __RISTRETTO_SETTINGS_H__
 #define __RISTRETTO_SETTINGS_H__
 
+#include <gtk/gtk.h>
+
 G_BEGIN_DECLS
 
 #define RSTTO_TYPE_SETTINGS rstto_settings_get_type()
diff --git a/src/thumbnailer.c b/src/thumbnailer.c
index 44fd681..22e669a 100644
--- a/src/thumbnailer.c
+++ b/src/thumbnailer.c
@@ -22,7 +22,6 @@
 #include <string.h>
 
 #include <glib.h>
-#include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <dbus/dbus-glib.h>
 
diff --git a/src/thumbnailer.h b/src/thumbnailer.h
index c4d4e68..806c0c8 100644
--- a/src/thumbnailer.h
+++ b/src/thumbnailer.h
@@ -20,6 +20,8 @@
 #ifndef __RISTRETTO_THUMBNAILER_H__
 #define __RISTRETTO_THUMBNAILER_H__
 
+#include <gtk/gtk.h>
+
 G_BEGIN_DECLS
 
 #define RSTTO_TYPE_THUMBNAILER rstto_thumbnailer_get_type()
diff --git a/src/util.c b/src/util.c
index 8ec127f..56b9a33 100644
--- a/src/util.c
+++ b/src/util.c
@@ -18,7 +18,6 @@
  */
 
 #include <config.h>
-#include <glib.h>
 #include <locale.h>
 
 #include "util.h"
diff --git a/src/util.h b/src/util.h
index ec741cf..9541ecb 100644
--- a/src/util.h
+++ b/src/util.h
@@ -20,6 +20,8 @@
 #ifndef __RISTRETTO_UTIL_H__
 #define __RISTRETTO_UTIL_H__
 
+#include <glib.h>
+
 G_BEGIN_DECLS
 
 typedef enum
diff --git a/src/wallpaper_manager.c b/src/wallpaper_manager.c
index 5505868..a6d6992 100644
--- a/src/wallpaper_manager.c
+++ b/src/wallpaper_manager.c
@@ -22,13 +22,11 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gtk/gtk.h>
 #include <gio/gio.h>
 
 #include <libexif/exif-data.h>
 
 #include "util.h"
-#include "file.h"
 #include "wallpaper_manager.h"
 
 gint 
diff --git a/src/wallpaper_manager.h b/src/wallpaper_manager.h
index dc95d0f..91a0fae 100644
--- a/src/wallpaper_manager.h
+++ b/src/wallpaper_manager.h
@@ -20,6 +20,10 @@
 #ifndef __RISTRETTO_WALLPAPER_MANAGER_IFACE__
 #define __RISTRETTO_WALLPAPER_MANAGER_IFACE__
 
+#include <gtk/gtk.h>
+
+#include "file.h"
+
 G_BEGIN_DECLS
 
 #define RSTTO_WALLPAPER_MANAGER_TYPE \
diff --git a/src/xfce_wallpaper_manager.c b/src/xfce_wallpaper_manager.c
index c396377..2a81d16 100644
--- a/src/xfce_wallpaper_manager.c
+++ b/src/xfce_wallpaper_manager.c
@@ -23,7 +23,6 @@
 #include <config.h>
 
 #include <glib.h>
-#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -39,7 +38,6 @@
 #include "util.h"
 #include "file.h"
 #include "monitor_chooser.h"
-#include "wallpaper_manager.h"
 #include "xfce_wallpaper_manager.h"
 
 enum MonitorStyle
diff --git a/src/xfce_wallpaper_manager.h b/src/xfce_wallpaper_manager.h
index 8c892cc..52b7074 100644
--- a/src/xfce_wallpaper_manager.h
+++ b/src/xfce_wallpaper_manager.h
@@ -20,6 +20,10 @@
 #ifndef __RISTRETTO_XFCE_WALLPAPER_MANAGER_H__
 #define __RISTRETTO_XFCE_WALLPAPER_MANAGER_H__
 
+#include <gtk/gtk.h>
+
+#include "wallpaper_manager.h"
+
 G_BEGIN_DECLS
 
 #define RSTTO_TYPE_XFCE_WALLPAPER_MANAGER \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

More information about the Xfce4-commits mailing list