# HG changeset patch # User Gary Kramlich # Date 1219929932 0 # Node ID 25af9b1994c8491f229dd1fa3e36c218c00b508f # Parent 7ddaa405936ebeac0c2a75045c284e98ca03b93a renamed sound-loader.[ch] to sound-theme-loader.[ch] other updates for the rename as necessary diff -r 7ddaa405936e -r 25af9b1994c8 libpurple/Makefile.am --- a/libpurple/Makefile.am Thu Aug 28 13:13:39 2008 +0000 +++ b/libpurple/Makefile.am Thu Aug 28 13:25:32 2008 +0000 @@ -75,7 +75,7 @@ stringref.c \ stun.c \ sound.c \ - sound-loader.c \ + sound-theme-loader.c \ sound-theme.c \ sslconn.c \ upnp.c \ @@ -133,7 +133,7 @@ stringref.h \ stun.h \ sound.h \ - sound-loader.h \ + sound-theme-loader.h \ sound-theme.h \ sslconn.h \ upnp.h \ diff -r 7ddaa405936e -r 25af9b1994c8 libpurple/core.c --- a/libpurple/core.c Thu Aug 28 13:13:39 2008 +0000 +++ b/libpurple/core.c Thu Aug 28 13:25:32 2008 +0000 @@ -46,7 +46,7 @@ #include "signals.h" #include "smiley.h" #include "sound.h" -#include "sound-loader.h" +#include "sound-theme-loader.h" #include "sslconn.h" #include "status.h" #include "stun.h" diff -r 7ddaa405936e -r 25af9b1994c8 libpurple/sound-loader.c --- a/libpurple/sound-loader.c Thu Aug 28 13:13:39 2008 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,115 +0,0 @@ -/* - * SoundThemeLoader for LibPurple - * - * Pidgin is the legal property of its developers, whose names are too numerous - * to list here. Please refer to the COPYRIGHT file distributed with this - * source distribution. - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * - */ - -#include "sound-loader.h" -#include "sound-theme.h" -#include "util.h" -#include "xmlnode.h" - -/***************************************************************************** - * Sound Theme Builder - *****************************************************************************/ - -static PurpleTheme * -purple_sound_loader_build(const gchar *dir) -{ - xmlnode *root_node = NULL, *sub_node; - gchar *filename_full, *data; - PurpleSoundTheme *theme = NULL; - - /* Find the theme file */ - g_return_val_if_fail(dir != NULL, NULL); - filename_full = g_build_filename(dir, "theme.xml", NULL); - - if (g_file_test(filename_full, G_FILE_TEST_IS_REGULAR)) - root_node = xmlnode_from_file(dir, "theme.xml", "sound themes", "sound-loader"); - - g_free(filename_full); - g_return_val_if_fail(root_node != NULL, NULL); - - /* Parse the tree */ - sub_node = xmlnode_get_child(root_node, "description"); - data = xmlnode_get_data(sub_node); - - if (xmlnode_get_attrib(root_node, "name") != NULL) { - theme = g_object_new(PURPLE_TYPE_SOUND_THEME, - "type", "sound", - "name", xmlnode_get_attrib(root_node, "name"), - "author", xmlnode_get_attrib(root_node, "author"), - "image", xmlnode_get_attrib(root_node, "image"), - "directory", dir, - "description", data, NULL); - - sub_node = xmlnode_get_child(root_node, "event"); - - while (sub_node) { - purple_sound_theme_set_file(theme, - xmlnode_get_attrib(sub_node, "name"), - xmlnode_get_attrib(sub_node, "file")); - sub_node = xmlnode_get_next_twin(sub_node); - } - } - - xmlnode_free(root_node); - g_free(data); - return PURPLE_THEME(theme); -} - -/****************************************************************************** - * GObject Stuff - *****************************************************************************/ - -static void -purple_sound_theme_loader_class_init(PurpleSoundThemeLoaderClass *klass) -{ - PurpleThemeLoaderClass *loader_klass = PURPLE_THEME_LOADER_CLASS(klass); - - loader_klass->purple_theme_loader_build = purple_sound_loader_build; -} - - -GType -purple_sound_theme_loader_get_type(void) -{ - static GType type = 0; - if (type == 0) { - static const GTypeInfo info = { - sizeof (PurpleSoundThemeLoaderClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc)purple_sound_theme_loader_class_init, /* class_init */ - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (PurpleSoundThemeLoader), - 0, /* n_preallocs */ - NULL, /* instance_init */ - NULL, /* value table */ - }; - type = g_type_register_static(PURPLE_TYPE_THEME_LOADER, - "PurpleSoundThemeLoader", - &info, 0); - } - return type; -} - - diff -r 7ddaa405936e -r 25af9b1994c8 libpurple/sound-loader.h --- a/libpurple/sound-loader.h Thu Aug 28 13:13:39 2008 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,71 +0,0 @@ -/** - * @file sound-loader.h Purple Sound Theme Loader Class API - */ - -/* purple - * - * Purple is the legal property of its developers, whose names are too numerous - * to list here. Please refer to the COPYRIGHT file distributed with this - * source distribution. - * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - */ - -#ifndef _PURPLE_SOUND_THEME_LOADER_H_ -#define _PURPLE_SOUND_THEME_LOADER_H_ - -#include -#include -#include "theme-loader.h" - -/** - * A purple sound theme loader. extends PurpleThemeLoader (theme-loader.h) - * This is a class designed to build sound themes - * - * PurpleSoundThemeLoader is a GObject. - */ -typedef struct _PurpleSoundThemeLoader PurpleSoundThemeLoader; -typedef struct _PurpleSoundThemeLoaderClass PurpleSoundThemeLoaderClass; - -#define PURPLE_TYPE_SOUND_THEME_LOADER (purple_sound_theme_loader_get_type ()) -#define PURPLE_SOUND_THEME_LOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PURPLE_TYPE_SOUND_THEME_LOADER, PurpleSoundThemeLoader)) -#define PURPLE_SOUND_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_TYPE_SOUND_THEME_LOADER, PurpleSoundThemeLoaderClass)) -#define PURPLE_IS_SOUND_THEME_LOADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PURPLE_TYPE_SOUND_THEME_LOADER)) -#define PURPLE_IS_SOUND_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_TYPE_SOUND_THEME_LOADER)) -#define PURPLE_SOUND_THEME_LOADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_TYPE_SOUND_THEME_LOADER, PurpleSoundThemeLoaderClass)) - -struct _PurpleSoundThemeLoader -{ - PurpleThemeLoader parent; -}; - -struct _PurpleSoundThemeLoaderClass -{ - PurpleThemeLoaderClass parent_class; -}; - -/**************************************************************************/ -/** @name Purple Theme-Loader API */ -/**************************************************************************/ -G_BEGIN_DECLS - -/** - * GObject foo. - * @internal. - */ -GType purple_sound_theme_loader_get_type(void); - -G_END_DECLS -#endif /* _PURPLE_SOUND_THEME_LOADER_H_ */ diff -r 7ddaa405936e -r 25af9b1994c8 libpurple/sound-theme-loader.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libpurple/sound-theme-loader.c Thu Aug 28 13:25:32 2008 +0000 @@ -0,0 +1,115 @@ +/* + * SoundThemeLoader for LibPurple + * + * Pidgin is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA + * + */ + +#include "sound-theme-loader.h" +#include "sound-theme.h" +#include "util.h" +#include "xmlnode.h" + +/***************************************************************************** + * Sound Theme Builder + *****************************************************************************/ + +static PurpleTheme * +purple_sound_loader_build(const gchar *dir) +{ + xmlnode *root_node = NULL, *sub_node; + gchar *filename_full, *data; + PurpleSoundTheme *theme = NULL; + + /* Find the theme file */ + g_return_val_if_fail(dir != NULL, NULL); + filename_full = g_build_filename(dir, "theme.xml", NULL); + + if (g_file_test(filename_full, G_FILE_TEST_IS_REGULAR)) + root_node = xmlnode_from_file(dir, "theme.xml", "sound themes", "sound-loader"); + + g_free(filename_full); + g_return_val_if_fail(root_node != NULL, NULL); + + /* Parse the tree */ + sub_node = xmlnode_get_child(root_node, "description"); + data = xmlnode_get_data(sub_node); + + if (xmlnode_get_attrib(root_node, "name") != NULL) { + theme = g_object_new(PURPLE_TYPE_SOUND_THEME, + "type", "sound", + "name", xmlnode_get_attrib(root_node, "name"), + "author", xmlnode_get_attrib(root_node, "author"), + "image", xmlnode_get_attrib(root_node, "image"), + "directory", dir, + "description", data, NULL); + + sub_node = xmlnode_get_child(root_node, "event"); + + while (sub_node) { + purple_sound_theme_set_file(theme, + xmlnode_get_attrib(sub_node, "name"), + xmlnode_get_attrib(sub_node, "file")); + sub_node = xmlnode_get_next_twin(sub_node); + } + } + + xmlnode_free(root_node); + g_free(data); + return PURPLE_THEME(theme); +} + +/****************************************************************************** + * GObject Stuff + *****************************************************************************/ + +static void +purple_sound_theme_loader_class_init(PurpleSoundThemeLoaderClass *klass) +{ + PurpleThemeLoaderClass *loader_klass = PURPLE_THEME_LOADER_CLASS(klass); + + loader_klass->purple_theme_loader_build = purple_sound_loader_build; +} + + +GType +purple_sound_theme_loader_get_type(void) +{ + static GType type = 0; + if (type == 0) { + static const GTypeInfo info = { + sizeof (PurpleSoundThemeLoaderClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc)purple_sound_theme_loader_class_init, /* class_init */ + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (PurpleSoundThemeLoader), + 0, /* n_preallocs */ + NULL, /* instance_init */ + NULL, /* value table */ + }; + type = g_type_register_static(PURPLE_TYPE_THEME_LOADER, + "PurpleSoundThemeLoader", + &info, 0); + } + return type; +} + + diff -r 7ddaa405936e -r 25af9b1994c8 libpurple/sound-theme-loader.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libpurple/sound-theme-loader.h Thu Aug 28 13:25:32 2008 +0000 @@ -0,0 +1,71 @@ +/** + * @file sound-loader.h Purple Sound Theme Loader Class API + */ + +/* purple + * + * Purple is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA + */ + +#ifndef _PURPLE_SOUND_THEME_LOADER_H_ +#define _PURPLE_SOUND_THEME_LOADER_H_ + +#include +#include +#include "theme-loader.h" + +/** + * A purple sound theme loader. extends PurpleThemeLoader (theme-loader.h) + * This is a class designed to build sound themes + * + * PurpleSoundThemeLoader is a GObject. + */ +typedef struct _PurpleSoundThemeLoader PurpleSoundThemeLoader; +typedef struct _PurpleSoundThemeLoaderClass PurpleSoundThemeLoaderClass; + +#define PURPLE_TYPE_SOUND_THEME_LOADER (purple_sound_theme_loader_get_type ()) +#define PURPLE_SOUND_THEME_LOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PURPLE_TYPE_SOUND_THEME_LOADER, PurpleSoundThemeLoader)) +#define PURPLE_SOUND_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_TYPE_SOUND_THEME_LOADER, PurpleSoundThemeLoaderClass)) +#define PURPLE_IS_SOUND_THEME_LOADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PURPLE_TYPE_SOUND_THEME_LOADER)) +#define PURPLE_IS_SOUND_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_TYPE_SOUND_THEME_LOADER)) +#define PURPLE_SOUND_THEME_LOADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_TYPE_SOUND_THEME_LOADER, PurpleSoundThemeLoaderClass)) + +struct _PurpleSoundThemeLoader +{ + PurpleThemeLoader parent; +}; + +struct _PurpleSoundThemeLoaderClass +{ + PurpleThemeLoaderClass parent_class; +}; + +/**************************************************************************/ +/** @name Purple Theme-Loader API */ +/**************************************************************************/ +G_BEGIN_DECLS + +/** + * GObject foo. + * @internal. + */ +GType purple_sound_theme_loader_get_type(void); + +G_END_DECLS +#endif /* _PURPLE_SOUND_THEME_LOADER_H_ */ diff -r 7ddaa405936e -r 25af9b1994c8 libpurple/sound.c --- a/libpurple/sound.c Thu Aug 28 13:13:39 2008 +0000 +++ b/libpurple/sound.c Thu Aug 28 13:25:32 2008 +0000 @@ -25,7 +25,7 @@ #include "blist.h" #include "prefs.h" #include "sound.h" -#include "sound-loader.h" +#include "sound-theme-loader.h" #include "theme-manager.h" static PurpleSoundUiOps *sound_ui_ops = NULL;