Mercurial > pidgin
changeset 28165:5e554e9296ac
merge of '193869c7b6c12d13ccb96d731ceb8fe5f3a82f2d'
and 'ea05c841d86670f2d6d02024b5dd61d126f18b39'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Tue, 01 Sep 2009 00:34:39 +0000 |
| parents | 8aa7df246e13 (current diff) 011fe3d13658 (diff) |
| children | a5fcfbc6f3f9 |
| files | |
| diffstat | 5 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/theme-loader.c Mon Aug 31 20:27:04 2009 +0000 +++ b/libpurple/theme-loader.c Tue Sep 01 00:34:39 2009 +0000 @@ -118,7 +118,7 @@ /* TYPE STRING (read only) */ pspec = g_param_spec_string("type", "Type", - "The string represtenting the type of the theme", + "The string representing the type of the theme", NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); g_object_class_install_property(obj_class, PROP_TYPE, pspec);
--- a/libpurple/theme-loader.h Mon Aug 31 20:27:04 2009 +0000 +++ b/libpurple/theme-loader.h Tue Sep 01 00:34:39 2009 +0000 @@ -71,11 +71,11 @@ GType purple_theme_loader_get_type(void); /** - * Returns the string represtenting the type of the theme loader + * Returns the string representing the type of the theme loader * * @param self The theme loader * - * @returns The string represting this type + * @returns The string representing this type */ const gchar *purple_theme_loader_get_type_string(PurpleThemeLoader *self);
--- a/libpurple/theme.c Mon Aug 31 20:27:04 2009 +0000 +++ b/libpurple/theme.c Tue Sep 01 00:34:39 2009 +0000 @@ -190,7 +190,7 @@ /* TYPE STRING (read only) */ pspec = g_param_spec_string("type", "Type", - "The string represtenting the type of the theme", + "The string representing the type of the theme", NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); g_object_class_install_property(obj_class, PROP_TYPE, pspec);
--- a/libpurple/theme.h Mon Aug 31 20:27:04 2009 +0000 +++ b/libpurple/theme.h Tue Sep 01 00:34:39 2009 +0000 @@ -73,7 +73,7 @@ * * @param theme The purple theme. * - * @return The string representating the name of the theme. + * @return The string representing the name of the theme. */ const gchar *purple_theme_get_name(PurpleTheme *theme); @@ -124,7 +124,7 @@ * * @param theme The purple theme. * - * @return The string represtenting the type. + * @return The string representing the type. */ const gchar *purple_theme_get_type_string(PurpleTheme *theme); @@ -133,7 +133,7 @@ * * @param theme The purple theme. * - * @return The string represtenting the theme directory. + * @return The string representing the theme directory. */ const gchar *purple_theme_get_dir(PurpleTheme *theme);
--- a/pidgin/pidginstock.c Mon Aug 31 20:27:04 2009 +0000 +++ b/pidgin/pidginstock.c Tue Sep 01 00:34:39 2009 +0000 @@ -602,7 +602,7 @@ pidgin_stock_load_stock_icon_theme(NULL); /* Pre-load Status icon theme - this avoids a bug with displaying the correct icon in the tray, theme is destroyed after*/ - if (purple_prefs_get_string(PIDGIN_PREFS_ROOT "/icon/status/theme") && + if (purple_prefs_get_string(PIDGIN_PREFS_ROOT "/status/icon-theme") && (path = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/status/icon-theme-dir"))) { PidginStatusIconTheme *theme = PIDGIN_STATUS_ICON_THEME(purple_theme_loader_build(PURPLE_THEME_LOADER(loader), path));