libempathy-gtk/gossip-ui-utils.c libempathy-gtk/gossip-accounts-dialog.c

2007-06-03 Xavier Claessens  <xclaesse@gmail.com>

	* libempathy-gtk/gossip-ui-utils.c
	* libempathy-gtk/gossip-accounts-dialog.c
	* libempathy-gtk/Makefile.am
	* src/empathy-accounts-main.c
	* src/empathy-chat-main.c
	* src/Makefile.am
	* src/empathy-main.c
	* libempathy/gossip-utils.c
	* libempathy/Makefile.am
	* src/empathy-filter.h
	* src/empathy-filter-plugin.c
	* src/empathy-filter.xml
	* src/empathy-filter.c
	* libempathy/gossip-paths.c
	* libempathy/gossip-paths.h: Remove unused code.


svn path=/trunk/; revision=120

4 files changed, 1 insertions, 91 deletions

diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 72f740e5d..37bb98e09 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -2,7 +2,6 @@ AM_CPPFLAGS =                                           \
 	-I.                                             \
 	-I$(top_srcdir)                                 \
 	-DDATADIR=\""$(datadir)"\"              	\
-	-DLOCALEDIR=\""$(datadir)/locale"\"		\
 	$(LIBEMPATHY_CFLAGS)				\
 	$(WARN_CFLAGS)
 
@@ -20,7 +19,6 @@ libempathy_la_SOURCES =             						\
 	gossip-time.c			gossip-time.h				\
 	gossip-presence.c		gossip-presence.h			\
 	gossip-telepathy-group.c	gossip-telepathy-group.h		\
-	gossip-paths.c			gossip-paths.h				\
 	gossip-debug.c			gossip-debug.h				\
 	gossip-utils.c			gossip-utils.h				\
 	gossip-message.c		gossip-message.h			\
diff --git a/libempathy/gossip-paths.c b/libempathy/gossip-paths.c
deleted file mode 100644
index aa97bdcc7..000000000
--- a/libempathy/gossip-paths.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2006-2007 Imendio AB
- *
- * 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) any later version.
- *
- * This library 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Richard Hult <richard@imendio.com>
- */
-
-#include "config.h"
-
-#include "gossip-paths.h"
-
-#define EMPATHY "empathy"
-
-gchar *
-gossip_paths_get_glade_path (const gchar *filename)
-{
-	return g_build_filename (DATADIR, EMPATHY, filename, NULL);
-}
-
-gchar *
-gossip_paths_get_image_path (const gchar *filename)
-{
-	return g_build_filename (DATADIR, EMPATHY, filename, NULL);
-}
-
-gchar *
-gossip_paths_get_dtd_path (const gchar *filename)
-{
-	return g_build_filename (DATADIR, EMPATHY, filename, NULL);
-}
-
-gchar *
-gossip_paths_get_locale_path ()
-{
-	return g_strdup (LOCALEDIR);
-}
diff --git a/libempathy/gossip-paths.h b/libempathy/gossip-paths.h
deleted file mode 100644
index e00a33e28..000000000
--- a/libempathy/gossip-paths.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2006 Imendio AB
- *
- * 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) any later version.
- *
- * This library 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GOSSIP_PATHS_H__
-#define __GOSSIP_PATHS_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-gchar *gossip_paths_get_glade_path  (const gchar *filename);
-gchar *gossip_paths_get_image_path  (const gchar *filename);
-gchar *gossip_paths_get_dtd_path    (const gchar *filename);
-gchar *gossip_paths_get_sound_path  (const gchar *filename);
-gchar *gossip_paths_get_locale_path (void);
-
-G_END_DECLS
-
-#endif /* __GOSSIP_PATHS_H__ */
diff --git a/libempathy/gossip-utils.c b/libempathy/gossip-utils.c
index 579981616..27bcb85d1 100644
--- a/libempathy/gossip-utils.c
+++ b/libempathy/gossip-utils.c
@@ -37,7 +37,6 @@
 
 #include "gossip-debug.h"
 #include "gossip-utils.h"
-#include "gossip-paths.h"
 #include "empathy-contact-manager.h"
 
 #define DEBUG_DOMAIN "Utils"
@@ -208,7 +207,7 @@ gossip_xml_validate (xmlDoc      *doc,
 	xmlDtd       *dtd;
 	gboolean      ret;
 
-	path = gossip_paths_get_dtd_path (dtd_filename);
+	path = g_build_filename (DATADIR, "empathy", dtd_filename, NULL);
 
 	/* The list of valid chars is taken from libxml. */
 	escaped = xmlURIEscapeStr (path, ":@&=+$,/?;");