[seahorse] Fix a few warnings from GCC.



commit 2868f3acacc84fc0fa0dec34a7d867190dda5a26
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Thu May 10 12:15:09 2018 +0200

    Fix a few warnings from GCC.

 pgp/seahorse-gpgme-secret-deleter.c |    2 +-
 pgp/seahorse-keyserver-search.c     |    7 ++++---
 pgp/seahorse-keyserver-sync.c       |    2 +-
 pgp/seahorse-pgp-backend.c          |    4 ++--
 pgp/seahorse-pgp-key-properties.c   |    2 +-
 pgp/seahorse-pgp-subkey.c           |    2 +-
 pgp/seahorse-signer.c               |    2 +-
 pkcs11/seahorse-pkcs11-generate.c   |    2 +-
 8 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/pgp/seahorse-gpgme-secret-deleter.c b/pgp/seahorse-gpgme-secret-deleter.c
index 25c89b9..4b6c19f 100644
--- a/pgp/seahorse-gpgme-secret-deleter.c
+++ b/pgp/seahorse-gpgme-secret-deleter.c
@@ -104,7 +104,7 @@ seahorse_gpgme_secret_deleter_add_object (SeahorseDeleter *deleter,
                return FALSE;
        if (seahorse_object_get_usage (SEAHORSE_OBJECT (object)) != SEAHORSE_USAGE_PRIVATE_KEY)
                return FALSE;
-       self->key = g_object_ref (object);
+       self->key = SEAHORSE_GPGME_KEY (g_object_ref (object));
        self->keys = g_list_append (self->keys, object);
        return TRUE;
 }
diff --git a/pgp/seahorse-keyserver-search.c b/pgp/seahorse-keyserver-search.c
index f88d024..1e14803 100644
--- a/pgp/seahorse-keyserver-search.c
+++ b/pgp/seahorse-keyserver-search.c
@@ -247,7 +247,8 @@ select_inital_keyservers (SeahorseWidget *swidget)
        gchar *name;
        guint i;
 
-       names = g_settings_get_strv (seahorse_app_settings_instance (), "last-search-servers");
+       names = g_settings_get_strv (G_SETTINGS (seahorse_app_settings_instance ()),
+                                                               "last-search-servers");
 
        /* Close the expander if all servers are selected */
        widget = seahorse_widget_get_widget (swidget, "search-where");
@@ -421,7 +422,7 @@ on_keyserver_search_ok_clicked (GtkButton *button, SeahorseWidget *swidget)
        /* The keyservers to search, and save for next time */
        selection = get_keyserver_selection (swidget);
        g_return_if_fail (selection->uris != NULL);
-       g_settings_set_strv (seahorse_app_settings_instance (), "last-search-servers",
+       g_settings_set_strv (G_SETTINGS (seahorse_app_settings_instance ()), "last-search-servers",
                             selection->all ? NULL : (const gchar * const*)selection->uris->pdata);
 
        /* Open the new result window; its transient parent is *our* transient
@@ -485,7 +486,7 @@ seahorse_keyserver_search_show (GtkWindow *parent)
 
        /* The key servers to list */
        settings = seahorse_pgp_settings_instance ();
-       on_settings_keyservers_changed (settings, "keyservers", swidget);
+       on_settings_keyservers_changed (G_SETTINGS (settings), "keyservers", swidget);
        g_signal_connect_object (settings, "changed::keyservers",
                                 G_CALLBACK (on_settings_keyservers_changed), swidget, 0);
 
diff --git a/pgp/seahorse-keyserver-sync.c b/pgp/seahorse-keyserver-sync.c
index bab9fad..3d93c0d 100644
--- a/pgp/seahorse-keyserver-sync.c
+++ b/pgp/seahorse-keyserver-sync.c
@@ -96,7 +96,7 @@ on_sync_configure_clicked (GtkButton *button, SeahorseWidget *swidget)
 {
     SeahorsePrefs *prefs_dialog = seahorse_prefs_new (GTK_WINDOW (seahorse_widget_get_widget (swidget, 
swidget->name)), "keyserver-tab");
     gtk_dialog_run (GTK_DIALOG (prefs_dialog));
-    gtk_widget_destroy (GTK_DIALOG (prefs_dialog));
+    gtk_widget_destroy (GTK_WIDGET (prefs_dialog));
 }
 
 static void
diff --git a/pgp/seahorse-pgp-backend.c b/pgp/seahorse-pgp-backend.c
index d788593..9b9dbf9 100644
--- a/pgp/seahorse-pgp-backend.c
+++ b/pgp/seahorse-pgp-backend.c
@@ -176,7 +176,7 @@ seahorse_pgp_backend_constructed (GObject *obj)
                          G_CALLBACK (on_settings_keyservers_changed), self);
 
        /* Initial loading */
