Skip to content

Commit

Permalink
Remove trailing white spaces
Browse files Browse the repository at this point in the history
Based on patch from "Gun.io Whitespace Robot" <contact@gun.io>
  • Loading branch information
thos committed Jan 20, 2012
1 parent a0dbd9b commit d41e4b7
Show file tree
Hide file tree
Showing 27 changed files with 86 additions and 86 deletions.
2 changes: 1 addition & 1 deletion COPYING.LIB
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.

1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
Expand Down
2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,7 @@ Changes since 0.6.0:
* Fixed bugs:

MB#9570 - [widget] Bug in mx_widget_set_tooltip_text
MB#9529 - [table] Calculate row_spacing correctly
MB#9529 - [table] Calculate row_spacing correctly
MB#9346 - Memory leak in widgets implementing MxScrollable
MB#9055 - Unable to set the popup location of MxComboBox
MB#9656 - [MxListView] Missing break statement in mx_list_view_set_property
Expand Down
4 changes: 2 additions & 2 deletions m4/introspection.m4
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
],[dnl
AC_ARG_ENABLE(introspection,
AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
[Enable introspection for this build]),,
[Enable introspection for this build]),,
[enable_introspection=auto])
])dnl
Expand All @@ -42,7 +42,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
[auto],[dnl
PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
],dnl
[dnl
[dnl
AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
])dnl
Expand Down
2 changes: 1 addition & 1 deletion mx/mx-entry.c
Original file line number Diff line number Diff line change
Expand Up @@ -2038,7 +2038,7 @@ const gchar *mx_entry_get_icon_highlight_suffix (MxEntry *entry)
* @suffix: the suffix to append to the filename for the highlight version
*
* Sets the suffix appended to the filename to use for the highlighted version
* of the icon. e.g. if you have set your primay icon to "primary-icon.png"
* of the icon. e.g. if you have set your primay icon to "primary-icon.png"
* and the suffix to "-highlight" #MxEntry will look for
* "primary-icon-highlight.png"
*/
Expand Down
4 changes: 2 additions & 2 deletions mx/mx-expander.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* @short_description: a container which the user can show or hide its child
*
* #MxExpander is a single child container that allows the user to show or
* hide its child. It displays a clickable bar (with a text label),
* hide its child. It displays a clickable bar (with a text label),
* which (by default) when clicked toggles display of the child.
*
* <figure id="mx-expander-expanded">
Expand Down Expand Up @@ -688,7 +688,7 @@ mx_expander_set_label (MxExpander *expander,
* @expander: A #MxExpander
* @expanded: the state of the expander to set
*
* Set the state (the #MxExpander:expanded property) of the expander.
* Set the state (the #MxExpander:expanded property) of the expander.
* This will cause the expander to open or close.
*/
void
Expand Down
26 changes: 13 additions & 13 deletions mx/mx-grid.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,25 +41,25 @@
* This layout is particularly flexible, with the following configuration possibilities:
*
* <itemizedlist>
* <listitem><para>Column and row spacing are controllable
* <listitem><para>Column and row spacing are controllable
* (#MxGrid:column_spacing and #MxGrid:row_spacing)</para></listitem>
* <listitem><para>Column and row sizes can be made consistent, regardless of the size
* <listitem><para>Column and row sizes can be made consistent, regardless of the size
* of the contained actors (#MxGrid:homogenous_columns and #MxGrid:homogenous_rows)
* </para></listitem>
* <listitem><para>Prefer to pack children vertically first,
* rather than horizontally (#MxGrid:orientation)</para></listitem>
* <listitem><para>Specify the maximum number of rows or columns
* to allow in the layout, to prevent it from being excessively stretched
* <listitem><para>Specify the maximum number of rows or columns
* to allow in the layout, to prevent it from being excessively stretched
* (#MxGrid:max_stride).</para></listitem>
* </itemizedlist>
*
* To demonstrate how these settings interact, here are a few images.
*
* <figure id="mx-grid">
* <title>MxGrid flowing across multiple rows</title>
* <para>An #MxGrid containing 9 child actors;
* #MxGrid:orientation is set to the default (MX_ORIENTATION_HORIZONTAL,
* i.e. lay out horizontally first); #MxGrid:max_stride has not been set
* <para>An #MxGrid containing 9 child actors;
* #MxGrid:orientation is set to the default (MX_ORIENTATION_HORIZONTAL,
* i.e. lay out horizontally first); #MxGrid:max_stride has not been set
* (so there's no maximum row size); #MxGrid:column_spacing and #MxGrid:row_spacing have
* been set so that there is spacing between cells vertically and horizontally.</para>
* <graphic fileref="MxGrid-3x3.png" format="PNG"/>
Expand All @@ -74,12 +74,12 @@
*
* <figure id="mx-grid-two-rows">
* <title>MxGrid flowing onto two rows</title>
* <para>The same #MxGrid with 9 children wrapping onto two rows: notice
* how the "odd" rectangle is on the end of a row, rather than at the
* bottom of a column. This is because preference
* is being given to packing onto the end of rows, rather than columns,
* because #MxGrid:orientation is set to MX_ORIENTATION_HORIZONTAL. Even though
* there is room for the rectangle at the bottom of the column, the
* <para>The same #MxGrid with 9 children wrapping onto two rows: notice
* how the "odd" rectangle is on the end of a row, rather than at the
* bottom of a column. This is because preference
* is being given to packing onto the end of rows, rather than columns,
* because #MxGrid:orientation is set to MX_ORIENTATION_HORIZONTAL. Even though
* there is room for the rectangle at the bottom of the column, the
* layout prefers to place children onto the end of a row if there is room.</para>
* <graphic fileref="MxGrid-2rows-row-major.png" format="PNG"/>
* </figure>
Expand Down
2 changes: 1 addition & 1 deletion mx/mx-private.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/
#include "mx-private.h"

static GDebugKey debug_keys[] =
static GDebugKey debug_keys[] =
{
{"layout", MX_DEBUG_LAYOUT},
{"inspector", MX_DEBUG_INSPECTOR},
Expand Down
6 changes: 3 additions & 3 deletions mx/mx-scroll-view.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
*
* <figure id="mx-scroll-view">
* <title>#MxScrollView around an #MxBoxLayout</title>
* <para>An example of an #MxScrollView wrapped around an #MxBoxLayout
* actor (which implements #MxScrollable). The #MxBoxLayout contains
* nine #ClutterRectangle instances, but the stage is too small for
* <para>An example of an #MxScrollView wrapped around an #MxBoxLayout
* actor (which implements #MxScrollable). The #MxBoxLayout contains
* nine #ClutterRectangle instances, but the stage is too small for
* all of them to be visible. The #MxScrollView adds the appropriate
* horizontal scroll, which makes it possible to scroll to the end
* of the row of rectangles.</para>
Expand Down
2 changes: 1 addition & 1 deletion mx/mx-slider.c
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ mx_slider_get_preferred_width (ClutterActor *actor,
if (min_width_p)
*min_width_p = priv->handle_width + padding.left + padding.right;

/* Set the preferred size as some arbitrary value larger than the handle
/* Set the preferred size as some arbitrary value larger than the handle
* width. This ensures the slider can actually move!
*/
if (nat_width_p)
Expand Down
10 changes: 5 additions & 5 deletions mx/mx-table.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@
* with rows and columns. #MxTable adds several child properties to its
* children which control their position and size in the table.
*
* While other layouts (like #MxGrid) allow you to achieve
* table-like effects, #MxTable is the only layout which allows
* While other layouts (like #MxGrid) allow you to achieve
* table-like effects, #MxTable is the only layout which allows
* you to precisely (and easily) place elements at particular grid coordinates,
* via mx_table_add_actor().
*
* <figure id="mx-table">
* <title>#MxTable, 3 rows by 3 columns</title>
* <para>Notice how rectangles have only been placed in a few of
* the cells inside the table: this would be very difficult to do
* with any other layout, without having layouts within layouts within
* <para>Notice how rectangles have only been placed in a few of
* the cells inside the table: this would be very difficult to do
* with any other layout, without having layouts within layouts within
* layouts...</para>
* <graphic fileref="MxTable.png" format="PNG"/>
* </figure>
Expand Down
4 changes: 2 additions & 2 deletions mx/mx-texture-frame.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ struct _MxTextureFrame
{
/*< private >*/
ClutterActor parent_instance;

MxTextureFramePrivate *priv;
};

struct _MxTextureFrameClass
struct _MxTextureFrameClass
{
ClutterActorClass parent_class;

Expand Down
8 changes: 4 additions & 4 deletions mx/mx-viewport.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@
* SECTION:mx-viewport
* @short_description: single child scrollable container
*
* #MxViewport allows non-scrollable children (like images or text)
* to be scrollable by implementing the #MxScrollable and #ClutterContainer
* #MxViewport allows non-scrollable children (like images or text)
* to be scrollable by implementing the #MxScrollable and #ClutterContainer
* interface.
*
* To use it, add the non-scrollable child to an #MxViewport; then sit the
* To use it, add the non-scrollable child to an #MxViewport; then sit the
* viewport inside an #MxScrollView to get the scrollbars.
*
* <figure id="mx-viewport">
* <title>#MxViewport around an #MxLabel</title>
* <para>An example of a large label (which isn't normally scrollable),
* <para>An example of a large label (which isn't normally scrollable),
* placed inside an #MxViewport, which is in turn inside an #MxScrollView.
* </para>
* <graphic fileref="MxViewport.png" format="PNG"/>
Expand Down
48 changes: 24 additions & 24 deletions mx/x11/xsettings-client.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -63,7 +63,7 @@ notify_changes (XSettingsClient *client,
while (old_iter || new_iter)
{
int cmp;

if (old_iter && new_iter)
cmp = strcmp (old_iter->setting->name, new_iter->setting->name);
else if (old_iter)
Expand Down Expand Up @@ -123,7 +123,7 @@ fetch_card16 (XSettingsBuffer *buffer,

x = *(CARD16 *)buffer->pos;
buffer->pos += 2;

if (buffer->byte_order == local_byte_order)
*result = x;
else
Expand All @@ -134,10 +134,10 @@ fetch_card16 (XSettingsBuffer *buffer,

static XSettingsResult
fetch_ushort (XSettingsBuffer *buffer,
unsigned short *result)
unsigned short *result)
{
CARD16 x;
XSettingsResult r;
XSettingsResult r;

r = fetch_card16 (buffer, &x);
if (r == XSETTINGS_SUCCESS)
Expand All @@ -157,12 +157,12 @@ fetch_card32 (XSettingsBuffer *buffer,

x = *(CARD32 *)buffer->pos;
buffer->pos += 4;

if (buffer->byte_order == local_byte_order)
*result = x;
else
*result = (x << 24) | ((x & 0xff00) << 8) | ((x & 0xff0000) >> 8) | (x >> 24);

return XSETTINGS_SUCCESS;
}

Expand Down Expand Up @@ -192,12 +192,12 @@ parse_settings (unsigned char *data,
CARD32 n_entries;
CARD32 i;
XSettingsSetting *setting = NULL;

local_byte_order = xsettings_byte_order ();

buffer.pos = buffer.data = data;
buffer.len = len;

result = fetch_card8 (&buffer, (unsigned char *)&buffer.byte_order);
if (buffer.byte_order != MSBFirst &&
buffer.byte_order != LSBFirst)
Expand All @@ -223,7 +223,7 @@ parse_settings (unsigned char *data,
CARD16 name_len;
CARD32 v_int;
size_t pad_len;

result = fetch_card8 (&buffer, &type);
if (result != XSETTINGS_SUCCESS)
goto out;
Expand Down Expand Up @@ -293,7 +293,7 @@ parse_settings (unsigned char *data,
result = XSETTINGS_NO_MEM;
goto out;
}

memcpy (setting->data.v_string, buffer.pos, v_int);
setting->data.v_string[v_int] = '\0';
buffer.pos += pad_len;
Expand Down Expand Up @@ -370,7 +370,7 @@ read_settings (XSettingsClient *client)
int result;

int (*old_handler) (Display *, XErrorEvent *);

XSettingsList *old_list = client->settings;

client->settings = NULL;
Expand All @@ -383,7 +383,7 @@ read_settings (XSettingsClient *client)
False, client->xsettings_atom,
&type, &format, &n_items, &bytes_after, &data);
XSetErrorHandler (old_handler);

if (result == Success && type != None)
{
if (type != client->xsettings_atom)
Expand All @@ -396,7 +396,7 @@ read_settings (XSettingsClient *client)
}
else
client->settings = parse_settings (data, n_items);

XFree (data);
}
}
Expand Down Expand Up @@ -437,12 +437,12 @@ check_manager_window (XSettingsClient *client)
client->ungrab (client->display);
else
XUngrabServer (client->display);

XFlush (client->display);

if (client->manager_window && client->watch)
{
if (!client->watch (client->manager_window, True,
if (!client->watch (client->manager_window, True,
PropertyChangeMask | StructureNotifyMask,
client->cb_data))
{
Expand All @@ -453,8 +453,8 @@ check_manager_window (XSettingsClient *client)
return;
}
}


read_settings (client);
}

Expand Down Expand Up @@ -482,7 +482,7 @@ xsettings_client_new_with_grab_funcs (Display *display,
char buffer[256];
char *atom_names[3];
Atom atoms[3];

client = malloc (sizeof *client);
if (!client)
return NULL;
Expand All @@ -494,7 +494,7 @@ xsettings_client_new_with_grab_funcs (Display *display,
client->cb_data = cb_data;
client->grab = grab;
client->ungrab = ungrab;

client->manager_window = None;
client->settings = NULL;

Expand All @@ -510,7 +510,7 @@ xsettings_client_new_with_grab_funcs (Display *display,
atoms[1] = XInternAtom (display, atom_names[1], False);
atoms[2] = XInternAtom (display, atom_names[2], False);
#endif

client->selection_atom = atoms[0];
client->xsettings_atom = atoms[1];
client->manager_atom = atoms[2];
Expand Down Expand Up @@ -551,7 +551,7 @@ xsettings_client_destroy (XSettingsClient *client)
False, 0, client->cb_data);
if (client->manager_window && client->watch)
client->watch (client->manager_window, False, 0, client->cb_data);

xsettings_list_free (client->settings);
free (client);
}
Expand Down Expand Up @@ -596,14 +596,14 @@ xsettings_client_process_event (XSettingsClient *client,
{
check_manager_window (client);
/* let GDK do its cleanup */
return False;
return False;
}
else if (xev->xany.type == PropertyNotify)
{
read_settings (client);
return True;
}
}

return False;
}
Loading

0 comments on commit d41e4b7

Please sign in to comment.