From 38994ad95d20d8eeb8920a300a12fb5e1cffceb5 Mon Sep 17 00:00:00 2001 From: "A. Palsson" Date: Sun, 12 Jul 2020 08:31:21 +0200 Subject: [PATCH 1/4] Removed unused/unnecessary include statements. --- src/app_menu_item.c | 2 -- src/file.c | 4 ---- src/gnome_wallpaper_manager.c | 8 -------- src/icon_bar.c | 5 ----- src/image_list.c | 5 ----- src/image_viewer.c | 6 ------ src/main.c | 5 ----- src/main_window.c | 3 --- src/mime_db.c | 8 -------- src/monitor_chooser.c | 2 -- src/preferences_dialog.c | 2 -- src/privacy_dialog.c | 2 -- src/properties_dialog.c | 3 --- src/settings.c | 2 -- src/thumbnailer.c | 5 ----- src/util.c | 3 --- src/wallpaper_manager.c | 7 ------- src/xfce_wallpaper_manager.c | 11 ----------- 18 files changed, 83 deletions(-) diff --git a/src/app_menu_item.c b/src/app_menu_item.c index cf1fe6ef..73c62c5c 100644 --- a/src/app_menu_item.c +++ b/src/app_menu_item.c @@ -17,9 +17,7 @@ * 02110-1301, USA. */ -#include #include -#include #include "app_menu_item.h" diff --git a/src/file.c b/src/file.c index f8f3724d..5697a5dd 100644 --- a/src/file.c +++ b/src/file.c @@ -17,12 +17,8 @@ * 02110-1301, USA. */ -#include - #include -#include - #if HAVE_MAGIC_H #include #endif diff --git a/src/gnome_wallpaper_manager.c b/src/gnome_wallpaper_manager.c index 268e3215..3c5708ab 100644 --- a/src/gnome_wallpaper_manager.c +++ b/src/gnome_wallpaper_manager.c @@ -17,18 +17,10 @@ * 02110-1301, USA. */ -#include - #include -#include -#include #include #include -#include - -#include -#include "util.h" #include "file.h" #include "monitor_chooser.h" #include "gnome_wallpaper_manager.h" diff --git a/src/icon_bar.c b/src/icon_bar.c index 32f96449..493ecae2 100644 --- a/src/icon_bar.c +++ b/src/icon_bar.c @@ -21,17 +21,12 @@ * Boston, MA 02111-1307, USA. */ -#include - #include -#include - #include "util.h" #include "file.h" #include "thumbnailer.h" #include "settings.h" -#include "marshal.h" #include "icon_bar.h" #define MINIMUM_ICON_ITEM_WIDTH 32 diff --git a/src/image_list.c b/src/image_list.c index 3aa69304..4c0f58d0 100644 --- a/src/image_list.c +++ b/src/image_list.c @@ -20,13 +20,8 @@ * Copyright (c) Benedict Meurer */ -#include - -#include #include -#include - #include "util.h" #include "image_list.h" #include "thumbnailer.h" diff --git a/src/image_viewer.c b/src/image_viewer.c index ebacd730..6f2ad1bc 100644 --- a/src/image_viewer.c +++ b/src/image_viewer.c @@ -17,19 +17,13 @@ * 02110-1301, USA. */ -#include -#include #include -#include -#include -#include #include #include "util.h" #include "image_viewer.h" #include "settings.h" -#include "marshal.h" /* Do not make this buffer too large, * this breaks some pixbufloaders. diff --git a/src/main.c b/src/main.c index b4e4869d..6cec195e 100644 --- a/src/main.c +++ b/src/main.c @@ -25,14 +25,9 @@ #include #include -#include -#include #include -#include -#include -#include "util.h" #include "file.h" #include "image_list.h" #include "settings.h" diff --git a/src/main_window.c b/src/main_window.c index 7978f795..780042c8 100644 --- a/src/main_window.c +++ b/src/main_window.c @@ -19,7 +19,6 @@ #include #include -#include #include #include @@ -28,8 +27,6 @@ #include #include -#include - #include "settings.h" #include "mime_db.h" #include "util.h" diff --git a/src/mime_db.c b/src/mime_db.c index 505b6d81..e39331ec 100644 --- a/src/mime_db.c +++ b/src/mime_db.c @@ -17,16 +17,8 @@ * 02110-1301, USA. */ -#include -#include -#include -#include -#include -#include - #include #include -#include #include diff --git a/src/monitor_chooser.c b/src/monitor_chooser.c index b973aedd..a65706f9 100644 --- a/src/monitor_chooser.c +++ b/src/monitor_chooser.c @@ -17,8 +17,6 @@ * 02110-1301, USA. */ -#include -#include #include #include "monitor_chooser.h" diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c index 314261b4..43e51661 100644 --- a/src/preferences_dialog.c +++ b/src/preferences_dialog.c @@ -17,9 +17,7 @@ * 02110-1301, USA. */ -#include #include -#include #include "util.h" #include "settings.h" diff --git a/src/privacy_dialog.c b/src/privacy_dialog.c index 152fa3b3..d5380343 100644 --- a/src/privacy_dialog.c +++ b/src/privacy_dialog.c @@ -17,9 +17,7 @@ * 02110-1301, USA. */ -#include #include -#include #include "settings.h" #include "privacy_dialog.h" diff --git a/src/properties_dialog.c b/src/properties_dialog.c index 4b2432dc..29359c4a 100644 --- a/src/properties_dialog.c +++ b/src/properties_dialog.c @@ -17,14 +17,11 @@ * 02110-1301, USA. */ -#include - #include #include #include "settings.h" -#include "util.h" #include "file.h" #include "properties_dialog.h" diff --git a/src/settings.c b/src/settings.c index c16a0fab..5e35fa92 100644 --- a/src/settings.c +++ b/src/settings.c @@ -17,8 +17,6 @@ * 02110-1301, USA. */ -#include - #include #include #include diff --git a/src/thumbnailer.c b/src/thumbnailer.c index b883423d..6da97770 100644 --- a/src/thumbnailer.c +++ b/src/thumbnailer.c @@ -17,22 +17,17 @@ * 02110-1301, USA. */ -#include - #include #include #include -#include - #include #include "util.h" #include "file.h" #include "settings.h" #include "thumbnailer.h" -#include "marshal.h" #include "tumbler.h" static void diff --git a/src/util.c b/src/util.c index 56b9a331..3ee8e220 100644 --- a/src/util.c +++ b/src/util.c @@ -17,7 +17,4 @@ * 02110-1301, USA. */ -#include -#include - #include "util.h" diff --git a/src/wallpaper_manager.c b/src/wallpaper_manager.c index 0e24b834..44d5f67b 100644 --- a/src/wallpaper_manager.c +++ b/src/wallpaper_manager.c @@ -17,16 +17,9 @@ * 02110-1301, USA. */ -#include -#include - #include #include -#include - -#include -#include "util.h" #include "wallpaper_manager.h" gint diff --git a/src/xfce_wallpaper_manager.c b/src/xfce_wallpaper_manager.c index ffa26f57..b7354139 100644 --- a/src/xfce_wallpaper_manager.c +++ b/src/xfce_wallpaper_manager.c @@ -17,23 +17,12 @@ * 02110-1301, USA. */ -#include - #include #include -#include #include #include #include -#include -#include - -#include -#include - -#include -#include "util.h" #include "file.h" #include "monitor_chooser.h" #include "xfce_wallpaper_manager.h" -- GitLab From 1f202f5054b2fbc763c0ce7e4a2a552d22f918bb Mon Sep 17 00:00:00 2001 From: "A. Palsson" Date: Sun, 12 Jul 2020 08:34:15 +0200 Subject: [PATCH 2/4] Removed unused/unnecessary macro definitions. --- src/app_menu_item.h | 4 ---- src/file.h | 4 ---- src/gnome_wallpaper_manager.h | 8 -------- src/icon_bar.c | 3 --- src/icon_bar.h | 3 --- src/image_list.h | 22 ---------------------- src/image_viewer.h | 9 --------- src/main_window.h | 9 --------- src/mime_db.h | 8 -------- src/monitor_chooser.h | 9 --------- src/preferences_dialog.h | 8 -------- src/privacy_dialog.h | 8 -------- src/properties_dialog.h | 8 -------- src/settings.h | 8 -------- src/thumbnailer.h | 4 ---- src/wallpaper_manager.h | 8 +------- src/xfce_wallpaper_manager.h | 8 -------- 17 files changed, 1 insertion(+), 130 deletions(-) diff --git a/src/app_menu_item.h b/src/app_menu_item.h index 1318a7af..712a3be6 100644 --- a/src/app_menu_item.h +++ b/src/app_menu_item.h @@ -26,10 +26,6 @@ G_BEGIN_DECLS #define RSTTO_TYPE_APP_MENU_ITEM (rstto_app_menu_item_get_type()) #define RSTTO_APP_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RSTTO_TYPE_APP_MENU_ITEM, RsttoAppMenuItem)) -#define RSTTO_APP_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), RSTTO_TYPE_APP_MENU_ITEM, RsttoAppMenuItemClass)) -#define RSTTO_IS_APP_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), RSTTO_TYPE_APP_MENU_ITEM)) -#define RSTTO_IS_APP_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), RSTTO_TYPE_APP_MENU_ITEM ())) -#define RSTTO_APP_MENU_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), RSTTO_TYPE_APP_MENU_ITEM, RsttoAppMenuItemClass)) typedef struct _RsttoAppMenuItemPrivate RsttoAppMenuItemPrivate; diff --git a/src/file.h b/src/file.h index c1cd87b1..e02462d0 100644 --- a/src/file.h +++ b/src/file.h @@ -43,10 +43,6 @@ G_BEGIN_DECLS RSTTO_TYPE_FILE, \ RsttoFileClass)) -#define RSTTO_IS_FILE_CLASS(klass)( \ - G_TYPE_CHECK_CLASS_TYPE ((klass), \ - RSTTO_TYPE_FILE())) - typedef struct _RsttoFile RsttoFile; typedef struct _RsttoFilePriv RsttoFilePriv; diff --git a/src/gnome_wallpaper_manager.h b/src/gnome_wallpaper_manager.h index 553010f2..242eab6a 100644 --- a/src/gnome_wallpaper_manager.h +++ b/src/gnome_wallpaper_manager.h @@ -33,19 +33,11 @@ G_BEGIN_DECLS RSTTO_TYPE_GNOME_WALLPAPER_MANAGER, \ RsttoGnomeWallpaperManager)) -#define RSTTO_IS_GNOME_WALLPAPER_MANAGER(obj)( \ - G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - RSTTO_TYPE_GNOME_WALLPAPER_MANAGER)) - #define RSTTO_GNOME_WALLPAPER_MANAGER_CLASS(klass)( \ G_TYPE_CHECK_CLASS_CAST ((klass), \ RSTTO_TYPE_GNOME_WALLPAPER_MANAGER, \ RsttoGnomeWallpaperManagerClass)) -#define RSTTO_IS_GNOME_WALLPAPER_MANAGER_CLASS(klass)( \ - G_TYPE_CHECK_CLASS_TYPE ((klass), \ - RSTTO_TYPE_GNOME_WALLPAPER_MANAGER())) - typedef struct _RsttoGnomeWallpaperManager RsttoGnomeWallpaperManager; typedef struct _RsttoGnomeWallpaperManagerPriv RsttoGnomeWallpaperManagerPriv; diff --git a/src/icon_bar.c b/src/icon_bar.c index 493ecae2..14343627 100644 --- a/src/icon_bar.c +++ b/src/icon_bar.c @@ -29,9 +29,6 @@ #include "settings.h" #include "icon_bar.h" -#define MINIMUM_ICON_ITEM_WIDTH 32 -#define ICON_TEXT_PADDING 1 - #define RSTTO_ICON_BAR_VALID_MODEL_AND_COLUMNS(obj) \ ((obj)->priv->model != NULL && \ (obj)->priv->file_column != -1) diff --git a/src/icon_bar.h b/src/icon_bar.h index 03f0e426..adb85593 100644 --- a/src/icon_bar.h +++ b/src/icon_bar.h @@ -29,10 +29,7 @@ G_BEGIN_DECLS #define RSTTO_TYPE_ICON_BAR (rstto_icon_bar_get_type ()) #define RSTTO_ICON_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RSTTO_TYPE_ICON_BAR, RsttoIconBar)) -#define RSTTO_ICON_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), RSTTO_TYPE_ICON_BAR, RsttoIconBarClass)) #define RSTTO_IS_ICON_BAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), RSTTO_TYPE_ICON_BAR)) -#define RSTTO_IS_ICON_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), RSTTO_TYPE_ICON_BAR)) -#define RSTTO_ICON_BAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), RSTTO_TYPE_ICON_BAR, RsttoIconBarClass)) typedef struct _RsttoIconBarPrivate RsttoIconBarPrivate; typedef struct _RsttoIconBarClass RsttoIconBarClass; diff --git a/src/image_list.h b/src/image_list.h index 223761ef..81e85ea5 100644 --- a/src/image_list.h +++ b/src/image_list.h @@ -37,15 +37,6 @@ G_BEGIN_DECLS G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ RSTTO_TYPE_IMAGE_LIST)) -#define RSTTO_IMAGE_LIST_CLASS(klass)( \ - G_TYPE_CHECK_CLASS_CAST ((klass), \ - RSTTO_TYPE_IMAGE_LIST, \ - RsttoImageListClass)) - -#define RSTTO_IS_IMAGE_LIST_CLASS(klass)( \ - G_TYPE_CHECK_CLASS_TYPE ((klass), \ - RSTTO_TYPE_IMAGE_LIST())) - typedef struct _RsttoImageListPriv RsttoImageListPriv; typedef struct _RsttoImageList RsttoImageList; @@ -69,19 +60,6 @@ struct _RsttoImageListClass RSTTO_TYPE_IMAGE_LIST_ITER, \ RsttoImageListIter)) -#define RSTTO_IS_IMAGE_LIST_ITER(obj)( \ - G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - RSTTO_TYPE_IMAGE_LIST_ITER)) - -#define RSTTO_IMAGE_LIST_ITER_CLASS(klass)( \ - G_TYPE_CHECK_CLASS_CAST ((klass), \ - RSTTO_TYPE_IMAGE_LIST_ITER, \ - RsttoImageListIterClass)) - -#define RSTTO_IS_IMAGE_LIST_ITER_CLASS(klass)( \ - G_TYPE_CHECK_CLASS_TYPE ((klass), \ - RSTTO_TYPE_IMAGE_LIST_ITER())) - typedef struct _RsttoImageListIter RsttoImageListIter; typedef struct _RsttoImageListIterPriv RsttoImageListIterPriv; struct _RsttoImageListIter diff --git a/src/image_viewer.h b/src/image_viewer.h index 7ce06151..6d4b2207 100644 --- a/src/image_viewer.h +++ b/src/image_viewer.h @@ -37,15 +37,6 @@ G_BEGIN_DECLS G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ RSTTO_TYPE_IMAGE_VIEWER)) -#define RSTTO_IMAGE_VIEWER_CLASS(klass)( \ - G_TYPE_CHECK_CLASS_CAST ((klass), \ - RSTTO_TYPE_IMAGE_VIEWER, \ - RsttoImageViewerClass)) - -#define RSTTO_IS_IMAGE_VIEWER_CLASS(klass)( \ - G_TYPE_CHECK_CLASS_TYPE ((klass), \ - RSTTO_TYPE_IMAGE_VIEWER())) - typedef struct _RsttoImageViewerPriv RsttoImageViewerPriv; typedef struct _RsttoImageViewer RsttoImageViewer; diff --git a/src/main_window.h b/src/main_window.h index 00b2115b..0ed203d0 100644 --- a/src/main_window.h +++ b/src/main_window.h @@ -37,15 +37,6 @@ G_BEGIN_DECLS G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ RSTTO_TYPE_MAIN_WINDOW)) -#define RSTTO_MAIN_WINDOW_CLASS(klass)( \ - G_TYPE_CHECK_CLASS_CAST ((klass), \ - RSTTO_TYPE_MAIN_WINDOW, \ - RsttoMainWindowClass)) - -#define RSTTO_IS_MAIN_WINDOW_CLASS(klass)( \ - G_TYPE_CHECK_CLASS_TYPE ((klass), \ - RSTTO_TYPE_MAIN_WINDOW())) - typedef struct _RsttoMainWindowPriv RsttoMainWindowPriv; typedef struct _RsttoMainWindow RsttoMainWindow; diff --git a/src/mime_db.h b/src/mime_db.h index 4ab5b70d..97be37f0 100644 --- a/src/mime_db.h +++ b/src/mime_db.h @@ -31,19 +31,11 @@ G_BEGIN_DECLS RSTTO_TYPE_MIME_DB, \ RsttoMimeDB)) -#define RSTTO_IS_MIME_DB(obj)( \ - G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - RSTTO_TYPE_MIME_DB)) - #define RSTTO_MIME_DB_CLASS(klass)( \ G_TYPE_CHECK_CLASS_CAST ((klass), \ RSTTO_TYPE_MIME_DB, \ RsttoMimeDBClass)) -#define RSTTO_IS_MIME_DB_CLASS(klass)( \ - G_TYPE_CHECK_CLASS_TYPE ((klass), \ - RSTTO_TYPE_MIME_DB())) - typedef struct _RsttoMimeDB RsttoMimeDB; typedef struct _RsttoMimeDBPriv RsttoMimeDBPriv; diff --git a/src/monitor_chooser.h b/src/monitor_chooser.h index 2fe5e40b..203296d4 100644 --- a/src/monitor_chooser.h +++ b/src/monitor_chooser.h @@ -35,15 +35,6 @@ G_BEGIN_DECLS G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ RSTTO_TYPE_MONITOR_CHOOSER)) -#define RSTTO_MONITOR_CHOOSER_CLASS(klass)( \ - G_TYPE_CHECK_CLASS_CAST ((klass), \ - RSTTO_TYPE_MONITOR_CHOOSER, \ - RsttoMonitorChooserClass)) - -#define RSTTO_IS_MONITOR_CHOOSER_CLASS(klass)( \ - G_TYPE_CHECK_CLASS_TYPE ((klass), \ - RSTTO_TYPE_MONITOR_CHOOSER())) - typedef struct _RsttoMonitorChooserPriv RsttoMonitorChooserPriv; typedef struct _RsttoMonitorChooser RsttoMonitorChooser; diff --git a/src/preferences_dialog.h b/src/preferences_dialog.h index 35832697..fbc6f6ab 100644 --- a/src/preferences_dialog.h +++ b/src/preferences_dialog.h @@ -31,19 +31,11 @@ G_BEGIN_DECLS RSTTO_TYPE_PREFERENCES_DIALOG, \ RsttoPreferencesDialog)) -#define RSTTO_IS_PREFERENCES_DIALOG(obj)( \ - G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - RSTTO_TYPE_PREFERENCES_DIALOG)) - #define RSTTO_PREFERENCES_DIALOG_CLASS(klass)( \ G_TYPE_CHECK_CLASS_CAST ((klass), \ RSTTO_TYPE_PREFERENCES_DIALOG, \ RsttoPreferencesDialogClass)) -#define RSTTO_IS_PREFERENCES_DIALOG_CLASS(klass)( \ - G_TYPE_CHECK_CLASS_TYPE ((klass), \ - RSTTO_TYPE_PREFERENCES_DIALOG())) - typedef struct _RsttoPreferencesDialog RsttoPreferencesDialog; typedef struct _RsttoPreferencesDialogPriv RsttoPreferencesDialogPriv; diff --git a/src/privacy_dialog.h b/src/privacy_dialog.h index bef4af06..020053cb 100644 --- a/src/privacy_dialog.h +++ b/src/privacy_dialog.h @@ -31,19 +31,11 @@ G_BEGIN_DECLS RSTTO_TYPE_PRIVACY_DIALOG, \ RsttoPrivacyDialog)) -#define RSTTO_IS_PRIVACY_DIALOG(obj)( \ - G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - RSTTO_TYPE_PRIVACY_DIALOG)) - #define RSTTO_PRIVACY_DIALOG_CLASS(klass)( \ G_TYPE_CHECK_CLASS_CAST ((klass), \ RSTTO_TYPE_PRIVACY_DIALOG, \ RsttoPrivacyDialogClass)) -#define RSTTO_IS_PRIVACY_DIALOG_CLASS(klass)( \ - G_TYPE_CHECK_CLASS_TYPE ((klass), \ - RSTTO_TYPE_PRIVACY_DIALOG())) - typedef struct _RsttoPrivacyDialog RsttoPrivacyDialog; typedef struct _RsttoPrivacyDialogPriv RsttoPrivacyDialogPriv; diff --git a/src/properties_dialog.h b/src/properties_dialog.h index 512b9d2c..40713cff 100644 --- a/src/properties_dialog.h +++ b/src/properties_dialog.h @@ -31,19 +31,11 @@ G_BEGIN_DECLS RSTTO_TYPE_PROPERTIES_DIALOG, \ RsttoPropertiesDialog)) -#define RSTTO_IS_PROPERTIES_DIALOG(obj)( \ - G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - RSTTO_TYPE_PROPERTIES_DIALOG)) - #define RSTTO_PROPERTIES_DIALOG_CLASS(klass)( \ G_TYPE_CHECK_CLASS_CAST ((klass), \ RSTTO_TYPE_PROPERTIES_DIALOG, \ RsttoPropertiesDialogClass)) -#define RSTTO_IS_PROPERTIES_DIALOG_CLASS(klass)( \ - G_TYPE_CHECK_CLASS_TYPE ((klass), \ - RSTTO_TYPE_PROPERTIES_DIALOG())) - typedef struct _RsttoPropertiesDialog RsttoPropertiesDialog; typedef struct _RsttoPropertiesDialogPriv RsttoPropertiesDialogPriv; diff --git a/src/settings.h b/src/settings.h index d3f4bea5..8d589d75 100644 --- a/src/settings.h +++ b/src/settings.h @@ -31,19 +31,11 @@ G_BEGIN_DECLS RSTTO_TYPE_SETTINGS, \ RsttoSettings)) -#define RSTTO_IS_SETTINGS(obj)( \ - G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - RSTTO_TYPE_SETTINGS)) - #define RSTTO_SETTINGS_CLASS(klass)( \ G_TYPE_CHECK_CLASS_CAST ((klass), \ RSTTO_TYPE_SETTINGS, \ RsttoSettingsClass)) -#define RSTTO_IS_SETTINGS_CLASS(klass)( \ - G_TYPE_CHECK_CLASS_TYPE ((klass), \ - RSTTO_TYPE_SETTINGS())) - typedef struct _RsttoSettings RsttoSettings; typedef struct _RsttoSettingsPriv RsttoSettingsPriv; diff --git a/src/thumbnailer.h b/src/thumbnailer.h index 806c0c85..a928cf46 100644 --- a/src/thumbnailer.h +++ b/src/thumbnailer.h @@ -40,10 +40,6 @@ G_BEGIN_DECLS RSTTO_TYPE_THUMBNAILER, \ RsttoThumbnailerClass)) -#define RSTTO_IS_THUMBNAILER_CLASS(klass)( \ - G_TYPE_CHECK_CLASS_TYPE ((klass), \ - RSTTO_TYPE_THUMBNAILER())) - typedef struct _RsttoThumbnailer RsttoThumbnailer; typedef struct _RsttoThumbnailerPriv RsttoThumbnailerPriv; diff --git a/src/wallpaper_manager.h b/src/wallpaper_manager.h index 89902285..b89c83ea 100644 --- a/src/wallpaper_manager.h +++ b/src/wallpaper_manager.h @@ -28,13 +28,7 @@ G_BEGIN_DECLS #define RSTTO_WALLPAPER_MANAGER_TYPE \ rstto_wallpaper_manager_get_type () -#define RSTTO_WALLPAPER_MANAGER(obj)( \ - G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - RSTTO_WALLPAPER_MANAGER_TYPE, \ - RsttoWallpaperManager)) -#define RSTTO_IS_WALLPAPER_MANAGER(obj)( \ - G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - RSTTO_WALLPAPER_MANAGER_TYPE)) + #define RSTTO_WALLPAPER_MANAGER_GET_IFACE(inst)( \ G_TYPE_INSTANCE_GET_INTERFACE ((inst), \ RSTTO_WALLPAPER_MANAGER_TYPE, \ diff --git a/src/xfce_wallpaper_manager.h b/src/xfce_wallpaper_manager.h index 52b70746..00ea2045 100644 --- a/src/xfce_wallpaper_manager.h +++ b/src/xfce_wallpaper_manager.h @@ -34,19 +34,11 @@ G_BEGIN_DECLS RSTTO_TYPE_XFCE_WALLPAPER_MANAGER, \ RsttoXfceWallpaperManager)) -#define RSTTO_IS_XFCE_WALLPAPER_MANAGER(obj)( \ - G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - RSTTO_TYPE_XFCE_WALLPAPER_MANAGER)) - #define RSTTO_XFCE_WALLPAPER_MANAGER_CLASS(klass)( \ G_TYPE_CHECK_CLASS_CAST ((klass), \ RSTTO_TYPE_XFCE_WALLPAPER_MANAGER, \ RsttoXfceWallpaperManagerClass)) -#define RSTTO_IS_XFCE_WALLPAPER_MANAGER_CLASS(klass)( \ - G_TYPE_CHECK_CLASS_TYPE ((klass), \ - RSTTO_TYPE_XFCE_WALLPAPER_MANAGER())) - typedef struct _RsttoXfceWallpaperManager RsttoXfceWallpaperManager; typedef struct _RsttoXfceWallpaperManagerPriv RsttoXfceWallpaperManagerPriv; -- GitLab From 688923f7116879a4556ddd12b542c3bbc0a13550 Mon Sep 17 00:00:00 2001 From: "A. Palsson" Date: Sun, 12 Jul 2020 09:24:39 +0200 Subject: [PATCH 3/4] Removed unused/unnecessary global variables. --- src/properties_dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/properties_dialog.c b/src/properties_dialog.c index 29359c4a..a250e9cb 100644 --- a/src/properties_dialog.c +++ b/src/properties_dialog.c @@ -61,7 +61,7 @@ enum EXIF_PROP_MAKE, EXIF_PROP_APERATURE, EXIF_PROP_COUNT -} RsttoExifProp; +}; enum { -- GitLab From 58d1ad7ff05598688dda378c8b77c0470c0a73df Mon Sep 17 00:00:00 2001 From: "A. Palsson" Date: Sun, 12 Jul 2020 11:05:38 +0200 Subject: [PATCH 4/4] Removed deprecated code. gtk_adjustment_changed() and gtk_adjustment_value_changed() are unnecessary since GTK+ 3.18. --- src/image_viewer.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/image_viewer.c b/src/image_viewer.c index 6f2ad1bc..d8331a1c 100644 --- a/src/image_viewer.c +++ b/src/image_viewer.c @@ -2476,8 +2476,6 @@ rstto_motion_notify_event (GtkWidget *widget, GdkEventMotion *event) gtk_adjustment_set_value (adjustment, gtk_adjustment_get_lower (adjustment)); } - if (val != gtk_adjustment_get_value (adjustment)) - gtk_adjustment_value_changed (adjustment); } if (viewer->priv->motion.y != viewer->priv->motion.current_y) @@ -2497,8 +2495,6 @@ rstto_motion_notify_event (GtkWidget *widget, GdkEventMotion *event) gtk_adjustment_set_value (adjustment, gtk_adjustment_get_lower (adjustment)); } - if (val != gtk_adjustment_get_value (adjustment)) - gtk_adjustment_value_changed (adjustment); } break; case RSTTO_IMAGE_VIEWER_MOTION_STATE_BOX_ZOOM: @@ -2762,14 +2758,6 @@ rstto_button_release_event (GtkWidget *widget, GdkEventButton *event) g_object_thaw_notify(G_OBJECT(viewer->vadjustment)); g_object_thaw_notify(G_OBJECT(viewer->hadjustment)); - /* - * Trigger the 'changed' signal, update the rest - * of - * the appliaction. - */ - gtk_adjustment_changed(viewer->hadjustment); - gtk_adjustment_changed(viewer->vadjustment); - g_signal_emit_by_name(viewer, "scale-changed"); } break; -- GitLab