Hi,
On Thu, May 26, 2016 at 05:07:04PM -0400, Marc-André Lureau wrote:
> Hi
>
> ----- Original Message -----
> > By harmless I mean not changing whole functions that were implemented
> > with tab indentation.
> >
> > Just for reference, after this patch:
> >
> > grep $'\t' src/*.[ch] | wc -l
> > 413
> >
>
> nack, I would rather not have style changes only commit.
I agree for files/functions that use tab indentation everywhere, I don't
think this is the case but it is fine if you don't agree. Patch is not
really important.
>
> > grep -l $'\t' src/*.[ch]
> > src/continuation.c
> > src/continuation.h
> > src/coroutine_gthread.c
> > src/coroutine.h
> > src/coroutine_ucontext.c
> > src/coroutine_winfibers.c
> > src/spice-grabsequence.c
> > src/vncdisplaykeymap.c
> > ---
> > src/channel-display.h | 2 +-
> > src/channel-main.c | 14 +++++++-------
> > src/channel-record.h | 2 +-
> > src/gio-coroutine.c | 10 +++++-----
> > src/spice-audio.h | 6 +++---
> > src/spice-channel.c | 2 +-
> > src/spice-gtk-session.c | 6 +++---
> > src/spice-session.c | 36 ++++++++++++++++++------------------
> > src/spice-widget.h | 8 ++++----
> > src/spicy-screenshot.c | 4 ++--
> > src/spicy.c | 12 ++++++------
> > 11 files changed, 51 insertions(+), 51 deletions(-)
> >
> > diff --git a/src/channel-display.h b/src/channel-display.h
> > index bd4bc87..1bc01ea 100644
> > --- a/src/channel-display.h
> > +++ b/src/channel-display.h
> > @@ -109,7 +109,7 @@ struct _SpiceDisplayChannelClass {
> > /*< private >*/
> > };
> >
> > -GType spice_display_channel_get_type(void);
> > +GType spice_display_channel_get_type(void);
> > gboolean spice_display_get_primary(SpiceChannel *channel, guint32
> > surface_id,
> > SpiceDisplayPrimary *primary);
> >
> > diff --git a/src/channel-main.c b/src/channel-main.c
> > index b91daa5..11801a7 100644
> > --- a/src/channel-main.c
> > +++ b/src/channel-main.c
> > @@ -343,13 +343,13 @@ static void spice_main_get_property(GObject *object,
> > switch (prop_id) {
> > case PROP_MOUSE_MODE:
> > g_value_set_int(value, c->mouse_mode);
> > - break;
> > + break;
> > case PROP_AGENT_CONNECTED:
> > g_value_set_boolean(value, c->agent_connected);
> > - break;
> > + break;
> > case PROP_AGENT_CAPS_0:
> > g_value_set_int(value, c->agent_caps[0]);
> > - break;
> > + break;
> > case PROP_DISPLAY_DISABLE_WALLPAPER:
> > g_value_set_boolean(value, c->display_disable_wallpaper);
> > break;
> > @@ -372,8 +372,8 @@ static void spice_main_get_property(GObject *object,
> > g_value_set_int(value, spice_main_get_max_clipboard(self));
> > break;
> > default:
> > - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
> > - break;
> > + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
> > + break;
> > }
> > }
> >
> > @@ -409,8 +409,8 @@ static void spice_main_set_property(GObject *gobject,
> > guint prop_id,
> > spice_main_set_max_clipboard(self, g_value_get_int(value));
> > break;
> > default:
> > - G_OBJECT_WARN_INVALID_PROPERTY_ID(gobject, prop_id, pspec);
> > - break;
> > + G_OBJECT_WARN_INVALID_PROPERTY_ID(gobject, prop_id, pspec);
> > + break;
> > }
> > }
> >
> > diff --git a/src/channel-record.h b/src/channel-record.h
> > index c851421..76cced1 100644
> > --- a/src/channel-record.h
> > +++ b/src/channel-record.h
> > @@ -72,7 +72,7 @@ struct _SpiceRecordChannelClass {
> > /* Do not add fields to this struct */
> > };
> >
> > -GType spice_record_channel_get_type(void);
> > +GType spice_record_channel_get_type(void);
> > void spice_record_send_data(SpiceRecordChannel *channel, gpointer
> > data,
> > gsize bytes, guint32 time);
> >
> > diff --git a/src/gio-coroutine.c b/src/gio-coroutine.c
> > index c866e15..0613e2a 100644
> > --- a/src/gio-coroutine.c
> > +++ b/src/gio-coroutine.c
> > @@ -37,8 +37,8 @@ GCoroutine* g_coroutine_self(void)
> >
> > /* Main loop helper functions */
> > static gboolean g_io_wait_helper(GSocket *sock G_GNUC_UNUSED,
> > - GIOCondition cond,
> > - gpointer data)
> > + GIOCondition cond,
> > + gpointer data)
> > {
> > struct coroutine *to = data;
> > coroutine_yieldto(to, &cond);
> > @@ -96,7 +96,7 @@ void g_coroutine_wakeup(GCoroutine *coroutine)
> > * true if the condition we're checking is ready for dispatch
> > */
> > static gboolean g_condition_wait_prepare(GSource *src,
> > - int *timeout) {
> > + int *timeout) {
> > GConditionWaitSource *vsrc = (GConditionWaitSource *)src;
> > *timeout = -1;
> > return vsrc->func(vsrc->data);
> > @@ -113,8 +113,8 @@ static gboolean g_condition_wait_check(GSource *src)
> > }
> >
> > static gboolean g_condition_wait_dispatch(GSource *src G_GNUC_UNUSED,
> > - GSourceFunc cb,
> > - gpointer data) {
> > + GSourceFunc cb,
> > + gpointer data) {
> > return cb(data);
> > }
> >
> > diff --git a/src/spice-audio.h b/src/spice-audio.h
> > index 01f564a..896454c 100644
> > --- a/src/spice-audio.h
> > +++ b/src/spice-audio.h
> > @@ -32,10 +32,10 @@ G_BEGIN_DECLS
> >
> > #define SPICE_TYPE_AUDIO spice_audio_get_type()
> >
> > -#define SPICE_AUDIO(obj) \
> > +#define SPICE_AUDIO(obj) \
> > (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPICE_TYPE_AUDIO, SpiceAudio))
> >
> > -#define SPICE_AUDIO_CLASS(klass) \
> > +#define SPICE_AUDIO_CLASS(klass) \
> > (G_TYPE_CHECK_CLASS_CAST ((klass), SPICE_TYPE_AUDIO, SpiceAudioClass))
> >
> > #define SPICE_IS_AUDIO(obj) \
> > @@ -44,7 +44,7 @@ G_BEGIN_DECLS
> > #define SPICE_IS_AUDIO_CLASS(klass) \
> > (G_TYPE_CHECK_CLASS_TYPE ((klass), SPICE_TYPE_AUDIO))
> >
> > -#define SPICE_AUDIO_GET_CLASS(obj) \
> > +#define SPICE_AUDIO_GET_CLASS(obj) \
> > (G_TYPE_INSTANCE_GET_CLASS ((obj), SPICE_TYPE_AUDIO, SpiceAudioClass))
> >
> > typedef struct _SpiceAudio SpiceAudio;
> > diff --git a/src/spice-channel.c b/src/spice-channel.c
> > index c555f75..f35cd0d 100644
> > --- a/src/spice-channel.c
> > +++ b/src/spice-channel.c
> > @@ -1358,7 +1358,7 @@ static gchar *addr_to_string(GSocketAddress *addr)
> >
> > static gboolean
> > spice_channel_gather_sasl_credentials(SpiceChannel *channel,
> > - sasl_interact_t *interact)
> > + sasl_interact_t *interact)
> > {
> > SpiceChannelPrivate *c;
> > int ninteract;
> > diff --git a/src/spice-gtk-session.c b/src/spice-gtk-session.c
> > index bbcbeeb..1be3b05 100644
> > --- a/src/spice-gtk-session.c
> > +++ b/src/spice-gtk-session.c
> > @@ -329,7 +329,7 @@ static void spice_gtk_session_get_property(GObject
> > *gobject,
> > switch (prop_id) {
> > case PROP_SESSION:
> > g_value_set_object(value, s->session);
> > - break;
> > + break;
> > case PROP_AUTO_CLIPBOARD:
> > g_value_set_boolean(value, s->auto_clipboard_enable);
> > break;
> > @@ -343,8 +343,8 @@ static void spice_gtk_session_get_property(GObject
> > *gobject,
> > g_value_set_boolean(value, s->sync_modifiers);
> > break;
> > default:
> > - G_OBJECT_WARN_INVALID_PROPERTY_ID(gobject, prop_id, pspec);
> > - break;
> > + G_OBJECT_WARN_INVALID_PROPERTY_ID(gobject, prop_id, pspec);
> > + break;
> > }
> > }
> >
> > diff --git a/src/spice-session.c b/src/spice-session.c
> > index e02d684..689dee5 100644
> > --- a/src/spice-session.c
> > +++ b/src/spice-session.c
> > @@ -593,46 +593,46 @@ static void spice_session_get_property(GObject
> > *gobject,
> > switch (prop_id) {
> > case PROP_HOST:
> > g_value_set_string(value, s->host);
> > - break;
> > + break;
> > case PROP_UNIX_PATH:
> > g_value_set_string(value, s->unix_path);
> > break;
> > case PROP_PORT:
> > g_value_set_string(value, s->port);
> > - break;
> > + break;
> > case PROP_TLS_PORT:
> > g_value_set_string(value, s->tls_port);
> > - break;
> > + break;
> > case PROP_USERNAME:
> > g_value_set_string(value, s->username);
> > - break;
> > + break;
> > case PROP_PASSWORD:
> > g_value_set_string(value, s->password);
> > - break;
> > + break;
> > case PROP_CA_FILE:
> > g_value_set_string(value, s->ca_file);
> > - break;
> > + break;
> > case PROP_CIPHERS:
> > g_value_set_string(value, s->ciphers);
> > - break;
> > + break;
> > case PROP_PROTOCOL:
> > g_value_set_int(value, s->protocol);
> > - break;
> > + break;
> > case PROP_URI:
> > g_value_take_string(value, spice_uri_create(session));
> > break;
> > case PROP_CLIENT_SOCKETS:
> > g_value_set_boolean(value, s->client_provided_sockets);
> > - break;
> > + break;
> > case PROP_PUBKEY:
> > g_value_set_boxed(value, s->pubkey);
> > - break;
> > + break;
> > case PROP_CA:
> > g_value_set_boxed(value, s->ca);
> > - break;
> > + break;
> > case PROP_CERT_SUBJECT:
> > g_value_set_string(value, s->cert_subject);
> > - break;
> > + break;
> > case PROP_VERIFY:
> > g_value_set_flags(value, s->verify);
> > break;
> > @@ -677,13 +677,13 @@ static void spice_session_get_property(GObject
> > *gobject,
> > break;
> > case PROP_NAME:
> > g_value_set_string(value, s->name);
> > - break;
> > + break;
> > case PROP_UUID:
> > g_value_set_pointer(value, s->uuid);
> > - break;
> > + break;
> > case PROP_PROXY:
> > g_value_take_string(value, spice_uri_to_string(s->proxy));
> > - break;
> > + break;
> > case PROP_SHARED_DIR:
> > g_value_set_string(value, spice_session_get_shared_dir(session));
> > break;
> > @@ -694,8 +694,8 @@ static void spice_session_get_property(GObject
> > *gobject,
> > g_value_set_enum(value, s->preferred_compression);
> > break;
> > default:
> > - G_OBJECT_WARN_INVALID_PROPERTY_ID(gobject, prop_id, pspec);
> > - break;
> > + G_OBJECT_WARN_INVALID_PROPERTY_ID(gobject, prop_id, pspec);
> > + break;
> > }
> > }
> >
> > @@ -760,7 +760,7 @@ static void spice_session_set_property(GObject
> > *gobject,
> > s->verify |= SPICE_SESSION_VERIFY_PUBKEY;
> > else
> > s->verify &= ~SPICE_SESSION_VERIFY_PUBKEY;
> > - break;
> > + break;
> > case PROP_CERT_SUBJECT:
> > g_free(s->cert_subject);
> > s->cert_subject = g_value_dup_string(value);
> > diff --git a/src/spice-widget.h b/src/spice-widget.h
> > index a8adf9c..98749da 100644
> > --- a/src/spice-widget.h
> > +++ b/src/spice-widget.h
> > @@ -53,12 +53,12 @@ typedef struct _SpiceDisplayClass SpiceDisplayClass;
> > */
> > typedef enum
> > {
> > - SPICE_DISPLAY_KEY_EVENT_PRESS = 1,
> > - SPICE_DISPLAY_KEY_EVENT_RELEASE = 2,
> > - SPICE_DISPLAY_KEY_EVENT_CLICK = 3,
> > + SPICE_DISPLAY_KEY_EVENT_PRESS = 1,
> > + SPICE_DISPLAY_KEY_EVENT_RELEASE = 2,
> > + SPICE_DISPLAY_KEY_EVENT_CLICK = 3,
> > } SpiceDisplayKeyEvent;
> >
> > -GType spice_display_get_type(void);
> > +GType spice_display_get_type(void);
> >
> > SpiceDisplay* spice_display_new(SpiceSession *session, int channel_id);
> > SpiceDisplay* spice_display_new_with_monitor(SpiceSession *session, gint
> > channel_id, gint monitor_id);
> > diff --git a/src/spicy-screenshot.c b/src/spicy-screenshot.c
> > index ab1f387..2edf93a 100644
> > --- a/src/spicy-screenshot.c
> > +++ b/src/spicy-screenshot.c
> > @@ -55,8 +55,8 @@ static int write_ppm_32(void)
> >
> > fp = fopen(outf,"w");
> > if (NULL == fp) {
> > - fprintf(stderr, "%s: can't open %s: %s\n", g_get_prgname(), outf,
> > strerror(errno));
> > - return -1;
> > + fprintf(stderr, "%s: can't open %s: %s\n", g_get_prgname(), outf,
> > strerror(errno));
> > + return -1;
> > }
> > fprintf(fp, "P6\n%d %d\n255\n",
> > d_width, d_height);
> > diff --git a/src/spicy.c b/src/spicy.c
> > index cbd8e8b..f4234f8 100644
> > --- a/src/spicy.c
> > +++ b/src/spicy.c
> > @@ -688,14 +688,14 @@ static const GtkActionEntry entries[] = {
> > .accelerator = "<shift>F11",
> > },{
> > #ifdef USE_SMARTCARD
> > - .name = "InsertSmartcard",
> > - .label = "_Insert Smartcard",
> > - .callback = G_CALLBACK(menu_cb_insert_smartcard),
> > + .name = "InsertSmartcard",
> > + .label = "_Insert Smartcard",
> > + .callback = G_CALLBACK(menu_cb_insert_smartcard),
> > .accelerator = "<shift>F8",
> > },{
> > - .name = "RemoveSmartcard",
> > - .label = "_Remove Smartcard",
> > - .callback = G_CALLBACK(menu_cb_remove_smartcard),
> > + .name = "RemoveSmartcard",
> > + .label = "_Remove Smartcard",
> > + .callback = G_CALLBACK(menu_cb_remove_smartcard),
> > .accelerator = "<shift>F9",
> > },{
> > #endif
> > --
> > 2.5.5
> >
> > _______________________________________________
> > Spice-devel mailing list
> > Spice-devel@xxxxxxxxxxxxxxxxxxxxx
> > https://lists.freedesktop.org/mailman/listinfo/spice-devel
> >
> _______________________________________________
> Spice-devel mailing list
> Spice-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel