summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrbuj <[email protected]>2019-09-02 21:59:53 +0200
committerRobert Antoni Buj Gelonch <[email protected]>2019-09-03 18:10:02 +0200
commit22055045d0aedfdc59bd02262ba4f772bc98f22e (patch)
tree8a5aac4126b7edf604b65c490a4d605adf5eb586
parent9bd8ff26b6c038bb6d8509bf999f16dfb5408a88 (diff)
downloadengrampa-22055045d0aedfdc59bd02262ba4f772bc98f22e.tar.bz2
engrampa-22055045d0aedfdc59bd02262ba4f772bc98f22e.tar.xz
remove warnings: cast from function call [-Wbad-function-cast]
dlg-batch-add.c:513:83: warning: cast from function call of type ‘gint’ {aka ‘int’} to non-matching type ‘double’ [-Wbad-function-cast] 513 | gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("a_volume_spinbutton")), (double) g_settings_get_int (data->settings, PREF_BATCH_ADD_VOLUME_SIZE) / MEGABYTE); | ^ dlg-new.c:321:81: warning: cast from function call of type ‘gint’ {aka ‘int’} to non-matching type ‘double’ [-Wbad-function-cast] 321 | gtk_spin_button_set_value (GTK_SPIN_BUTTON (data->n_volume_spinbutton), (double) g_settings_get_int (settings, PREF_BATCH_ADD_VOLUME_SIZE) / MEGABYTE); | ^
-rw-r--r--src/dlg-batch-add.c2
-rw-r--r--src/dlg-new.c4
-rw-r--r--src/typedefs.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/dlg-batch-add.c b/src/dlg-batch-add.c
index 3597214..50b85d8 100644
--- a/src/dlg-batch-add.c
+++ b/src/dlg-batch-add.c
@@ -510,7 +510,7 @@ dlg_batch_add_files (FrWindow *window,
gtk_button_set_label (GTK_BUTTON (GET_WIDGET ("a_add_button")), FR_STOCK_CREATE_ARCHIVE);
gtk_expander_set_expanded (GTK_EXPANDER (GET_WIDGET ("a_other_options_expander")), FALSE /*g_settings_get_boolean (data->settings, PREF_BATCH_ADD_OTHER_OPTIONS)*/);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("a_encrypt_header_checkbutton")), g_settings_get_boolean (data->settings_general, PREF_GENERAL_ENCRYPT_HEADER));
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("a_volume_spinbutton")), (double) g_settings_get_int (data->settings, PREF_BATCH_ADD_VOLUME_SIZE) / MEGABYTE);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("a_volume_spinbutton")), g_settings_get_int (data->settings, PREF_BATCH_ADD_VOLUME_SIZE) / MEGABYTE);
first_filename = (char*) file_list->data;
diff --git a/src/dlg-new.c b/src/dlg-new.c
index d0c8e6b..57cd301 100644
--- a/src/dlg-new.c
+++ b/src/dlg-new.c
@@ -36,7 +36,7 @@
#define GET_WIDGET(x) (_gtk_builder_get_widget (data->builder, (x)))
#define DEFAULT_EXTENSION ".tar.gz"
#define BAD_CHARS "/\\*"
-#define MEGABYTE (1024 * 1024)
+#define MEGABYTE (1024.0 * 1024.0)
/* called when the main dialog is closed. */
@@ -318,7 +318,7 @@ dlg_new_archive (FrWindow *window,
g_object_unref (settings);
settings = g_settings_new (ENGRAMPA_SCHEMA_BATCH_ADD);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (data->n_volume_spinbutton), (double) g_settings_get_int (settings, PREF_BATCH_ADD_VOLUME_SIZE) / MEGABYTE);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (data->n_volume_spinbutton), g_settings_get_int (settings, PREF_BATCH_ADD_VOLUME_SIZE) / MEGABYTE);
g_object_unref (settings);
/* format chooser */
diff --git a/src/typedefs.h b/src/typedefs.h
index 22a7417..0206f51 100644
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -26,7 +26,7 @@
#include <glib.h>
#include <glib-object.h>
-#define MEGABYTE (1024 * 1024)
+#define MEGABYTE (1024.0 * 1024.0)
#define ADD_FOLDER_OPTIONS_DIR "engrampa/options"