10 files changed, 36 insertions, 39 deletions
diff --git a/plugins/keyboard/delayed-dialog.c b/plugins/keyboard/delayed-dialog.c
index acbb99a..bfa63ae 100644
--- a/plugins/keyboard/delayed-dialog.c
+++ b/plugins/keyboard/delayed-dialog.c
@@ -13,8 +13,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 St, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
 */
 
 #include <stdlib.h>
diff --git a/plugins/keyboard/delayed-dialog.h b/plugins/keyboard/delayed-dialog.h
index a28bf90..367bf18 100644
--- a/plugins/keyboard/delayed-dialog.h
+++ b/plugins/keyboard/delayed-dialog.h
@@ -13,8 +13,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 St, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
 */
 
 
diff --git a/plugins/keyboard/msd-keyboard-manager.c b/plugins/keyboard/msd-keyboard-manager.c
index d4a25b3..293fb18 100644
--- a/plugins/keyboard/msd-keyboard-manager.c
+++ b/plugins/keyboard/msd-keyboard-manager.c
@@ -15,7 +15,7 @@
 *
 * 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 St, Fifth Floor, Boston, MA 02110-1301, USA.
 *
 */
 
diff --git a/plugins/keyboard/msd-keyboard-manager.h b/plugins/keyboard/msd-keyboard-manager.h
index aa3ae95..2986a5b 100644
--- a/plugins/keyboard/msd-keyboard-manager.h
+++ b/plugins/keyboard/msd-keyboard-manager.h
@@ -14,7 +14,7 @@
 *
 * 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 St, Fifth Floor, Boston, MA 02110-1301, USA.
 *
 */
 
diff --git a/plugins/keyboard/msd-keyboard-plugin.c b/plugins/keyboard/msd-keyboard-plugin.c
index 5f89ca2..310c74c 100644
--- a/plugins/keyboard/msd-keyboard-plugin.c
+++ b/plugins/keyboard/msd-keyboard-plugin.c
@@ -14,7 +14,7 @@
 *
 * 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 St, Fifth Floor, Boston, MA 02110-1301, USA.
 *
 */
 
diff --git a/plugins/keyboard/msd-keyboard-plugin.h b/plugins/keyboard/msd-keyboard-plugin.h
index 84f2420..39a18d7 100644
--- a/plugins/keyboard/msd-keyboard-plugin.h
+++ b/plugins/keyboard/msd-keyboard-plugin.h
@@ -14,7 +14,7 @@
 *
 * 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 St, Fifth Floor, Boston, MA 02110-1301, USA.
 *
 */
 
diff --git a/plugins/keyboard/msd-keyboard-xkb.c b/plugins/keyboard/msd-keyboard-xkb.c
index 546c3d8..29cc066 100644
--- a/plugins/keyboard/msd-keyboard-xkb.c
+++ b/plugins/keyboard/msd-keyboard-xkb.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 St, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
 */
 
 #include "config.h"
diff --git a/plugins/keyboard/msd-keyboard-xkb.h b/plugins/keyboard/msd-keyboard-xkb.h
index 816e341..469a469 100644
--- a/plugins/keyboard/msd-keyboard-xkb.h
+++ b/plugins/keyboard/msd-keyboard-xkb.h
@@ -17,8 +17,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 St, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
 */
 
 #ifndef __MSD_KEYBOARD_XKB_H
diff --git a/plugins/keyboard/msd-xmodmap.c b/plugins/keyboard/msd-xmodmap.c
index 7539382..5bea2da 100644
--- a/plugins/keyboard/msd-xmodmap.c
+++ b/plugins/keyboard/msd-xmodmap.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 St, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
 */
 
 #include "config.h"
@@ -37,38 +37,35 @@ void
 msd_load_modmap_files (void)
 {
 GSettings *settings;
- GSList *tmp;
- GSList *loaded_file_list;
+ GSList *tmp = NULL;
+ GSList *loaded_file_list = NULL;
+ gchar **settings_list;
+ gint i;
 
 settings = g_settings_new (KEYBOARD_SCHEMA);
-
- gchar **settings_list;
 settings_list = g_settings_get_strv (settings, LOADED_FILES_KEY);
+
 if (settings_list != NULL) {
- gint i;
- for (i = 0; i < G_N_ELEMENTS (settings_list); i++) {
- if (settings_list[i] != NULL)
- loaded_file_list = 
- g_slist_append (loaded_file_list, g_strdup (settings_list[i]));
+ for (i = 0; settings_list[i] != NULL; i++) {
+ loaded_file_list =
+ g_slist_append (loaded_file_list, g_strdup (settings_list[i]));
 }
- g_strfreev (settings_list);
- }
-
- for (tmp = loaded_file_list; tmp != NULL; tmp = tmp->next) {
- gchar *file;
- gchar *command;
+ for (tmp = loaded_file_list; tmp != NULL; tmp = tmp->next) {
+ gchar *file;
+ gchar *command;
 
- file = g_build_filename (g_get_home_dir (), (gchar *) tmp->data, NULL);
- command = g_strconcat ("xmodmap ", file, NULL);
- g_free (file);
+ file = g_build_filename (g_get_home_dir (), (gchar *) tmp->data, NULL);
+ command = g_strconcat ("xmodmap ", file, NULL);
+ g_free (file);
 
- g_spawn_command_line_async (command, NULL);
+ g_spawn_command_line_async (command, NULL);
 
- g_free (command);
- g_free (tmp->data);
+ g_free (command);
+ g_free (tmp->data);
+ }
+ g_strfreev (settings_list);
+ g_slist_free (loaded_file_list);
 }
-
- g_slist_free (loaded_file_list);
 g_object_unref (settings);
 }
 
diff --git a/plugins/keyboard/msd-xmodmap.h b/plugins/keyboard/msd-xmodmap.h
index 04b4505..4316edb 100644
--- a/plugins/keyboard/msd-xmodmap.h
+++ b/plugins/keyboard/msd-xmodmap.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 St, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
 */
 
 #ifndef XMODMAP_H