[Xfce4-commits] [apps/xfce4-screensaver] 418/425: Tidy up trailing whitespace
noreply at xfce.org
noreply at xfce.org
Mon Oct 15 01:54:25 CEST 2018
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/xfce4-screensaver.
commit b13a1e7e1645db933cc3fee5f6d966e6435527e6
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Sat Oct 13 12:53:30 2018 -0400
Tidy up trailing whitespace
---
data/xfce4-screensaver-preferences.ui | 2 +-
doc/docbook.css | 4 +-
src/gs-prefs.h | 26 +++---
src/xfce-bg.c | 2 +-
src/xfce-rr-private.h | 4 +-
src/xfce-rr.c | 148 +++++++++++++++++-----------------
src/xfce-rr.h | 6 +-
src/xfce4-screensaver-preferences.c | 2 +-
src/xfcekbd-config-private.h | 6 +-
9 files changed, 100 insertions(+), 100 deletions(-)
diff --git a/data/xfce4-screensaver-preferences.ui b/data/xfce4-screensaver-preferences.ui
index 69135dc..5d0433c 100644
--- a/data/xfce4-screensaver-preferences.ui
+++ b/data/xfce4-screensaver-preferences.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1
+<!-- Generated with glade 3.22.1
xfce4-screensaver - screensaver preferences
Copyright (C) 2018 Xfce Developers
diff --git a/doc/docbook.css b/doc/docbook.css
index 9a0e72a..4bd8a47 100644
--- a/doc/docbook.css
+++ b/doc/docbook.css
@@ -3,12 +3,12 @@ body {
}
table {
- border: solid 1pt;
+ border: solid 1pt;
border-collapse: collapse;
}
th {
- background: #eeeeee;
+ background: #eeeeee;
padding: 5px;
}
diff --git a/src/gs-prefs.h b/src/gs-prefs.h
index bca1fd8..f004e8f 100644
--- a/src/gs-prefs.h
+++ b/src/gs-prefs.h
@@ -38,9 +38,9 @@ G_BEGIN_DECLS
/**
* Screensaver theme selection mode
- * The selection mode used by screensaver. May be "blank-only" to enable the screensaver
- * without using any theme on activation, "single" to enable screensaver using only one
- * theme on activation (specified in "themes" key), and "random" to enable the screensaver
+ * The selection mode used by screensaver. May be "blank-only" to enable the screensaver
+ * without using any theme on activation, "single" to enable screensaver using only one
+ * theme on activation (specified in "themes" key), and "random" to enable the screensaver
* using a random theme on activation.
*/
#define KEY_MODE "/mode"
@@ -55,7 +55,7 @@ G_BEGIN_DECLS
/**
* Time before power management baseline
- * The number of seconds of inactivity before signalling to power management.
+ * The number of seconds of inactivity before signalling to power management.
* This key is set and maintained by the session power management agent.
*/
#define KEY_POWER_DELAY "/power-management-delay"
@@ -99,8 +99,8 @@ G_BEGIN_DECLS
/**
* Embedded keyboard command
- * The command that will be run, if the "embedded_keyboard_enabled" key is set to TRUE,
- * to embed a keyboard widget into the window. This command should implement an XEMBED
+ * The command that will be run, if the "embedded_keyboard_enabled" key is set to TRUE,
+ * to embed a keyboard widget into the window. This command should implement an XEMBED
* plug interface and output a window XID on the standard output.
*/
#define KEY_KEYBOARD_COMMAND "/embedded-keyboard-command"
@@ -123,8 +123,8 @@ G_BEGIN_DECLS
/**
* Time before logout option
- * The number of minutes after the screensaver activation before a logout option will
- * appear in the unlock dialog. This key has effect only if the "logout_enable" key is
+ * The number of minutes after the screensaver activation before a logout option will
+ * appear in the unlock dialog. This key has effect only if the "logout_enable" key is
* set to TRUE.
*/
#define KEY_LOGOUT_DELAY "/logout-delay"
@@ -132,8 +132,8 @@ G_BEGIN_DECLS
/**
* Logout command
- * The command to invoke when the logout button is clicked. This command should simply
- * log the user out without any interaction. This key has effect only if the
+ * The command to invoke when the logout button is clicked. This command should simply
+ * log the user out without any interaction. This key has effect only if the
* "logout_enable" key is set to TRUE.
*/
#define KEY_LOGOUT_COMMAND "/logout-command"
@@ -141,7 +141,7 @@ G_BEGIN_DECLS
/**
* Allow user switching
- * Set this to TRUE to offer an option in the unlock dialog to switch to a different
+ * Set this to TRUE to offer an option in the unlock dialog to switch to a different
* user account.
*/
#define KEY_USER_SWITCH_ENABLED "/user-switch-enabled"
@@ -149,8 +149,8 @@ G_BEGIN_DECLS
/**
* Screensaver themes
- * This key specifies the list of themes to be used by the screensaver. It's ignored
- * when "mode" key is "blank-only", should provide the theme name when "mode" is "single",
+ * This key specifies the list of themes to be used by the screensaver. It's ignored
+ * when "mode" key is "blank-only", should provide the theme name when "mode" is "single",
* and should provide a list of themes when "mode" is "random".
*/
#define KEY_THEMES "/themes"
diff --git a/src/xfce-bg.c b/src/xfce-bg.c
index 59b497d..71af4a3 100644
--- a/src/xfce-bg.c
+++ b/src/xfce-bg.c
@@ -347,7 +347,7 @@ xfce_bg_get_property_prefix (XfconfChannel *channel,
/* Check for workspace usage */
prefix = g_strconcat("/backdrop/screen0/monitor", monitor_name, "/workspace0", NULL);
- if (xfce_bg_check_property_prefix (channel, prefix))
+ if (xfce_bg_check_property_prefix (channel, prefix))
{
return prefix;
}
diff --git a/src/xfce-rr-private.h b/src/xfce-rr-private.h
index 543b51d..4cbfdc1 100644
--- a/src/xfce-rr-private.h
+++ b/src/xfce-rr-private.h
@@ -35,11 +35,11 @@ struct XfceRRScreenPrivate
Screen *xscreen;
ScreenInfo *info;
Window xroot;
-
+
int randr_event_base;
int rr_major_version;
int rr_minor_version;
-
+
Atom connector_type_atom;
};
diff --git a/src/xfce-rr.c b/src/xfce-rr.c
index ad61a21..b6c5e8e 100644
--- a/src/xfce-rr.c
+++ b/src/xfce-rr.c
@@ -1,7 +1,7 @@
/* xfce-rr.c
*
* Copyright 2007, 2008, Red Hat, Inc.
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of the
@@ -11,12 +11,12 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Library General Public
* License along with this library; see the file COPYING.LIB. If not,
* write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
- *
+ *
* Author: Soren Sandmann <sandmann at redhat.com>
*/
@@ -72,7 +72,7 @@ struct XfceRROutput
{
ScreenInfo * info;
RROutput id;
-
+
char * name;
XfceRRCrtc * current_crtc;
gboolean connected;
@@ -96,13 +96,13 @@ struct XfceRRCrtc
{
ScreenInfo * info;
RRCrtc id;
-
+
XfceRRMode * current_mode;
XfceRROutput ** current_outputs;
XfceRROutput ** possible_outputs;
int x;
int y;
-
+
XfceRRRotation current_rotation;
XfceRRRotation rotations;
int gamma_size;
@@ -199,15 +199,15 @@ static XfceRROutput *
xfce_rr_output_by_id (ScreenInfo *info, RROutput id)
{
XfceRROutput **output;
-
+
g_assert (info != NULL);
-
+
for (output = info->outputs; *output; ++output)
{
if ((*output)->id == id)
return *output;
}
-
+
return NULL;
}
@@ -215,16 +215,16 @@ static XfceRRCrtc *
crtc_by_id (ScreenInfo *info, RRCrtc id)
{
XfceRRCrtc **crtc;
-
+
if (!info)
return NULL;
-
+
for (crtc = info->crtcs; *crtc; ++crtc)
{
if ((*crtc)->id == id)
return *crtc;
}
-
+
return NULL;
}
@@ -232,15 +232,15 @@ static XfceRRMode *
mode_by_id (ScreenInfo *info, RRMode id)
{
XfceRRMode **mode;
-
+
g_assert (info != NULL);
-
+
for (mode = info->modes; *mode; ++mode)
{
if ((*mode)->id == id)
return *mode;
}
-
+
return NULL;
}
@@ -250,32 +250,32 @@ screen_info_free (ScreenInfo *info)
XfceRROutput **output;
XfceRRCrtc **crtc;
XfceRRMode **mode;
-
+
g_assert (info != NULL);
#ifdef HAVE_RANDR
if (info->resources)
{
XRRFreeScreenResources (info->resources);
-
+
info->resources = NULL;
}
#endif
-
+
if (info->outputs)
{
for (output = info->outputs; *output; ++output)
output_free (*output);
g_free (info->outputs);
}
-
+
if (info->crtcs)
{
for (crtc = info->crtcs; *crtc; ++crtc)
crtc_free (*crtc);
g_free (info->crtcs);
}
-
+
if (info->modes)
{
for (mode = info->modes; *mode; ++mode)
@@ -288,7 +288,7 @@ screen_info_free (ScreenInfo *info)
/* The modes themselves were freed above */
g_free (info->clone_modes);
}
-
+
g_free (info);
}
@@ -326,10 +326,10 @@ gather_clone_modes (ScreenInfo *info)
XfceRROutput *output1, *output2;
output1 = info->outputs[i];
-
+
if (!output1->connected)
continue;
-
+
for (j = 0; output1->modes[j] != NULL; ++j)
{
XfceRRMode *mode = output1->modes[j];
@@ -340,10 +340,10 @@ gather_clone_modes (ScreenInfo *info)
for (k = 0; info->outputs[k] != NULL; ++k)
{
output2 = info->outputs[k];
-
+
if (!output2->connected)
continue;
-
+
if (!has_similar_mode (output2, mode))
{
valid = FALSE;
@@ -357,7 +357,7 @@ gather_clone_modes (ScreenInfo *info)
}
g_ptr_array_add (result, NULL);
-
+
info->clone_modes = (XfceRRMode **)g_ptr_array_free (result, FALSE);
}
@@ -443,7 +443,7 @@ fill_out_screen_info (Display *xdisplay,
#ifdef HAVE_RANDR
XRRScreenResources *resources;
GdkDisplay *display;
-
+
g_assert (xdisplay != NULL);
g_assert (info != NULL);
@@ -496,7 +496,7 @@ fill_out_screen_info (Display *xdisplay,
}
else
{
- xfce_rr_screen_get_ranges (info->screen,
+ xfce_rr_screen_get_ranges (info->screen,
&(info->min_width),
&(info->max_width),
&(info->min_height),
@@ -529,7 +529,7 @@ screen_info_new (XfceRRScreen *screen, gboolean needs_reprobe, GError **error)
info->crtcs = NULL;
info->modes = NULL;
info->screen = screen;
-
+
if (fill_out_screen_info (priv->xdisplay, priv->xroot, info, needs_reprobe, error))
{
return info;
@@ -546,7 +546,7 @@ screen_update (XfceRRScreen *screen, gboolean force_callback, gboolean needs_rep
{
ScreenInfo *info;
gboolean changed = FALSE;
-
+
g_assert (screen != NULL);
info = screen_info_new (screen, needs_reprobe, error);
@@ -559,12 +559,12 @@ screen_update (XfceRRScreen *screen, gboolean force_callback, gboolean needs_rep
#endif
screen_info_free (screen->priv->info);
-
+
screen->priv->info = info;
if (changed || force_callback)
g_signal_emit (G_OBJECT (screen), screen_signals[SCREEN_CHANGED], 0);
-
+
return changed;
}
@@ -866,16 +866,16 @@ xfce_rr_screen_get_ranges (XfceRRScreen *screen,
g_return_if_fail (XFCE_IS_RR_SCREEN (screen));
priv = screen->priv;
-
+
if (min_width)
*min_width = priv->info->min_width;
-
+
if (max_width)
*max_width = priv->info->max_width;
-
+
if (min_height)
*min_height = priv->info->min_height;
-
+
if (max_height)
*max_height = priv->info->max_height;
}
@@ -976,7 +976,7 @@ xfce_rr_screen_list_crtcs (XfceRRScreen *screen)
{
g_return_val_if_fail (XFCE_IS_RR_SCREEN (screen), NULL);
g_return_val_if_fail (screen->priv->info != NULL, NULL);
-
+
return screen->priv->info->crtcs;
}
@@ -985,10 +985,10 @@ static XfceRROutput *
output_new (ScreenInfo *info, RROutput id)
{
XfceRROutput *output = g_slice_new0 (XfceRROutput);
-
+
output->id = id;
output->info = info;
-
+
return output;
}
@@ -1004,13 +1004,13 @@ get_property (Display *dpy,
unsigned long nitems, bytes_after;
Atom actual_type;
guint8 *result;
-
+
XRRGetOutputProperty (dpy, output, atom,
0, 100, False, False,
AnyPropertyType,
&actual_type, &actual_format,
&nitems, &bytes_after, &prop);
-
+
if (actual_type == XA_INTEGER && actual_format == 8)
{
result = g_memdup (prop, nitems);
@@ -1021,9 +1021,9 @@ get_property (Display *dpy,
{
result = NULL;
}
-
+
XFree (prop);
-
+
return result;
#else
return NULL;
@@ -1054,7 +1054,7 @@ read_edid_data (XfceRROutput *output, int *len)
else
g_free (result);
}
-
+
return NULL;
}
@@ -1108,11 +1108,11 @@ output_initialize (XfceRROutput *output, XRRScreenResources *res, GError **error
DISPLAY (output), res, output->id);
GPtrArray *a;
int i;
-
+
#if 0
g_print ("Output %lx Timestamp: %u\n", output->id, (guint32)info->timestamp);
#endif
-
+
if (!info || !output->info)
{
/* FIXME: see the comment in crtc_initialize() */
@@ -1122,7 +1122,7 @@ output_initialize (XfceRROutput *output, XRRScreenResources *res, GError **error
(int) output->id);
return FALSE;
}
-
+
output->name = g_strdup (info->name); /* FIXME: what is nameLen used for? */
output->current_crtc = crtc_by_id (output->info, info->crtc);
output->width_mm = info->mm_width;
@@ -1132,46 +1132,46 @@ output_initialize (XfceRROutput *output, XRRScreenResources *res, GError **error
/* Possible crtcs */
a = g_ptr_array_new ();
-
+
for (i = 0; i < info->ncrtc; ++i)
{
XfceRRCrtc *crtc = crtc_by_id (output->info, info->crtcs[i]);
-
+
if (crtc)
g_ptr_array_add (a, crtc);
}
g_ptr_array_add (a, NULL);
output->possible_crtcs = (XfceRRCrtc **)g_ptr_array_free (a, FALSE);
-
+
/* Clones */
a = g_ptr_array_new ();
for (i = 0; i < info->nclone; ++i)
{
XfceRROutput *xfce_rr_output = xfce_rr_output_by_id (output->info, info->clones[i]);
-
+
if (xfce_rr_output)
g_ptr_array_add (a, xfce_rr_output);
}
g_ptr_array_add (a, NULL);
output->clones = (XfceRROutput **)g_ptr_array_free (a, FALSE);
-
+
/* Modes */
a = g_ptr_array_new ();
for (i = 0; i < info->nmode; ++i)
{
XfceRRMode *mode = mode_by_id (output->info, info->modes[i]);
-
+
if (mode)
g_ptr_array_add (a, mode);
}
g_ptr_array_add (a, NULL);
output->modes = (XfceRRMode **)g_ptr_array_free (a, FALSE);
-
+
output->n_preferred = info->npreferred;
-
+
/* Edid data */
output->edid_data = read_edid_data (output, &output->edid_size);
-
+
XRRFreeOutputInfo (info);
return TRUE;
@@ -1271,13 +1271,13 @@ xfce_rr_rotation_from_xrotation (Rotation r)
{
int i;
XfceRRRotation result = 0;
-
+
for (i = 0; i < G_N_ELEMENTS (rotation_map); ++i)
{
if (r & rotation_map[i].xrot)
result |= rotation_map[i].rot;
}
-
+
return result;
}
@@ -1290,7 +1290,7 @@ XfceRRMode *
xfce_rr_crtc_get_current_mode (XfceRRCrtc *crtc)
{
g_return_val_if_fail (crtc != NULL, NULL);
-
+
return crtc->current_mode;
}
@@ -1298,10 +1298,10 @@ static XfceRRCrtc *
crtc_new (ScreenInfo *info, RROutput id)
{
XfceRRCrtc *crtc = g_slice_new0 (XfceRRCrtc);
-
+
crtc->id = id;
crtc->info = info;
-
+
return crtc;
}
@@ -1347,11 +1347,11 @@ crtc_initialize (XfceRRCrtc *crtc,
XRRCrtcInfo *info = XRRGetCrtcInfo (DISPLAY (crtc), res, crtc->id);
GPtrArray *a;
int i;
-
+
#if 0
g_print ("CRTC %lx Timestamp: %u\n", crtc->id, (guint32)info->timestamp);
#endif
-
+
if (!info)
{
/* FIXME: We need to reaquire the screen resources */
@@ -1365,41 +1365,41 @@ crtc_initialize (XfceRRCrtc *crtc,
(int) crtc->id);
return FALSE;
}
-
+
/* XfceRRMode */
crtc->current_mode = mode_by_id (crtc->info, info->mode);
-
+
crtc->x = info->x;
crtc->y = info->y;
-
+
/* Current outputs */
a = g_ptr_array_new ();
for (i = 0; i < info->noutput; ++i)
{
XfceRROutput *output = xfce_rr_output_by_id (crtc->info, info->outputs[i]);
-
+
if (output)
g_ptr_array_add (a, output);
}
g_ptr_array_add (a, NULL);
crtc->current_outputs = (XfceRROutput **)g_ptr_array_free (a, FALSE);
-
+
/* Possible outputs */
a = g_ptr_array_new ();
for (i = 0; i < info->npossible; ++i)
{
XfceRROutput *output = xfce_rr_output_by_id (crtc->info, info->possible[i]);
-
+
if (output)
g_ptr_array_add (a, output);
}
g_ptr_array_add (a, NULL);
crtc->possible_outputs = (XfceRROutput **)g_ptr_array_free (a, FALSE);
-
+
/* Rotations */
crtc->current_rotation = xfce_rr_rotation_from_xrotation (info->rotation);
crtc->rotations = xfce_rr_rotation_from_xrotation (info->rotations);
-
+
XRRFreeCrtcInfo (info);
/* get an store gamma size */
@@ -1422,10 +1422,10 @@ static XfceRRMode *
mode_new (ScreenInfo *info, RRMode id)
{
XfceRRMode *mode = g_slice_new0 (XfceRRMode);
-
+
mode->id = id;
mode->info = info;
-
+
return mode;
}
@@ -1449,7 +1449,7 @@ mode_initialize (XfceRRMode *mode, XRRModeInfo *info)
{
g_assert (mode != NULL);
g_assert (info != NULL);
-
+
mode->name = g_strdup (info->name);
mode->width = info->width;
mode->height = info->height;
diff --git a/src/xfce-rr.h b/src/xfce-rr.h
index 38c48e4..bef84f1 100644
--- a/src/xfce-rr.h
+++ b/src/xfce-rr.h
@@ -1,7 +1,7 @@
/* xfce-rr.h
*
* Copyright 2007, 2008, Red Hat, Inc.
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of the
@@ -11,12 +11,12 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Library General Public
* License along with this library; see the file COPYING.LIB. If not,
* write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
- *
+ *
* Author: Soren Sandmann <sandmann at redhat.com>
*/
#ifndef XFCE_RR_H
diff --git a/src/xfce4-screensaver-preferences.c b/src/xfce4-screensaver-preferences.c
index b334d3f..4cfd1d8 100644
--- a/src/xfce4-screensaver-preferences.c
+++ b/src/xfce4-screensaver-preferences.c
@@ -935,7 +935,7 @@ time_to_string_text (long time)
secs = g_strdup_printf (ngettext ("%d second",
"%d seconds", sec), sec);
- inc_len = strlen (g_strdup_printf (_("%s %s"),
+ inc_len = strlen (g_strdup_printf (_("%s %s"),
g_strdup_printf (ngettext ("%d hour",
"%d hours", 1), 1),
g_strdup_printf (ngettext ("%d minute",
diff --git a/src/xfcekbd-config-private.h b/src/xfcekbd-config-private.h
index c1b1d79..12bd093 100644
--- a/src/xfcekbd-config-private.h
+++ b/src/xfcekbd-config-private.h
@@ -71,7 +71,7 @@
/**
* KBD/Indicator: The font
- * The font for the layout indicator. This should be in
+ * The font for the layout indicator. This should be in
* "[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]" format.
*/
#define KEY_KBD_INDICATOR_FONT_FAMILY "/kbd/indicator/font-family"
@@ -79,7 +79,7 @@
/**
* KBD/Indicator: The foreground color
- * The foreground color for the layout indicator.
+ * The foreground color for the layout indicator.
* This should be in "R G B" format, for example "255 0 0".
*/
#define KEY_KBD_INDICATOR_FOREGROUND_COLOR "/kbd/indicator/foreground-color"
@@ -87,7 +87,7 @@
/**
* KBD/Indicator: The background color
- * The background color for the layout indicator.
+ * The background color for the layout indicator.
* This should be in "R G B" format, for example "255 0 0".
*/
#define KEY_KBD_INDICATOR_BACKGROUND_COLOR "/kbd/indicator/background-color"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list