-       on_settings_keyservers_changed (seahorse_pgp_settings_instance (), "keyservers", self);
+       on_settings_keyservers_changed (G_SETTINGS (seahorse_pgp_settings_instance ()), "keyservers", self);
 #endif
 }
 
@@ -494,7 +494,7 @@ seahorse_pgp_backend_search_remote_async (SeahorsePgpBackend *self,
        g_return_if_fail (SEAHORSE_IS_PGP_BACKEND (self));
 
        /* Get a list of all selected key servers */
-       names = g_settings_get_strv (seahorse_app_settings_instance (), "last-search-servers");
+       names = g_settings_get_strv (G_SETTINGS (seahorse_app_settings_instance ()), "last-search-servers");
        if (names != NULL && names[0] != NULL) {
                servers = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
                for (i = 0; names[i] != NULL; i++)
diff --git a/pgp/seahorse-pgp-key-properties.c b/pgp/seahorse-pgp-key-properties.c
index b5c23db..7817624 100644
--- a/pgp/seahorse-pgp-key-properties.c
+++ b/pgp/seahorse-pgp-key-properties.c
@@ -1982,7 +1982,7 @@ seahorse_pgp_key_properties_show (SeahorsePgpKey *pkey, GtkWindow *parent)
                swidget = setup_private_properties (pkey, parent);
        if (swidget) {
                seahorse_widget_show (swidget);
-               return g_object_ref (seahorse_widget_get_toplevel (swidget));
+               return GTK_WINDOW (g_object_ref (seahorse_widget_get_toplevel (swidget)));
        }
 
        return NULL;
diff --git a/pgp/seahorse-pgp-subkey.c b/pgp/seahorse-pgp-subkey.c
index 36f552b..6fc916c 100644
--- a/pgp/seahorse-pgp-subkey.c
+++ b/pgp/seahorse-pgp-subkey.c
@@ -287,7 +287,7 @@ seahorse_pgp_subkey_get_usage (SeahorsePgpSubkey *self)
                const char *name;
        } FlagNames;
 
-       const FlagNames const flag_names[] = {
+       const FlagNames flag_names[] = {
                { SEAHORSE_FLAG_CAN_ENCRYPT,      N_("Encrypt") },
                { SEAHORSE_FLAG_CAN_SIGN,         N_("Sign") },
                { SEAHORSE_FLAG_CAN_CERTIFY,      N_("Certify") },
diff --git a/pgp/seahorse-signer.c b/pgp/seahorse-signer.c
index 836a8ba..07a7e97 100755
--- a/pgp/seahorse-signer.c
+++ b/pgp/seahorse-signer.c
@@ -81,7 +81,7 @@ seahorse_signer_get (GtkWindow *parent)
     seahorse_combo_keys_attach (GTK_COMBO_BOX (combo), collection, NULL);
     g_object_unref (collection);
 
-    settings = seahorse_pgp_settings_instance ();
+    settings = G_SETTINGS (seahorse_pgp_settings_instance ());
 
     /* Select the last key used */
     id = g_settings_get_string (settings, "last-signer");
diff --git a/pkcs11/seahorse-pkcs11-generate.c b/pkcs11/seahorse-pkcs11-generate.c
index 913fbfc..ef9d5e2 100644
--- a/pkcs11/seahorse-pkcs11-generate.c
+++ b/pkcs11/seahorse-pkcs11-generate.c
@@ -238,7 +238,7 @@ on_token_changed (GtkComboBox *combo_box,
 
        if (gtk_combo_box_get_active_iter (combo_box, &iter)) {
                object = gcr_collection_model_object_for_iter (self->token_model, &iter);
-               self->token = g_object_ref (object);
+               self->token = SEAHORSE_PKCS11_TOKEN (g_object_ref (object));
        }
 
        model = GTK_TREE_MODEL (self->mechanism_store);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]