Commit 08004d4e authored by Benjamin Otte's avatar Benjamin Otte

Merge branch 'wip/otte/for-master' into 'master'

Wip/otte/for master

Closes #3295

See merge request !2748
parents 6d5c5125 6d7e56be
Pipeline #224892 passed with stages
in 21 minutes and 45 seconds
......@@ -294,7 +294,7 @@ gtk_gst_media_file_update_audio (GtkMediaStream *stream,
GtkGstMediaFile *self = GTK_GST_MEDIA_FILE (stream);
gst_player_set_mute (self->player, muted);
gst_player_set_volume (self->player, volume);
gst_player_set_volume (self->player, volume * volume * volume);
}
static void
......
......@@ -124,8 +124,8 @@ g_io_module_unload (GIOModule *module)
char **
g_io_module_query (void)
{
char *eps[] = {
GTK_PRINT_BACKEND_EXTENSION_POINT_NAME,
char * eps[] = {
(char *) GTK_PRINT_BACKEND_EXTENSION_POINT_NAME,
NULL
};
......@@ -919,7 +919,7 @@ cloudprint_printer_get_options (GtkPrinter *printer,
/* How many document pages to go onto one side of paper. */
option = gtk_printer_option_new ("gtk-n-up", _("Pages per _sheet:"), GTK_PRINTER_OPTION_TYPE_PICKONE);
gtk_printer_option_choices_from_array (option, G_N_ELEMENTS (n_up),
(char **) n_up, (char **) n_up /* FIXME i18n (localised digits)! */);
n_up, n_up /* FIXME i18n (localised digits)! */);
gtk_printer_option_set (option, "1");
gtk_printer_option_set_add (set, option);
g_object_unref (option);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment