changeset 5841:eeb72d03e189

[gaim-migrate @ 6272] smiley themes convert now committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Thu, 12 Jun 2003 18:17:31 +0000
parents 8f5ccf9e590a
children dbed8c87f750
files src/gaimrc.c src/gtkprefs.c
diffstat 2 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/gaimrc.c	Thu Jun 12 12:29:24 2003 +0000
+++ b/src/gaimrc.c	Thu Jun 12 18:17:31 2003 +0000
@@ -1135,8 +1135,7 @@
 		} else if (!strcmp(p->option, "web_command")) {
 			gaim_prefs_set_string("/gaim/gtk/browsers/command", p->value[0]);
 		} else if (!strcmp(p->option, "smiley_theme")) {
-			/* XXX: the smiley theme stuff needs converting */
-			load_smiley_theme(p->value[0], TRUE);
+			gaim_prefs_set_string("/gaim/gtk/smileys/theme", p->value[0]);
 		} else if (!strcmp(p->option, "conv_size")) {
 			gaim_prefs_set_int("/gaim/gtk/conversations/im/default_width",
 					atoi(p->value[0]));
--- a/src/gtkprefs.c	Thu Jun 12 12:29:24 2003 +0000
+++ b/src/gtkprefs.c	Thu Jun 12 18:17:31 2003 +0000
@@ -451,7 +451,7 @@
 	GtkTreeIter  iter;
 	const char *filename;
 	GValue val = { 0, };
-	
+
 	if (! gtk_tree_selection_get_selected (sel, &model, &iter))
 		return;
 	gtk_tree_model_get_value (model, &iter, 2, &val);
@@ -2758,7 +2758,7 @@
 smiley_theme_pref_cb(const char *name, GaimPrefType type, gpointer value,
 					 gpointer data)
 {
-	if (strcmp(name, ""))
+	if (!strcmp(name, "/gaim/gtk/smileys/theme"))
 		load_smiley_theme((const char *)value, TRUE);
 }