[Xfce4-commits] <xfce4-panel:devel> Strip trailing spaces in the code.
Nick Schermer
nick at xfce.org
Tue Aug 11 20:30:02 CEST 2009
Updating branch refs/heads/devel
to 8d0366a0cd7703f2ed936154d480082ab104cde5 (commit)
from 250a27750e3902f8890f8e4f71714d13b42c8210 (commit)
commit 8d0366a0cd7703f2ed936154d480082ab104cde5
Author: Nick Schermer <nick at xfce.org>
Date: Thu Mar 12 21:17:49 2009 +0100
Strip trailing spaces in the code.
libxfce4panel/xfce-arrow-button.c | 30 +++++++++++++++---------------
libxfce4panel/xfce-scaled-image.c | 2 +-
libxfce4panel/xfce-scaled-image.h | 2 +-
plugins/launcher/launcher-dialog.h | 2 +-
plugins/launcher/launcher.c | 4 ++--
plugins/separator/separator.h | 2 +-
plugins/showdesktop/showdesktop.c | 2 +-
plugins/systray/xfce-tray-dialogs.h | 2 +-
8 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/libxfce4panel/xfce-arrow-button.c b/libxfce4panel/xfce-arrow-button.c
index 003f8f0..46a9d56 100644
--- a/libxfce4panel/xfce-arrow-button.c
+++ b/libxfce4panel/xfce-arrow-button.c
@@ -67,7 +67,7 @@ static void xfce_arrow_button_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void xfce_arrow_button_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-
+
struct _XfceArrowButtonPrivate
@@ -144,7 +144,7 @@ xfce_arrow_button_class_init (XfceArrowButtonClass * klass)
"The arrow type of the menu button",
GTK_TYPE_ARROW_TYPE,
GTK_ARROW_UP,
- G_PARAM_READWRITE
+ G_PARAM_READWRITE
| G_PARAM_STATIC_STRINGS));
}
@@ -234,7 +234,7 @@ xfce_arrow_button_expose_event (GtkWidget *widget,
XfceArrowButton *button = XFCE_ARROW_BUTTON (widget);
GtkWidget *child;
gint x, y, width;
-
+
/* draw the button */
(*GTK_WIDGET_CLASS (xfce_arrow_button_parent_class)->expose_event) (widget, event);
@@ -263,11 +263,11 @@ xfce_arrow_button_expose_event (GtkWidget *widget,
width = MIN (widget->allocation.height - 2 * widget->style->ythickness,
widget->allocation.width - 2 * widget->style->xthickness);
width = CLAMP (width, 1, ARROW_WIDTH);
-
+
x = widget->allocation.x + (widget->allocation.width - width) / 2;
y = widget->allocation.y + (widget->allocation.height - width) / 2;
}
-
+
gtk_paint_arrow (widget->style, widget->window,
GTK_WIDGET_STATE (widget), GTK_SHADOW_NONE,
&(event->area), widget, "xfce_arrow_button",
@@ -292,7 +292,7 @@ xfce_arrow_button_size_request (GtkWidget *widget,
{
/* use gtk for the widget size */
(*GTK_WIDGET_CLASS (xfce_arrow_button_parent_class)->size_request) (widget, requisition);
-
+
/* reserve space for the arrow */
switch (button->priv->arrow_type)
{
@@ -300,12 +300,12 @@ xfce_arrow_button_size_request (GtkWidget *widget,
case GTK_ARROW_DOWN:
requisition->width += ARROW_WIDTH;
break;
-
+
case GTK_ARROW_LEFT:
case GTK_ARROW_RIGHT:
requisition->height += ARROW_WIDTH;
break;
-
+
default:
break;
}
@@ -329,7 +329,7 @@ xfce_arrow_button_size_allocate (GtkWidget *widget,
/* allocate the button */
(*GTK_WIDGET_CLASS (xfce_arrow_button_parent_class)->size_allocate) (widget, allocation);
-
+
if (button->priv->arrow_type != GTK_ARROW_NONE)
{
child = gtk_bin_get_child (GTK_BIN (widget));
@@ -337,7 +337,7 @@ xfce_arrow_button_size_allocate (GtkWidget *widget,
{
/* copy the child allocation */
child_allocation = child->allocation;
-
+
/* update the allocation to make space for the arrow */
switch (button->priv->arrow_type)
{
@@ -346,13 +346,13 @@ xfce_arrow_button_size_allocate (GtkWidget *widget,
child_allocation.height -= ARROW_WIDTH;
child_allocation.y += ARROW_WIDTH;
break;
-
+
default:
child_allocation.width -= ARROW_WIDTH;
child_allocation.x += ARROW_WIDTH;
break;
}
-
+
/* set the child allocation again */
gtk_widget_size_allocate (child, &child_allocation);
}
@@ -450,13 +450,13 @@ xfce_arrow_button_set_arrow_type (XfceArrowButton *button,
g_return_if_fail (XFCE_IS_ARROW_BUTTON (button));
if (G_LIKELY (button->priv->arrow_type != arrow_type))
- {
+ {
/* store the new arrow type */
button->priv->arrow_type = arrow_type;
/* emit signal */
- g_signal_emit (G_OBJECT (button),
- arrow_button_signals[ARROW_TYPE_CHANGED],
+ g_signal_emit (G_OBJECT (button),
+ arrow_button_signals[ARROW_TYPE_CHANGED],
0, arrow_type);
/* notify property change */
diff --git a/libxfce4panel/xfce-scaled-image.c b/libxfce4panel/xfce-scaled-image.c
index 58632f1..6e5cf04 100644
--- a/libxfce4panel/xfce-scaled-image.c
+++ b/libxfce4panel/xfce-scaled-image.c
@@ -1,7 +1,7 @@
/* $Id$ */
/*
* Copyright (C) 2008-2009 Nick Schermer <nick at xfce.org>
- *
+ *
* This library is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
diff --git a/libxfce4panel/xfce-scaled-image.h b/libxfce4panel/xfce-scaled-image.h
index 6bea0ef..372ca0f 100644
--- a/libxfce4panel/xfce-scaled-image.h
+++ b/libxfce4panel/xfce-scaled-image.h
@@ -1,7 +1,7 @@
/* $Id$ */
/*
* Copyright (C) 2008-2009 Nick Schermer <nick at xfce.org>
- *
+ *
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
diff --git a/plugins/launcher/launcher-dialog.h b/plugins/launcher/launcher-dialog.h
index 5be30e8..915cd41 100644
--- a/plugins/launcher/launcher-dialog.h
+++ b/plugins/launcher/launcher-dialog.h
@@ -1,7 +1,7 @@
/* $Id$ */
/*
* Copyright (C) 2008-2009 Nick Schermer <nick at xfce.org>
- *
+ *
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index 67872cd..9cc885b 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -484,10 +484,10 @@ launcher_plugin_construct (XfcePanelPlugin *panel_plugin)
g_value_set_static_string (value, filenames[i]);
g_ptr_array_add (array, value);
}
-
+
/* set items */
g_object_set (G_OBJECT (plugin), "items", array, NULL);
-
+
/* cleanup */
xfconf_array_free (array);
}
diff --git a/plugins/separator/separator.h b/plugins/separator/separator.h
index 0cd2275..a6a6b25 100644
--- a/plugins/separator/separator.h
+++ b/plugins/separator/separator.h
@@ -2,7 +2,7 @@
/*
* Copyright (c) 2005-2007 Jasper Huijsmans <jasper at xfce.org>
* Copyright (c) 2007-2009 Nick Schermer <nick at xfce.org>
- *
+ *
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
diff --git a/plugins/showdesktop/showdesktop.c b/plugins/showdesktop/showdesktop.c
index e1aae40..a9eb2c6 100644
--- a/plugins/showdesktop/showdesktop.c
+++ b/plugins/showdesktop/showdesktop.c
@@ -2,7 +2,7 @@
/*
* Copyright (c) 2005-2007 Jasper Huijsmans <jasper at xfce.org>
* Copyright (c) 2007-2009 Nick Schermer <nick at xfce.org>
- *
+ *
* This library is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
diff --git a/plugins/systray/xfce-tray-dialogs.h b/plugins/systray/xfce-tray-dialogs.h
index e2433b0..b135730 100644
--- a/plugins/systray/xfce-tray-dialogs.h
+++ b/plugins/systray/xfce-tray-dialogs.h
@@ -1,7 +1,7 @@
/* $Id$ */
/*
* Copyright (C) 2007-2009 Nick Schermer <nick at xfce.org>
- *
+ *
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
More information about the Xfce4-commits
mailing list