[Xfce4-commits] <xfce4-session:xfce-4.8> Update FSF address.
Jérôme Guelfucci
noreply at xfce.org
Mon Feb 14 18:20:02 CET 2011
Updating branch refs/heads/xfce-4.8
to 30d17cd5eb7443b6bc75842cec2af7bf6d502f57 (commit)
from e1892dad44a49617f791738a34d3d145050291e9 (commit)
commit 30d17cd5eb7443b6bc75842cec2af7bf6d502f57
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date: Mon Feb 14 18:11:15 2011 +0100
Update FSF address.
engines/balou/balou-theme.c | 12 ++++++------
engines/balou/balou-theme.h | 8 ++++----
engines/balou/balou.c | 12 ++++++------
engines/balou/balou.h | 8 ++++----
engines/balou/config.c | 4 ++--
engines/balou/engine.c | 10 +++++-----
engines/mice/generate.c | 10 +++++-----
engines/mice/mice.c | 8 ++++----
engines/simple/simple.c | 14 +++++++-------
libxfsm/xfsm-splash-engine.h | 8 ++++----
libxfsm/xfsm-splash-rc.c | 8 ++++----
libxfsm/xfsm-splash-rc.h | 8 ++++----
libxfsm/xfsm-util.c | 4 ++--
libxfsm/xfsm-util.h | 8 ++++----
panel-plugin/xfsm-logout-plugin.c | 10 +++++-----
settings/main.c | 3 ++-
settings/module.c | 4 ++--
settings/module.h | 8 ++++----
settings/splash-settings.c | 4 ++--
settings/xfae-dialog.c | 4 ++--
settings/xfae-dialog.h | 4 ++--
settings/xfae-model.c | 4 ++--
settings/xfae-model.h | 4 ++--
settings/xfae-window.c | 4 ++--
settings/xfae-window.h | 8 ++++----
settings/xfce4-session-settings-common.h | 3 ++-
xfce4-session-logout/main.c | 4 ++--
xfce4-session/ice-layer.c | 4 ++--
xfce4-session/ice-layer.h | 8 ++++----
xfce4-session/main.c | 4 ++--
xfce4-session/shutdown.c | 4 ++--
xfce4-session/shutdown.h | 4 ++--
xfce4-session/sm-layer.c | 6 +++---
xfce4-session/sm-layer.h | 4 ++--
xfce4-session/xfsm-chooser.c | 4 ++--
xfce4-session/xfsm-chooser.h | 4 ++--
xfce4-session/xfsm-client.c | 4 ++--
xfce4-session/xfsm-client.h | 4 ++--
xfce4-session/xfsm-compat-gnome.c | 4 ++--
xfce4-session/xfsm-compat-gnome.h | 4 ++--
xfce4-session/xfsm-compat-kde.c | 4 ++--
xfce4-session/xfsm-compat-kde.h | 4 ++--
xfce4-session/xfsm-dns.c | 4 ++--
xfce4-session/xfsm-dns.h | 4 ++--
xfce4-session/xfsm-error.c | 3 ++-
xfce4-session/xfsm-fadeout.c | 4 ++--
xfce4-session/xfsm-fadeout.h | 4 ++--
xfce4-session/xfsm-global.c | 4 ++--
xfce4-session/xfsm-global.h | 4 ++--
xfce4-session/xfsm-legacy.c | 5 ++---
xfce4-session/xfsm-legacy.h | 4 ++--
xfce4-session/xfsm-manager.h | 4 ++--
xfce4-session/xfsm-properties.c | 4 ++--
xfce4-session/xfsm-properties.h | 4 ++--
xfce4-session/xfsm-shutdown-helper.c | 8 ++++----
xfce4-session/xfsm-shutdown-helper.h | 10 +++++-----
xfce4-session/xfsm-splash-screen.c | 12 ++++++------
xfce4-session/xfsm-splash-screen.h | 8 ++++----
xfce4-session/xfsm-startup.c | 8 ++++----
xfce4-session/xfsm-startup.h | 8 ++++----
xfce4-tips/main.c | 8 ++++----
xfsm-shutdown-helper/main.c | 11 ++++++-----
62 files changed, 188 insertions(+), 185 deletions(-)
diff --git a/engines/balou/balou-theme.c b/engines/balou/balou-theme.c
index 0c9e8d5..708589c 100644
--- a/engines/balou/balou-theme.c
+++ b/engines/balou/balou-theme.c
@@ -7,16 +7,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
@@ -48,7 +48,7 @@
static void load_color_pair (const XfceRc *rc,
const gchar *name,
- GdkColor *color1_return,
+ GdkColor *color1_return,
GdkColor *color2_return,
const gchar *color_default);
static GdkPixbuf *load_pixbuf (const gchar *path,
@@ -349,7 +349,7 @@ balou_theme_destroy (BalouTheme *theme)
static void
load_color_pair (const XfceRc *rc,
const gchar *name,
- GdkColor *color1_return,
+ GdkColor *color1_return,
GdkColor *color2_return,
const gchar *color_default)
{
diff --git a/engines/balou/balou-theme.h b/engines/balou/balou-theme.h
index 217448e..1e2e1ba 100644
--- a/engines/balou/balou-theme.h
+++ b/engines/balou/balou-theme.h
@@ -7,16 +7,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __BALOU_THEME_H__
diff --git a/engines/balou/balou.c b/engines/balou/balou.c
index 3b20d5e..752021b 100644
--- a/engines/balou/balou.c
+++ b/engines/balou/balou.c
@@ -7,16 +7,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
@@ -399,8 +399,8 @@ balou_window_init (BalouWindow *window,
gtk_window_set_screen (GTK_WINDOW (window->wmwindow), screen);
gtk_window_set_skip_pager_hint (GTK_WINDOW (window->wmwindow), TRUE);
gtk_window_set_skip_taskbar_hint (GTK_WINDOW (window->wmwindow), TRUE);
-
- window->backbuf = gdk_pixmap_new (window->window,
+
+ window->backbuf = gdk_pixmap_new (window->window,
window->area.width,
window->area.height,
-1);
diff --git a/engines/balou/balou.h b/engines/balou/balou.h
index 0c3fe22..98da07b 100644
--- a/engines/balou/balou.h
+++ b/engines/balou/balou.h
@@ -7,16 +7,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __BALOU_H__
diff --git a/engines/balou/config.c b/engines/balou/config.c
index 4349fcc..c84094d 100644
--- a/engines/balou/config.c
+++ b/engines/balou/config.c
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/engines/balou/engine.c b/engines/balou/engine.c
index 0f3fefd..6a18a27 100644
--- a/engines/balou/engine.c
+++ b/engines/balou/engine.c
@@ -7,16 +7,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
@@ -56,7 +56,7 @@ engine_setup (XfsmSplashEngine *engine,
static void
-engine_next (XfsmSplashEngine *engine,
+engine_next (XfsmSplashEngine *engine,
const gchar *text)
{
Balou *balou = BALOU (engine->user_data);
diff --git a/engines/mice/generate.c b/engines/mice/generate.c
index 6520983..c2870fa 100644
--- a/engines/mice/generate.c
+++ b/engines/mice/generate.c
@@ -7,16 +7,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
@@ -81,7 +81,7 @@ int main (int argc, char **argv)
gtk_init (&argc, &argv);
if (argc != 3)
- {
+ {
fprintf (stderr, "Usage: generate <file> <steps>\n");
return EXIT_FAILURE;
}
diff --git a/engines/mice/mice.c b/engines/mice/mice.c
index ede19e9..4b89f14 100644
--- a/engines/mice/mice.c
+++ b/engines/mice/mice.c
@@ -7,16 +7,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/engines/simple/simple.c b/engines/simple/simple.c
index 72d4c7a..98eaff4 100644
--- a/engines/simple/simple.c
+++ b/engines/simple/simple.c
@@ -7,16 +7,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
@@ -245,7 +245,7 @@ simple_next (XfsmSplashEngine *engine, const gchar *text)
gdk_gc_set_rgb_fg_color (simple->gc, &simple->fgcolor);
gdk_draw_layout (simple->pixmap,
- simple->gc,
+ simple->gc,
tx, ty,
simple->layout);
@@ -479,7 +479,7 @@ config_configure (XfsmSplashConfig *config,
xfsm_splash_rc_write_entry (config->rc, "Image", "");
}
g_free (path_locale);
-
+
gtk_widget_destroy (dialog);
}
@@ -499,7 +499,7 @@ config_init (XfsmSplashConfig *config)
config->version = g_strdup (VERSION);
config->author = g_strdup ("Benedikt Meurer");
config->homepage = g_strdup ("http://www.xfce.org/");
-
+
config->configure = config_configure;
config->preview = config_preview;
}
diff --git a/libxfsm/xfsm-splash-engine.h b/libxfsm/xfsm-splash-engine.h
index a5a4cf2..d77a8db 100644
--- a/libxfsm/xfsm-splash-engine.h
+++ b/libxfsm/xfsm-splash-engine.h
@@ -7,16 +7,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFSM_SPLASH_ENGINE_H__
diff --git a/libxfsm/xfsm-splash-rc.c b/libxfsm/xfsm-splash-rc.c
index 4931f18..d652d1d 100644
--- a/libxfsm/xfsm-splash-rc.c
+++ b/libxfsm/xfsm-splash-rc.c
@@ -7,16 +7,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/libxfsm/xfsm-splash-rc.h b/libxfsm/xfsm-splash-rc.h
index aea7d3e..4dd21f9 100644
--- a/libxfsm/xfsm-splash-rc.h
+++ b/libxfsm/xfsm-splash-rc.h
@@ -7,16 +7,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFSM_SPLASH_RC_H__
diff --git a/libxfsm/xfsm-util.c b/libxfsm/xfsm-util.c
index 2639153..e766c25 100644
--- a/libxfsm/xfsm-util.c
+++ b/libxfsm/xfsm-util.c
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*
* Parts of this file where taken from gnome-session/gsm-multiscreen.c,
* which was written by Mark McLoughlin <mark at skynet.ie>.
diff --git a/libxfsm/xfsm-util.h b/libxfsm/xfsm-util.h
index 7bab34c..b215b54 100644
--- a/libxfsm/xfsm-util.h
+++ b/libxfsm/xfsm-util.h
@@ -7,16 +7,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFSM_UTIL_H__
diff --git a/panel-plugin/xfsm-logout-plugin.c b/panel-plugin/xfsm-logout-plugin.c
index fe01709..fcb1680 100644
--- a/panel-plugin/xfsm-logout-plugin.c
+++ b/panel-plugin/xfsm-logout-plugin.c
@@ -6,16 +6,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*
* The session id generator was taken from the KDE session manager.
* Copyright (c) 2000 Matthias Ettrich <ettrich at kde.org>
@@ -135,7 +135,7 @@ static const struct
N_("_Hibernate"),
"xfsm-hibernate",
N_("Failed to hibernate")
- },
+ },
};
static void
diff --git a/settings/main.c b/settings/main.c
index 1f3162e..f845438 100644
--- a/settings/main.c
+++ b/settings/main.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/settings/module.c b/settings/module.c
index 082dfba..9cb7417 100644
--- a/settings/module.c
+++ b/settings/module.c
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/settings/module.h b/settings/module.h
index d10c120..c2a6e29 100644
--- a/settings/module.h
+++ b/settings/module.h
@@ -7,16 +7,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __MODULE_H__
diff --git a/settings/splash-settings.c b/settings/splash-settings.c
index d725a3a..1f4a398 100644
--- a/settings/splash-settings.c
+++ b/settings/splash-settings.c
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/settings/xfae-dialog.c b/settings/xfae-dialog.c
index 7334ead..e798985 100644
--- a/settings/xfae-dialog.c
+++ b/settings/xfae-dialog.c
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/settings/xfae-dialog.h b/settings/xfae-dialog.h
index 5e362a7..9b94f0e 100644
--- a/settings/xfae-dialog.h
+++ b/settings/xfae-dialog.h
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFAE_DIALOG_H__
diff --git a/settings/xfae-model.c b/settings/xfae-model.c
index dcc6098..1680fae 100644
--- a/settings/xfae-model.c
+++ b/settings/xfae-model.c
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/settings/xfae-model.h b/settings/xfae-model.h
index a9d94e4..1bce514 100644
--- a/settings/xfae-model.h
+++ b/settings/xfae-model.h
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFAE_MODEL_H__
diff --git a/settings/xfae-window.c b/settings/xfae-window.c
index f47d3e1..88fe8e7 100644
--- a/settings/xfae-window.c
+++ b/settings/xfae-window.c
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/settings/xfae-window.h b/settings/xfae-window.h
index 3c586cc..6dae741 100644
--- a/settings/xfae-window.h
+++ b/settings/xfae-window.h
@@ -8,16 +8,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFAE_WINDOW_H__
diff --git a/settings/xfce4-session-settings-common.h b/settings/xfce4-session-settings-common.h
index d3f9254..633a5c5 100644
--- a/settings/xfce4-session-settings-common.h
+++ b/settings/xfce4-session-settings-common.h
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFCE4_SESSION_SETTINGS_COMMON_H__
diff --git a/xfce4-session-logout/main.c b/xfce4-session-logout/main.c
index d322995..5ae3314 100644
--- a/xfce4-session-logout/main.c
+++ b/xfce4-session-logout/main.c
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/xfce4-session/ice-layer.c b/xfce4-session/ice-layer.c
index 8ba194f..4ad0bc5 100644
--- a/xfce4-session/ice-layer.c
+++ b/xfce4-session/ice-layer.c
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/xfce4-session/ice-layer.h b/xfce4-session/ice-layer.h
index 8425b3b..5d6b3d6 100644
--- a/xfce4-session/ice-layer.h
+++ b/xfce4-session/ice-layer.h
@@ -7,16 +7,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFSM_ICE_LAYER_H__
diff --git a/xfce4-session/main.c b/xfce4-session/main.c
index 78429b8..ff6e324 100644
--- a/xfce4-session/main.c
+++ b/xfce4-session/main.c
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/xfce4-session/shutdown.c b/xfce4-session/shutdown.c
index 6a97ef5..fb2bd04 100644
--- a/xfce4-session/shutdown.c
+++ b/xfce4-session/shutdown.c
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*
* Parts of this file where taken from gnome-session/logout.c, which
* was written by Owen Taylor <otaylor at redhat.com>.
diff --git a/xfce4-session/shutdown.h b/xfce4-session/shutdown.h
index a9b219d..65ac453 100644
--- a/xfce4-session/shutdown.h
+++ b/xfce4-session/shutdown.h
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFSM_SHUTDOWN_H__
diff --git a/xfce4-session/sm-layer.c b/xfce4-session/sm-layer.c
index 89fe6de..b71a986 100644
--- a/xfce4-session/sm-layer.c
+++ b/xfce4-session/sm-layer.c
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
@@ -266,7 +266,7 @@ sm_save_yourself_request (SmsConn sms_conn,
save_type == SmSaveLocal ? "Local"
: (save_type == SmSaveGlobal ? "Global" : "Both"));
xfsm_verbose (" Shutdown: %s\n", shutdown ? "True" : "False");
- xfsm_verbose (" Interact Style: %s\n",
+ xfsm_verbose (" Interact Style: %s\n",
interact_style == SmInteractStyleNone ? "None"
: (interact_style == SmInteractStyleErrors ? "Errors" : "Any"));
xfsm_verbose (" Fast: %s\n", fast ? "True" : "False");
diff --git a/xfce4-session/sm-layer.h b/xfce4-session/sm-layer.h
index 677be85..90cf96a 100644
--- a/xfce4-session/sm-layer.h
+++ b/xfce4-session/sm-layer.h
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __SM_LAYER_H__
diff --git a/xfce4-session/xfsm-chooser.c b/xfce4-session/xfsm-chooser.c
index 0a11e78..842291a 100644
--- a/xfce4-session/xfsm-chooser.c
+++ b/xfce4-session/xfsm-chooser.c
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/xfce4-session/xfsm-chooser.h b/xfce4-session/xfsm-chooser.h
index e823c85..e75f60a 100644
--- a/xfce4-session/xfsm-chooser.h
+++ b/xfce4-session/xfsm-chooser.h
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFSM_CHOOSER_H__
diff --git a/xfce4-session/xfsm-client.c b/xfce4-session/xfsm-client.c
index fea8474..f0821f4 100644
--- a/xfce4-session/xfsm-client.c
+++ b/xfce4-session/xfsm-client.c
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/xfce4-session/xfsm-client.h b/xfce4-session/xfsm-client.h
index 89edce5..110de88 100644
--- a/xfce4-session/xfsm-client.h
+++ b/xfce4-session/xfsm-client.h
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFSM_CLIENT_H__
diff --git a/xfce4-session/xfsm-compat-gnome.c b/xfce4-session/xfsm-compat-gnome.c
index 3ed79b3..e9040c6 100644
--- a/xfce4-session/xfsm-compat-gnome.c
+++ b/xfce4-session/xfsm-compat-gnome.c
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*
* Most parts of this file where taken from gnome-session.
*/
diff --git a/xfce4-session/xfsm-compat-gnome.h b/xfce4-session/xfsm-compat-gnome.h
index 999897f..b404ec1 100644
--- a/xfce4-session/xfsm-compat-gnome.h
+++ b/xfce4-session/xfsm-compat-gnome.h
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*
* Most parts of this file where taken from gnome-session.
*/
diff --git a/xfce4-session/xfsm-compat-kde.c b/xfce4-session/xfsm-compat-kde.c
index 69473ea..ced6ece 100644
--- a/xfce4-session/xfsm-compat-kde.c
+++ b/xfce4-session/xfsm-compat-kde.c
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/xfce4-session/xfsm-compat-kde.h b/xfce4-session/xfsm-compat-kde.h
index f85808e..1e60de4 100644
--- a/xfce4-session/xfsm-compat-kde.h
+++ b/xfce4-session/xfsm-compat-kde.h
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFSM_COMPAT_KDE_H__
diff --git a/xfce4-session/xfsm-dns.c b/xfce4-session/xfsm-dns.c
index daf260b..0275426 100644
--- a/xfce4-session/xfsm-dns.c
+++ b/xfce4-session/xfsm-dns.c
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*
* Parts of this file where taken from gnome-session/main.c, which
* was written by Tom Tromey.
diff --git a/xfce4-session/xfsm-dns.h b/xfce4-session/xfsm-dns.h
index 5ac421b..08d652e 100644
--- a/xfce4-session/xfsm-dns.h
+++ b/xfce4-session/xfsm-dns.h
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFSM_DNS_H__
diff --git a/xfce4-session/xfsm-error.c b/xfce4-session/xfsm-error.c
index 81020b7..399230a 100644
--- a/xfce4-session/xfsm-error.c
+++ b/xfce4-session/xfsm-error.c
@@ -12,7 +12,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/xfce4-session/xfsm-fadeout.c b/xfce4-session/xfsm-fadeout.c
index d2c3889..dbfaf95 100644
--- a/xfce4-session/xfsm-fadeout.c
+++ b/xfce4-session/xfsm-fadeout.c
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/xfce4-session/xfsm-fadeout.h b/xfce4-session/xfsm-fadeout.h
index 5afb6da..9b31af2 100644
--- a/xfce4-session/xfsm-fadeout.h
+++ b/xfce4-session/xfsm-fadeout.h
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFSM_FADEOUT_H__
diff --git a/xfce4-session/xfsm-global.c b/xfce4-session/xfsm-global.c
index ec9f1cf..fa5bbaf 100644
--- a/xfce4-session/xfsm-global.c
+++ b/xfce4-session/xfsm-global.c
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/xfce4-session/xfsm-global.h b/xfce4-session/xfsm-global.h
index 3288c5f..1fdfe8c 100644
--- a/xfce4-session/xfsm-global.h
+++ b/xfce4-session/xfsm-global.h
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFSM_GLOBAL_H__
diff --git a/xfce4-session/xfsm-legacy.c b/xfce4-session/xfsm-legacy.c
index 91470cd..c730b30 100644
--- a/xfce4-session/xfsm-legacy.c
+++ b/xfce4-session/xfsm-legacy.c
@@ -15,9 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*
* Most of the code in this file is borred from ksmserver, the KDE session
* management server.
diff --git a/xfce4-session/xfsm-legacy.h b/xfce4-session/xfsm-legacy.h
index c5c0e9a..54602af 100644
--- a/xfce4-session/xfsm-legacy.h
+++ b/xfce4-session/xfsm-legacy.h
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFSM_LEGACY_H__
diff --git a/xfce4-session/xfsm-manager.h b/xfce4-session/xfsm-manager.h
index f83887c..ffbc7ea 100644
--- a/xfce4-session/xfsm-manager.h
+++ b/xfce4-session/xfsm-manager.h
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFSM_MANAGER_H__
diff --git a/xfce4-session/xfsm-properties.c b/xfce4-session/xfsm-properties.c
index 22c3688..d75dec6 100644
--- a/xfce4-session/xfsm-properties.c
+++ b/xfce4-session/xfsm-properties.c
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/xfce4-session/xfsm-properties.h b/xfce4-session/xfsm-properties.h
index 46e4353..815dc39 100644
--- a/xfce4-session/xfsm-properties.h
+++ b/xfce4-session/xfsm-properties.h
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFSM_PROPERTIES_H__
diff --git a/xfce4-session/xfsm-shutdown-helper.c b/xfce4-session/xfsm-shutdown-helper.c
index 4a66edd..3debeb2 100644
--- a/xfce4-session/xfsm-shutdown-helper.c
+++ b/xfce4-session/xfsm-shutdown-helper.c
@@ -16,8 +16,8 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
@@ -383,9 +383,9 @@ xfsm_shutdown_helper_init_polkit_data (XfsmShutdownHelper *helper)
g_warning ("Unable to create Polkit subject");
return FALSE;
}
-
- g_value_init (&hash_elem,
+
+ g_value_init (&hash_elem,
dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE));
g_value_set_static_boxed (&hash_elem, helper->polkit_subject_hash);
diff --git a/xfce4-session/xfsm-shutdown-helper.h b/xfce4-session/xfsm-shutdown-helper.h
index 8700945..20e1076 100644
--- a/xfce4-session/xfsm-shutdown-helper.h
+++ b/xfce4-session/xfsm-shutdown-helper.h
@@ -8,16 +8,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFSM_SHUTDOWN_HELPER_H
@@ -58,7 +58,7 @@ gboolean xfsm_shutdown_helper_hibernate (XfsmShutdownHelp
gboolean xfsm_shutdown_helper_send_command (XfsmShutdownHelper *helper,
XfsmShutdownType shutdown_type,
GError **error);
-
+
G_END_DECLS
diff --git a/xfce4-session/xfsm-splash-screen.c b/xfce4-session/xfsm-splash-screen.c
index 22bf667..89ca5da 100644
--- a/xfce4-session/xfsm-splash-screen.c
+++ b/xfce4-session/xfsm-splash-screen.c
@@ -7,16 +7,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
@@ -186,7 +186,7 @@ again:
sessions, default_session);
result = xfsm_splash_screen_run (splash, chooser);
- if (result == XFSM_RESPONSE_LOAD)
+ if (result == XFSM_RESPONSE_LOAD)
{
if (name_return != NULL)
*name_return = xfsm_chooser_get_session (XFSM_CHOOSER (chooser));
@@ -212,7 +212,7 @@ again:
GTK_DIALOG_NO_SEPARATOR,
GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK,
+ GTK_STOCK_OK,
GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
diff --git a/xfce4-session/xfsm-splash-screen.h b/xfce4-session/xfsm-splash-screen.h
index 95721fe..f68c5d4 100644
--- a/xfce4-session/xfsm-splash-screen.h
+++ b/xfce4-session/xfsm-splash-screen.h
@@ -7,16 +7,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFSM_SPLASH_SCREEN_H__
diff --git a/xfce4-session/xfsm-startup.c b/xfce4-session/xfsm-startup.c
index c7ff3b5..ebee638 100644
--- a/xfce4-session/xfsm-startup.c
+++ b/xfce4-session/xfsm-startup.c
@@ -8,16 +8,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/xfce4-session/xfsm-startup.h b/xfce4-session/xfsm-startup.h
index 424b740..38c0eae 100644
--- a/xfce4-session/xfsm-startup.h
+++ b/xfce4-session/xfsm-startup.h
@@ -8,16 +8,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifndef __XFSM_STARTUP_H__
diff --git a/xfce4-tips/main.c b/xfce4-tips/main.c
index 355d6bd..bfd9e1b 100644
--- a/xfce4-tips/main.c
+++ b/xfce4-tips/main.c
@@ -7,16 +7,16 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
diff --git a/xfsm-shutdown-helper/main.c b/xfsm-shutdown-helper/main.c
index eb525a1..667f288 100644
--- a/xfsm-shutdown-helper/main.c
+++ b/xfsm-shutdown-helper/main.c
@@ -7,16 +7,17 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA.
+
*
* XXX - since this program is executed with root permissions, it may not
* be a good idea to trust glib!!
@@ -85,7 +86,7 @@ run (const gchar *command)
#if defined(HAVE_SETSID)
setsid ();
#endif
-
+
#if defined (HAVE_SIGPROCMASK)
sigemptyset (&sigset);
sigaddset (&sigset, SIGHUP);
More information about the Xfce4-commits
mailing list