[gtk/wip/baedert/for-master: 5/12] Pass common_cflags to print backends

[Timm Bäder <baedert src gnome org>]

commit 8b7fcd8acdff495390a2163bb6a55c73d116f462
Author: Timm Bäder <mail baedert org>
Date:   Mon May 18 11:38:02 2020 +0200

    Pass common_cflags to print backends

 modules/printbackends/gtkcupssecretsutils.c |  2 +-
 modules/printbackends/gtkprintbackendcups.c | 13 ++++++++-----
 modules/printbackends/meson.build           |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/modules/printbackends/gtkcupssecretsutils.c b/modules/printbackends/gtkcupssecretsutils.c
index 8b78c97f06..a25285a25d 100644
--- a/modules/printbackends/gtkcupssecretsutils.c
+++ b/modules/printbackends/gtkcupssecretsutils.c
@@ -888,7 +888,7 @@ gtk_cups_secrets_service_watch (GBusNameAppearedCallback appeared,
                            NULL);
 }
 
-void
+static void
 cleanup_task_data (gpointer data)
 {
   gint                i;
diff --git a/modules/printbackends/gtkprintbackendcups.c b/modules/printbackends/gtkprintbackendcups.c
index c750d6a712..110658fe31 100644
--- a/modules/printbackends/gtkprintbackendcups.c
+++ b/modules/printbackends/gtkprintbackendcups.c
@@ -649,6 +649,7 @@ add_cups_options (const gchar *key,
                           custom_value = TRUE;
                           break;
 
+                        case PPD_CUSTOM_UNKNOWN:
                         default :
                           custom_value = FALSE;
                         }
@@ -1153,7 +1154,7 @@ request_password (gpointer data)
 
       dispatch->backend->authentication_lock = TRUE;
 
-      switch (ippGetOperation (dispatch->request->ipp_request))
+      switch ((guint)ippGetOperation (dispatch->request->ipp_request))
         {
           case IPP_PRINT_JOB:
             if (job_title != NULL && printer_name != NULL)
@@ -2286,7 +2287,7 @@ cups_printer_handle_attribute (GtkPrintBackendCups *cups_backend,
           col = ippGetCollection (attr, i);
           for (iter = ippFirstAttribute (col); iter != NULL; iter = ippNextAttribute (col))
             {
-              switch (ippGetValueTag (iter))
+              switch ((guint)ippGetValueTag (iter))
                 {
                   case IPP_TAG_INTEGER:
                     if (g_strcmp0 (ippGetName (iter), "media-bottom-margin") == 0)
@@ -3038,7 +3039,7 @@ avahi_connection_test_cb (GObject      *source_object,
   g_free (data);
 }
 
-gboolean
+static gboolean
 avahi_txt_get_key_value_pair (const gchar  *entry,
                               gchar       **key,
                               gchar       **value)
@@ -3705,6 +3706,8 @@ update_backend_status (GtkPrintBackendCups    *cups_backend,
     case GTK_CUPS_CONNECTION_AVAILABLE:
       g_object_set (cups_backend, "status", GTK_PRINT_BACKEND_STATUS_OK, NULL);
       break;
+
+    case GTK_CUPS_CONNECTION_IN_PROGRESS:
     default: ;
     }
 }
@@ -4958,7 +4961,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 
           if (ppdNextCustomParam (coption) == NULL)
            {
-              switch (cparam->type)
+              switch ((guint)cparam->type)
                {
                 case PPD_CUSTOM_INT:
                  option = gtk_printer_option_new (gtk_name, label,
@@ -6320,7 +6323,7 @@ supports_am_pm (void)
  * Returns a newly allocated string holding UTC time in HH:MM:SS format
  * or NULL.
  */
-gchar *
+static gchar *
 localtime_to_utctime (const char *local_time)
 {
   const char *formats_0[] = {" %I : %M : %S %p ", " %p %I : %M : %S ",
diff --git a/modules/printbackends/meson.build b/modules/printbackends/meson.build
index c8c56454d6..643a8ba888 100644
--- a/modules/printbackends/meson.build
+++ b/modules/printbackends/meson.build
@@ -68,7 +68,7 @@ printbackends_args = [
   '-DGTK_COMPILATION',
   '-DGTK_DISABLE_DEPRECATION_WARNINGS',
   '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
-]
+] + common_cflags
 
 if print_backends.contains('cups')
   shared_module('printbackend-cups',