GNOME.org
 

[network-manager-applet/lr/gtk4: 7/10] nma/tests: add GTK4 support

commit 8ed98f50c8cc83f1a356c4aa8045ced8b8a8994c
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Feb 15 11:47:00 2019 +0100

    nma/tests: add GTK4 support
    
    Just paint over the differencies with a few ifdefs.

 src/libnma/tests/bar-code.c            | 10 +++++++---
 src/libnma/tests/cert-chooser.c        | 35 ++++++++++++++++++++++++++++++++++
 src/libnma/tests/mobile-wizard.c       |  4 ++++
 src/libnma/tests/run-vpn.c             |  5 +++++
 src/libnma/tests/vpn-password-dialog.c |  4 ++++
 src/libnma/tests/wifi-dialog-secrets.c |  4 ++++
 src/libnma/tests/wifi-dialog.c         |  4 ++++
 7 files changed, 63 insertions(+), 3 deletions(-)
---
diff --git a/src/libnma/tests/bar-code.c b/src/libnma/tests/bar-code.c
index 7925b880..f85a0cfa 100644
--- a/src/libnma/tests/bar-code.c
+++ b/src/libnma/tests/bar-code.c
@@ -106,10 +106,14 @@ main (int argc, char *argv[])
        nm_connection_add_setting (connection,
                                   nm_setting_wireless_new ());
 
-        gtk_init (&argc, &argv);
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_init ();
+#else
+       gtk_init (&argc, &argv);
+#endif
 
-        w = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-        gtk_widget_show (w);
+       w = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+       gtk_widget_show (w);
        gtk_window_set_default_size (GTK_WINDOW (w), 800, 680);
        g_signal_connect (w, "delete-event", G_CALLBACK (delete), NULL);
 
diff --git a/src/libnma/tests/cert-chooser.c b/src/libnma/tests/cert-chooser.c
index 352460a9..99808d12 100644
--- a/src/libnma/tests/cert-chooser.c
+++ b/src/libnma/tests/cert-chooser.c
@@ -24,21 +24,36 @@ main (int argc, char *argv[])
        GtkBox *content;
        GtkWidget *widget;
 
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_init ();
+#else
        gtk_init (&argc, &argv);
+#endif
 
        dialog = gtk_dialog_new_with_buttons ("NMACertChooser test",
                                              NULL, GTK_DIALOG_MODAL,
                                              "Dismiss",  GTK_RESPONSE_DELETE_EVENT,
                                              NULL);
        content = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_box_set_spacing (content, 6);
+#endif
 
        widget = nma_cert_chooser_new ("Any", 0);
        gtk_widget_show (widget);
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_container_add (GTK_CONTAINER (content), widget);
+#else
        gtk_box_pack_start (content, widget, TRUE, TRUE, 6);
+#endif
 
        widget = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
        gtk_widget_show (widget);
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_container_add (GTK_CONTAINER (content), widget);
+#else
        gtk_box_pack_start (content, widget, TRUE, TRUE, 6);
+#endif
 
        widget = nma_cert_chooser_new ("FLAG_PASSWORDS", NMA_CERT_CHOOSER_FLAG_PASSWORDS);
        nma_cert_chooser_set_cert (NMA_CERT_CHOOSER (widget),
@@ -47,23 +62,43 @@ main (int argc, char *argv[])
        nma_cert_chooser_set_key_uri (NMA_CERT_CHOOSER (widget),
                                      "pkcs11:object=worship;type=doom");
        gtk_widget_show (widget);
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_container_add (GTK_CONTAINER (content), widget);
+#else
        gtk_box_pack_start (content, widget, TRUE, TRUE, 6);
+#endif
 
        widget = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
        gtk_widget_show (widget);
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_container_add (GTK_CONTAINER (content), widget);
+#else
        gtk_box_pack_start (content, widget, TRUE, TRUE, 6);
+#endif
 
        widget = nma_cert_chooser_new ("FLAG_CERT", NMA_CERT_CHOOSER_FLAG_CERT);
        gtk_widget_show (widget);
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_container_add (GTK_CONTAINER (content), widget);
+#else
        gtk_box_pack_start (content, widget, TRUE, TRUE, 6);
+#endif
 
        widget = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
        gtk_widget_show (widget);
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_container_add (GTK_CONTAINER (content), widget);
+#else
        gtk_box_pack_start (content, widget, TRUE, TRUE, 6);
+#endif
 
        widget = nma_cert_chooser_new ("FLAG_PEM", NMA_CERT_CHOOSER_FLAG_PEM);
        gtk_widget_show (widget);
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_container_add (GTK_CONTAINER (content), widget);
+#else
        gtk_box_pack_start (content, widget, TRUE, TRUE, 6);
+#endif
 
        gtk_dialog_run (GTK_DIALOG (dialog));
 }
