Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Wip/otte/for master

Closes #3295

See merge request GNOME/gtk!2748
This commit is contained in:
Benjamin Otte
2020-10-27 16:27:10 +00:00
parent 6d5c512571 6d7e56bed6
commit 08004d4eed
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/media/gtkgstmediafile.c
View File

@@ -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

6
modules/printbackends/gtkprintbackendcloudprint.c
View File

@@ -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);