[empathy] empathy-conf: fix coding style and update FSF address

[Guillaume Desmottes <gdesmott src gnome org>]

commit 0a1923ccc82889a3cd26082df0e19f6d7c14f5dc
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon May 18 16:02:37 2009 +0100

    empathy-conf: fix coding style and update FSF address
---
 libempathy-gtk/empathy-conf.c |    4 ++--
 libempathy-gtk/empathy-conf.h |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libempathy-gtk/empathy-conf.c b/libempathy-gtk/empathy-conf.c
index fae2c37..62efa60 100644
--- a/libempathy-gtk/empathy-conf.c
+++ b/libempathy-gtk/empathy-conf.c
@@ -14,8 +14,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.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA  02110-1301  USA
  *
  * Authors: Richard Hult <richard imendio com>
  */
diff --git a/libempathy-gtk/empathy-conf.h b/libempathy-gtk/empathy-conf.h
index 2051a7f..4a6fdc4 100644
--- a/libempathy-gtk/empathy-conf.h
+++ b/libempathy-gtk/empathy-conf.h
@@ -14,8 +14,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.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA  02110-1301  USA
  */
 
 #ifndef __EMPATHY_CONF_H__
@@ -78,7 +78,7 @@ struct _EmpathyConfClass {
 #define EMPATHY_PREFS_IMPORT_ASKED                 EMPATHY_PREFS_PATH "/import_asked"
 #define EMPATHY_PREFS_FILE_TRANSFER_DEFAULT_FOLDER EMPATHY_PREFS_PATH "/file_transfer/default_folder"
 
-typedef void (*EmpathyConfNotifyFunc) (EmpathyConf  *conf, 
+typedef void (*EmpathyConfNotifyFunc) (EmpathyConf  *conf,
 				      const gchar *key,
 				      gpointer     user_data);