Mercurial > pidgin.yaz
changeset 25402:0c7b74fc558e
Lots of minor whitespace and comment changes:
* Removed stray whitespace
* Changed a few places that used space indentation to use tabs
* Changed some places that used tabs for alignment in the middle
of a line of code to use spaces
* Use two tabs to indent code that spans more than one line instead of
a few tabs and a few spaces in an effort to align the subsequent lines
with the initial one
* Changed "#ifdef _BLAH_H" to "#ifdef BLAH_H" because an underscore
followed by a capital letter is reserved for use by the compiler and
system libraries.
I also changed the path to the sound theme.xml file from
root_node = xmlnode_from_file(dir, "theme.xml", "sound themes", "sound-loader");
to
root_node = xmlnode_from_file(dir, "theme.xml", "sound themes", "sound-theme-loader");
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 25 Jan 2009 22:55:23 +0000 |
| parents | 3d8c53f3108e |
| children | f62c5b302b91 |
| files | ChangeLog ChangeLog.API Makefile.mingw libpurple/Makefile.mingw libpurple/plugins/Makefile.mingw libpurple/protocols/Makefile.mingw libpurple/protocols/myspace/README libpurple/sound-theme-loader.c libpurple/sound-theme-loader.h libpurple/sound-theme.c libpurple/sound-theme.h libpurple/theme-loader.c libpurple/theme-loader.h libpurple/theme-manager.c libpurple/theme-manager.h libpurple/theme.c libpurple/theme.h pidgin/gtkblist-theme-loader.c pidgin/gtkblist-theme-loader.h pidgin/gtkblist-theme.c pidgin/gtkblist-theme.h pidgin/gtkicon-theme-loader.c pidgin/gtkicon-theme-loader.h pidgin/gtkicon-theme.c pidgin/gtkicon-theme.h pidgin/gtkstatus-icon-theme.c pidgin/gtkstatus-icon-theme.h po/README po/et.po |
| diffstat | 29 files changed, 736 insertions(+), 764 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jan 24 03:11:09 2009 +0000 +++ b/ChangeLog Sun Jan 25 22:55:23 2009 +0000 @@ -613,13 +613,13 @@ version 2.2.0 (09/13/2007): http://developer.pidgin.im/query?status=closed&milestone=2.2.0 - Libpurple: + libpurple: * New protocol plugin: MySpaceIM (Jeff Connelly, Google Summer of Code) * XMPP enhancements. See - http://www.adiumx.com/blog/2007/07/soc-xmpp-update.php (Andreas + http://www.adiumx.com/blog/2007/07/soc-xmpp-update.php (Andreas Monitzer, Google Summer of Code for Adium) - * Certificate management. Libpurple will validate certificates on + * Certificate management. libpurple will validate certificates on SSL-encrypted protocols (William Ehlhardt, Google Summer of Code) * Some adjustments were made to fix sending messages when using the MSN HTTP method. (Laszlo Pandy)
--- a/ChangeLog.API Sat Jan 24 03:11:09 2009 +0000 +++ b/ChangeLog.API Sun Jan 25 22:55:23 2009 +0000 @@ -43,13 +43,13 @@ * Purple::Request::Fields::new * Purple::Request::Field::new * Purple::Request::Field::account_new - * Purple::Request::Field::bool_new - * Purple::Request::Field::choice_new - * Purple::Request::Field::int_new - * Purple::Request::Field::label_new - * Purple::Request::Field::list_new - * Purple::Request::Field::string_new - * Purple::Request::Field::group_new + * Purple::Request::Field::bool_new + * Purple::Request::Field::choice_new + * Purple::Request::Field::int_new + * Purple::Request::Field::label_new + * Purple::Request::Field::list_new + * Purple::Request::Field::string_new + * Purple::Request::Field::group_new version 2.5.5 (??/??/2009): libpurple:
--- a/Makefile.mingw Sat Jan 24 03:11:09 2009 +0000 +++ b/Makefile.mingw Sun Jan 25 22:55:23 2009 +0000 @@ -2,7 +2,7 @@ # # Author: hermanator12002@yahoo.com # Date 9/11/02 -# Description: Top Makefile for win32 (mingw) port of Pidgin and LibPurple +# Description: Top Makefile for win32 (mingw) port of Pidgin and libpurple # PIDGIN_TREE_TOP := .
--- a/libpurple/Makefile.mingw Sat Jan 24 03:11:09 2009 +0000 +++ b/libpurple/Makefile.mingw Sun Jan 25 22:55:23 2009 +0000 @@ -1,7 +1,7 @@ # # Makefile.mingw # -# Description: Makefile for win32 (mingw) version of LibPurple +# Description: Makefile for win32 (mingw) version of libpurple # PIDGIN_TREE_TOP := ..
--- a/libpurple/plugins/Makefile.mingw Sat Jan 24 03:11:09 2009 +0000 +++ b/libpurple/plugins/Makefile.mingw Sun Jan 25 22:55:23 2009 +0000 @@ -1,7 +1,7 @@ # # Makefile.mingw # -# Description: Makefile for win32 (mingw) version of LibPurple Plugins +# Description: Makefile for win32 (mingw) version of libpurple Plugins # PIDGIN_TREE_TOP := ../..
--- a/libpurple/protocols/Makefile.mingw Sat Jan 24 03:11:09 2009 +0000 +++ b/libpurple/protocols/Makefile.mingw Sun Jan 25 22:55:23 2009 +0000 @@ -2,7 +2,7 @@ # # Author: hermanator12002@yahoo.com # Date 9/11/02 -# Description: Protocols Makefile for win32 (mingw) port of LibPurple +# Description: Protocols Makefile for win32 (mingw) port of libpurple # PIDGIN_TREE_TOP := ../..
--- a/libpurple/protocols/myspace/README Sat Jan 24 03:11:09 2009 +0000 +++ b/libpurple/protocols/myspace/README Sun Jan 25 22:55:23 2009 +0000 @@ -1,9 +1,8 @@ -MySpaceIM Protocol Plugin for Libpurple by Jeff Connelly 20070807 - +MySpaceIM Protocol Plugin for libpurple by Jeff Connelly 2007-08-07 Greetings. This package contains a plugin for libpurple (as used in -Pidgin, formerly Gaim) to connect to the new MySpaceIM instant messaging -network and send/receive messages. Functionality is only basic as of yet, +Pidgin, formerly Gaim) to connect to the new MySpaceIM instant messaging +network and send/receive messages. Functionality is only basic as of yet, and this code should be considered alpha quality. This code was initially developed under Google Summer of Code 2007. @@ -15,10 +14,10 @@ Login using your _email address_ you use to login to myspace.com. You can't login using your numeric ID or alias. -To test it out, send a message to yourself (by your username or numeric -uid (email not yet supported)) or tom (6221). In either case you should -get a reply. You should also be able to talk to other MySpaceIM users if -you desire. Replies will always be shown as coming from a user's username, +To test it out, send a message to yourself (by your username or numeric +uid (email not yet supported)) or tom (6221). In either case you should +get a reply. You should also be able to talk to other MySpaceIM users if +you desire. Replies will always be shown as coming from a user's username, even if you IM by email or userid. Feedback welcome. You can IM my test account at "msimprpl" if you feel like it. @@ -26,4 +25,3 @@ Enjoy, -Jeff Connelly msimprpl@xyzzy.cjb.net -
--- a/libpurple/sound-theme-loader.c Sat Jan 24 03:11:09 2009 +0000 +++ b/libpurple/sound-theme-loader.c Sun Jan 25 22:55:23 2009 +0000 @@ -1,5 +1,5 @@ /* - * SoundThemeLoader for LibPurple + * 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 @@ -18,7 +18,6 @@ * 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 "internal.h" @@ -28,7 +27,7 @@ #include "xmlnode.h" /***************************************************************************** - * Sound Theme Builder + * Sound Theme Builder *****************************************************************************/ static PurpleTheme * @@ -43,41 +42,41 @@ 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"); + root_node = xmlnode_from_file(dir, "theme.xml", "sound themes", "sound-theme-loader"); g_free(filename_full); g_return_val_if_fail(root_node != NULL, NULL); - /* Parse the tree */ + /* 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); + "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")); + xmlnode_get_attrib(sub_node, "name"), + xmlnode_get_attrib(sub_node, "file")); sub_node = xmlnode_get_next_twin(sub_node); } } - xmlnode_free(root_node); + xmlnode_free(root_node); g_free(data); return PURPLE_THEME(theme); } /****************************************************************************** - * GObject Stuff + * GObject Stuff *****************************************************************************/ static void @@ -88,29 +87,25 @@ loader_klass->purple_theme_loader_build = purple_sound_loader_build; } - -GType +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; + 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; } - -
--- a/libpurple/sound-theme-loader.h Sat Jan 24 03:11:09 2009 +0000 +++ b/libpurple/sound-theme-loader.h Sun Jan 25 22:55:23 2009 +0000 @@ -1,5 +1,5 @@ /** - * @file sound-loader.h Purple Sound Theme Loader Class API + * @file sound-theme-loader.h Purple Sound Theme Loader Class API */ /* purple @@ -23,8 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _PURPLE_SOUND_THEME_LOADER_H_ -#define _PURPLE_SOUND_THEME_LOADER_H_ +#ifndef PURPLE_SOUND_THEME_LOADER_H +#define PURPLE_SOUND_THEME_LOADER_H #include <glib.h> #include <glib-object.h> @@ -39,12 +39,12 @@ 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)) +#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 { @@ -68,4 +68,4 @@ GType purple_sound_theme_loader_get_type(void); G_END_DECLS -#endif /* _PURPLE_SOUND_THEME_LOADER_H_ */ +#endif /* PURPLE_SOUND_THEME_LOADER_H */
--- a/libpurple/sound-theme.c Sat Jan 24 03:11:09 2009 +0000 +++ b/libpurple/sound-theme.c Sun Jan 25 22:55:23 2009 +0000 @@ -1,5 +1,5 @@ /* - * Sound Themes for LibPurple + * Sound Themes 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 @@ -18,7 +18,6 @@ * 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 "internal.h" @@ -27,10 +26,10 @@ #define PURPLE_SOUND_THEME_GET_PRIVATE(Gobject) \ ((PurpleSoundThemePrivate *) ((PURPLE_SOUND_THEME(Gobject))->priv)) - /****************************************************************************** * Structs *****************************************************************************/ + typedef struct { /* used to store filenames of diffrent sounds */ GHashTable *sound_files; @@ -47,12 +46,12 @@ *****************************************************************************/ /****************************************************************************** - * GObject Stuff + * GObject Stuff *****************************************************************************/ static void purple_sound_theme_init(GTypeInstance *instance, - gpointer klass) + gpointer klass) { PurpleSoundThemePrivate *priv; @@ -60,105 +59,100 @@ priv = PURPLE_SOUND_THEME_GET_PRIVATE(instance); - priv->sound_files = g_hash_table_new_full (g_str_hash, - g_str_equal, - g_free, - g_free); + priv->sound_files = g_hash_table_new_full(g_str_hash, + g_str_equal, g_free, g_free); } -static void -purple_sound_theme_finalize (GObject *obj) +static void +purple_sound_theme_finalize(GObject *obj) { PurpleSoundThemePrivate *priv; priv = PURPLE_SOUND_THEME_GET_PRIVATE(obj); - + g_hash_table_destroy(priv->sound_files); - parent_class->finalize (obj); + parent_class->finalize(obj); } static void -purple_sound_theme_class_init (PurpleSoundThemeClass *klass) +purple_sound_theme_class_init(PurpleSoundThemeClass *klass) { GObjectClass *obj_class = G_OBJECT_CLASS(klass); - parent_class = g_type_class_peek_parent (klass); + parent_class = g_type_class_peek_parent(klass); - obj_class->finalize = purple_sound_theme_finalize; + obj_class->finalize = purple_sound_theme_finalize; } -GType -purple_sound_theme_get_type (void) +GType +purple_sound_theme_get_type(void) { - static GType type = 0; - if (type == 0) { - static const GTypeInfo info = { - sizeof (PurpleSoundThemeClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc)purple_sound_theme_class_init, /* class_init */ - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (PurpleSoundTheme), - 0, /* n_preallocs */ - purple_sound_theme_init, /* instance_init */ - NULL, /* value table */ - }; - type = g_type_register_static (PURPLE_TYPE_THEME, - "PurpleSoundTheme", - &info, 0); - } - return type; + static GType type = 0; + if (type == 0) { + static const GTypeInfo info = { + sizeof(PurpleSoundThemeClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc)purple_sound_theme_class_init, /* class_init */ + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof(PurpleSoundTheme), + 0, /* n_preallocs */ + purple_sound_theme_init, /* instance_init */ + NULL, /* value table */ + }; + type = g_type_register_static(PURPLE_TYPE_THEME, + "PurpleSoundTheme", &info, 0); + } + return type; } - /***************************************************************************** - * Public API functions + * Public API functions *****************************************************************************/ const gchar * purple_sound_theme_get_file(PurpleSoundTheme *theme, - const gchar *event) + const gchar *event) { PurpleSoundThemePrivate *priv; g_return_val_if_fail(PURPLE_IS_SOUND_THEME(theme), NULL); priv = PURPLE_SOUND_THEME_GET_PRIVATE(theme); - + return g_hash_table_lookup(priv->sound_files, event); } gchar * purple_sound_theme_get_file_full(PurpleSoundTheme *theme, - const gchar *event) + const gchar *event) { const gchar *filename; g_return_val_if_fail(PURPLE_IS_SOUND_THEME(theme), NULL); filename = purple_sound_theme_get_file(theme, event); - + g_return_val_if_fail(filename, NULL); return g_build_filename(purple_theme_get_dir(PURPLE_THEME(theme)), filename, NULL); } -void +void purple_sound_theme_set_file(PurpleSoundTheme *theme, - const gchar *event, - const gchar *filename) + const gchar *event, + const gchar *filename) { PurpleSoundThemePrivate *priv; g_return_if_fail(PURPLE_IS_SOUND_THEME(theme)); - + priv = PURPLE_SOUND_THEME_GET_PRIVATE(theme); - if (filename != NULL)g_hash_table_replace(priv->sound_files, - g_strdup(event), - g_strdup(filename)); - else g_hash_table_remove(priv->sound_files, event); + if (filename != NULL) + g_hash_table_replace(priv->sound_files, + g_strdup(event), g_strdup(filename)); + else + g_hash_table_remove(priv->sound_files, event); } - -
--- a/libpurple/sound-theme.h Sat Jan 24 03:11:09 2009 +0000 +++ b/libpurple/sound-theme.h Sun Jan 25 22:55:23 2009 +0000 @@ -23,8 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _PURPLE_SOUND_THEME_H_ -#define _PURPLE_SOUND_THEME_H_ +#ifndef PURPLE_SOUND_THEME_H +#define PURPLE_SOUND_THEME_H #include <glib.h> #include <glib-object.h> @@ -41,12 +41,12 @@ typedef struct _PurpleSoundTheme PurpleSoundTheme; typedef struct _PurpleSoundThemeClass PurpleSoundThemeClass; -#define PURPLE_TYPE_SOUND_THEME (purple_sound_theme_get_type ()) -#define PURPLE_SOUND_THEME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PURPLE_TYPE_SOUND_THEME, PurpleSoundTheme)) -#define PURPLE_SOUND_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_TYPE_SOUND_THEME, PurpleSoundThemeClass)) -#define PURPLE_IS_SOUND_THEME(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PURPLE_TYPE_SOUND_THEME)) -#define PURPLE_IS_SOUND_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_TYPE_SOUND_THEME)) -#define PURPLE_SOUND_THEME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_TYPE_SOUND_THEME, PurpleSoundThemeClass)) +#define PURPLE_TYPE_SOUND_THEME (purple_sound_theme_get_type()) +#define PURPLE_SOUND_THEME(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_SOUND_THEME, PurpleSoundTheme)) +#define PURPLE_SOUND_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_SOUND_THEME, PurpleSoundThemeClass)) +#define PURPLE_IS_SOUND_THEME(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_SOUND_THEME)) +#define PURPLE_IS_SOUND_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_SOUND_THEME)) +#define PURPLE_SOUND_THEME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_SOUND_THEME, PurpleSoundThemeClass)) struct _PurpleSoundTheme { @@ -71,23 +71,26 @@ GType purple_sound_theme_get_type(void); /** - * Returns a copy of the filename for the sound event + * Returns a copy of the filename for the sound event. * - * @param event the purple sound event to look up + * @param event The purple sound event to look up. * - * @returns the filename of the sound event + * @returns The filename of the sound event. */ const gchar *purple_sound_theme_get_file(PurpleSoundTheme *theme, - const gchar *event); + const gchar *event); + /** * Returns a copy of the directory and filename for the sound event * - * @param event the purple sound event to look up + * @param event The purple sound event to look up * - * @returns the directory + '/' + filename of the sound event + * @returns The directory + '/' + filename of the sound event. This is + * a newly allocated string that should be freed with g_free. */ gchar *purple_sound_theme_get_file_full(PurpleSoundTheme *theme, - const gchar *event); + const gchar *event); + /** * Sets the filename for a given sound event * @@ -95,8 +98,8 @@ * @param filename the name of the file to be used for the event */ void purple_sound_theme_set_file(PurpleSoundTheme *theme, - const gchar *event, - const gchar *filename); + const gchar *event, + const gchar *filename); G_END_DECLS -#endif /* _PURPLE_SOUND_THEME_H_ */ +#endif /* PURPLE_SOUND_THEME_H */
--- a/libpurple/theme-loader.c Sat Jan 24 03:11:09 2009 +0000 +++ b/libpurple/theme-loader.c Sun Jan 25 22:55:23 2009 +0000 @@ -1,5 +1,5 @@ /* - * ThemeLoaders for LibPurple + * 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 @@ -18,8 +18,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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * */ + #include "internal.h" #include "theme-loader.h" @@ -27,6 +27,7 @@ ((PurpleThemeLoaderPrivate *) ((PurpleThemeLoader)->priv)) void purple_theme_loader_set_type_string(PurpleThemeLoader *loader, const gchar *type); + /****************************************************************************** * Structs *****************************************************************************/ @@ -59,7 +60,7 @@ { PurpleThemeLoader *theme_loader = PURPLE_THEME_LOADER(obj); - switch(param_id) { + switch (param_id) { case PROP_TYPE: g_value_set_string(value, purple_theme_loader_get_type_string(theme_loader)); default: @@ -74,7 +75,7 @@ { PurpleThemeLoader *loader = PURPLE_THEME_LOADER(obj); - switch(param_id) { + switch (param_id) { case PROP_TYPE: purple_theme_loader_set_type_string(loader, g_value_get_string(value)); break; @@ -95,21 +96,21 @@ static void purple_theme_loader_finalize(GObject *obj) { - PurpleThemeLoader *loader = PURPLE_THEME_LOADER(obj); + PurpleThemeLoader *loader = PURPLE_THEME_LOADER(obj); PurpleThemeLoaderPrivate *priv = PURPLE_THEME_LOADER_GET_PRIVATE(loader); g_free(priv->type); - parent_class->finalize (obj); + parent_class->finalize(obj); } static void -purple_theme_loader_class_init (PurpleThemeLoaderClass *klass) +purple_theme_loader_class_init(PurpleThemeLoaderClass *klass) { GObjectClass *obj_class = G_OBJECT_CLASS(klass); GParamSpec *pspec; - - parent_class = g_type_class_peek_parent (klass); + + parent_class = g_type_class_peek_parent(klass); obj_class->get_property = purple_theme_loader_get_property; obj_class->set_property = purple_theme_loader_set_property; @@ -123,39 +124,35 @@ g_object_class_install_property(obj_class, PROP_TYPE, pspec); } - -GType -purple_theme_loader_get_type (void) +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 */ - purple_theme_loader_init, /* instance_init */ - NULL, /* value table */ - }; - type = g_type_register_static (G_TYPE_OBJECT, - "PurpleThemeLoader", - &info, G_TYPE_FLAG_ABSTRACT); - } - return type; + 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 */ + purple_theme_loader_init, /* instance_init */ + NULL, /* value table */ + }; + type = g_type_register_static(G_TYPE_OBJECT, + "PurpleThemeLoader", &info, G_TYPE_FLAG_ABSTRACT); + } + return type; } - /***************************************************************************** - * Public API functions + * Public API functions *****************************************************************************/ - const gchar * -purple_theme_loader_get_type_string (PurpleThemeLoader *theme_loader) +purple_theme_loader_get_type_string(PurpleThemeLoader *theme_loader) { PurpleThemeLoaderPrivate *priv = NULL;
--- a/libpurple/theme-loader.h Sat Jan 24 03:11:09 2009 +0000 +++ b/libpurple/theme-loader.h Sun Jan 25 22:55:23 2009 +0000 @@ -23,8 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _PURPLE_THEME_LOADER_H_ -#define _PURPLE_THEME_LOADER_H_ +#ifndef PURPLE_THEME_LOADER_H +#define PURPLE_THEME_LOADER_H #include <glib.h> #include <glib-object.h> @@ -40,12 +40,12 @@ 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)) +#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 { @@ -73,20 +73,20 @@ /** * Returns the string represtenting the type of the theme loader * - * @param self the theme loader + * @param self The theme loader * - * @returns the string represting this type + * @returns The string represting this type */ const gchar *purple_theme_loader_get_type_string(PurpleThemeLoader *self); /** * Creates a new PurpleTheme * - * @param dir the directory containing the theme + * @param dir The directory containing the theme * - * @returns PurpleTheme containing the information from the directory + * @returns A 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_ */ +#endif /* PURPLE_THEME_LOADER_H */
--- a/libpurple/theme-manager.c Sat Jan 24 03:11:09 2009 +0000 +++ b/libpurple/theme-manager.c Sun Jan 25 22:55:23 2009 +0000 @@ -1,5 +1,5 @@ /* - * Themes for LibPurple + * Themes 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 @@ -18,8 +18,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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * */ + #include <glib.h> #include <string.h> @@ -34,66 +34,66 @@ static GHashTable *theme_table = NULL; /***************************************************************************** - * GObject Stuff + * GObject Stuff ****************************************************************************/ -GType +GType purple_theme_manager_get_type(void) { - static GType type = 0; - if (type == 0) { - static const GTypeInfo info = { - sizeof (PurpleThemeManagerClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - NULL, /* class_init */ - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (PurpleThemeManager), - 0, /* n_preallocs */ - NULL, /* instance_init */ - NULL, /* Value Table */ - }; - type = g_type_register_static(G_TYPE_OBJECT, - "PurpleThemeManager", - &info, 0); - } - return type; + static GType type = 0; + if (type == 0) { + static const GTypeInfo info = { + sizeof(PurpleThemeManagerClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + NULL, /* class_init */ + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof(PurpleThemeManager), + 0, /* n_preallocs */ + NULL, /* instance_init */ + NULL, /* Value Table */ + }; + type = g_type_register_static(G_TYPE_OBJECT, + "PurpleThemeManager", &info, 0); + } + return type; } /****************************************************************************** * Helpers *****************************************************************************/ + /* makes a key of <type> + '/' + <name> */ static gchar * purple_theme_manager_make_key(const gchar *name, const gchar *type) { g_return_val_if_fail(name && *name, NULL); - g_return_val_if_fail(type && *type, NULL); + g_return_val_if_fail(type && *type, NULL); return g_strconcat(type, "/", name, NULL); } -/* returns TRUE if theme is of type "user_data" */ +/* returns TRUE if theme is of type "user_data" */ static gboolean purple_theme_manager_is_theme_type(gchar *key, - gpointer value, - gchar *user_data) + gpointer value, + gchar *user_data) { return g_str_has_prefix(key, g_strconcat(user_data, "/", NULL)); } static gboolean purple_theme_manager_is_theme(gchar *key, - gpointer value, - gchar *user_data) + gpointer value, + gchar *user_data) { return PURPLE_IS_THEME(value); } static void purple_theme_manager_function_wrapper(gchar *key, - gpointer value, - PTFunc user_data) + gpointer value, + PTFunc user_data) { if (PURPLE_IS_THEME(value)) (* user_data)(value); @@ -102,7 +102,6 @@ static void purple_theme_manager_build_dir(const gchar *root) { - gchar *purple_dir, *theme_dir; const gchar *name = NULL, *type = NULL; GDir *rdir, *tdir; @@ -114,25 +113,25 @@ return; /* Parses directory by root/name/purple/type */ - while((name = g_dir_read_name(rdir))) { + while ((name = g_dir_read_name(rdir))) { purple_dir = g_build_filename(root, name, "purple", NULL); tdir = g_dir_open(purple_dir, 0, NULL); - - if(!tdir) { + + if (!tdir) { g_free(purple_dir); continue; } - while((type = g_dir_read_name(tdir))) { - if((loader = g_hash_table_lookup(theme_table, type))) { + while ((type = g_dir_read_name(tdir))) { + if ((loader = g_hash_table_lookup(theme_table, type))) { PurpleTheme *theme = NULL; theme_dir = g_build_filename(purple_dir, type, NULL); theme = purple_theme_loader_build(loader, theme_dir); - if(PURPLE_IS_THEME(theme)) + if (PURPLE_IS_THEME(theme)) purple_theme_manager_add_theme(theme); } } @@ -145,28 +144,25 @@ } /***************************************************************************** - * Public API functions * + * Public API functions *****************************************************************************/ void purple_theme_manager_init(void) { theme_table = g_hash_table_new_full(g_str_hash, - g_str_equal, - g_free, - g_object_unref); + g_str_equal, g_free, g_object_unref); } -void -purple_theme_manager_refresh() +void +purple_theme_manager_refresh(void) { gchar *path = NULL; const gchar *xdg = NULL; gint i = 0; g_hash_table_foreach_remove(theme_table, - (GHRFunc) purple_theme_manager_is_theme, - NULL); + (GHRFunc) purple_theme_manager_is_theme, NULL); /* Add themes from ~/.purple */ path = g_build_filename(purple_user_dir(), "themes", NULL); @@ -174,7 +170,7 @@ g_free(path); /* look for XDG_DATA_HOME. If we don't have it use ~/.local, and add it */ - if((xdg = g_getenv("XDG_DATA_HOME")) != NULL) + if ((xdg = g_getenv("XDG_DATA_HOME")) != NULL) path = g_build_filename(xdg, "themes", NULL); else path = g_build_filename(purple_home_dir(), ".local", "themes", NULL); @@ -184,10 +180,10 @@ /* now dig through XDG_DATA_DIRS and add those too */ xdg = g_getenv("XDG_DATA_DIRS"); - if(xdg) { + if (xdg) { gchar **xdg_dirs = g_strsplit(xdg, G_SEARCHPATH_SEPARATOR_S, 0); - for(i = 0; xdg_dirs[i]; i++) { + for (i = 0; xdg_dirs[i]; i++) { path = g_build_filename(xdg_dirs[i], "themes", NULL); purple_theme_manager_build_dir(path); g_free(path); @@ -197,13 +193,12 @@ } } -void -purple_theme_manager_uninit() +void +purple_theme_manager_uninit(void) { g_hash_table_destroy(theme_table); } - void purple_theme_manager_register_type(PurpleThemeLoader *loader) { @@ -215,7 +210,7 @@ g_return_if_fail(type); /* if something is already there do nothing */ - if (! g_hash_table_lookup(theme_table, type)) + if (!g_hash_table_lookup(theme_table, type)) g_hash_table_insert(theme_table, type, loader); } @@ -229,19 +224,18 @@ type = purple_theme_loader_get_type_string(loader); g_return_if_fail(type); - if (g_hash_table_lookup(theme_table, type) == loader){ - + if (g_hash_table_lookup(theme_table, type) == loader) + { g_hash_table_remove(theme_table, type); g_hash_table_foreach_remove(theme_table, - (GHRFunc)purple_theme_manager_is_theme_type, - (gpointer)type); - }/* only free if given registered loader */ + (GHRFunc)purple_theme_manager_is_theme_type, (gpointer)type); + } /* only free if given registered loader */ } PurpleTheme * purple_theme_manager_find_theme(const gchar *name, - const gchar *type) + const gchar *type) { gchar *key; PurpleTheme *theme; @@ -257,21 +251,20 @@ return theme; } - -void +void purple_theme_manager_add_theme(PurpleTheme *theme) { gchar *key; - + g_return_if_fail(PURPLE_IS_THEME(theme)); key = purple_theme_manager_make_key(purple_theme_get_name(theme), - purple_theme_get_type_string(theme)); + purple_theme_get_type_string(theme)); g_return_if_fail(key); /* if something is already there do nothing */ - if (g_hash_table_lookup(theme_table, key) == NULL) + if (g_hash_table_lookup(theme_table, key) == NULL) g_hash_table_insert(theme_table, key, theme); } @@ -283,22 +276,20 @@ g_return_if_fail(PURPLE_IS_THEME(theme)); key = purple_theme_manager_make_key(purple_theme_get_name(theme), - purple_theme_get_type_string(theme)); + purple_theme_get_type_string(theme)); g_return_if_fail(key); - g_hash_table_remove(theme_table, key); + g_hash_table_remove(theme_table, key); - g_free(key); + g_free(key); } -void +void purple_theme_manager_for_each_theme(PTFunc func) { g_return_if_fail(func); g_hash_table_foreach(theme_table, - (GHFunc) purple_theme_manager_function_wrapper, - func); + (GHFunc) purple_theme_manager_function_wrapper, func); } -
--- a/libpurple/theme-manager.h Sat Jan 24 03:11:09 2009 +0000 +++ b/libpurple/theme-manager.h Sun Jan 25 22:55:23 2009 +0000 @@ -2,7 +2,8 @@ * @file thememanager.h Theme Manager API */ -/* purple +/* + * 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 @@ -23,8 +24,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef __PURPLE_THEME_MANAGER_H__ -#define __PURPLE_THEME_MANAGER_H__ +#ifndef PURPLE_THEME_MANAGER_H +#define PURPLE_THEME_MANAGER_H #include <glib-object.h> #include <glib.h> @@ -36,12 +37,12 @@ typedef struct _PurpleThemeManager PurpleThemeManager; typedef struct _PurpleThemeManagerClass PurpleThemeManagerClass; -#define PURPLE_TYPE_THEME_MANAGER (purple_theme_manager_get_type ()) +#define PURPLE_TYPE_THEME_MANAGER (purple_theme_manager_get_type()) #define PURPLE_THEME_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_THEME_MANAGER, PurpleThemeManager)) -#define PURPLE_THEME_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_TYPE_THEME_MANAGER, PurpleThemeManagerClass)) -#define PURPLE_IS_THEME_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PURPLE_TYPE_THEME_MANAGER)) -#define PURPLE_IS_THEME_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_TYPE_THEME_MANAGER)) -#define PURPLE_GET_THEME_MANAGER_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_TYPE_THEME_MANAGER, PurpleThemeManagerClass)) +#define PURPLE_THEME_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_THEME_MANAGER, PurpleThemeManagerClass)) +#define PURPLE_IS_THEME_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_THEME_MANAGER)) +#define PURPLE_IS_THEME_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_THEME_MANAGER)) +#define PURPLE_GET_THEME_MANAGER_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_THEME_MANAGER, PurpleThemeManagerClass)) struct _PurpleThemeManager { GObject parent; @@ -58,68 +59,73 @@ /** * GObject foo. + * * @internal. */ -GType purple_theme_manager_get_type (void); +GType purple_theme_manager_get_type(void); /** - * Initalizes the theme manager + * Initalizes the theme manager. */ -void purple_theme_manager_init (void); +void purple_theme_manager_init(void); /** - * Uninitalizes the manager then frees all the themes an loaders it is responsible for + * Uninitalizes the manager then frees all the themes and loaders it is + * responsible for. */ -void purple_theme_manager_uninit (void); +void purple_theme_manager_uninit(void); /** - * Rebuilds all the themes in the theme manager - * (removes all current themes but keeps the added loaders) + * Rebuilds all the themes in the theme manager. + * (Removes all current themes but keeps the added loaders.) */ void purple_theme_manager_refresh(void); /** - * Finds the PurpleTheme object stored by the theme manager - * - * @param name the name of the PurpleTheme - * @param type the type of the PurpleTheme + * Finds the PurpleTheme object stored by the theme manager. * - * @returns The PurpleTheme or NULL if it wasn't found + * @param name The name of the PurpleTheme. + * @param type The type of the PurpleTheme. + * + * @returns The PurpleTheme, or NULL if it wasn't found. */ PurpleTheme *purple_theme_manager_find_theme(const gchar *name, const gchar *type); /** - * Adds a PurpleTheme to the theme manager, if the theme already exits it does nothing + * Adds a PurpleTheme to the theme manager. If the theme already exists + * then this function does nothing. * - * @param theme the PurpleTheme to add to the manager + * @param theme The PurpleTheme to add to the manager. */ void purple_theme_manager_add_theme(PurpleTheme *theme); /** - * Removes a PurpleTheme from the theme manager, and frees the theme - * @param theme the PurpleTheme to remove from the manager + * Removes a PurpleTheme from the theme manager and frees the theme. + * + * @param theme The PurpleTheme to remove from the manager. */ void purple_theme_manager_remove_theme(PurpleTheme *theme); /** - * Addes a Loader to the theme manager so it knows how to build themes - * @param loader the PurpleThemeLoader to add + * Adds a loader to the theme manager so it knows how to build themes. + * + * @param loader The PurpleThemeLoader to add. */ void purple_theme_manager_register_type(PurpleThemeLoader *loader); /** - * Removes the loader and all themes of the same type from the loader - * @param loader the PurpleThemeLoader to be removed + * Removes the loader and all themes of the same type from the loader. + * + * @param loader The PurpleThemeLoader to be removed. */ void purple_theme_manager_unregister_type(PurpleThemeLoader *loader); /** - * Calles the given function on each purple theme + * Calls the given function on each purple theme. * - * @param func the PTFunc to be applied to each theme + * @param func The PTFunc to be applied to each theme. */ -void purple_theme_manager_for_each_theme(PTFunc func); +void purple_theme_manager_for_each_theme(PTFunc func); G_END_DECLS -#endif /* __PURPLE_THEME_MANAGER_H__ */ - +#endif /* PURPLE_THEME_MANAGER_H */
--- a/libpurple/theme.c Sat Jan 24 03:11:09 2009 +0000 +++ b/libpurple/theme.c Sun Jan 25 22:55:23 2009 +0000 @@ -1,5 +1,5 @@ /* - * Themes for LibPurple + * Themes 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 @@ -18,8 +18,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., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA - * */ + #include <glib.h> #include <string.h> @@ -35,6 +35,7 @@ /****************************************************************************** * Structs *****************************************************************************/ + typedef struct { gchar *name; gchar *description; @@ -65,16 +66,16 @@ }; /****************************************************************************** - * GObject Stuff * + * GObject Stuff *****************************************************************************/ static void purple_theme_get_property(GObject *obj, guint param_id, GValue *value, - GParamSpec *psec) + GParamSpec *psec) { PurpleTheme *theme = PURPLE_THEME(obj); - switch(param_id) { + switch (param_id) { case PROP_NAME: g_value_set_string(value, purple_theme_get_name(theme)); break; @@ -101,11 +102,11 @@ static void purple_theme_set_property(GObject *obj, guint param_id, const GValue *value, - GParamSpec *psec) + GParamSpec *psec) { PurpleTheme *theme = PURPLE_THEME(obj); - switch(param_id) { + switch (param_id) { case PROP_NAME: purple_theme_set_name(theme, g_value_get_string(value)); break; @@ -132,7 +133,7 @@ static void purple_theme_init(GTypeInstance *instance, - gpointer klass) + gpointer klass) { PurpleTheme *theme = PURPLE_THEME(instance); theme->priv = g_new0(PurpleThemePrivate, 1); @@ -141,9 +142,9 @@ static void purple_theme_finalize(GObject *obj) { - PurpleTheme *theme = PURPLE_THEME(obj); + PurpleTheme *theme = PURPLE_THEME(obj); PurpleThemePrivate *priv = PURPLE_THEME_GET_PRIVATE(theme); - + g_free(priv->name); g_free(priv->description); g_free(priv->author); @@ -155,7 +156,7 @@ } static void -purple_theme_class_init (PurpleThemeClass *klass) +purple_theme_class_init(PurpleThemeClass *klass) { GObjectClass *obj_class = G_OBJECT_CLASS(klass); GParamSpec *pspec; @@ -165,90 +166,89 @@ obj_class->get_property = purple_theme_get_property; obj_class->set_property = purple_theme_set_property; obj_class->finalize = purple_theme_finalize; - + /* NAME */ pspec = g_param_spec_string("name", "Name", - "The name of the theme", - NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT); + "The name of the theme", + NULL, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT); g_object_class_install_property(obj_class, PROP_NAME, pspec); /* DESCRIPTION */ pspec = g_param_spec_string("description", "Description", - "The description of the theme", - NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT); + "The description of the theme", + NULL, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT); g_object_class_install_property(obj_class, PROP_DESCRIPTION, pspec); /* AUTHOR */ pspec = g_param_spec_string("author", "Author", - "The author of the theme", - NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT); + "The author of the theme", + NULL, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT); g_object_class_install_property(obj_class, PROP_AUTHOR, pspec); /* TYPE STRING (read only) */ pspec = g_param_spec_string("type", "Type", - "The string represtenting the type of the theme", - NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); + "The string represtenting the type of the theme", + NULL, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); g_object_class_install_property(obj_class, PROP_TYPE, pspec); /* DIRECTORY */ pspec = g_param_spec_string("directory", "Directory", - "The directory that contains the theme and all its files", - NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT); + "The directory that contains the theme and all its files", + NULL, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT); g_object_class_install_property(obj_class, PROP_DIR, pspec); /* PREVIEW IMAGE */ pspec = g_param_spec_string("image", "Image", - "A preview image of the theme", - NULL, - G_PARAM_READWRITE); + "A preview image of the theme", + NULL, + G_PARAM_READWRITE); g_object_class_install_property(obj_class, PROP_IMAGE, pspec); } -GType -purple_theme_get_type (void) +GType +purple_theme_get_type(void) { - static GType type = 0; - if (type == 0) { - static const GTypeInfo info = { - sizeof (PurpleThemeClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc)purple_theme_class_init, /* class_init */ - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (PurpleTheme), - 0, /* n_preallocs */ - purple_theme_init, /* instance_init */ - NULL, /* value table */ - }; - type = g_type_register_static (G_TYPE_OBJECT, - "PurpleTheme", - &info, G_TYPE_FLAG_ABSTRACT); - } - return type; + static GType type = 0; + if (type == 0) { + static const GTypeInfo info = { + sizeof(PurpleThemeClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc)purple_theme_class_init, /* class_init */ + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof(PurpleTheme), + 0, /* n_preallocs */ + purple_theme_init, /* instance_init */ + NULL, /* value table */ + }; + type = g_type_register_static (G_TYPE_OBJECT, + "PurpleTheme", &info, G_TYPE_FLAG_ABSTRACT); + } + return type; } /****************************************************************************** * Helper Functions *****************************************************************************/ -static gchar* +static gchar * theme_clean_text(const gchar *text) { - gchar *clean_text = g_markup_escape_text(text, strlen(text)); + gchar *clean_text = g_markup_escape_text(text, -1); g_strdelimit(clean_text, "\n", ' '); purple_str_strip_char(clean_text, '\r'); return clean_text; } /***************************************************************************** - * Public API functions + * Public API function *****************************************************************************/ const gchar * @@ -349,7 +349,7 @@ } const gchar * -purple_theme_get_dir(PurpleTheme *theme) +purple_theme_get_dir(PurpleTheme *theme) { PurpleThemePrivate *priv; @@ -388,15 +388,15 @@ purple_theme_get_image_full(PurpleTheme *theme) { const gchar *filename = purple_theme_get_image(theme); - + g_return_val_if_fail(filename, NULL); return g_build_filename(purple_theme_get_dir(PURPLE_THEME(theme)), filename, NULL); } -void +void purple_theme_set_image(PurpleTheme *theme, const gchar *img) -{ +{ PurpleThemePrivate *priv; g_return_if_fail(PURPLE_IS_THEME(theme));
--- a/libpurple/theme.h Sat Jan 24 03:11:09 2009 +0000 +++ b/libpurple/theme.h Sun Jan 25 22:55:23 2009 +0000 @@ -23,8 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _PURPLE_THEME_H_ -#define _PURPLE_THEME_H_ +#ifndef PURPLE_THEME_H +#define PURPLE_THEME_H #include <glib.h> #include <glib-object.h> @@ -39,12 +39,12 @@ typedef struct _PurpleTheme PurpleTheme; typedef struct _PurpleThemeClass PurpleThemeClass; -#define PURPLE_TYPE_THEME (purple_theme_get_type ()) -#define PURPLE_THEME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PURPLE_TYPE_THEME, PurpleTheme)) -#define PURPLE_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_TYPE_THEME, PurpleThemeClass)) -#define PURPLE_IS_THEME(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PURPLE_TYPE_THEME)) -#define PURPLE_IS_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_TYPE_THEME)) -#define PURPLE_THEME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_TYPE_THEME, PurpleThemeClass)) +#define PURPLE_TYPE_THEME (purple_theme_get_type ()) +#define PURPLE_THEME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PURPLE_TYPE_THEME, PurpleTheme)) +#define PURPLE_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_TYPE_THEME, PurpleThemeClass)) +#define PURPLE_IS_THEME(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PURPLE_TYPE_THEME)) +#define PURPLE_IS_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PURPLE_TYPE_THEME)) +#define PURPLE_THEME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PURPLE_TYPE_THEME, PurpleThemeClass)) struct _PurpleTheme { @@ -69,107 +69,107 @@ GType purple_theme_get_type(void); /** - * Returns the name of the PurpleTheme object - * - * @param theme the purple theme + * Returns the name of the PurpleTheme object. * - * @return The string representating the name of the theme + * @param theme The purple theme. + * + * @return The string representating the name of the theme. */ const gchar *purple_theme_get_name(PurpleTheme *theme); /** - * Sets the name of the PurpleTheme object - * - * @param theme the purple theme - * @param name the name of the PurpleTheme object + * Sets the name of the PurpleTheme object. + * + * @param theme The purple theme. + * @param name The name of the PurpleTheme object. */ void purple_theme_set_name(PurpleTheme *theme, const gchar *name); /** - * Returns the description of the PurpleTheme object - * - * @param theme the purple theme + * Returns the description of the PurpleTheme object. * - * @return A short description of the theme + * @param theme The purple theme. + * + * @return A short description of the theme. */ const gchar *purple_theme_get_description(PurpleTheme *theme); /** - * Sets the description of the PurpleTheme object - * - * @param theme the purple theme - * @param description the description of the PurpleTheme object + * Sets the description of the PurpleTheme object. + * + * @param theme The purple theme. + * @param description The description of the PurpleTheme object. */ void purple_theme_set_description(PurpleTheme *theme, const gchar *description); /** - * Returns the author of the PurpleTheme object - * - * @param theme the purple theme + * Returns the author of the PurpleTheme object. * - * @return The author of the theme + * @param theme The purple theme. + * + * @return The author of the theme. */ const gchar *purple_theme_get_author(PurpleTheme *theme); /** - * Sets the author of the PurpleTheme object - * - * @param theme the purple theme - * @param author the author of the PurpleTheme object + * Sets the author of the PurpleTheme object. + * + * @param theme The purple theme. + * @param author The author of the PurpleTheme object. */ void purple_theme_set_author(PurpleTheme *theme, const gchar *author); /** - * Returns the type (string) of the PurpleTheme object - * - * @param theme the purple theme + * Returns the type (string) of the PurpleTheme object. * - * @return The string represtenting the type + * @param theme The purple theme. + * + * @return The string represtenting the type. */ const gchar *purple_theme_get_type_string(PurpleTheme *theme); /** - * Returns the directory of the PurpleTheme object - * - * @param theme the purple theme + * Returns the directory of the PurpleTheme object. * - * @return The string represtenting the theme directory + * @param theme The purple theme. + * + * @return The string represtenting the theme directory. */ const gchar *purple_theme_get_dir(PurpleTheme *theme); /** - * Sets the directory of the PurpleTheme object - * - * @param theme the purple theme - * @param dir the directory of the PurpleTheme object + * Sets the directory of the PurpleTheme object. + * + * @param theme The purple theme. + * @param dir The directory of the PurpleTheme object. */ void purple_theme_set_dir(PurpleTheme *theme, const gchar *dir); /** - * Returns the image preview of the PurpleTheme object - * - * @param theme the purple theme + * Returns the image preview of the PurpleTheme object. * - * @return The image preview of the PurpleTheme object + * @param theme The purple theme. + * + * @return The image preview of the PurpleTheme object. */ const gchar *purple_theme_get_image(PurpleTheme *theme); /** - * Returns the image preview and directory of the PurpleTheme object - * - * @param theme the purple theme + * Returns the image preview and directory of the PurpleTheme object. * - * @return The image preview of the PurpleTheme object + * @param theme The purple theme. + * + * @return The image preview of the PurpleTheme object. */ gchar *purple_theme_get_image_full(PurpleTheme *theme); /** - * Sets the directory of the PurpleTheme object - * - * @param theme the purple theme - * @param img the image preview of the PurpleTheme object + * Sets the directory of the PurpleTheme object. + * + * @param theme The purple theme. + * @param img The image preview of the PurpleTheme object. */ void purple_theme_set_image(PurpleTheme *theme, const gchar *img); G_END_DECLS -#endif /* _PURPLE_THEME_H_ */ +#endif /* PURPLE_THEME_H */
--- a/pidgin/gtkblist-theme-loader.c Sat Jan 24 03:11:09 2009 +0000 +++ b/pidgin/gtkblist-theme-loader.c Sun Jan 25 22:55:23 2009 +0000 @@ -18,7 +18,6 @@ * 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 <stdlib.h> @@ -31,9 +30,11 @@ /****************************************************************************** * Globals *****************************************************************************/ + #define DEFAULT_TEXT_COLOR "black" + /***************************************************************************** - * Buddy List Theme Builder + * Buddy List Theme Builder *****************************************************************************/ static PurpleTheme * @@ -65,7 +66,7 @@ /* init all structs and colors */ bgcolor = g_new0(GdkColor, 1); expanded_bgcolor = g_new0(GdkColor, 1); - collapsed_bgcolor = g_new0(GdkColor, 1); + collapsed_bgcolor = g_new0(GdkColor, 1); layout = g_new0(PidginBlistLayout, 1); @@ -78,7 +79,7 @@ away = g_new0(FontColorPair, 1); offline = g_new0(FontColorPair, 1); idle = g_new0(FontColorPair, 1); - message = g_new0(FontColorPair, 1); + message = g_new0(FontColorPair, 1); message_nick_said = g_new0(FontColorPair, 1); status = g_new0(FontColorPair, 1); @@ -94,14 +95,13 @@ /* <groups> */ if ((success = (success && (sub_node = xmlnode_get_child(root_node, "groups")) != NULL - && (sub_sub_node = xmlnode_get_child(sub_node, "expanded")) != NULL))) { - + && (sub_sub_node = xmlnode_get_child(sub_node, "expanded")) != NULL))) + { expanded->font = g_strdup(xmlnode_get_attrib(sub_sub_node, "font")); if ((temp = xmlnode_get_attrib(sub_sub_node, "text_color")) != NULL && gdk_color_parse(temp, &color)) expanded->color = g_strdup(temp); else expanded->color = g_strdup(DEFAULT_TEXT_COLOR); - if ((temp = xmlnode_get_attrib(sub_sub_node, "background")) != NULL && gdk_color_parse(temp, expanded_bgcolor)) gdk_colormap_alloc_color(gdk_colormap_get_system(), expanded_bgcolor, FALSE, TRUE); @@ -111,8 +111,8 @@ } } - if ((success = (success && sub_node != NULL && (sub_sub_node = xmlnode_get_child(sub_node, "collapsed")) != NULL))) { - + if ((success = (success && sub_node != NULL && (sub_sub_node = xmlnode_get_child(sub_node, "collapsed")) != NULL))) + { collapsed->font = g_strdup(xmlnode_get_attrib(sub_sub_node, "font")); if((temp = xmlnode_get_attrib(sub_sub_node, "text_color")) != NULL && gdk_color_parse(temp, &color)) @@ -129,13 +129,13 @@ /* <buddys> */ if ((success = (success && (sub_node = xmlnode_get_child(root_node, "buddys")) != NULL && - (sub_sub_node = xmlnode_get_child(sub_node, "placement")) != NULL))) { - + (sub_sub_node = xmlnode_get_child(sub_node, "placement")) != NULL))) + { layout->status_icon = (temp = xmlnode_get_attrib(sub_sub_node, "status_icon")) != NULL ? atoi(temp) : 0; layout->text = (temp = xmlnode_get_attrib(sub_sub_node, "name")) != NULL ? atoi(temp) : 1; layout->emblem = (temp = xmlnode_get_attrib(sub_sub_node, "emblem")) != NULL ? atoi(temp) : 2; layout->protocol_icon = (temp = xmlnode_get_attrib(sub_sub_node, "protocol_icon")) != NULL ? atoi(temp) : 3; - layout->buddy_icon = (temp = xmlnode_get_attrib(sub_sub_node, "buddy_icon")) != NULL ? atoi(temp) : 4; + layout->buddy_icon = (temp = xmlnode_get_attrib(sub_sub_node, "buddy_icon")) != NULL ? atoi(temp) : 4; layout->show_status = (temp = xmlnode_get_attrib(sub_sub_node, "status_icon")) != NULL ? atoi(temp) != 0 : 1; } @@ -147,7 +147,7 @@ contact_color = NULL; } } - + if ((success = (success && sub_node != NULL && (sub_sub_node = xmlnode_get_child(sub_node, "contact_text")) != NULL))) { contact->font = g_strdup(xmlnode_get_attrib(sub_sub_node, "font")); if(gdk_color_parse(temp = xmlnode_get_attrib(sub_sub_node, "color"), &color)) @@ -182,7 +182,7 @@ idle->color = g_strdup(temp); else online->color = g_strdup(DEFAULT_TEXT_COLOR); } - + if ((success = (success && sub_node != NULL && (sub_sub_node = xmlnode_get_child(sub_node, "message_text")) != NULL))) { message->font = g_strdup(xmlnode_get_attrib(sub_sub_node, "font")); if(gdk_color_parse(temp = xmlnode_get_attrib(sub_sub_node, "color"), &color)) @@ -196,7 +196,7 @@ message_nick_said->color = g_strdup(temp); else message_nick_said->color = g_strdup(DEFAULT_TEXT_COLOR); } - + if ((success = (success && sub_node != NULL && (sub_sub_node = xmlnode_get_child(sub_node, "status_text")) != NULL))) { status->font = g_strdup(xmlnode_get_attrib(sub_sub_node, "font")); if(gdk_color_parse(temp = xmlnode_get_attrib(sub_sub_node, "color"), &color)) @@ -209,29 +209,29 @@ /* the new theme */ theme = g_object_new(PIDGIN_TYPE_BLIST_THEME, - "type", "blist", - "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, - "background-color", bgcolor, - "layout", layout, - "expanded-color", expanded_bgcolor, - "expanded-text", expanded, - "collapsed-color", collapsed_bgcolor, - "collapsed-text", collapsed, - "contact-color", contact_color, - "contact", contact, - "online", online, - "away", away, - "offline", offline, - "idle", idle, - "message", message, - "message_nick_said", message_nick_said, - "status", status, NULL); + "type", "blist", + "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, + "background-color", bgcolor, + "layout", layout, + "expanded-color", expanded_bgcolor, + "expanded-text", expanded, + "collapsed-color", collapsed_bgcolor, + "collapsed-text", collapsed, + "contact-color", contact_color, + "contact", contact, + "online", online, + "away", away, + "offline", offline, + "idle", idle, + "message", message, + "message_nick_said", message_nick_said, + "status", status, NULL); - xmlnode_free(root_node); + xmlnode_free(root_node); g_free(data); /* malformed xml file - also frees all partial data*/ @@ -244,7 +244,7 @@ } /****************************************************************************** - * GObject Stuff + * GObject Stuff *****************************************************************************/ static void @@ -255,29 +255,25 @@ loader_klass->purple_theme_loader_build = pidgin_blist_loader_build; } - -GType +GType pidgin_blist_theme_loader_get_type(void) { - static GType type = 0; - if (type == 0) { - static const GTypeInfo info = { - sizeof (PidginBlistThemeLoaderClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc)pidgin_blist_theme_loader_class_init, /* class_init */ - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (PidginBlistThemeLoader), - 0, /* n_preallocs */ - NULL, /* instance_init */ - NULL, /* value table */ - }; - type = g_type_register_static(PURPLE_TYPE_THEME_LOADER, - "PidginBlistThemeLoader", - &info, 0); - } - return type; + static GType type = 0; + if (type == 0) { + static const GTypeInfo info = { + sizeof(PidginBlistThemeLoaderClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc)pidgin_blist_theme_loader_class_init, /* class_init */ + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof(PidginBlistThemeLoader), + 0, /* n_preallocs */ + NULL, /* instance_init */ + NULL, /* value table */ + }; + type = g_type_register_static(PURPLE_TYPE_THEME_LOADER, + "PidginBlistThemeLoader", &info, 0); + } + return type; } - -
--- a/pidgin/gtkblist-theme-loader.h Sat Jan 24 03:11:09 2009 +0000 +++ b/pidgin/gtkblist-theme-loader.h Sun Jan 25 22:55:23 2009 +0000 @@ -23,8 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _PIDGIN_BLIST_THEME_LOADER_H_ -#define _PIDGIN_BLIST_THEME_LOADER_H_ +#ifndef PIDGIN_BLIST_THEME_LOADER_H +#define PIDGIN_BLIST_THEME_LOADER_H #include <glib.h> #include <glib-object.h> @@ -39,12 +39,12 @@ typedef struct _PidginBlistThemeLoader PidginBlistThemeLoader; typedef struct _PidginBlistThemeLoaderClass PidginBlistThemeLoaderClass; -#define PIDGIN_TYPE_BLIST_THEME_LOADER (pidgin_blist_theme_loader_get_type ()) -#define PIDGIN_BLIST_THEME_LOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_BLIST_THEME_LOADER, PidginBlistThemeLoader)) -#define PIDGIN_BLIST_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_BLIST_THEME_LOADER, PidginBlistThemeLoaderClass)) -#define PIDGIN_IS_BLIST_THEME_LOADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_BLIST_THEME_LOADER)) -#define PIDGIN_IS_BLIST_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_BLIST_THEME_LOADER)) -#define PIDGIN_BLIST_THEME_LOADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_BLIST_THEME_LOADER, PidginBlistThemeLoaderClass)) +#define PIDGIN_TYPE_BLIST_THEME_LOADER (pidgin_blist_theme_loader_get_type ()) +#define PIDGIN_BLIST_THEME_LOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_BLIST_THEME_LOADER, PidginBlistThemeLoader)) +#define PIDGIN_BLIST_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_BLIST_THEME_LOADER, PidginBlistThemeLoaderClass)) +#define PIDGIN_IS_BLIST_THEME_LOADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_BLIST_THEME_LOADER)) +#define PIDGIN_IS_BLIST_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_BLIST_THEME_LOADER)) +#define PIDGIN_BLIST_THEME_LOADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_BLIST_THEME_LOADER, PidginBlistThemeLoaderClass)) struct _PidginBlistThemeLoader { @@ -68,4 +68,4 @@ GType pidgin_blist_theme_loader_get_type(void); G_END_DECLS -#endif /* _PIDGIN_BLIST_THEME_LOADER_H_ */ +#endif /* PIDGIN_BLIST_THEME_LOADER_H */
--- a/pidgin/gtkblist-theme.c Sat Jan 24 03:11:09 2009 +0000 +++ b/pidgin/gtkblist-theme.c Sun Jan 25 22:55:23 2009 +0000 @@ -18,7 +18,6 @@ * 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 "gtkblist-theme.h" @@ -29,12 +28,13 @@ /****************************************************************************** * Structs *****************************************************************************/ + typedef struct { /* Buddy list */ gdouble opacity; GdkColor *bgcolor; PidginBlistLayout *layout; - + /* groups */ GdkColor *expanded_color; FontColorPair *expanded; @@ -67,6 +67,7 @@ /****************************************************************************** * Enums *****************************************************************************/ + enum { PROP_ZERO = 0, PROP_BACKGROUND_COLOR, @@ -92,9 +93,9 @@ *****************************************************************************/ void -free_font_and_color(FontColorPair *pair) +free_font_and_color(FontColorPair *pair) { - if(pair != NULL){ + if (pair != NULL) { if (pair->font) g_free(pair->font); if (pair->color) @@ -104,23 +105,23 @@ } /****************************************************************************** - * GObject Stuff + * GObject Stuff *****************************************************************************/ static void pidgin_blist_theme_init(GTypeInstance *instance, - gpointer klass) + gpointer klass) { (PIDGIN_BLIST_THEME(instance))->priv = g_new0(PidginBlistThemePrivate, 1); } static void pidgin_blist_theme_get_property(GObject *obj, guint param_id, GValue *value, - GParamSpec *psec) + GParamSpec *psec) { PidginBlistTheme *theme = PIDGIN_BLIST_THEME(obj); - switch(param_id) { + switch (param_id) { case PROP_BACKGROUND_COLOR: g_value_set_pointer(value, pidgin_blist_theme_get_background_color(theme)); break; @@ -177,11 +178,11 @@ static void pidgin_blist_theme_set_property(GObject *obj, guint param_id, const GValue *value, - GParamSpec *psec) + GParamSpec *psec) { PidginBlistTheme *theme = PIDGIN_BLIST_THEME(obj); - switch(param_id) { + switch (param_id) { case PROP_BACKGROUND_COLOR: pidgin_blist_theme_set_background_color(theme, g_value_get_pointer(value)); break; @@ -235,8 +236,9 @@ break; } } -static void -pidgin_blist_theme_finalize (GObject *obj) + +static void +pidgin_blist_theme_finalize(GObject *obj) { PidginBlistThemePrivate *priv; @@ -244,7 +246,7 @@ /* Buddy List */ g_free(priv->layout); - + /* Group */ free_font_and_color(priv->expanded); free_font_and_color(priv->collapsed); @@ -264,7 +266,7 @@ } static void -pidgin_blist_theme_class_init (PidginBlistThemeClass *klass) +pidgin_blist_theme_class_init(PidginBlistThemeClass *klass) { GObjectClass *obj_class = G_OBJECT_CLASS(klass); GParamSpec *pspec; @@ -277,114 +279,114 @@ /* Buddy List */ pspec = g_param_spec_pointer("background-color", "Background Color", - "The background color for the buddy list", - G_PARAM_READWRITE); + "The background color for the buddy list", + G_PARAM_READWRITE); g_object_class_install_property(obj_class, PROP_BACKGROUND_COLOR, pspec); pspec = g_param_spec_pointer("layout", "Layout", - "The layout of icons, name, and status of the blist", - G_PARAM_READWRITE); + "The layout of icons, name, and status of the blist", + G_PARAM_READWRITE); g_object_class_install_property(obj_class, PROP_LAYOUT, pspec); /* Group */ pspec = g_param_spec_pointer("expanded-color", "Expanded Background Color", - "The background color of an expanded group", - G_PARAM_READWRITE); + "The background color of an expanded group", + G_PARAM_READWRITE); g_object_class_install_property(obj_class, PROP_EXPANDED_COLOR, pspec); pspec = g_param_spec_pointer("expanded-text", "Expanded Text", - "The text information for when a group is expanded", - G_PARAM_READWRITE); + "The text information for when a group is expanded", + G_PARAM_READWRITE); g_object_class_install_property(obj_class, PROP_EXPANDED_TEXT, pspec); pspec = g_param_spec_pointer("collapsed-color", "Collapsed Background Color", - "The background color of a collapsed group", - G_PARAM_READWRITE); + "The background color of a collapsed group", + G_PARAM_READWRITE); g_object_class_install_property(obj_class, PROP_COLLAPSED_COLOR, pspec); pspec = g_param_spec_pointer("collapsed-text", "Collapsed Text", - "The text information for when a group is collapsed", - G_PARAM_READWRITE); + "The text information for when a group is collapsed", + G_PARAM_READWRITE); g_object_class_install_property(obj_class, PROP_COLLAPSED_TEXT, pspec); /* Buddy */ pspec = g_param_spec_pointer("contact-color", "Contact/Chat Background Color", - "The background color of a contact or chat", - G_PARAM_READWRITE); + "The background color of a contact or chat", + G_PARAM_READWRITE); g_object_class_install_property(obj_class, PROP_CONTACT_COLOR, pspec); pspec = g_param_spec_pointer("contact", "Contact Text", - "The text information for when a contact is expanded", - G_PARAM_READWRITE); + "The text information for when a contact is expanded", + G_PARAM_READWRITE); g_object_class_install_property(obj_class, PROP_CONTACT, pspec); pspec = g_param_spec_pointer("online", "On-line Text", - "The text information for when a buddy is online", - G_PARAM_READWRITE); + "The text information for when a buddy is online", + G_PARAM_READWRITE); g_object_class_install_property(obj_class, PROP_ONLINE, pspec); pspec = g_param_spec_pointer("away", "Away Text", - "The text information for when a buddy is away", - G_PARAM_READWRITE); + "The text information for when a buddy is away", + G_PARAM_READWRITE); g_object_class_install_property(obj_class, PROP_AWAY, pspec); pspec = g_param_spec_pointer("offline", "Off-line Text", - "The text information for when a buddy is off-line", - G_PARAM_READWRITE); + "The text information for when a buddy is off-line", + G_PARAM_READWRITE); g_object_class_install_property(obj_class, PROP_OFFLINE, pspec); pspec = g_param_spec_pointer("idle", "Idle Text", - "The text information for when a buddy is idle", - G_PARAM_READWRITE); + "The text information for when a buddy is idle", + G_PARAM_READWRITE); g_object_class_install_property(obj_class, PROP_IDLE, pspec); pspec = g_param_spec_pointer("message", "Message Text", - "The text information for when a buddy has an unread message", - G_PARAM_READWRITE); + "The text information for when a buddy has an unread message", + G_PARAM_READWRITE); g_object_class_install_property(obj_class, PROP_MESSAGE, pspec); pspec = g_param_spec_pointer("message_nick_said", "Message (Nick Said) Text", - "The text information for when a chat has an unread message that mentions your nick", - G_PARAM_READWRITE); + "The text information for when a chat has an unread message that mentions your nick", + G_PARAM_READWRITE); g_object_class_install_property(obj_class, PROP_MESSAGE_NICK_SAID, pspec); pspec = g_param_spec_pointer("status", "Status Text", - "The text information for a buddy's status", - G_PARAM_READWRITE); + "The text information for a buddy's status", + G_PARAM_READWRITE); g_object_class_install_property(obj_class, PROP_STATUS, pspec); } -GType +GType pidgin_blist_theme_get_type (void) { - static GType type = 0; - if (type == 0) { - static GTypeInfo info = { - sizeof (PidginBlistThemeClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc)pidgin_blist_theme_class_init, /* class_init */ - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (PidginBlistTheme), - 0, /* n_preallocs */ - pidgin_blist_theme_init, /* instance_init */ - NULL, /* value table */ - }; - type = g_type_register_static (PURPLE_TYPE_THEME, - "PidginBlistTheme", - &info, 0); - } - return type; + static GType type = 0; + if (type == 0) { + static GTypeInfo info = { + sizeof(PidginBlistThemeClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc)pidgin_blist_theme_class_init, /* class_init */ + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof(PidginBlistTheme), + 0, /* n_preallocs */ + pidgin_blist_theme_init, /* instance_init */ + NULL, /* value table */ + }; + type = g_type_register_static (PURPLE_TYPE_THEME, + "PidginBlistTheme", &info, 0); + } + return type; } /***************************************************************************** - * Public API functions + * Public API functions *****************************************************************************/ /* get methods */ + GdkColor * pidgin_blist_theme_get_background_color(PidginBlistTheme *theme) { @@ -636,7 +638,7 @@ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme)); - free_font_and_color(priv->expanded); + free_font_and_color(priv->expanded); priv->expanded = pair; } @@ -661,7 +663,7 @@ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme)); - free_font_and_color(priv->collapsed); + free_font_and_color(priv->collapsed); priv->collapsed = pair; } @@ -686,7 +688,7 @@ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme)); - free_font_and_color(priv->contact); + free_font_and_color(priv->contact); priv->contact = pair; } @@ -699,7 +701,7 @@ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme)); - free_font_and_color(priv->online); + free_font_and_color(priv->online); priv->online = pair; } @@ -712,7 +714,7 @@ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme)); - free_font_and_color(priv->away); + free_font_and_color(priv->away); priv->away = pair; } @@ -725,7 +727,7 @@ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme)); - free_font_and_color(priv->offline); + free_font_and_color(priv->offline); priv->offline = pair; } @@ -738,7 +740,7 @@ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme)); - free_font_and_color(priv->idle); + free_font_and_color(priv->idle); priv->idle = pair; } @@ -751,7 +753,7 @@ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme)); - free_font_and_color(priv->message); + free_font_and_color(priv->message); priv->message = pair; } @@ -777,6 +779,6 @@ priv = PIDGIN_BLIST_THEME_GET_PRIVATE(G_OBJECT(theme)); - free_font_and_color(priv->status); + free_font_and_color(priv->status); priv->status = pair; }
--- a/pidgin/gtkblist-theme.h Sat Jan 24 03:11:09 2009 +0000 +++ b/pidgin/gtkblist-theme.h Sun Jan 25 22:55:23 2009 +0000 @@ -23,8 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _PIDGIN_BLIST_THEME_H_ -#define _PIDGIN_BLIST_THEME_H_ +#ifndef PIDGIN_BLIST_THEME_H +#define PIDGIN_BLIST_THEME_H #include <glib.h> #include <glib-object.h> @@ -33,7 +33,6 @@ #include "theme.h" /** - * extends PurpleTheme (theme.h) * A pidgin buddy list theme. * This is an object for Purple to represent a buddy list theme. * @@ -42,12 +41,12 @@ typedef struct _PidginBlistTheme PidginBlistTheme; typedef struct _PidginBlistThemeClass PidginBlistThemeClass; -#define PIDGIN_TYPE_BLIST_THEME (pidgin_blist_theme_get_type ()) -#define PIDGIN_BLIST_THEME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_BLIST_THEME, PidginBlistTheme)) -#define PIDGIN_BLIST_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_BLIST_THEME, PidginBlistThemeClass)) -#define PIDGIN_IS_BLIST_THEME(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_BLIST_THEME)) -#define PIDGIN_IS_BLIST_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_BLIST_THEME)) -#define PIDGIN_BLIST_THEME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_BLIST_THEME, PidginBlistThemeClass)) +#define PIDGIN_TYPE_BLIST_THEME (pidgin_blist_theme_get_type ()) +#define PIDGIN_BLIST_THEME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_BLIST_THEME, PidginBlistTheme)) +#define PIDGIN_BLIST_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_BLIST_THEME, PidginBlistThemeClass)) +#define PIDGIN_IS_BLIST_THEME(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_BLIST_THEME)) +#define PIDGIN_IS_BLIST_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_BLIST_THEME)) +#define PIDGIN_BLIST_THEME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_BLIST_THEME, PidginBlistThemeClass)) struct _PidginBlistTheme { @@ -74,12 +73,12 @@ gint emblem; gint protocol_icon; gint buddy_icon; - gboolean show_status; + gboolean show_status; } PidginBlistLayout; /**************************************************************************/ -/** @name FontColorPair API */ +/** @name FontColorPair API */ /**************************************************************************/ /** @@ -101,101 +100,101 @@ /* get methods */ /** - * Returns the background color of the buddy list + * Returns the background color of the buddy list. * - * @returns a gdk color + * @returns A gdk color. */ GdkColor *pidgin_blist_theme_get_background_color(PidginBlistTheme *theme); /** * Returns the opacity of the buddy list window - * (0.0 or clear to 1.0 fully Opaque) + * (0.0 or clear to 1.0 fully opaque). * - * @returns the opacity + * @returns The opacity */ gdouble pidgin_blist_theme_get_opacity(PidginBlistTheme *theme); /** - * Returns the layout to be used with the buddy list + * Returns the layout to be used with the buddy list. * - * @returns the buddy list layout + * @returns The buddy list layout. */ PidginBlistLayout *pidgin_blist_theme_get_layout(PidginBlistTheme *theme); /** - * Returns the background color to be used with expanded groups + * Returns the background color to be used with expanded groups. * - * @returns a gdk color + * @returns A gdk color. */ GdkColor *pidgin_blist_theme_get_expanded_background_color(PidginBlistTheme *theme); /** - * Returns the text font and color to be used with expanded groups + * Returns the text font and color to be used with expanded groups. * - * @returns a font and color pair + * @returns A font and color pair. */ FontColorPair *pidgin_blist_theme_get_expanded_text_info(PidginBlistTheme *theme); /** - * Returns the background color to be used with collapsed groups + * Returns the background color to be used with collapsed groups. * - * @returns a gdk color + * @returns A gdk color. */ GdkColor *pidgin_blist_theme_get_collapsed_background_color(PidginBlistTheme *theme); /** - * Returns the text font and color to be used with collapsed groups + * Returns the text font and color to be used with collapsed groups. * - * @returns a font and color pair + * @returns A font and color pair. */ FontColorPair *pidgin_blist_theme_get_collapsed_text_info(PidginBlistTheme *theme); /** - * Returns the colors to be used for contacts and chats + * Returns the colors to be used for contacts and chats. * - * @returns a gdkcolor for contacts and chats + * @returns A gdkcolor for contacts and chats. */ GdkColor *pidgin_blist_theme_get_contact_color(PidginBlistTheme *theme); /** - * Returns the text font and color to be used for expanded contacts + * Returns the text font and color to be used for expanded contacts. * - * @returns a font and color pair + * @returns A font and color pair. */ FontColorPair *pidgin_blist_theme_get_contact_text_info(PidginBlistTheme *theme); /** - * Returns the text font and color to be used for online buddies + * Returns the text font and color to be used for online buddies. * - * @returns a font and color pair + * @returns A font and color pair. */ FontColorPair *pidgin_blist_theme_get_online_text_info(PidginBlistTheme *theme); /** - * Returns the text font and color to be used for away and idle buddies + * Returns the text font and color to be used for away and idle buddies. * - * @returns a font and color pair + * @returns A font and color pair. */ FontColorPair *pidgin_blist_theme_get_away_text_info(PidginBlistTheme *theme); /** - * Returns the text font and color to be used for offline buddies + * Returns the text font and color to be used for offline buddies. * - * @returns a font and color pair + * @returns A font and color pair. */ FontColorPair *pidgin_blist_theme_get_offline_text_info(PidginBlistTheme *theme); /** - * Returns the text font and color to be used for idle buddies + * Returns the text font and color to be used for idle buddies. * - * @returns a font and color pair + * @returns A font and color pair. */ FontColorPair *pidgin_blist_theme_get_idle_text_info(PidginBlistTheme *theme); /** - * Returns the text font and color to be used for buddies with unread messages + * Returns the text font and color to be used for buddies with unread messages. * - * @returns a font and color pair + * @returns A font and color pair. */ FontColorPair *pidgin_blist_theme_get_unread_message_text_info(PidginBlistTheme *theme); @@ -203,131 +202,131 @@ * Returns the text font and color to be used for chats with unread messages * that mention your nick. * - * @returns a font and color pair + * @returns A font and color pair. */ FontColorPair *pidgin_blist_theme_get_unread_message_nick_said_text_info(PidginBlistTheme *theme); /** - * Returns the text font and color to be used for a buddy's status message + * Returns the text font and color to be used for a buddy's status message. * - * @returns a font and color pair + * @returns A font and color pair. */ FontColorPair *pidgin_blist_theme_get_status_text_info(PidginBlistTheme *theme); /* Set Methods */ /** - * Sets the background color to be used for this buddy list theme + * Sets the background color to be used for this buddy list theme. * - * @param color the new background color + * @param color The new background color. */ void pidgin_blist_theme_set_background_color(PidginBlistTheme *theme, GdkColor *color); /** - * Sets the opacity to be used for this buddy list theme + * Sets the opacity to be used for this buddy list theme. * - * @param opacity the new opacity setting + * @param opacity The new opacity setting. */ void pidgin_blist_theme_set_opacity(PidginBlistTheme *theme, gdouble opacity); /** - * Sets the buddy list layout to be used for this buddy list theme + * Sets the buddy list layout to be used for this buddy list theme. * - * @param layout the new layout + * @param layout The new layout. */ void pidgin_blist_theme_set_layout(PidginBlistTheme *theme, PidginBlistLayout *layout); /** - * Sets the background color to be used for expanded groups + * Sets the background color to be used for expanded groups. * - * @param color the new background color + * @param color The new background color. */ void pidgin_blist_theme_set_expanded_background_color(PidginBlistTheme *theme, GdkColor *color); /** - * Sets the text color and font to be used for expanded groups + * Sets the text color and font to be used for expanded groups. * - * @param pair the new text font at color pair + * @param pair The new text font at color pair. */ void pidgin_blist_theme_set_expanded_text_info(PidginBlistTheme *theme, FontColorPair *pair); /** - * Sets the background color to be used for collapsed groups + * Sets the background color to be used for collapsed groups. * - * @param color the new background color + * @param color The new background color. */ void pidgin_blist_theme_set_collapsed_background_color(PidginBlistTheme *theme, GdkColor *color); /** - * Sets the text color and font to be used for expanded groups + * Sets the text color and font to be used for expanded groups. * - * @param pair the new text font at color pair + * @param pair The new text font at color pair. */ void pidgin_blist_theme_set_collapsed_text_info(PidginBlistTheme *theme, FontColorPair *pair); /** - * Sets the background color to be used for contacts and chats + * Sets the background color to be used for contacts and chats. * - * @param color the color to use for contacts and chats + * @param color The color to use for contacts and chats. */ void pidgin_blist_theme_set_contact_color(PidginBlistTheme *theme, GdkColor *color); /** - * Sets the text color and font to be used for expanded contacts + * Sets the text color and font to be used for expanded contacts. * - * @param pair the new text font at color pair + * @param pair The new text font at color pair. */ void pidgin_blist_theme_set_contact_text_info(PidginBlistTheme *theme, FontColorPair *pair); /** - * Sets the text color and font to be used for online buddies + * Sets the text color and font to be used for online buddies. * - * @param pair the new text font at color pair + * @param pair The new text font at color pair. */ void pidgin_blist_theme_set_online_text_info(PidginBlistTheme *theme, FontColorPair *pair); /** - * Sets the text color and font to be used for away and idle buddies + * Sets the text color and font to be used for away and idle buddies. * - * @param pair the new text font at color pair + * @param pair The new text font at color pair. */ void pidgin_blist_theme_set_away_text_info(PidginBlistTheme *theme, FontColorPair *pair); /** - * Sets the text color and font to be used for offline buddies + * Sets the text color and font to be used for offline buddies. * - * @param pair the new text font at color pair + * @param pair The new text font at color pair. */ void pidgin_blist_theme_set_offline_text_info(PidginBlistTheme *theme, FontColorPair *pair); /** - * Sets the text color and font to be used for idle buddies + * Sets the text color and font to be used for idle buddies. * - * @param pair the new text font at color pair + * @param pair The new text font at color pair. */ void pidgin_blist_theme_set_idle_text_info(PidginBlistTheme *theme, FontColorPair *pair); /** - * Sets the text color and font to be used for buddies with unread messages + * Sets the text color and font to be used for buddies with unread messages. * - * @param pair the new text font at color pair + * @param pair The new text font at color pair. */ void pidgin_blist_theme_set_unread_message_text_info(PidginBlistTheme *theme, FontColorPair *pair); /** * Sets the text color and font to be used for a chat with unread messages - * that mention your nick + * that mention your nick. * - * @param pair the new text font at color pair + * @param pair The new text font at color pair. */ void pidgin_blist_theme_set_unread_message_nick_said_text_info(PidginBlistTheme *theme, FontColorPair *pair); /** - * Sets the text color and font to be used for buddy status messages + * Sets the text color and font to be used for buddy status messages. * - * @param pair the new text font at color pair + * @param pair The new text font at color pair. */ void pidgin_blist_theme_set_status_text_info(PidginBlistTheme *theme, FontColorPair *pair); G_END_DECLS -#endif /* _PIDGIN_BLIST_THEME_H_ */ +#endif /* PIDGIN_BLIST_THEME_H */
--- a/pidgin/gtkicon-theme-loader.c Sat Jan 24 03:11:09 2009 +0000 +++ b/pidgin/gtkicon-theme-loader.c Sun Jan 25 22:55:23 2009 +0000 @@ -18,7 +18,6 @@ * 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 "gtkicon-theme-loader.h" @@ -27,7 +26,7 @@ #include "xmlnode.h" /***************************************************************************** - * Icon Theme Builder + * Icon Theme Builder *****************************************************************************/ static PurpleTheme * @@ -42,41 +41,41 @@ 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"); + root_node = xmlnode_from_file(dir, "theme.xml", "sound themes", "sound-theme-loader"); g_free(filename_full); g_return_val_if_fail(root_node != NULL, NULL); - /* Parse the tree */ + /* 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(PIDGIN_TYPE_STATUS_ICON_THEME, - "type", "status-icon", - "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); - + "type", "status-icon", + "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, "icon"); - while (sub_node){ + while (sub_node) { pidgin_icon_theme_set_icon(theme, - xmlnode_get_attrib(sub_node, "id"), - xmlnode_get_attrib(sub_node, "file")); + xmlnode_get_attrib(sub_node, "id"), + xmlnode_get_attrib(sub_node, "file")); sub_node = xmlnode_get_next_twin(sub_node); } } - xmlnode_free(root_node); + xmlnode_free(root_node); g_free(data); return PURPLE_THEME(theme); } /****************************************************************************** - * GObject Stuff + * GObject Stuff *****************************************************************************/ static void @@ -88,28 +87,25 @@ } -GType +GType pidgin_icon_theme_loader_get_type (void) { - static GType type = 0; - if (type == 0) { - static const GTypeInfo info = { - sizeof (PidginIconThemeLoaderClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc)pidgin_icon_theme_loader_class_init, /* class_init */ - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (PidginIconThemeLoader), - 0, /* n_preallocs */ - NULL, /* instance_init */ - NULL, /* value table */ - }; - type = g_type_register_static (PURPLE_TYPE_THEME_LOADER, - "PidginIconThemeLoader", - &info, 0); - } - return type; + static GType type = 0; + if (type == 0) { + static const GTypeInfo info = { + sizeof(PidginIconThemeLoaderClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc)pidgin_icon_theme_loader_class_init, /* class_init */ + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (PidginIconThemeLoader), + 0, /* n_preallocs */ + NULL, /* instance_init */ + NULL, /* value table */ + }; + type = g_type_register_static (PURPLE_TYPE_THEME_LOADER, + "PidginIconThemeLoader", &info, 0); + } + return type; } - -
--- a/pidgin/gtkicon-theme-loader.h Sat Jan 24 03:11:09 2009 +0000 +++ b/pidgin/gtkicon-theme-loader.h Sun Jan 25 22:55:23 2009 +0000 @@ -23,8 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _PIDGIN_ICON_THEME_LOADER_H_ -#define _PIDGIN_ICON_THEME_LOADER_H_ +#ifndef PIDGIN_ICON_THEME_LOADER_H +#define PIDGIN_ICON_THEME_LOADER_H #include <glib.h> #include <glib-object.h> @@ -37,14 +37,14 @@ * PidginIconThemeLoader is a GObject. */ typedef struct _PidginIconThemeLoader PidginIconThemeLoader; -typedef struct _PidginIconThemeLoaderClass PidginIconThemeLoaderClass; +typedef struct _PidginIconThemeLoaderClass PidginIconThemeLoaderClass; -#define PIDGIN_TYPE_ICON_THEME_LOADER (pidgin_icon_theme_loader_get_type ()) -#define PIDGIN_ICON_THEME_LOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_ICON_THEME_LOADER, PidginIconThemeLoader)) -#define PIDGIN_ICON_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_ICON_THEME_LOADER, PidginIconThemeLoaderClass)) -#define PIDGIN_IS_ICON_THEME_LOADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_ICON_THEME_LOADER)) -#define PIDGIN_IS_ICON_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_ICON_THEME_LOADER)) -#define PIDGIN_ICON_THEME_LOADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_ICON_THEME_LOADER, PidginIconThemeLoaderClass)) +#define PIDGIN_TYPE_ICON_THEME_LOADER (pidgin_icon_theme_loader_get_type ()) +#define PIDGIN_ICON_THEME_LOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_ICON_THEME_LOADER, PidginIconThemeLoader)) +#define PIDGIN_ICON_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_ICON_THEME_LOADER, PidginIconThemeLoaderClass)) +#define PIDGIN_IS_ICON_THEME_LOADER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_ICON_THEME_LOADER)) +#define PIDGIN_IS_ICON_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_ICON_THEME_LOADER)) +#define PIDGIN_ICON_THEME_LOADER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_ICON_THEME_LOADER, PidginIconThemeLoaderClass)) struct _PidginIconThemeLoader { @@ -68,4 +68,4 @@ GType pidgin_icon_theme_loader_get_type(void); G_END_DECLS -#endif /* _PIDGIN_ICON_THEME_LOADER_H_ */ +#endif /* PIDGIN_ICON_THEME_LOADER_H */
--- a/pidgin/gtkicon-theme.c Sat Jan 24 03:11:09 2009 +0000 +++ b/pidgin/gtkicon-theme.c Sun Jan 25 22:55:23 2009 +0000 @@ -18,7 +18,6 @@ * 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 "gtkicon-theme.h" @@ -29,10 +28,10 @@ #define PIDGIN_ICON_THEME_GET_PRIVATE(Gobject) \ ((PidginIconThemePrivate *) ((PIDGIN_ICON_THEME(Gobject))->priv)) - /****************************************************************************** * Structs *****************************************************************************/ + typedef struct { /* used to store filenames of diffrent icons */ GHashTable *icon_files; @@ -45,12 +44,12 @@ static GObjectClass *parent_class = NULL; /****************************************************************************** - * GObject Stuff + * GObject Stuff *****************************************************************************/ static void pidgin_icon_theme_init(GTypeInstance *instance, - gpointer klass) + gpointer klass) { PidginIconThemePrivate *priv; @@ -59,18 +58,16 @@ priv = PIDGIN_ICON_THEME_GET_PRIVATE(instance); priv->icon_files = g_hash_table_new_full(g_str_hash, - g_str_equal, - g_free, - g_free); + g_str_equal, g_free, g_free); } -static void +static void pidgin_icon_theme_finalize(GObject *obj) { PidginIconThemePrivate *priv; priv = PIDGIN_ICON_THEME_GET_PRIVATE(obj); - + g_hash_table_destroy(priv->icon_files); g_free(priv); @@ -84,64 +81,62 @@ parent_class = g_type_class_peek_parent(klass); - obj_class->finalize = pidgin_icon_theme_finalize; + obj_class->finalize = pidgin_icon_theme_finalize; } -GType +GType pidgin_icon_theme_get_type(void) { - static GType type = 0; - if (type == 0) { - static const GTypeInfo info = { - sizeof (PidginIconThemeClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc)pidgin_icon_theme_class_init, /* class_init */ - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (PidginIconTheme), - 0, /* n_preallocs */ - pidgin_icon_theme_init, /* instance_init */ - NULL, /* value table */ - }; - type = g_type_register_static(PURPLE_TYPE_THEME, - "PidginIconTheme", - &info, G_TYPE_FLAG_ABSTRACT); - } - return type; + static GType type = 0; + if (type == 0) { + static const GTypeInfo info = { + sizeof(PidginIconThemeClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc)pidgin_icon_theme_class_init, /* class_init */ + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof(PidginIconTheme), + 0, /* n_preallocs */ + pidgin_icon_theme_init, /* instance_init */ + NULL, /* value table */ + }; + type = g_type_register_static(PURPLE_TYPE_THEME, + "PidginIconTheme", &info, G_TYPE_FLAG_ABSTRACT); + } + return type; } - /***************************************************************************** - * Public API functions + * Public API functions *****************************************************************************/ const gchar * pidgin_icon_theme_get_icon(PidginIconTheme *theme, - const gchar *id) + const gchar *id) { PidginIconThemePrivate *priv; g_return_val_if_fail(PIDGIN_IS_ICON_THEME(theme), NULL); priv = PIDGIN_ICON_THEME_GET_PRIVATE(theme); - + return g_hash_table_lookup(priv->icon_files, id); } -void +void pidgin_icon_theme_set_icon(PidginIconTheme *theme, - const gchar *id, - const gchar *filename) + const gchar *id, + const gchar *filename) { PidginIconThemePrivate *priv; g_return_if_fail(PIDGIN_IS_ICON_THEME(theme)); - + priv = PIDGIN_ICON_THEME_GET_PRIVATE(theme); if (filename != NULL) g_hash_table_replace(priv->icon_files, - g_strdup(id), - g_strdup(filename)); - else g_hash_table_remove(priv->icon_files, id); + g_strdup(id), g_strdup(filename)); + else + g_hash_table_remove(priv->icon_files, id); }
--- a/pidgin/gtkicon-theme.h Sat Jan 24 03:11:09 2009 +0000 +++ b/pidgin/gtkicon-theme.h Sun Jan 25 22:55:23 2009 +0000 @@ -23,8 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _PIDGIN_ICON_THEME_H_ -#define _PIDGIN_ICON_THEME_H_ +#ifndef PIDGIN_ICON_THEME_H +#define PIDGIN_ICON_THEME_H #include <glib.h> #include <glib-object.h> @@ -40,12 +40,12 @@ typedef struct _PidginIconTheme PidginIconTheme; typedef struct _PidginIconThemeClass PidginIconThemeClass; -#define PIDGIN_TYPE_ICON_THEME (pidgin_icon_theme_get_type ()) -#define PIDGIN_ICON_THEME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_ICON_THEME, PidginIconTheme)) -#define PIDGIN_ICON_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_ICON_THEME, PidginIconThemeClass)) -#define PIDGIN_IS_ICON_THEME(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_ICON_THEME)) -#define PIDGIN_IS_ICON_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_ICON_THEME)) -#define PIDGIN_ICON_THEME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_ICON_THEME, PidginIconThemeClass)) +#define PIDGIN_TYPE_ICON_THEME (pidgin_icon_theme_get_type ()) +#define PIDGIN_ICON_THEME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_ICON_THEME, PidginIconTheme)) +#define PIDGIN_ICON_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_ICON_THEME, PidginIconThemeClass)) +#define PIDGIN_IS_ICON_THEME(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_ICON_THEME)) +#define PIDGIN_IS_ICON_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_ICON_THEME)) +#define PIDGIN_ICON_THEME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_ICON_THEME, PidginIconThemeClass)) struct _PidginIconTheme { @@ -77,7 +77,8 @@ * @returns the filename of the icon event */ const gchar *pidgin_icon_theme_get_icon(PidginIconTheme *theme, - const gchar *event); + const gchar *event); + /** * Sets the filename for a given icon id, setting the icon to NULL will remove the icon from the theme * @@ -85,8 +86,8 @@ * @param filename the name of the file to be used for the given id */ void pidgin_icon_theme_set_icon(PidginIconTheme *theme, - const gchar *icon_id, - const gchar *filename); + const gchar *icon_id, + const gchar *filename); G_END_DECLS -#endif /* _PIDGIN_ICON_THEME_H_ */ +#endif /* PIDGIN_ICON_THEME_H */
--- a/pidgin/gtkstatus-icon-theme.c Sat Jan 24 03:11:09 2009 +0000 +++ b/pidgin/gtkstatus-icon-theme.c Sun Jan 25 22:55:23 2009 +0000 @@ -18,7 +18,6 @@ * 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 "gtkstatus-icon-theme.h" @@ -26,13 +25,14 @@ /****************************************************************************** * Globals *****************************************************************************/ + static GObjectClass *parent_class = NULL; /****************************************************************************** - * GObject Stuff + * GObject Stuff *****************************************************************************/ -static void +static void pidgin_status_icon_theme_finalize(GObject *obj) { parent_class->finalize(obj); @@ -45,29 +45,28 @@ parent_class = g_type_class_peek_parent(klass); - obj_class->finalize = pidgin_status_icon_theme_finalize; + obj_class->finalize = pidgin_status_icon_theme_finalize; } -GType +GType pidgin_status_icon_theme_get_type(void) { - static GType type = 0; - if (type == 0) { - static const GTypeInfo info = { - sizeof (PidginStatusIconThemeClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc)pidgin_status_icon_theme_class_init, /* class_init */ - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (PidginStatusIconTheme), - 0, /* n_preallocs */ - NULL, - NULL, /* value table */ - }; - type = g_type_register_static(PIDGIN_TYPE_ICON_THEME, - "PidginStatusIconTheme", - &info, 0); - } - return type; + static GType type = 0; + if (type == 0) { + static const GTypeInfo info = { + sizeof (PidginStatusIconThemeClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc)pidgin_status_icon_theme_class_init, /* class_init */ + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (PidginStatusIconTheme), + 0, /* n_preallocs */ + NULL, + NULL, /* value table */ + }; + type = g_type_register_static(PIDGIN_TYPE_ICON_THEME, + "PidginStatusIconTheme", &info, 0); + } + return type; }
--- a/pidgin/gtkstatus-icon-theme.h Sat Jan 24 03:11:09 2009 +0000 +++ b/pidgin/gtkstatus-icon-theme.h Sun Jan 25 22:55:23 2009 +0000 @@ -23,8 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#ifndef _PIDGIN_STATUS_ICON_THEME_H_ -#define _PIDGIN_STATUS_ICON_THEME_H_ +#ifndef PIDGIN_STATUS_ICON_THEME_H +#define PIDGIN_STATUS_ICON_THEME_H #include <glib-object.h> #include "gtkicon-theme.h" @@ -39,12 +39,12 @@ typedef struct _PidginStatusIconTheme PidginStatusIconTheme; typedef struct _PidginStatusIconThemeClass PidginStatusIconThemeClass; -#define PIDGIN_TYPE_STATUS_ICON_THEME (pidgin_status_icon_theme_get_type ()) -#define PIDGIN_STATUS_ICON_THEME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_STATUS_ICON_THEME, PidginStatusIconTheme)) -#define PIDGIN_STATUS_ICON_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_STATUS_ICON_THEME, PidginStatusIconThemeClass)) -#define PIDGIN_IS_STATUS_ICON_THEME(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_STATUS_ICON_THEME)) -#define PIDGIN_IS_STATUS_ICON_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_STATUS_ICON_THEME)) -#define PIDGIN_STATUS_ICON_THEME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_STATUS_ICON_THEME, PidginStatusIconThemeClass)) +#define PIDGIN_TYPE_STATUS_ICON_THEME (pidgin_status_icon_theme_get_type ()) +#define PIDGIN_STATUS_ICON_THEME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_STATUS_ICON_THEME, PidginStatusIconTheme)) +#define PIDGIN_STATUS_ICON_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_STATUS_ICON_THEME, PidginStatusIconThemeClass)) +#define PIDGIN_IS_STATUS_ICON_THEME(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_STATUS_ICON_THEME)) +#define PIDGIN_IS_STATUS_ICON_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_STATUS_ICON_THEME)) +#define PIDGIN_STATUS_ICON_THEME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_STATUS_ICON_THEME, PidginStatusIconThemeClass)) struct _PidginStatusIconTheme { @@ -68,4 +68,4 @@ GType pidgin_status_icon_theme_get_type(void); G_END_DECLS -#endif /* _PIDGIN_STATUS_ICON_THEME_H_ */ +#endif /* PIDGIN_STATUS_ICON_THEME_H */
--- a/po/README Sat Jan 24 03:11:09 2009 +0000 +++ b/po/README Sun Jan 25 22:55:23 2009 +0000 @@ -1,2 +1,2 @@ -For information on translating Pidgin, Libpurple, and Finch, please see +For information on translating Pidgin, libpurple, and Finch, please see our wiki page at http://developer.pidgin.im/wiki/TipsForTranslators.
--- a/po/et.po Sat Jan 24 03:11:09 2009 +0000 +++ b/po/et.po Sun Jan 25 22:55:23 2009 +0000 @@ -2258,7 +2258,7 @@ #. * summary #. * description msgid "Tests the ciphers that ship with libpurple." -msgstr "Libpurple'ga kaasasolevate šifrite testimine." +msgstr "libpurple'ga kaasasolevate šifrite testimine." #. *< type #. *< ui_requirement