Mercurial > hg > forks > geeqie
changeset 2441:a2d4729a3b2d
Fix GCC and Clang compile warnings.
| author | Omari Stephens <xsdg@google.com> |
|---|---|
| date | Sun, 25 Dec 2016 01:47:15 +0000 |
| parents | e5533195963f |
| children | c249abb0c0e2 |
| files | src/cache_maint.c src/layout.c src/layout_util.c src/preferences.c src/typedefs.h src/view_dir.h src/view_file.h |
| diffstat | 7 files changed, 16 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cache_maint.c Sat Dec 24 13:44:25 2016 +0100 +++ b/src/cache_maint.c Sun Dec 25 01:47:15 2016 +0000 @@ -32,6 +32,7 @@ #include "ui_spinner.h" #include "ui_tabcomp.h" #include "ui_utildlg.h" +#include "window.h" typedef struct _CMData CMData;
--- a/src/layout.c Sat Dec 24 13:44:25 2016 +0100 +++ b/src/layout.c Sun Dec 25 01:47:15 2016 +0000 @@ -1728,7 +1728,7 @@ void layout_toolbar_toggle(LayoutWindow *lw) { if (!layout_valid(&lw)) return; - if (!lw->toolbar) return; + if (!lw->toolbar[TOOLBAR_MAIN]) return; lw->options.toolbar_hidden = !lw->options.toolbar_hidden; @@ -2125,8 +2125,8 @@ layout_config_parse(lw->options.style, lw->options.order, &lw->dir_location, &lw->file_location, &lw->image_location); - if (lw->options.dir_view_type >= VIEW_DIR_TYPES_COUNT) lw->options.dir_view_type = 0; - if (lw->options.file_view_type >= VIEW_FILE_TYPES_COUNT) lw->options.file_view_type = 0; + if (lw->options.dir_view_type > DIRVIEW_LAST) lw->options.dir_view_type = 0; + if (lw->options.file_view_type > FILEVIEW_LAST) lw->options.file_view_type = 0; /* divider positions */
--- a/src/layout_util.c Sat Dec 24 13:44:25 2016 +0100 +++ b/src/layout_util.c Sun Dec 25 01:47:15 2016 +0000 @@ -2134,7 +2134,7 @@ menu_split_radio_entries, G_N_ELEMENTS(menu_split_radio_entries), 0, G_CALLBACK(layout_menu_split_cb), lw); gtk_action_group_add_radio_actions(lw->action_group, - menu_view_dir_radio_entries, VIEW_DIR_TYPES_COUNT, + menu_view_dir_radio_entries, DIRVIEW_LAST + 1 /* count */, 0, G_CALLBACK(layout_menu_view_dir_as_cb), lw); gtk_action_group_add_radio_actions(lw->action_group, menu_color_radio_entries, COLOR_PROFILE_FILE + COLOR_PROFILE_INPUTS,
--- a/src/preferences.c Sat Dec 24 13:44:25 2016 +0100 +++ b/src/preferences.c Sun Dec 25 01:47:15 2016 +0000 @@ -410,7 +410,7 @@ static void config_window_help_cb(GtkWidget *widget, gpointer data) { - GtkWidget *notebook = GTK_NOTEBOOK(data); + GtkWidget *notebook = GTK_WIDGET(data); gint i; static gchar *html_section[] = @@ -426,7 +426,7 @@ "GuideOptionsBehavior.html" }; - i = gtk_notebook_get_current_page(notebook); + i = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook)); help_window_show(html_section[i]); } @@ -1979,7 +1979,7 @@ } static void add_intent_menu(GtkWidget *table, gint column, gint row, const gchar *text, - guint option, guint *option_c) + gint option, gint *option_c) { GtkWidget *combo; gint current = 0;
--- a/src/typedefs.h Sat Dec 24 13:44:25 2016 +0100 +++ b/src/typedefs.h Sun Dec 25 01:47:15 2016 +0000 @@ -38,12 +38,18 @@ typedef enum { DIRVIEW_LIST, - DIRVIEW_TREE + DIRVIEW_TREE, + + // Keep this up to date! + DIRVIEW_LAST = DIRVIEW_TREE } DirViewType; typedef enum { FILEVIEW_LIST, - FILEVIEW_ICON + FILEVIEW_ICON, + + // Keep this up to date! + FILEVIEW_LAST = FILEVIEW_ICON } FileViewType; #define CMD_COPY "geeqie-copy-command.desktop"
--- a/src/view_dir.h Sat Dec 24 13:44:25 2016 +0100 +++ b/src/view_dir.h Sun Dec 25 01:47:15 2016 +0000 @@ -30,8 +30,6 @@ DIR_COLUMN_COUNT }; -#define VIEW_DIR_TYPES_COUNT 2 - ViewDir *vd_new(DirViewType type, FileData *dir_fd); void vd_set_select_func(ViewDir *vdl, void (*func)(ViewDir *vdl, FileData *fd, gpointer data), gpointer data);
--- a/src/view_file.h Sat Dec 24 13:44:25 2016 +0100 +++ b/src/view_file.h Sun Dec 25 01:47:15 2016 +0000 @@ -21,8 +21,6 @@ #ifndef VIEW_FILE_H #define VIEW_FILE_H -#define VIEW_FILE_TYPES_COUNT 2 - #define VFLIST(_vf_) ((ViewFileInfoList *)(_vf_->info)) #define VFICON(_vf_) ((ViewFileInfoIcon *)(_vf_->info))