Drop gtkbuilder helper files, since we're not using them so far.HEADmaster

3 files changed, 1 insertions, 126 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index daa1b95..5a6447d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,8 +17,7 @@ bin_PROGRAMS = sonancy
 
 sonancy_SOURCES =					\
 	sonancy-main.c					\
-	sonancy-window.c	sonancy-window.h	\
-	sonancy-xml.c		sonancy-xml.h
+	sonancy-window.c	sonancy-window.h
 
 sonancy_LDADD=						\
 	$(SONANCY_LIBS)
diff --git a/src/sonancy-xml.c b/src/sonancy-xml.c
deleted file mode 100644
index 9f55a04..0000000
--- a/src/sonancy-xml.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2002-2007 Imendio AB
- * Copyright (C) 2008 Brian Pepple
- *
- * 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) 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.
- * 
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gtk/gtkbuilder.h>
-
-#include "sonancy-xml.h"
-
-static GtkBuilder *
-xml_get_file (const gchar *filename,
-              const gchar *first_widget,
-              va_list      args)
-{
-	GObject    **pointer;
-	GtkBuilder  *ui = NULL;
-	const char  *name;
-	gchar       *path;
-	GError      *err = NULL;
-
-	/* Create the gtkbuilder */
-	ui = gtk_builder_new ();
-	gtk_builder_set_translation_domain (ui, GETTEXT_PACKAGE);
-	path = g_build_filename (DATADIR, PACKAGE, filename, NULL);
-
-	/* Load the xml file */
-	if (gtk_builder_add_from_file (ui, path, &err) == 0) {
-		g_warning ("XML file error: %s", err->message);
-		g_error_free (err);
-		g_free (path);
-		return NULL;
-	}
-	g_free (path);
-
-	/* Grab the widgets */
-	for (name = first_widget; name; name = va_arg (args, char *)) {
-		pointer = va_arg (args, void *);
-		
-		*pointer = gtk_builder_get_object (ui, name);
-		
-		if (!*pointer) {
-			g_warning ("Widget '%s' at '%s' is missing.",
-				   name, filename);
-			continue;
-		}
-	}
-	return ui;
-}
-
-gboolean
-sonancy_xml_get_file (const gchar *filename,
-		      const gchar *first_widget,
-		      ...)
-{
-	GtkBuilder *ui;
-	va_list     args;
-
-	va_start (args, first_widget);
-
-	ui = xml_get_file (filename, first_widget, args);
-
-	va_end (args);
-
-	if (!ui) {
-		return FALSE;
-	}
-
-	g_object_unref (ui);
-
-	return TRUE;
-}
diff --git a/src/sonancy-xml.h b/src/sonancy-xml.h
deleted file mode 100644
index cc646fd..0000000
--- a/src/sonancy-xml.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2002-2007 Imendio AB
- * Copyright (C) 2008 Brian Pepple
- *
- * 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) 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.
- */
-
-#ifndef __SONANCY_XML_H__
-#define __SONANCY_XML_H__
-
-#include <glib/gtypes.h>
-
-gboolean    sonancy_xml_get_file (const gchar *filename,
-				  const gchar *first_widget,
-				  ...);
-
-#endif /*  __SONANCY_XML_H__ */
-