[seahorse/feature/whitespace-ci] Get rid of trailing spaces
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse/feature/whitespace-ci] Get rid of trailing spaces
- Date: Sun, 14 Mar 2021 21:42:31 +0000 (UTC)
commit e16fb52a6bcdc991cbbf739ff4b55d6d00e9c507
Author: Niels De Graef <nielsdegraef gmail com>
Date: Sun Mar 14 19:37:03 2021 +0100
Get rid of trailing spaces
Although it almost physically hurts to mangle our Git history, it makes
sense to start getting rid of trailing whitespace, so we can easily
start enforcing this through our CI, rather than having time-consuming
nitpicks during PR reviews.
Since we're touching these lines already, we can use it to also start
enforcing more and more of a consistent code style.
libseahorse/seahorse-bind.c | 140 +++++++++++++++++++++----------------------
libseahorse/seahorse-bind.h | 26 ++++----
libseahorse/seahorse-util.c | 58 +++++++++---------
libseahorse/seahorse-util.h | 43 ++++++-------
pgp/seahorse-gpg-op.c | 43 +++++++------
pgp/seahorse-gpg-op.h | 6 +-
pgp/seahorse-gpg-options.c | 124 ++++++++++++++++++--------------------
pgp/seahorse-gpg-options.h | 28 +++++----
pgp/seahorse-gpgme-data.c | 86 +++++++++++++-------------
pgp/seahorse-gpgme-data.h | 18 +++---
pgp/seahorse-gpgme-dialogs.h | 28 ++++-----
pgp/seahorse-gpgme-key-op.h | 24 ++++----
pgp/seahorse-gpgme-photo.c | 28 ++++-----
pgp/seahorse-gpgme-photos.c | 111 +++++++++++++++++-----------------
pgp/seahorse-gpgme.c | 45 +++++++-------
pgp/seahorse-gpgme.h | 15 ++---
pgp/seahorse-pgp-keysets.c | 16 ++---
pgp/seahorse-pgp-keysets.h | 16 ++---
pgp/seahorse-server-source.c | 2 +-
pgp/seahorse-xloadimage.c | 2 +-
ssh/seahorse-ssh-askpass.c | 2 +-
ssh/ssh.vala | 2 +-
22 files changed, 426 insertions(+), 437 deletions(-)
---
diff --git a/libseahorse/seahorse-bind.c b/libseahorse/seahorse-bind.c
index 562924e4..c9810a79 100644
--- a/libseahorse/seahorse-bind.c
+++ b/libseahorse/seahorse-bind.c
@@ -1,23 +1,23 @@
-/*
+/*
* Seahorse
- *
+ *
* Copyright (C) 2008 Stefan Walter
- *
- * This program is free software; you can redistribute it and/or modify
+ *
+ * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this program; if not, see
* <http://www.gnu.org/licenses/>.
*/
-
+
#include "config.h"
#include "seahorse-bind.h"
@@ -32,7 +32,7 @@ value_equal (const GValue *a, const GValue *b)
if (G_VALUE_TYPE (a) != G_VALUE_TYPE (b))
return FALSE;
-
+
switch (G_VALUE_TYPE (a))
{
case G_TYPE_BOOLEAN:
@@ -145,7 +145,7 @@ value_equal (const GValue *a, const GValue *b)
}
break;
}
-
+
return retval;
}
@@ -160,14 +160,14 @@ typedef struct _Binding {
gulong connection;
SeahorseTransform transform;
gboolean processing;
-
+
gint references;
} Binding;
static void binding_unref (Binding *binding);
static void binding_ref (Binding *binding);
-static void
+static void
binding_src_gone (gpointer data, GObject *was)
{
Binding *binding = (Binding*)data;
@@ -184,16 +184,16 @@ binding_dest_gone (gpointer data, GObject *was)
at = g_list_find (binding->obj_dests, was);
g_assert (at != NULL);
-
+
/* Remove it from the list */
binding->obj_dests = g_list_delete_link (binding->obj_dests, at);
-
+
/* If no more destination objects, then go away */
if (!binding->obj_dests)
binding_unref (binding);
}
-static void
+static void
binding_ref (Binding *binding)
{
g_assert (binding);
@@ -206,35 +206,35 @@ binding_unref (Binding *binding)
GList *l;
g_assert (binding);
-
+
g_assert (binding->references > 0);
--binding->references;
if (binding->references > 0)
return;
-
+
if (G_IS_OBJECT (binding->obj_src)) {
g_signal_handler_disconnect (binding->obj_src, binding->connection);
g_object_weak_unref (binding->obj_src, binding_src_gone, binding);
binding->obj_src = NULL;
}
-
+
for (l = binding->obj_dests; l; l = g_list_next (l)) {
if (G_IS_OBJECT (l->data))
g_object_weak_unref (l->data, binding_dest_gone, binding);
}
g_list_free (binding->obj_dests);
binding->obj_dests = NULL;
-
+
g_assert (binding->prop_src);
g_param_spec_unref (binding->prop_src);
binding->prop_src = NULL;
-
+
g_assert (binding->prop_dest);
g_param_spec_unref (binding->prop_dest);
binding->prop_dest = NULL;
-
+
g_free (binding);
-
+
/* Remove from the list of all bindings */
g_assert (all_bindings);
g_hash_table_remove (all_bindings, binding);
@@ -252,7 +252,7 @@ bind_transfer (Binding *binding, gboolean forward)
g_assert (binding->obj_src);
g_assert (binding->obj_dests);
-
+
/* IMPORTANT: No return during this fuction */
binding_ref (binding);
binding->processing = TRUE;
@@ -261,7 +261,7 @@ bind_transfer (Binding *binding, gboolean forward)
memset (&src, 0, sizeof (src));
g_value_init (&src, binding->prop_src->value_type);
g_object_get_property (binding->obj_src, binding->prop_src->name, &src);
-
+
/* Transform the value */
memset (&dest, 0, sizeof (dest));
g_value_init (&dest, binding->prop_dest->value_type);
@@ -274,7 +274,7 @@ bind_transfer (Binding *binding, gboolean forward)
memset (&check, 0, sizeof (check));
g_value_init (&check, binding->prop_dest->value_type);
g_object_get_property (l->data, binding->prop_dest->name, &check);
-
+
/* Set the property on the destination object */
if (!value_equal (&dest, &check))
g_object_set_property (l->data, binding->prop_dest->name, &dest);
@@ -282,52 +282,51 @@ bind_transfer (Binding *binding, gboolean forward)
g_value_unset (&check);
}
- } else {
-
- g_warning ("couldn't transform value from '%s' to '%s' when trying to "
- "transfer bound property from %s.%s to %s.%s",
- g_type_name (binding->prop_src->value_type),
- g_type_name (binding->prop_dest->value_type),
- G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (binding->obj_src)),
- binding->prop_src->name,
- G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (binding->obj_dests->data)),
- binding->prop_dest->name);
- }
-
+ } else {
+ g_warning ("couldn't transform value from '%s' to '%s' when trying to "
+ "transfer bound property from %s.%s to %s.%s",
+ g_type_name (binding->prop_src->value_type),
+ g_type_name (binding->prop_dest->value_type),
+ G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (binding->obj_src)),
+ binding->prop_src->name,
+ G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (binding->obj_dests->data)),
+ binding->prop_dest->name);
+ }
+
g_value_unset (&src);
g_value_unset (&dest);
-
+
binding->processing = FALSE;
binding_unref (binding);
}
-static void
+static void
binding_fire (GObject *gobject, GParamSpec *pspec, gpointer data)
{
Binding *binding = (Binding*)data;
g_assert (gobject == binding->obj_src);
g_assert (pspec == binding->prop_src);
g_assert (binding->transform);
-
+
if (!binding->processing)
bind_transfer (binding, TRUE);
}
-gpointer
-seahorse_bind_property (const gchar *prop_src, gpointer obj_src,
+gpointer
+seahorse_bind_property (const gchar *prop_src, gpointer obj_src,
const gchar *prop_dest, gpointer obj_dest)
{
g_return_val_if_fail (G_IS_OBJECT (obj_src), NULL);
g_return_val_if_fail (prop_src, NULL);
g_return_val_if_fail (G_IS_OBJECT (obj_dest), NULL);
g_return_val_if_fail (prop_dest, NULL);
-
+
return seahorse_bind_property_full (prop_src, obj_src,
g_value_transform,
prop_dest, obj_dest, NULL);
}
-gpointer
+gpointer
seahorse_bind_property_full (const gchar *prop_src, gpointer obj_src,
SeahorseTransform transform,
const gchar *prop_dest, ...)
@@ -337,7 +336,7 @@ seahorse_bind_property_full (const gchar *prop_src, gpointer obj_src,
GParamSpec *spec_dest;
GParamSpec *spec;
Binding *binding;
- gchar *detail;
+ g_autofree char *detail = NULL;
GObject *dest;
GList *dests, *l;
va_list va;
@@ -346,7 +345,7 @@ seahorse_bind_property_full (const gchar *prop_src, gpointer obj_src,
g_return_val_if_fail (G_IS_OBJECT (obj_src), NULL);
g_return_val_if_fail (prop_src, NULL);
g_return_val_if_fail (prop_dest, NULL);
-
+
cls = G_OBJECT_GET_CLASS (obj_src);
spec_src = g_object_class_find_property (cls, prop_src);
if (!spec_src) {
@@ -354,7 +353,7 @@ seahorse_bind_property_full (const gchar *prop_src, gpointer obj_src,
prop_src, G_OBJECT_CLASS_NAME (cls));
return NULL;
}
-
+
dests = NULL;
spec_dest = NULL;
va_start(va, prop_dest);
@@ -362,30 +361,30 @@ seahorse_bind_property_full (const gchar *prop_src, gpointer obj_src,
dest = G_OBJECT (va_arg (va, GObject*));
if (!dest)
break;
-
+
g_return_val_if_fail (G_IS_OBJECT (dest), NULL);
-
+
cls = G_OBJECT_GET_CLASS (dest);
spec = g_object_class_find_property (cls, prop_dest);
if (!spec) {
g_warning ("no property with the name '%s' exists in object of class '%s'",
prop_dest, G_OBJECT_CLASS_NAME (cls));
return NULL;
- }
-
+ }
+
if (spec_dest && spec->value_type != spec_dest->value_type) {
g_warning ("destination property '%s' has a different type between objects in
binding: %s != %s",
prop_dest, g_type_name (spec_dest->value_type), g_type_name
(spec->value_type));
return NULL;
- }
-
+ }
+
dests = g_list_prepend (dests, dest);
spec_dest = spec;
}
g_return_val_if_fail (spec_dest, NULL);
g_return_val_if_fail (dests, NULL);
-
+
binding = g_new0 (Binding, 1);
binding->obj_src = obj_src;
@@ -395,8 +394,7 @@ seahorse_bind_property_full (const gchar *prop_src, gpointer obj_src,
binding->transform = transform;
detail = g_strdup_printf ("notify::%s", prop_src);
binding->connection = g_signal_connect (obj_src, detail, G_CALLBACK (binding_fire), binding);
- g_free (detail);
-
+
binding->obj_dests = dests;
binding->prop_dest = spec_dest;
g_param_spec_ref (spec_dest);
@@ -404,15 +402,15 @@ seahorse_bind_property_full (const gchar *prop_src, gpointer obj_src,
g_object_weak_ref (l->data, binding_dest_gone, binding);
binding->references = 1;
-
+
/* Note this in all bindings */
if (!all_bindings)
all_bindings = g_hash_table_new (g_direct_hash, g_direct_equal);
g_hash_table_insert (all_bindings, binding, binding);
-
+
/* Transfer the first time */
binding_fire (obj_src, spec_src, binding);
-
+
return binding;
}
@@ -440,24 +438,24 @@ transfer_gone (gpointer data, GObject *was)
transfer_free (transfer);
}
-static void
+static void
transfer_free (Transfer *transfer)
{
g_assert (transfer);
-
+
if (G_IS_OBJECT (transfer->object)) {
g_object_weak_unref (transfer->object, transfer_gone, transfer);
g_signal_handler_disconnect (transfer->object, transfer->connection);
transfer->object = NULL;
}
-
+
if (G_IS_OBJECT (transfer->dest)) {
g_object_weak_unref (transfer->dest, transfer_gone, transfer);
transfer->dest = NULL;
}
-
+
g_free (transfer);
-
+
/* Remove from the list of all notifies */
g_assert (all_transfers);
g_hash_table_remove (all_transfers, transfer);
@@ -475,8 +473,8 @@ transfer_fire (GObject *object, GParamSpec *spec, gpointer data)
(transfer->callback) (object, transfer->dest);
}
-gpointer
-seahorse_bind_objects (const gchar *property, gpointer object,
+gpointer
+seahorse_bind_objects (const gchar *property, gpointer object,
SeahorseTransfer callback, gpointer dest)
{
GObjectClass *cls;
@@ -486,7 +484,7 @@ seahorse_bind_objects (const gchar *property, gpointer object,
g_return_val_if_fail (G_IS_OBJECT (object), NULL);
g_return_val_if_fail (G_IS_OBJECT (dest), NULL);
g_return_val_if_fail (callback, NULL);
-
+
if (property) {
cls = G_OBJECT_GET_CLASS (object);
if (!g_object_class_find_property (cls, property)) {
@@ -495,7 +493,7 @@ seahorse_bind_objects (const gchar *property, gpointer object,
return NULL;
}
}
-
+
transfer = g_new0 (Transfer, 1);
transfer->object = object;
@@ -503,7 +501,7 @@ seahorse_bind_objects (const gchar *property, gpointer object,
transfer->dest = dest;
g_object_weak_ref (dest, transfer_gone, transfer);
transfer->callback = callback;
-
+
if (property) {
detail = g_strdup_printf ("notify::%s", property);
transfer->connection = g_signal_connect (object, detail, G_CALLBACK (transfer_fire),
transfer);
@@ -511,15 +509,15 @@ seahorse_bind_objects (const gchar *property, gpointer object,
} else {
transfer->connection = g_signal_connect (object, "notify", G_CALLBACK (transfer_fire),
transfer);
}
-
+
/* Note this in all bindings */
if (!all_transfers)
all_transfers = g_hash_table_new (g_direct_hash, g_direct_equal);
g_hash_table_insert (all_transfers, transfer, transfer);
-
+
/* Transfer the first time */
transfer_fire (object, NULL, transfer);
-
+
return transfer;
}
diff --git a/libseahorse/seahorse-bind.h b/libseahorse/seahorse-bind.h
index a9a3e99a..c99643b8 100644
--- a/libseahorse/seahorse-bind.h
+++ b/libseahorse/seahorse-bind.h
@@ -1,23 +1,23 @@
-/*
+/*
* Seahorse
- *
+ *
* Copyright (C) 2008 Stefan Walter
- *
- * This program is free software; you can redistribute it and/or modify
+ *
+ * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this program; if not, see
* <http://www.gnu.org/licenses/>.
*/
-
+
#ifndef SEAHORSEBIND_H_
#define SEAHORSEBIND_H_
@@ -25,16 +25,16 @@
typedef gboolean (*SeahorseTransform) (const GValue *src, GValue *dest);
-gpointer seahorse_bind_property (const gchar *prop_src, gpointer obj_src,
- const gchar *prop_dest, gpointer obj_dest);
+gpointer seahorse_bind_property (const char *prop_src, gpointer obj_src,
+ const char *prop_dest, gpointer obj_dest);
-gpointer seahorse_bind_property_full (const gchar *prop_src, gpointer obj_src,
- SeahorseTransform transform,
- const gchar *prop_dest, ...) G_GNUC_NULL_TERMINATED;
+gpointer seahorse_bind_property_full (const char *prop_src, gpointer obj_src,
+ SeahorseTransform transform,
+ const char *prop_dest, ...) G_GNUC_NULL_TERMINATED;
typedef gboolean (*SeahorseTransfer) (GObject *src, GObject *dest);
-gpointer seahorse_bind_objects (const gchar *property, gpointer obj_src,
+gpointer seahorse_bind_objects (const char *property, gpointer obj_src,
SeahorseTransfer transfer, gpointer obj_dest);
void seahorse_bind_disconnect (gpointer binding);
diff --git a/libseahorse/seahorse-util.c b/libseahorse/seahorse-util.c
index 77a2927b..69a8082c 100644
--- a/libseahorse/seahorse-util.c
+++ b/libseahorse/seahorse-util.c
@@ -99,23 +99,22 @@ seahorse_util_error_domain ()
return q;
}
-/**
+/**
* seahorse_util_print_fd:
* @fd: The file descriptor to write to
* @s: The data to write
*
* Returns: FALSE on error, TRUE on success
- **/
-gboolean
+ */
+gboolean
seahorse_util_print_fd (int fd, const char* s)
{
/* Guarantee all data is written */
int r, l = strlen (s);
while (l > 0) {
-
r = write (fd, s, l);
-
+
if (r == -1) {
if (errno == EPIPE)
return FALSE;
@@ -123,7 +122,7 @@ seahorse_util_print_fd (int fd, const char* s)
g_critical ("couldn't write data to socket: %s", strerror (errno));
return FALSE;
}
-
+
} else {
s += r;
l -= r;
@@ -133,31 +132,28 @@ seahorse_util_print_fd (int fd, const char* s)
return TRUE;
}
-/**
+/**
* seahorse_util_printf_fd:
* @fd: The file descriptor to write to
* @fmt: The printf format of the data to write
* @...: The parameters to insert
*
* Returns: TRUE on success, FALSE on error
- **/
-gboolean
+ */
+gboolean
seahorse_util_printf_fd (int fd, const char* fmt, ...)
{
- gchar* t;
+ g_autofree char *t = NULL;
va_list ap;
- gboolean ret;
-
- va_start (ap, fmt);
+
+ va_start (ap, fmt);
t = g_strdup_vprintf (fmt, ap);
va_end (ap);
-
- ret = seahorse_util_print_fd (fd, t);
- g_free (t);
- return ret;
+
+ return seahorse_util_print_fd (fd, t);
}
-/**
+/**
* seahorse_util_read_data_block:
* @buf: A string buffer to write the data to.
* @input: The input stream to read from.
@@ -169,19 +165,20 @@ seahorse_util_printf_fd (int fd, const char* fmt, ...)
* Returns: The number of bytes copied.
*/
guint
-seahorse_util_read_data_block (GString *buf, GInputStream *input,
- const gchar *start, const gchar* end)
+seahorse_util_read_data_block (GString *buf,
+ GInputStream *input,
+ const char *start,
+ const char *end)
{
- const gchar *t;
+ const char *t;
guint copied = 0;
- gchar ch;
+ char ch;
gsize read;
-
+
/* Look for the beginning */
t = start;
while (g_input_stream_read_all (input, &ch, 1, &read, NULL, NULL) && read == 1) {
-
- /* Match next char */
+ /* Match next char */
if (*t == ch)
t++;
@@ -191,24 +188,23 @@ seahorse_util_read_data_block (GString *buf, GInputStream *input,
copied += strlen (start);
break;
}
- }
-
+ }
+
/* Look for the end */
t = end;
while (g_input_stream_read_all (input, &ch, 1, &read, NULL, NULL) && read == 1) {
-
/* Match next char */
if (*t == ch)
t++;
-
+
buf = g_string_append_c (buf, ch);
copied++;
-
+
/* Did we find the whole string? */
if (!*t)
break;
}
-
+
return copied;
}
diff --git a/libseahorse/seahorse-util.h b/libseahorse/seahorse-util.h
index e0d45865..e56ef526 100644
--- a/libseahorse/seahorse-util.h
+++ b/libseahorse/seahorse-util.h
@@ -18,7 +18,7 @@
* along with this program; if not, see
* <http://www.gnu.org/licenses/>.
*/
-
+
/**
* A bunch of miscellaneous utility functions.
*/
@@ -31,35 +31,36 @@
typedef guint64 SeahorseVersion;
-#define SEAHORSE_ERROR (seahorse_util_error_domain ())
+#define SEAHORSE_ERROR (seahorse_util_error_domain ())
-GQuark seahorse_util_error_domain (void);
+GQuark seahorse_util_error_domain (void);
-void seahorse_util_handle_error (GError **error,
- gpointer parent,
- const gchar* description,
- ...);
+void seahorse_util_handle_error (GError **error,
+ void *parent,
+ const char *description,
+ ...);
-guint seahorse_util_read_data_block (GString *buf,
- GInputStream* input,
- const gchar *start,
- const gchar* end);
+unsigned int seahorse_util_read_data_block (GString *buf,
+ GInputStream *input,
+ const char *start,
+ const char *end);
-gboolean seahorse_util_print_fd (int fd,
- const char* data);
+gboolean seahorse_util_print_fd (int fd,
+ const char *data);
-gboolean seahorse_util_printf_fd (int fd,
- const char* data, ...);
+gboolean seahorse_util_printf_fd (int fd,
+ const char *fmt,
+ ...);
-gboolean seahorse_util_write_file_private (const gchar* filename,
- const gchar* contents,
- GError **err);
+gboolean seahorse_util_write_file_private (const char *filename,
+ const char *contents,
+ GError **err);
-GList * seahorse_util_objects_sort_by_place (GList *objects);
+GList * seahorse_util_objects_sort_by_place (GList *objects);
-GList * seahorse_util_objects_splice_by_place (GList *objects);
+GList * seahorse_util_objects_splice_by_place (GList *objects);
-SeahorseVersion seahorse_util_parse_version (const char *version);
+SeahorseVersion seahorse_util_parse_version (const char *version);
guint seahorse_ulong_hash (gconstpointer v);
diff --git a/pgp/seahorse-gpg-op.c b/pgp/seahorse-gpg-op.c
index ac4fc177..4ec5f7af 100644
--- a/pgp/seahorse-gpg-op.c
+++ b/pgp/seahorse-gpg-op.c
@@ -18,7 +18,7 @@
*/
#include "config.h"
-
+
#include <glib.h>
#include <gpgme.h>
#include <string.h>
@@ -27,61 +27,60 @@
#include "pgp/seahorse-gpgme.h"
static gpgme_error_t
-execute_gpg_command (gpgme_ctx_t ctx, const gchar *args, gchar **std_out,
- gchar **std_err)
+execute_gpg_command (gpgme_ctx_t ctx,
+ const char *args,
+ char **std_out,
+ char **std_err)
{
gpgme_engine_info_t engine;
gpgme_error_t gerr;
GError *err = NULL;
- gint status;
- gchar *cmd;
-
+ int status;
+ g_autofree char *cmd = NULL;
+
gerr = gpgme_get_engine_info (&engine);
g_return_val_if_fail (GPG_IS_OK (gerr), gerr);
-
+
/* Look for the OpenPGP engine */
while (engine && engine->protocol != GPGME_PROTOCOL_OpenPGP)
engine = engine->next;
-
+
g_return_val_if_fail (engine != NULL && engine->file_name, GPG_E (GPG_ERR_INV_ENGINE));
-
+
gerr = GPG_OK;
-
+
cmd = g_strdup_printf ("%s --batch %s", engine->file_name, args);
- if (!g_spawn_command_line_sync (cmd, std_out, std_err, &status, &err) ||
+ if (!g_spawn_command_line_sync (cmd, std_out, std_err, &status, &err) ||
status != 0) {
gerr = GPG_E (GPG_ERR_GENERAL);
if(err != NULL)
g_error_free (err);
}
- g_free (cmd);
return gerr;
}
-gpgme_error_t
+gpgme_error_t
seahorse_gpg_op_num_uids (gpgme_ctx_t ctx, const char *pattern, guint *number)
{
- gchar *output = NULL;
+ g_autofree char *output = NULL;
gpgme_error_t err;
- gchar *args;
- gchar *found = NULL;
-
+ g_autofree char *args = NULL;
+ char *found = NULL;
+
g_return_val_if_fail (pattern != NULL, GPG_E (GPG_ERR_INV_VALUE));
args = g_strdup_printf ("--list-keys '%s'", pattern);
-
+
err = execute_gpg_command (ctx, args, &output, NULL);
- g_free (args);
-
+
if (!GPG_IS_OK (err))
return err;
-
+
found = output;
while ((found = strstr(found, "uid")) != NULL) {
*number = *number + 1;
found += 3;
}
- g_free (output);
return GPG_OK;
}
diff --git a/pgp/seahorse-gpg-op.h b/pgp/seahorse-gpg-op.h
index 563d68ce..3c10c177 100644
--- a/pgp/seahorse-gpg-op.h
+++ b/pgp/seahorse-gpg-op.h
@@ -23,6 +23,6 @@
#include <gpgme.h>
-gpgme_error_t seahorse_gpg_op_num_uids (gpgme_ctx_t ctx,
- const char *pattern,
- guint *number);
+gpgme_error_t seahorse_gpg_op_num_uids (gpgme_ctx_t ctx,
+ const char *pattern,
+ guint *number);
diff --git a/pgp/seahorse-gpg-options.c b/pgp/seahorse-gpg-options.c
index a5ade388..80c973e0 100644
--- a/pgp/seahorse-gpg-options.c
+++ b/pgp/seahorse-gpg-options.c
@@ -49,7 +49,7 @@ create_file (const gchar *file, mode_t mode, GError **err)
{
int fd;
g_assert (err && !*err);
-
+
if ((fd = open (file, O_CREAT | O_TRUNC | O_WRONLY, mode)) == -1) {
g_set_error (err, G_IO_CHANNEL_ERROR, g_io_channel_error_from_errno (errno),
"%s", g_strerror (errno));
@@ -61,7 +61,7 @@ create_file (const gchar *file, mode_t mode, GError **err)
g_set_error (err, G_IO_CHANNEL_ERROR, g_io_channel_error_from_errno (errno),
"%s", strerror (errno));
}
-
+
close (fd);
return *err ? FALSE : TRUE;
}
@@ -81,20 +81,20 @@ find_config_file (gboolean read, GError **err)
/* Check for and open ~/.gnupg/gpg.conf */
conf = g_strconcat (gpg_homedir, "/gpg.conf", NULL);
- if (g_file_test (conf, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_EXISTS))
+ if (g_file_test (conf, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_EXISTS))
return conf;
g_free (conf);
-
+
/* Check for and open ~/.gnupg/options */
conf = g_strconcat (gpg_homedir, "/options", NULL);
- if (g_file_test (conf, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_EXISTS))
+ if (g_file_test (conf, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_EXISTS))
return conf;
g_free (conf);
/* Make sure directory exists */
if (!g_file_test (gpg_homedir, G_FILE_TEST_EXISTS)) {
if (mkdir (gpg_homedir, 0700) == -1) {
- g_set_error (err, G_IO_CHANNEL_ERROR,
+ g_set_error (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (errno),
"%s", strerror (errno));
return NULL;
@@ -120,45 +120,41 @@ read_config_file (GError **err)
GError *e = NULL;
gboolean ret;
GArray *array;
- gchar *conf, *contents;
- gchar **lines, **l;
+ g_autofree char *conf = NULL;
+ g_autofree char *contents = NULL;
+ g_auto(GStrv) lines = NULL;
g_assert (!err || !*err);
if (!err)
err = &e;
-
+
conf = find_config_file (TRUE, err);
if (conf == NULL)
return NULL;
-
+
ret = g_file_get_contents (conf, &contents, NULL, err);
- g_free (conf);
-
if (!ret)
return FALSE;
-
+
lines = g_strsplit (contents, "\n", -1);
- g_free (contents);
-
+
array = g_array_new (TRUE, TRUE, sizeof (gchar**));
- for (l = lines; *l; l++)
+ for (char **l = lines; *l; l++)
g_array_append_val (array, *l);
-
- /* We took ownership of the individual lines */
- g_free (lines);
+
return array;
-}
+}
static gboolean
write_config_file (GArray *array, GError **err)
{
GError *e = NULL;
- gchar *conf, *contents;
+ char *conf, *contents;
g_assert (!err || !*err);
if (!err)
err = &e;
-
+
conf = find_config_file (FALSE, err);
if (conf == NULL)
return FALSE;
@@ -274,7 +270,7 @@ gpg_options_init (GError **err)
/**
* seahorse_gpg_homedir
- *
+ *
* Returns: The home dir that GPG uses for it's keys and configuration
**/
const gchar *
@@ -287,15 +283,15 @@ seahorse_gpg_homedir (void)
/**
* seahorse_gpg_options_find
- *
+ *
* @option: The option to find
* @value: Returns the value, or NULL when not found
* @err: Returns an error value when errors
- *
+ *
* Find the value for a given option in the gpg config file.
* Values without a value are returned as an empty string.
- * On success be sure to free *value after you're done with it.
- *
+ * On success be sure to free *value after you're done with it.
+ *
* Returns: TRUE if success, FALSE if not
**/
gboolean
@@ -311,36 +307,36 @@ seahorse_gpg_options_find (const gchar *option, gchar **value, GError **err)
/**
* seahorse_gpg_options_find_vals
- *
+ *
* @option: null terminated array of option names
- * @value: An array of pointers for return values
+ * @value: An array of pointers for return values
* @err: Returns an error value when errors
- *
+ *
* Find the value for a given options in the gpg config file.
* Values without a value are returned as an empty string.
- * On success be sure to free all *value after you're done
+ * On success be sure to free all *value after you're done
* with them. values should be at least as big as options
- *
+ *
* Returns: TRUE if success, FALSE if not
**/
gboolean
-seahorse_gpg_options_find_vals (const gchar *options[], gchar *values[],
+seahorse_gpg_options_find_vals (const char *options[], char *values[],
GError **err)
{
GError *e = NULL;
GArray *lines;
- const gchar **opt;
- gchar *line;
- gchar *t;
+ const char **opt;
+ char *line;
+ char *t;
guint i, j;
-
+
g_assert (!err || !*err);
if (!err)
err = &e;
if (!gpg_options_init (err))
return FALSE;
-
+
lines = read_config_file (err);
if (!lines)
return FALSE;
@@ -351,7 +347,7 @@ seahorse_gpg_options_find_vals (const gchar *options[], gchar *values[],
for (j = 0; j < lines->len; j++) {
line = g_array_index (lines, gchar*, j);
- g_assert (line != NULL);
+ g_assert (line != NULL);
g_strstrip (line);
@@ -361,13 +357,11 @@ seahorse_gpg_options_find_vals (const gchar *options[], gchar *values[],
if (g_str_has_prefix (line, *opt)) {
t = line + strlen (*opt);
if (t[0] == 0 || g_ascii_isspace (t[0])) {
- /*
- * We found a value. Fill it in. The caller
- * frees this stuff. Note that we don't short
- * circuit the search because for gpg options
- * can be specified multiple times, and the
- * last one wins.
- */
+ /* We found a value. Fill it in. The caller
+ * frees this stuff. Note that we don't short
+ * circuit the search because for gpg options
+ * can be specified multiple times, and the
+ * last one wins. */
g_free (values[i]);
values[i] = g_strdup (t);
@@ -396,12 +390,10 @@ process_conf_edits (GArray *lines, const gchar *options[], gchar *values[])
for (j = 0; j < lines->len; j++) {
line = g_array_index (lines, gchar*, j);
- g_assert (line != NULL);
+ g_assert (line != NULL);
- /*
- * Does this line have an ending?
- * We use this below when appending lines.
- */
+ /* Does this line have an ending?
+ * We use this below when appending lines. */
n = line;
/* Don't use g_strstrip as we don't want to modify the line */
@@ -431,7 +423,7 @@ process_conf_edits (GArray *lines, const gchar *options[], gchar *values[])
/* Are we setting this value? */
if (values[i]) {
- /* At this point we're rewriting the line, so we
+ /* At this point we're rewriting the line, so we
* can modify the old line */
*t = 0;
@@ -443,10 +435,8 @@ process_conf_edits (GArray *lines, const gchar *options[], gchar *values[])
else
n = g_strdup (n);
- /*
- * We're done with this option, all other instances
- * of it need to be commented out
- */
+ /* We're done with this option, all other instances
+ * of it need to be commented out */
values[i] = NULL;
}
@@ -488,19 +478,19 @@ process_conf_edits (GArray *lines, const gchar *options[], gchar *values[])
/**
* seahorse_gpg_options_change
- *
+ *
* @option: The option to change
* @value: The value to change it to
* @err: Returns an error value when errors
- *
+ *
* Changes the given option in the gpg config file.
* If value is NULL, the option will be deleted. If you want
- * an empty value, set value to an empty string.
- *
+ * an empty value, set value to an empty string.
+ *
* Returns: TRUE if success, FALSE if not
**/
gboolean
-seahorse_gpg_options_change (const gchar *option, const gchar *value,
+seahorse_gpg_options_change (const char *option, const char *value,
GError **err)
{
const gchar *options[2];
@@ -513,15 +503,15 @@ seahorse_gpg_options_change (const gchar *option, const gchar *value,
/**
* seahorse_gpg_options_change_vals
- *
+ *
* @option: null-terminated array of option names to change
* @value: The values to change respective option to
* @err: Returns an error value when errors
- *
+ *
* Changes the given option in the gpg config file.
* If a value is NULL, the option will be deleted. If you want
- * an empty value, set value to an empty string.
- *
+ * an empty value, set value to an empty string.
+ *
* Returns: TRUE if success, FALSE if not
**/
gboolean
@@ -543,9 +533,9 @@ seahorse_gpg_options_change_vals (const gchar *options[], gchar *values[],
return FALSE;
process_conf_edits (lines, options, values);
-
+
write_config_file (lines, err);
free_string_array (lines);
-
+
return *err ? FALSE : TRUE;
}
diff --git a/pgp/seahorse-gpg-options.h b/pgp/seahorse-gpg-options.h
index 73c53c2f..bc31c705 100644
--- a/pgp/seahorse-gpg-options.h
+++ b/pgp/seahorse-gpg-options.h
@@ -17,7 +17,7 @@
* <http://www.gnu.org/licenses/>.
*/
-/**
+/**
* A collection of functions for changing options in gpg.conf.
*/
@@ -25,16 +25,24 @@
#include <glib.h>
-const gchar * seahorse_gpg_homedir (void);
+G_BEGIN_DECLS
-gboolean seahorse_gpg_options_find(const gchar* option,
- gchar** value, GError** err);
+const char * seahorse_gpg_homedir (void);
-gboolean seahorse_gpg_options_find_vals(const gchar* options[],
- gchar* values[], GError** err);
+gboolean seahorse_gpg_options_find (const char *option,
+ char **value,
+ GError **err);
-gboolean seahorse_gpg_options_change(const gchar* option,
- const gchar* value, GError** err);
+gboolean seahorse_gpg_options_find_vals (const char *options[],
+ char *values[],
+ GError **err);
-gboolean seahorse_gpg_options_change_vals(const gchar* options[],
- gchar* values[], GError** err);
+gboolean seahorse_gpg_options_change (const char *option,
+ const char *value,
+ GError **err);
+
+gboolean seahorse_gpg_options_change_vals (const char *options[],
+ char *values[],
+ GError **err);
+
+G_BEGIN_DECLS
diff --git a/pgp/seahorse-gpgme-data.c b/pgp/seahorse-gpgme-data.c
index 73863398..98dd2a07 100644
--- a/pgp/seahorse-gpgme-data.c
+++ b/pgp/seahorse-gpgme-data.c
@@ -37,10 +37,10 @@ static int
handle_gio_error (GError *err)
{
g_return_val_if_fail (err, -1);
-
+
if (err->message)
g_message ("%s", err->message);
-
+
switch (err->code) {
case G_IO_ERROR_FAILED:
errno = EIO;
@@ -135,13 +135,13 @@ handle_gio_error (GError *err)
errno = EIO;
break;
};
-
+
g_error_free (err);
return -1;
}
/* ----------------------------------------------------------------------------------------
- * OUTPUT
+ * OUTPUT
*/
/* Called by gpgme to read data */
@@ -151,15 +151,15 @@ output_write(void *handle, const void *buffer, size_t size)
GOutputStream* output = handle;
GError *err = NULL;
gsize written;
-
+
g_return_val_if_fail (G_IS_OUTPUT_STREAM (output), -1);
-
+
if (!g_output_stream_write_all (output, buffer, size, &written, NULL, &err))
return handle_gio_error (err);
-
+
if (!g_output_stream_flush (output, NULL, &err))
return handle_gio_error (err);
-
+
return written;
}
@@ -178,7 +178,7 @@ output_seek (void *handle, off_t offset, int whence)
errno = EOPNOTSUPP;
return -1;
}
-
+
switch(whence)
{
case SEEK_SET:
@@ -198,7 +198,7 @@ output_seek (void *handle, off_t offset, int whence)
seek = G_SEEKABLE (output);
if (!g_seekable_seek (seek, offset, from, NULL, &err))
return handle_gio_error (err);
-
+
return offset;
}
@@ -208,12 +208,12 @@ output_release (void *handle)
{
GOutputStream* output = handle;
g_return_if_fail (G_IS_OUTPUT_STREAM (output));
-
+
g_object_unref (output);
}
/* GPGME vfs file operations */
-static struct gpgme_data_cbs output_cbs =
+static struct gpgme_data_cbs output_cbs =
{
NULL,
output_write,
@@ -228,11 +228,11 @@ seahorse_gpgme_data_output (GOutputStream* output)
gpgme_data_t ret = NULL;
g_return_val_if_fail (G_IS_OUTPUT_STREAM (output), NULL);
-
+
gerr = gpgme_data_new_from_cbs (&ret, &output_cbs, output);
if (!GPG_IS_OK (gerr))
return NULL;
-
+
g_object_ref (output);
return ret;
}
@@ -248,12 +248,12 @@ input_read (void *handle, void *buffer, size_t size)
GInputStream* input = handle;
GError *err = NULL;
gsize nread;
-
+
g_return_val_if_fail (G_IS_INPUT_STREAM (input), -1);
-
+
if (!g_input_stream_read_all (input, buffer, size, &nread, NULL, &err))
return handle_gio_error (err);
-
+
return nread;
}
@@ -272,7 +272,7 @@ input_seek (void *handle, off_t offset, int whence)
errno = EOPNOTSUPP;
return -1;
}
-
+
switch(whence)
{
case SEEK_SET:
@@ -302,12 +302,12 @@ input_release (void *handle)
{
GInputStream* input = handle;
g_return_if_fail (G_IS_INPUT_STREAM (input));
-
+
g_object_unref (input);
}
/* GPGME vfs file operations */
-static struct gpgme_data_cbs input_cbs =
+static struct gpgme_data_cbs input_cbs =
{
input_read,
NULL,
@@ -320,39 +320,39 @@ seahorse_gpgme_data_input (GInputStream* input)
{
gpgme_error_t gerr;
gpgme_data_t ret = NULL;
-
+
g_return_val_if_fail (G_IS_INPUT_STREAM (input), NULL);
-
+
gerr = gpgme_data_new_from_cbs (&ret, &input_cbs, input);
if (!GPG_IS_OK (gerr))
return NULL;
-
+
g_object_ref (input);
return ret;
}
-gpgme_data_t
+gpgme_data_t
seahorse_gpgme_data_new ()
{
gpgme_error_t gerr;
gpgme_data_t data;
-
+
gerr = gpgme_data_new (&data);
if (!GPG_IS_OK (gerr)) {
- if (gpgme_err_code_to_errno (gerr) == ENOMEM ||
+ if (gpgme_err_code_to_errno (gerr) == ENOMEM ||
gpgme_err_code (gerr) == GPG_ERR_ENOMEM) {
-
+
g_error ("%s: failed to allocate gpgme_data_t", G_STRLOC);
-
+
} else {
/* The only reason this should fail is above */
g_assert_not_reached ();
-
+
/* Just in case */
abort ();
}
}
-
+
return data;
}
@@ -361,35 +361,35 @@ seahorse_gpgme_data_new_from_mem (const char *buffer, size_t size, gboolean copy
{
gpgme_data_t data;
gpgme_error_t gerr;
-
+
gerr = gpgme_data_new_from_mem (&data, buffer, size, copy ? 1 : 0);
if (!GPG_IS_OK (gerr)) {
- if (gpgme_err_code_to_errno (gerr) == ENOMEM ||
+ if (gpgme_err_code_to_errno (gerr) == ENOMEM ||
gpgme_err_code (gerr) == GPG_ERR_ENOMEM) {
-
+
g_error ("%s: failed to allocate gpgme_data_t", G_STRLOC);
-
+
} else {
/* The only reason this should fail is above */
g_assert_not_reached ();
-
+
/* Just in case */
abort ();
}
}
-
+
return data;
}
-int
+int
seahorse_gpgme_data_write_all (gpgme_data_t data, const void* buffer, size_t len)
{
guchar *text = (guchar*)buffer;
- gint written = 0;
-
+ int written = 0;
+
if (len < 0)
- len = strlen ((gchar*)text);
-
+ len = strlen ((char *) text);
+
while (len > 0) {
written = gpgme_data_write (data, (void*)text, len);
if (written < 0) {
@@ -397,11 +397,11 @@ seahorse_gpgme_data_write_all (gpgme_data_t data, const void* buffer, size_t len
continue;
return -1;
}
-
+
len -= written;
text += written;
}
-
+
return written;
}
diff --git a/pgp/seahorse-gpgme-data.h b/pgp/seahorse-gpgme-data.h
index 33b4e5dc..303c565b 100644
--- a/pgp/seahorse-gpgme-data.h
+++ b/pgp/seahorse-gpgme-data.h
@@ -1,18 +1,18 @@
-/*
+/*
* Seahorse
- *
+ *
* Copyright (C) 2008 Stefan Walter
- *
- * This program is free software; you can redistribute it and/or modify
+ *
+ * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this program; if not, see
* <http://www.gnu.org/licenses/>.
@@ -32,11 +32,11 @@ gpgme_data_t seahorse_gpgme_data_input (GInputStream* input);
gpgme_data_t seahorse_gpgme_data_output (GOutputStream* output);
-/*
- * GTK/Glib use a model where if allocation fails, the program exits. These
+/*
+ * GTK/Glib use a model where if allocation fails, the program exits. These
* helper functions extend certain GPGME calls to provide the same behavior.
*/
-
+
gpgme_data_t seahorse_gpgme_data_new (void);
void seahorse_gpgme_data_release (gpgme_data_t data);
diff --git a/pgp/seahorse-gpgme-dialogs.h b/pgp/seahorse-gpgme-dialogs.h
index 82747dbe..3167d298 100644
--- a/pgp/seahorse-gpgme-dialogs.h
+++ b/pgp/seahorse-gpgme-dialogs.h
@@ -35,19 +35,19 @@
void seahorse_gpgme_generate_register (void);
void seahorse_gpgme_generate_show (SeahorseGpgmeKeyring *keyring,
- GtkWindow *parent,
- const char * name,
- const char *email,
- const gchar *comment);
+ GtkWindow *parent,
+ const char *name,
+ const char *email,
+ const char *comment);
void seahorse_gpgme_generate_key (SeahorseGpgmeKeyring *keyring,
- const gchar *name,
- const gchar *email,
- const gchar *comment,
- guint type,
- guint bits,
- time_t expires,
- GtkWindow *parent);
+ const char *name,
+ const char *email,
+ const char *comment,
+ unsigned int type,
+ unsigned int bits,
+ time_t expires,
+ GtkWindow *parent);
void seahorse_gpgme_add_revoker_new (SeahorseGpgmeKey *pkey,
GtkWindow *parent);
@@ -55,9 +55,9 @@ void seahorse_gpgme_add_revoker_new (SeahorseGpgmeKey *pkey,
void seahorse_gpgme_expires_new (SeahorseGpgmeSubkey *subkey,
GtkWindow *parent);
-gboolean seahorse_gpgme_photo_add (SeahorseGpgmeKey *pkey,
- GtkWindow *parent,
- const gchar *path);
+gboolean seahorse_gpgme_photo_add (SeahorseGpgmeKey *pkey,
+ GtkWindow *parent,
+ const char *path);
gboolean seahorse_gpgme_photo_delete (SeahorseGpgmePhoto *photo,
GtkWindow *parent);
diff --git a/pgp/seahorse-gpgme-key-op.h b/pgp/seahorse-gpgme-key-op.h
index 4ec37450..808e070d 100644
--- a/pgp/seahorse-gpgme-key-op.h
+++ b/pgp/seahorse-gpgme-key-op.h
@@ -85,10 +85,10 @@ gpgme_error_t seahorse_gpgme_key_op_sign (SeahorseGpgmeKey *
SeahorseSignCheck check,
SeahorseSignOptions options);
-gpgme_error_t seahorse_gpgme_key_op_sign_uid (SeahorseGpgmeUid *uid,
- SeahorseGpgmeKey *signer,
- SeahorseSignCheck check,
- SeahorseSignOptions options);
+gpgme_error_t seahorse_gpgme_key_op_sign_uid (SeahorseGpgmeUid *uid,
+ SeahorseGpgmeKey *signer,
+ SeahorseSignCheck check,
+ SeahorseSignOptions options);
void seahorse_gpgme_key_op_change_pass_async (SeahorseGpgmeKey *pkey,
GCancellable *cancellable,
@@ -108,16 +108,16 @@ gpgme_error_t seahorse_gpgme_key_op_set_disabled (SeahorseGpgmeKey *
gpgme_error_t seahorse_gpgme_key_op_set_expires (SeahorseGpgmeSubkey *subkey,
GDateTime *expires);
-gpgme_error_t seahorse_gpgme_key_op_add_revoker (SeahorseGpgmeKey *pkey,
+gpgme_error_t seahorse_gpgme_key_op_add_revoker (SeahorseGpgmeKey *pkey,
SeahorseGpgmeKey *revoker);
-void seahorse_gpgme_key_op_add_uid_async (SeahorseGpgmeKey *pkey,
- const gchar *name,
- const gchar *email,
- const gchar *comment,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
+void seahorse_gpgme_key_op_add_uid_async (SeahorseGpgmeKey *pkey,
+ const char *name,
+ const char *email,
+ const char *comment,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ void *user_data);
gboolean seahorse_gpgme_key_op_add_uid_finish (SeahorseGpgmeKey *pkey,
GAsyncResult *result,
diff --git a/pgp/seahorse-gpgme-photo.c b/pgp/seahorse-gpgme-photo.c
index cc85ae07..193ec0be 100644
--- a/pgp/seahorse-gpgme-photo.c
+++ b/pgp/seahorse-gpgme-photo.c
@@ -41,10 +41,6 @@ struct _SeahorseGpgmePhoto {
G_DEFINE_TYPE (SeahorseGpgmePhoto, seahorse_gpgme_photo, SEAHORSE_PGP_TYPE_PHOTO);
-/* -----------------------------------------------------------------------------
- * OBJECT
- */
-
static void
seahorse_gpgme_photo_init (SeahorseGpgmePhoto *self)
{
@@ -55,12 +51,12 @@ seahorse_gpgme_photo_constructor (GType type, guint n_props, GObjectConstructPar
{
GObject *obj = G_OBJECT_CLASS (seahorse_gpgme_photo_parent_class)->constructor (type, n_props, props);
SeahorseGpgmePhoto *self = NULL;
-
+
if (obj) {
self = SEAHORSE_GPGME_PHOTO (obj);
g_return_val_if_fail (self->pubkey, NULL);
}
-
+
return obj;
}
@@ -69,7 +65,7 @@ seahorse_gpgme_photo_get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
SeahorseGpgmePhoto *self = SEAHORSE_GPGME_PHOTO (object);
-
+
switch (prop_id) {
case PROP_PUBKEY:
g_value_set_boxed (value, seahorse_gpgme_photo_get_pubkey (self));
@@ -81,8 +77,10 @@ seahorse_gpgme_photo_get_property (GObject *object, guint prop_id,
}
static void
-seahorse_gpgme_photo_set_property (GObject *object, guint prop_id, const GValue *value,
- GParamSpec *pspec)
+seahorse_gpgme_photo_set_property (GObject *object,
+ unsigned int prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
SeahorseGpgmePhoto *self = SEAHORSE_GPGME_PHOTO (object);
@@ -112,7 +110,7 @@ seahorse_gpgme_photo_finalize (GObject *gobject)
static void
seahorse_gpgme_photo_class_init (SeahorseGpgmePhotoClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
gobject_class->constructor = seahorse_gpgme_photo_constructor;
gobject_class->finalize = seahorse_gpgme_photo_finalize;
@@ -129,15 +127,17 @@ seahorse_gpgme_photo_class_init (SeahorseGpgmePhotoClass *klass)
}
/* -----------------------------------------------------------------------------
- * PUBLIC
+ * PUBLIC
*/
-SeahorseGpgmePhoto*
-seahorse_gpgme_photo_new (gpgme_key_t pubkey, GdkPixbuf *pixbuf, guint index)
+SeahorseGpgmePhoto*
+seahorse_gpgme_photo_new (gpgme_key_t pubkey,
+ GdkPixbuf *pixbuf,
+ unsigned int index)
{
return g_object_new (SEAHORSE_TYPE_GPGME_PHOTO,
"pubkey", pubkey,
- "pixbuf", pixbuf,
+ "pixbuf", pixbuf,
"index", index, NULL);
}
diff --git a/pgp/seahorse-gpgme-photos.c b/pgp/seahorse-gpgme-photos.c
index 8e0f37c0..c148c767 100644
--- a/pgp/seahorse-gpgme-photos.c
+++ b/pgp/seahorse-gpgme-photos.c
@@ -39,47 +39,45 @@
#define LARGE_HEIGHT 288
static gboolean
-calc_scale (gint *width, gint *height)
+calc_scale (int *width, int *height)
{
- gdouble ratio, recpx, imgpx;
-
+ double ratio, recpx, imgpx;
+
recpx = DEFAULT_WIDTH + DEFAULT_HEIGHT;
imgpx = (*width) + (*height);
-
+
if (imgpx <= recpx)
return FALSE;
-
- /*
- * Keep aspect ratio, and don't squash large aspect ratios
- * unnecessarily.
- */
+
+ /* Keep aspect ratio, and don't squash large aspect ratios
+ * unnecessarily. */
ratio = imgpx / recpx;
*height = ((gdouble)(*height)) / ratio;
*width = ((gdouble)(*width)) / ratio;
return TRUE;
}
-static guint
+static unsigned int
suggest_resize (GtkWindow *parent)
{
GtkWidget *dlg;
- guint response;
-
- dlg = gtk_message_dialog_new_with_markup (parent,
+ unsigned int response;
+
+ dlg = gtk_message_dialog_new_with_markup (parent,
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
+ GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
_("<big><b>The photo is too large</b></big>\nThe recommended size for a photo on your key is
%d × %d pixels."),
DEFAULT_WIDTH, DEFAULT_HEIGHT);
-
- gtk_dialog_add_buttons (GTK_DIALOG (dlg),
+
+ gtk_dialog_add_buttons (GTK_DIALOG (dlg),
_("_Cancel"), GTK_RESPONSE_CANCEL,
_("_Don’t Resize"), GTK_RESPONSE_REJECT,
_("_Resize"), GTK_RESPONSE_ACCEPT,
NULL);
-
+
response = gtk_dialog_run (GTK_DIALOG (dlg));
gtk_widget_destroy (dlg);
-
+
return response;
}
@@ -88,70 +86,69 @@ save_to_fd (const gchar *buf, gsize count, GError **error, gpointer data)
{
int fd = GPOINTER_TO_INT (data);
gssize written;
-
+
written = write (fd, buf, count);
if (written != (gssize) count) {
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
+ g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
"%s", g_strerror (errno));
return FALSE;
}
-
+
return TRUE;
}
static gboolean
-prepare_photo_id (GtkWindow *parent, gchar *path, gchar **result, GError **error)
+prepare_photo_id (GtkWindow *parent, char *path, char **result, GError **error)
{
GdkPixbuf *pixbuf = NULL;
GdkPixbuf *sampled;
GdkPixbufFormat *format;
- gint width, height;
+ int width, height;
gboolean rewrite = FALSE;
gboolean resample = FALSE;
gboolean suggest = FALSE;
gboolean r;
- gchar *name;
+ g_autofree char *name = NULL;
struct stat sb;
int fd;
-
+
g_assert (path);
g_assert (result);
g_assert (!error || !*error);
-
+
*result = NULL;
-
+
format = gdk_pixbuf_get_file_info (path, &width, &height);
if (!format) {
- g_set_error (error, SEAHORSE_ERROR, -1,
+ g_set_error (error, SEAHORSE_ERROR, -1,
_("This is not a image file, or an unrecognized kind of image file. Try to use a JPEG
image."));
return FALSE;
}
-
+
/* Check if it's a JPEG */
name = gdk_pixbuf_format_get_name (format);
r = g_strcmp0 (name, "jpeg") == 0;
- g_free (name);
-
+
/* JPEGs we can use straight up */
if (r) {
-
+
/* If so we may just be able to use it straight up */
if (stat (path, &sb) != -1) {
-
+
/* Large file size, suggest resampling */
- if (sb.st_size > 8192)
+ if (sb.st_size > 8192)
suggest = TRUE;
}
-
+
/* Other formats */
} else {
rewrite = TRUE;
-
+
/* Check for large, but allow strange orientations */
if ((width + height) > (LARGE_WIDTH + LARGE_HEIGHT))
suggest = TRUE;
}
-
+
/* Suggest to the user that we resize the photo */
if (suggest) {
switch (suggest_resize (parent)) {
@@ -167,7 +164,7 @@ prepare_photo_id (GtkWindow *parent, gchar *path, gchar **result, GError **error
return FALSE;
}
}
-
+
/* No rewrite */
if (!rewrite)
return TRUE;
@@ -176,37 +173,37 @@ prepare_photo_id (GtkWindow *parent, gchar *path, gchar **result, GError **error
pixbuf = gdk_pixbuf_new_from_file (path, error);
if (!pixbuf)
return FALSE;
-
+
/* Resize it properly */
if (resample && calc_scale (&width, &height)) {
- sampled = gdk_pixbuf_scale_simple (pixbuf, width, height,
+ sampled = gdk_pixbuf_scale_simple (pixbuf, width, height,
GDK_INTERP_BILINEAR);
g_object_unref (pixbuf);
-
+
g_return_val_if_fail (sampled != NULL, FALSE);
pixbuf = sampled;
sampled = NULL;
}
-
+
/* And write it out to a temp */
fd = g_file_open_tmp ("seahorse-photo.XXXXXX", result, error);
if (fd == -1) {
g_object_unref (pixbuf);
return FALSE;
}
-
+
r = gdk_pixbuf_save_to_callback (pixbuf, save_to_fd, GINT_TO_POINTER (fd),
"jpeg", error, "quality", "75", NULL);
-
+
close (fd);
g_object_unref (pixbuf);
-
+
if (!r) {
g_free (*result);
*result = NULL;
return FALSE;
}
-
+
return TRUE;
}
@@ -216,8 +213,8 @@ add_image_files (GtkWidget *dialog)
{
GtkFileFilter* filter;
GSList *formats, *l;
- gchar **mimes, **t;
-
+ char **mimes, **t;
+
filter = gtk_file_filter_new ();
gtk_file_filter_set_name (filter, _("All image files"));
formats = gdk_pixbuf_get_formats ();
@@ -230,7 +227,7 @@ add_image_files (GtkWidget *dialog)
g_slist_free (formats);
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filter);
-
+
filter = gtk_file_filter_new ();
gtk_file_filter_set_name (filter, _("All JPEG files"));
gtk_file_filter_add_mime_type (filter, "image/jpeg");
@@ -238,9 +235,9 @@ add_image_files (GtkWidget *dialog)
filter = gtk_file_filter_new ();
gtk_file_filter_set_name (filter, _("All files"));
- gtk_file_filter_add_pattern (filter, "*");
+ gtk_file_filter_add_pattern (filter, "*");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-}
+}
gboolean
@@ -311,28 +308,28 @@ seahorse_gpgme_photo_delete (SeahorseGpgmePhoto *photo, GtkWindow *parent)
{
gpgme_error_t gerr;
GtkWidget *dlg;
- gint response;
+ int response;
g_return_val_if_fail (SEAHORSE_IS_GPGME_PHOTO (photo), FALSE);
-
+
dlg = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
_("Are you sure you want to remove the current photo from your key?"));
gtk_dialog_add_button (GTK_DIALOG (dlg), _("_Delete"), GTK_RESPONSE_ACCEPT);
gtk_dialog_add_button (GTK_DIALOG (dlg), _("_Cancel"), GTK_RESPONSE_REJECT);
-
+
response = gtk_dialog_run (GTK_DIALOG (dlg));
gtk_widget_destroy (dlg);
-
+
if (response != GTK_RESPONSE_ACCEPT)
return FALSE;
-
+
gerr = seahorse_gpgme_key_op_photo_delete (photo);
if (!GPG_IS_OK (gerr)) {
seahorse_gpgme_handle_error (gerr, _("Couldn’t delete photo"));
return FALSE;
}
-
+
return TRUE;
}
diff --git a/pgp/seahorse-gpgme.c b/pgp/seahorse-gpgme.c
index deed86e5..5069c736 100644
--- a/pgp/seahorse-gpgme.c
+++ b/pgp/seahorse-gpgme.c
@@ -1,19 +1,19 @@
-/*
+/*
* Seahorse
- *
+ *
* Copyright (C) 2008 Stefan Walter
* Copyright (C) 2011 Collabora Ltd.
*
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this program; if not, see
* <http://www.gnu.org/licenses/>.
@@ -95,29 +95,28 @@ seahorse_gpgme_propagate_error (gpgme_error_t gerr, GError** error)
*
*/
void
-seahorse_gpgme_handle_error (gpgme_error_t err, const char* desc, ...)
+seahorse_gpgme_handle_error (gpgme_error_t err, const char *desc, ...)
{
- gchar *t = NULL;
+ va_list ap;
+ g_autofree char *t = NULL;
switch (gpgme_err_code(err)) {
case GPG_ERR_CANCELED:
case GPG_ERR_NO_ERROR:
case GPG_ERR_ECANCELED:
return;
- default:
+ default:
break;
}
- va_list ap;
- va_start(ap, desc);
-
- if (desc)
- t = g_strdup_vprintf (desc, ap);
+ va_start (ap, desc);
+
+ if (desc)
+ t = g_strdup_vprintf (desc, ap);
+
+ va_end (ap);
- va_end(ap);
-
seahorse_util_show_error (NULL, t, gpgme_strerror (err));
- g_free(t);
}
/**
@@ -147,7 +146,7 @@ seahorse_gpgme_boxed_key_type (void)
{
static GType type = 0;
if (!type)
- type = g_boxed_type_register_static ("gpgme_key_t",
+ type = g_boxed_type_register_static ("gpgme_key_t",
(GBoxedCopyFunc)ref_return_key,
(GBoxedFreeFunc)gpgme_key_unref);
return type;
@@ -177,7 +176,7 @@ seahorse_gpgme_convert_validity (gpgme_validity_t validity)
case GPGME_VALIDITY_UNKNOWN:
default:
return SEAHORSE_VALIDITY_UNKNOWN;
- }
+ }
}
/*
@@ -221,16 +220,16 @@ seahorse_gpgme_get_keytype_table (SeahorseKeyTypeTable *table)
gpgme_error_t gerr;
gpgme_engine_info_t engine;
SeahorseVersion ver;
-
+
gerr = gpgme_get_engine_info (&engine);
g_return_val_if_fail (GPG_IS_OK (gerr), gerr);
-
+
while (engine && engine->protocol != GPGME_PROTOCOL_OpenPGP)
engine = engine->next;
g_return_val_if_fail (engine != NULL, GPG_E (GPG_ERR_GENERAL));
-
+
ver = seahorse_util_parse_version (engine->version);
-
+
if (ver >= VER_2012 || (ver >= VER_1410 && ver < VER_190))
*table = (SeahorseKeyTypeTable)&KEYTYPES_2012;
else if (ver >= VER_140 || ver >= VER_190)
@@ -241,7 +240,7 @@ seahorse_gpgme_get_keytype_table (SeahorseKeyTypeTable *table)
*table = (SeahorseKeyTypeTable)&KEYTYPES_120;
else // older versions not supported
gerr = GPG_E (GPG_ERR_USER_2);
-
+
return gerr;
}
diff --git a/pgp/seahorse-gpgme.h b/pgp/seahorse-gpgme.h
index 9c85212f..1ab67115 100644
--- a/pgp/seahorse-gpgme.h
+++ b/pgp/seahorse-gpgme.h
@@ -1,19 +1,19 @@
-/*
+/*
* Seahorse
- *
+ *
* Copyright (C) 2008 Stefan Walter
* Copyright (C) 2011 Collabora Ltd.
*
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this program; if not, see
* <http://www.gnu.org/licenses/>.
@@ -46,8 +46,9 @@ GQuark seahorse_gpgme_error_domain (void);
gboolean seahorse_gpgme_propagate_error (gpgme_error_t gerr,
GError** error);
-void seahorse_gpgme_handle_error (gpgme_error_t err,
- const gchar* desc, ...);
+void seahorse_gpgme_handle_error (gpgme_error_t err,
+ const char *desc,
+ ...);
#define SEAHORSE_GPGME_BOXED_KEY (seahorse_gpgme_boxed_key_type ())
diff --git a/pgp/seahorse-pgp-keysets.c b/pgp/seahorse-pgp-keysets.c
index 53a792d1..b2703ea8 100644
--- a/pgp/seahorse-pgp-keysets.c
+++ b/pgp/seahorse-pgp-keysets.c
@@ -1,18 +1,18 @@
-/*
+/*
* Seahorse
- *
+ *
* Copyright (C) 2008 Stefan Walter
- *
- * This program is free software; you can redistribute it and/or modify
+ *
+ * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this program; if not, see
* <http://www.gnu.org/licenses/>.
@@ -29,7 +29,7 @@
#include "seahorse-common.h"
/* -----------------------------------------------------------------------------
- * COMMON KEYSETS
+ * COMMON KEYSETS
*/
static void
@@ -39,7 +39,7 @@ on_settings_default_key_changed (GSettings *settings, const gchar *key, gpointer
gcr_filter_collection_refilter (GCR_FILTER_COLLECTION (user_data));
}
-static gboolean
+static gboolean
pgp_signers_match (GObject *obj,
gpointer data)
{
diff --git a/pgp/seahorse-pgp-keysets.h b/pgp/seahorse-pgp-keysets.h
index 10064f77..65bfe522 100644
--- a/pgp/seahorse-pgp-keysets.h
+++ b/pgp/seahorse-pgp-keysets.h
@@ -1,18 +1,18 @@
-/*
+/*
* Seahorse
- *
+ *
* Copyright (C) 2008 Stefan Walter
- *
- * This program is free software; you can redistribute it and/or modify
+ *
+ * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this program; if not, see
* <http://www.gnu.org/licenses/>.
@@ -24,9 +24,9 @@
#include <gcr/gcr.h>
/* -----------------------------------------------------------------------------
- * SOME COMMON KEYSETS
+ * SOME COMMON KEYSETS
*/
-
+
GcrCollection * seahorse_keyset_pgp_signers_new (void);
#endif /*SEAPGPKEYSETS_H_*/
diff --git a/pgp/seahorse-server-source.c b/pgp/seahorse-server-source.c
index cf88aceb..e3170f26 100644
--- a/pgp/seahorse-server-source.c
+++ b/pgp/seahorse-server-source.c
@@ -120,7 +120,7 @@ seahorse_server_source_finalize (GObject *gobject)
g_free (priv->server);
g_free (priv->uri);
-
+
G_OBJECT_CLASS (seahorse_server_source_parent_class)->finalize (gobject);
}
diff --git a/pgp/seahorse-xloadimage.c b/pgp/seahorse-xloadimage.c
index 8b2b9125..e3937161 100644
--- a/pgp/seahorse-xloadimage.c
+++ b/pgp/seahorse-xloadimage.c
@@ -49,7 +49,7 @@ int main (int argc, char* argv[])
fprintf (stderr, "seahorse-xloadimage: couldn't write to output file: %s", fname);
exit (1);
}
-
+
fclose(f);
return 0;
}
diff --git a/ssh/seahorse-ssh-askpass.c b/ssh/seahorse-ssh-askpass.c
index 5ebeeb2b..eb3ce0ed 100644
--- a/ssh/seahorse-ssh-askpass.c
+++ b/ssh/seahorse-ssh-askpass.c
@@ -19,7 +19,7 @@
*
* Author: Stef Walter <stefw collabora co uk>
*/
-
+
#include "config.h"
#include "seahorse-common.h"
diff --git a/ssh/ssh.vala b/ssh/ssh.vala
index 5dc3cab1..2025c54f 100644
--- a/ssh/ssh.vala
+++ b/ssh/ssh.vala
@@ -4,7 +4,7 @@
* Copyright (C) 2008 Stefan Walter
* Copyright (C) 2016 Niels De Graef
*
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
