# HG changeset patch # User Justin Rodriguez # Date 1212836600 0 # Node ID 68b7691aa3edaf304edbff095869ac35c9527e2b # Parent 52a1f5950f4639a823dee527575efb1458424f59 Added theme loader class abstract whose only (current/planned) function is to build themes diff -r 52a1f5950f46 -r 68b7691aa3ed libpurple/Makefile.am --- a/libpurple/Makefile.am Sat Jun 07 01:55:23 2008 +0000 +++ b/libpurple/Makefile.am Sat Jun 07 11:03:20 2008 +0000 @@ -78,6 +78,7 @@ sslconn.c \ upnp.c \ theme.c \ + theme-loader.c \ util.c \ value.c \ version.c \ @@ -132,6 +133,7 @@ sslconn.h \ upnp.h \ theme.h \ + theme-loader.h \ util.h \ value.h \ xmlnode.h \ diff -r 52a1f5950f46 -r 68b7691aa3ed libpurple/theme-loader.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libpurple/theme-loader.c Sat Jun 07 11:03:20 2008 +0000 @@ -0,0 +1,135 @@ +/* + * ThemeLoaders 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 "theme-loader.h" + +#define PURPLE_THEME_LOADER_GET_PRIVATE(PurpleThemeLoader) \ + ((PurpleThemeLoaderPrivate *) ((PurpleThemeLoader)->priv)) + + +/****************************************************************************** + * Structs + *****************************************************************************/ +typedef struct { + gchar *type; +} PurpleThemeLoaderPrivate; + +/****************************************************************************** + * Globals + *****************************************************************************/ + +/****************************************************************************** + * Enums + *****************************************************************************/ +#define PROP_TYPE_S "type" + +enum { + PROP_ZERO = 0, + PROP_TYPE, +}; + +/****************************************************************************** + * GObject Stuff * + *****************************************************************************/ + +static void +purple_theme_loader_get_property(GObject *obj, guint param_id, GValue *value, + GParamSpec *psec) +{ + PurpleThemeLoader *theme_loader = PURPLE_THEME_LOADER(obj); + + switch(param_id) { + case PROP_TYPE: + g_value_set_string(value, purple_theme_loader_get_type_string(theme_loader)); + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, param_id, psec); + break; + } +} + +static void +purple_theme_loader_class_init (PurpleThemeLoaderClass *klass) +{ + GObjectClass *obj_class = G_OBJECT_CLASS(klass); + GParamSpec *pspec; + + /* 2.4 + * g_type_class_add_private(klass, sizeof(PurpleThemePrivate)); */ + + obj_class->get_property = purple_theme_loader_get_property; + + /* TYPE STRING (read only) */ + pspec = g_param_spec_string(PROP_TYPE_S, "Type", + "The string represtenting the type of the theme", + NULL, + G_PARAM_READABLE | G_PARAM_CONSTRUCT_ONLY); + g_object_class_install_property(obj_class, PROP_TYPE, pspec); +} + + +GType +purple_theme_loader_get_type (void) +{ + static GType type = 0; + if (type == 0) { + static const GTypeInfo info = { + sizeof (PurpleThemeLoaderClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc)purple_theme_loader_class_init, /* class_init */ + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (PurpleThemeLoader), + 0, /* n_preallocs */ + NULL, /* instance_init */ + NULL, /* value table */ + }; + type = g_type_register_static (G_TYPE_OBJECT, + "PurpleThemeLoaderType", + &info, G_TYPE_FLAG_ABSTRACT); + } + return type; +} + + +/***************************************************************************** + * Public API functions * + *****************************************************************************/ + + +gchar * +purple_theme_loader_get_type_string (PurpleThemeLoader *theme_loader) +{ + PurpleThemeLoaderPrivate *priv = NULL; + + g_return_val_if_fail(PURPLE_IS_THEME_LOADER(theme_loader), NULL); + + priv = PURPLE_THEME_LOADER_GET_PRIVATE(theme_loader); + return priv->type; +} + +PurpleTheme * +purple_theme_loader_build (PurpleThemeLoader *loader, const gchar *dir) +{ + return PURPLE_THEME_LOADER_GET_CLASS(loader)->_purple_theme_loader_build(dir); +} diff -r 52a1f5950f46 -r 68b7691aa3ed libpurple/theme-loader.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libpurple/theme-loader.h Sat Jun 07 11:03:20 2008 +0000 @@ -0,0 +1,92 @@ +/** + * @file purpletheme.h Purple Theme Loader Abstact 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_THEME_LOADER_H_ +#define _PURPLE_THEME_LOADER_H_ + +#include +#include +#include "theme.h" + +/** + * A purple theme loader. + * This is an abstract class for Purple to use with the Purple theme manager. + * The loader is responsible for building each type of theme + * + * PurpleThemeLoader is a GObject. + */ +typedef struct _PurpleThemeLoader PurpleThemeLoader; +typedef struct _PurpleThemeLoaderClass PurpleThemeLoaderClass; + +#define PURPLE_TYPE_THEME_LOADER (purple_theme_loader_get_type ()) +#define PURPLE_THEME_LOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PURPLE_TYPE_THEME_LOADER, PurpleThemeLoader)) +#define PURPLE_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_TYPE_THEME_LOADER, PurpleThemeLoaderClass)) +#define PURPLE_IS_THEME_LOADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PURPLE_TYPE_THEME_LOADER)) +#define PURPLE_IS_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_TYPE_THEME_LOADER)) +#define PURPLE_THEME_LOADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_TYPE_THEME_LOADER, PurpleThemeLoaderClass)) + +struct _PurpleThemeLoader +{ + GObject parent; + gpointer priv; +}; + +struct _PurpleThemeLoaderClass +{ + GObjectClass parent_class; + PurpleTheme *(*_purple_theme_loader_build)(const gchar); +}; + +/**************************************************************************/ +/** @name Purple Theme-Loader API */ +/**************************************************************************/ +G_BEGIN_DECLS + +/** + * GObject foo. + * @internal. + */ +GType purple_theme_loader_get_type(void); + +/** + * Returns the string represtenting the type of the theme loader + * + * @param self the theme loader + * + * @returns the string represting this type + */ +gchar *purple_theme_loader_get_type_string(PurpleThemeLoader *self); + +/** + * Creates a new PurpleTheme + * + * @param dir the directory containing the theme + * + * @returns PurpleTheme containing the information from the directory + */ +PurpleTheme *purple_theme_loader_build(PurpleThemeLoader *loader, const gchar *dir); + +G_END_DECLS +#endif /* _PURPLE_THEME_LOADER_H_ */ diff -r 52a1f5950f46 -r 68b7691aa3ed libpurple/theme.c --- a/libpurple/theme.c Sat Jun 07 01:55:23 2008 +0000 +++ b/libpurple/theme.c Sat Jun 07 11:03:20 2008 +0000 @@ -61,9 +61,9 @@ }; -/********************************************************************* - * GObject Stuff * - *********************************************************************/ +/****************************************************************************** + * GObject Stuff * + *****************************************************************************/ static void purple_theme_get_property(GObject *obj, guint param_id, GValue *value, diff -r 52a1f5950f46 -r 68b7691aa3ed libpurple/theme.h --- a/libpurple/theme.h Sat Jun 07 01:55:23 2008 +0000 +++ b/libpurple/theme.h Sat Jun 07 11:03:20 2008 +0000 @@ -69,17 +69,6 @@ GType purple_theme_get_type(void); /** - * Creates a new PurpleTheme object - * - * @param name the purple theme name - * @param author the purple theme author - * @param type the purple theme type - * - * @return a new PurpleTheme object - */ -PurpleTheme *purple_theme_new(const gchar *name, const gchar *author, const gchar *type); - -/** * Returns the name of the PurpleTheme object * * @param theme the purple theme