summaryrefslogtreecommitdiff
path: root/plugins/xsettings
diff options
context:
space:
mode:
authorLaurent Napias <[email protected]>2019-06-29 11:50:53 +0200
committerlukefromdc <[email protected]>2019-07-01 02:49:33 +0000
commit8d22bd7590c3487df96f8dc3972173236c66de87 (patch)
tree14ccecbfa067a2d7ab2bdb315686d01a20ecc084 /plugins/xsettings
parent86362cdd37c71ad4d6b9a1c506838b201953fd29 (diff)
downloadmate-settings-daemon-8d22bd7590c3487df96f8dc3972173236c66de87.tar.bz2
mate-settings-daemon-8d22bd7590c3487df96f8dc3972173236c66de87.tar.xz
Remove trailing whitespaces
Diffstat (limited to 'plugins/xsettings')
-rw-r--r--plugins/xsettings/xsettings-common.c18
-rw-r--r--plugins/xsettings/xsettings-common.h6
-rw-r--r--plugins/xsettings/xsettings-manager.c32
-rw-r--r--plugins/xsettings/xsettings-manager.h2
4 files changed, 29 insertions, 29 deletions
diff --git a/plugins/xsettings/xsettings-common.c b/plugins/xsettings/xsettings-common.c
index 992175a..8e3e04c 100644
--- a/plugins/xsettings/xsettings-common.c
+++ b/plugins/xsettings/xsettings-common.c
@@ -15,7 +15,7 @@
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Owen Taylor, Red Hat, Inc.
@@ -33,7 +33,7 @@ xsettings_setting_copy (XSettingsSetting *setting)
{
XSettingsSetting *result;
size_t str_len;
-
+
result = malloc (sizeof *result);
if (!result)
return NULL;
@@ -73,7 +73,7 @@ xsettings_setting_copy (XSettingsSetting *setting)
if (result->name)
free (result->name);
free (result);
-
+
return NULL;
}
@@ -105,7 +105,7 @@ xsettings_list_copy (XSettingsList *list)
new = new_node;
new_iter = new_node;
-
+
old_iter = old_iter->next;
}
@@ -147,7 +147,7 @@ xsettings_setting_free (XSettingsSetting *setting)
{
if (setting->type == XSETTINGS_TYPE_STRING)
free (setting->data.v_string);
-
+
if (setting->name)
free (setting->name);
@@ -197,14 +197,14 @@ xsettings_list_insert (XSettingsList **list,
last = iter;
iter = iter->next;
}
-
+
if (last)
last->next = node;
else
*list = node;
-
+
node->next = iter;
-
+
return XSETTINGS_SUCCESS;
}
@@ -224,7 +224,7 @@ xsettings_list_delete (XSettingsList **list,
last->next = iter->next;
else
*list = iter->next;
-
+
xsettings_setting_free (iter->setting);
free (iter);
diff --git a/plugins/xsettings/xsettings-common.h b/plugins/xsettings/xsettings-common.h
index e3af4a6..caf0e59 100644
--- a/plugins/xsettings/xsettings-common.h
+++ b/plugins/xsettings/xsettings-common.h
@@ -15,7 +15,7 @@
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Owen Taylor, Red Hat, Inc.
@@ -35,7 +35,7 @@ typedef struct _XSettingsSetting XSettingsSetting;
/* Types of settings possible. Enum values correspond to
* protocol values.
*/
-typedef enum
+typedef enum
{
XSETTINGS_TYPE_INT = 0,
XSETTINGS_TYPE_STRING = 1,
@@ -75,7 +75,7 @@ struct _XSettingsSetting
{
char *name;
XSettingsType type;
-
+
union {
int v_int;
char *v_string;
diff --git a/plugins/xsettings/xsettings-manager.c b/plugins/xsettings/xsettings-manager.c
index 6578ce1..3d933d5 100644
--- a/plugins/xsettings/xsettings-manager.c
+++ b/plugins/xsettings/xsettings-manager.c
@@ -15,7 +15,7 @@
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Owen Taylor, Red Hat, Inc.
@@ -47,7 +47,7 @@ struct _XSettingsManager
static XSettingsList *settings;
-typedef struct
+typedef struct
{
Window window;
Atom timestamp_prop_atom;
@@ -74,9 +74,9 @@ timestamp_predicate (Display *display,
* @window: a #Window, used for communication with the server.
* The window must have PropertyChangeMask in its
* events mask or a hang will result.
- *
- * Routine to get the current X server time stamp.
- *
+ *
+ * Routine to get the current X server time stamp.
+ *
* Return value: the time stamp.
**/
static Time
@@ -106,7 +106,7 @@ xsettings_manager_check_running (Display *display,
{
char buffer[256];
Atom selection_atom;
-
+
sprintf(buffer, "_XSETTINGS_S%d", screen);
selection_atom = XInternAtom (display, buffer, False);
@@ -127,7 +127,7 @@ xsettings_manager_new (Display *display,
XClientMessageEvent xev;
char buffer[256];
-
+
manager = malloc (sizeof *manager);
if (!manager)
return NULL;
@@ -174,7 +174,7 @@ xsettings_manager_new (Display *display,
xev.data.l[2] = manager->window;
xev.data.l[3] = 0; /* manager specific data */
xev.data.l[4] = 0; /* manager specific data */
-
+
XSendEvent (display, RootWindow (display, screen),
False, StructureNotifyMask, (XEvent *)&xev);
}
@@ -182,7 +182,7 @@ xsettings_manager_new (Display *display,
{
manager->terminate (manager->cb_data);
}
-
+
return manager;
}
@@ -190,7 +190,7 @@ void
xsettings_manager_destroy (XSettingsManager *manager)
{
XDestroyWindow (manager->display, manager->window);
-
+
xsettings_list_free (manager->settings);
free (manager);
}
@@ -242,11 +242,11 @@ xsettings_manager_set_setting (XSettingsManager *manager,
new_setting = xsettings_setting_copy (setting);
if (!new_setting)
return XSETTINGS_NO_MEM;
-
+
new_setting->last_change_serial = manager->serial;
-
+
result = xsettings_list_insert (&settings, new_setting);
-
+
if (result != XSETTINGS_SUCCESS)
xsettings_setting_free (new_setting);
@@ -335,7 +335,7 @@ setting_store (XSettingsSetting *setting,
memcpy (buffer->pos, setting->name, string_len);
length -= string_len;
buffer->pos += string_len;
-
+
while (length > 0)
{
*(buffer->pos++) = 0;
@@ -355,12 +355,12 @@ setting_store (XSettingsSetting *setting,
string_len = strlen (setting->data.v_string);
*(CARD32 *)(buffer->pos) = string_len;
buffer->pos += 4;
-
+
length = XSETTINGS_PAD (string_len, 4);
memcpy (buffer->pos, setting->data.v_string, string_len);
length -= string_len;
buffer->pos += string_len;
-
+
while (length > 0)
{
*(buffer->pos++) = 0;
diff --git a/plugins/xsettings/xsettings-manager.h b/plugins/xsettings/xsettings-manager.h
index f309768..40681ae 100644
--- a/plugins/xsettings/xsettings-manager.h
+++ b/plugins/xsettings/xsettings-manager.h
@@ -15,7 +15,7 @@
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Owen Taylor, Red Hat, Inc.