# HG changeset patch # User Nathan Walp # Date 1055441851 0 # Node ID eeb72d03e189c76f6188bb28d3a58468f2382d7e # Parent 8f5ccf9e590a57d38bb4e229f056fa49b92153f3 [gaim-migrate @ 6272] smiley themes convert now committer: Tailor Script diff -r 8f5ccf9e590a -r eeb72d03e189 src/gaimrc.c --- 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])); diff -r 8f5ccf9e590a -r eeb72d03e189 src/gtkprefs.c --- 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); }