summaryrefslogtreecommitdiff
path: root/src/dlg-batch-add.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/dlg-batch-add.c')
-rw-r--r--src/dlg-batch-add.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/dlg-batch-add.c b/src/dlg-batch-add.c
index 2e36726..364b100 100644
--- a/src/dlg-batch-add.c
+++ b/src/dlg-batch-add.c
@@ -114,7 +114,7 @@ set_archive_options (DialogData *data)
int size;
value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (GET_WIDGET ("a_volume_spinbutton")));
- size = floor (value * MEGABYTE);
+ size = (int) (value * MEGABYTE);
g_settings_set_int (data->settings, PREF_BATCH_ADD_VOLUME_SIZE, size);
fr_window_set_volume_size (data->window, (guint) size);
}
@@ -394,13 +394,18 @@ archive_type_combo_box_changed_cb (GtkComboBox *combo_box,
const char *mime_type;
int idx = gtk_combo_box_get_active (combo_box);
char *icon_name;
+ char *content_type;
mime_type = mime_type_desc[data->supported_types[idx]].mime_type;
- if ((icon_name = g_content_type_get_generic_icon_name (mime_type)) != NULL) {
+ content_type = g_content_type_from_mime_type (mime_type);
+ if ((icon_name = g_content_type_get_generic_icon_name (content_type)) != NULL) {
gtk_image_set_from_icon_name (GTK_IMAGE (GET_WIDGET ("archive_icon_image")),
icon_name, GTK_ICON_SIZE_DIALOG);
+
g_free (icon_name);
}
+
+ g_free (content_type);
update_sensitivity_for_mime_type (data, mime_type);
}
@@ -464,6 +469,7 @@ dlg_batch_add_files (FrWindow *window,
const char *first_filename;
char *parent;
int i;
+ int size;
if (file_list == NULL)
return;
@@ -481,7 +487,9 @@ dlg_batch_add_files (FrWindow *window,
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 (GET_TOGGLE_BUTTON ("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")), g_settings_get_int (data->settings, PREF_BATCH_ADD_VOLUME_SIZE) / MEGABYTE);
+ size = g_settings_get_int (data->settings, PREF_BATCH_ADD_VOLUME_SIZE);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("a_volume_spinbutton")),
+ ((gdouble) size) / MEGABYTE);
first_filename = (char*) file_list->data;
parent = remove_level_from_path (first_filename);