diff --git a/src/libnma/tests/mobile-wizard.c b/src/libnma/tests/mobile-wizard.c
index 36232115..1e21868f 100644
--- a/src/libnma/tests/mobile-wizard.c
+++ b/src/libnma/tests/mobile-wizard.c
@@ -19,7 +19,11 @@ main (int argc, char *argv[])
 {
        NMAMobileWizard *wizard;
 
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_init ();
+#else
        gtk_init (&argc, &argv);
+#endif
 
        wizard = nma_mobile_wizard_new (NULL, NULL, NM_DEVICE_MODEM_CAPABILITY_NONE, TRUE, wizard_cb, NULL);
 
diff --git a/src/libnma/tests/run-vpn.c b/src/libnma/tests/run-vpn.c
index 8f3eb16b..b0e39d9d 100644
--- a/src/libnma/tests/run-vpn.c
+++ b/src/libnma/tests/run-vpn.c
@@ -33,7 +33,12 @@ main (int argc, char *argv[])
        GtkWidget *widget;
        gs_free_error GError *error = NULL;
 
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_init ();
+#else
        gtk_init (&argc, &argv);
+#endif
+
        if (argc != 2) {
                g_printerr ("Usage: %s libnm-vpn-plugin-<name>.so\n", argv[0]);
                return EXIT_FAILURE;
diff --git a/src/libnma/tests/vpn-password-dialog.c b/src/libnma/tests/vpn-password-dialog.c
index 696599aa..2a65b432 100644
--- a/src/libnma/tests/vpn-password-dialog.c
+++ b/src/libnma/tests/vpn-password-dialog.c
@@ -13,7 +13,11 @@ main (int argc, char *argv[])
 {
        GtkWidget *widget;
 
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_init ();
+#else
        gtk_init (&argc, &argv);
+#endif
 
        widget = nma_vpn_password_dialog_new ("Title", "Message", "Password");
 
diff --git a/src/libnma/tests/wifi-dialog-secrets.c b/src/libnma/tests/wifi-dialog-secrets.c
index 4ceffcc4..f6d9ef95 100644
--- a/src/libnma/tests/wifi-dialog-secrets.c
+++ b/src/libnma/tests/wifi-dialog-secrets.c
@@ -54,7 +54,11 @@ main (int argc, char *argv[])
                NULL
        };
 
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_init ();
+#else
        gtk_init (&argc, &argv);
+#endif
 
        client = nm_client_new (NULL, NULL);
        connection = nm_simple_connection_new ();
diff --git a/src/libnma/tests/wifi-dialog.c b/src/libnma/tests/wifi-dialog.c
index 10c08ff3..1f8219ae 100644
--- a/src/libnma/tests/wifi-dialog.c
+++ b/src/libnma/tests/wifi-dialog.c
@@ -20,7 +20,11 @@ main (int argc, char *argv[])
        GError *error = NULL;
        gs_unref_bytes GBytes *ssid = g_bytes_new_static ("<Maj Vaj Faj>", 13);
 
+#if GTK_CHECK_VERSION(3,90,0)
+       gtk_init ();
+#else
        gtk_init (&argc, &argv);
+#endif
 
        client = nm_client_new (NULL, NULL);
        connection = nm_simple_connection_new ();
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]