From: Rick Yorgason Date: Mon, 29 Oct 2018 11:04:10 +0000 (-0700) Subject: Fixed code styling. X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~86^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5dd7f20dab1a7c21a7e5bb52a71618452f266f39;p=gtk4.git Fixed code styling. --- diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c index 9185c04d25..147f64a848 100644 --- a/gtk/gtkprintoperation-win32.c +++ b/gtk/gtkprintoperation-win32.c @@ -963,7 +963,7 @@ devmode_from_settings (GtkPrintSettings *settings, gsize extras_len; const char *val; - // If we already provided a valid hDevMode, don't initialize a new one; just lock the one we have + /* If we already provided a valid hDevMode, don't initialize a new one; just lock the one we have */ if (hDevMode) { devmode = GlobalLock (hDevMode); @@ -995,9 +995,9 @@ devmode_from_settings (GtkPrintSettings *settings, g_free (extras); if (gtk_print_settings_has_key (settings, GTK_PRINT_SETTINGS_WIN32_DRIVER_VERSION)) - { - devmode->dmDriverVersion = gtk_print_settings_get_int (settings, GTK_PRINT_SETTINGS_WIN32_DRIVER_VERSION); - } + { + devmode->dmDriverVersion = gtk_print_settings_get_int (settings, GTK_PRINT_SETTINGS_WIN32_DRIVER_VERSION); + } } if (page_setup || @@ -1252,25 +1252,25 @@ dialog_from_print_settings (GtkPrintOperation *op, } } - // If we have a printer saved, restore our settings + /* If we have a printer saved, restore our settings */ printer = gtk_print_settings_get_printer (settings); if (printer) - { - printdlgex->hDevNames = gtk_print_win32_devnames_to_win32_from_printer_name (printer); + { + printdlgex->hDevNames = gtk_print_win32_devnames_to_win32_from_printer_name (printer); - printdlgex->hDevMode = devmode_from_settings (settings, + printdlgex->hDevMode = devmode_from_settings (settings, op->priv->default_page_setup, NULL); - } + } else - { - // Otherwise, use the default settings - DWORD FlagsCopy = printdlgex->Flags; - printdlgex->Flags |= PD_RETURNDEFAULT; - PrintDlgExW (printdlgex); - printdlgex->Flags = FlagsCopy; - - devmode_from_settings (settings, op->priv->default_page_setup, printdlgex->hDevMode); - } + { + /* Otherwise, use the default settings */ + DWORD FlagsCopy = printdlgex->Flags; + printdlgex->Flags |= PD_RETURNDEFAULT; + PrintDlgExW (printdlgex); + printdlgex->Flags = FlagsCopy; + + devmode_from_settings (settings, op->priv->default_page_setup, printdlgex->hDevMode); + } } typedef struct {