* Xavier Claessens <xclaesse@gmail.com>
*/
-#include <config.h>
+#include "config.h"
+#include "empathy-smiley-manager.h"
-#include <string.h>
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
+#include <tp-account-widgets/tpaw-utils.h>
-#include <libempathy/empathy-utils.h>
-#include "empathy-smiley-manager.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
typedef struct _SmileyManagerTree SmileyManagerTree;
struct _SmileyManagerTree {
gunichar c;
GdkPixbuf *pixbuf;
- const gchar *path;
+ gchar *path;
GSList *childrens;
};
g_object_unref (tree->pixbuf);
}
g_slist_free (tree->childrens);
+ g_free (tree->path);
g_slice_free (SmileyManagerTree, tree);
}
}
child->pixbuf = g_object_ref (pixbuf);
- child->path = path;
+ child->path = g_strdup (path);
}
static void
smiley_manager_add_valist (EmpathySmileyManager *manager,
GdkPixbuf *pixbuf,
- gchar *path,
+ const gchar *path,
const gchar *first_str,
va_list var_args)
{
smiley_manager_tree_insert (priv->tree, pixbuf, str, path);
}
- /* We give the ownership of path to the smiley */
g_object_set_data_full (G_OBJECT (pixbuf), "smiley_str",
g_strdup (first_str), g_free);
smiley = smiley_new (pixbuf, first_str);
va_list var_args;
g_return_if_fail (EMPATHY_IS_SMILEY_MANAGER (manager));
- g_return_if_fail (!EMP_STR_EMPTY (icon_name));
- g_return_if_fail (!EMP_STR_EMPTY (first_str));
+ g_return_if_fail (!TPAW_STR_EMPTY (icon_name));
+ g_return_if_fail (!TPAW_STR_EMPTY (first_str));
- pixbuf = empathy_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
+ pixbuf = tpaw_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
if (pixbuf) {
gchar *path;
va_start (var_args, first_str);
- path = empathy_filename_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
+ path = tpaw_filename_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
smiley_manager_add_valist (manager, pixbuf, path, first_str, var_args);
va_end (var_args);
g_object_unref (pixbuf);
+ g_free (path);
}
}
/* From fd.o icon-naming spec */
empathy_smiley_manager_add (manager, "face-angel", "O:-)", "O:)", NULL);
empathy_smiley_manager_add (manager, "face-angry", "X-(", ":@", NULL);
- empathy_smiley_manager_add (manager, "face-cool", "B-)", NULL);
+ empathy_smiley_manager_add (manager, "face-cool", "B-)", "B-|", NULL);
empathy_smiley_manager_add (manager, "face-crying", ":'(", NULL);
empathy_smiley_manager_add (manager, "face-devilish", ">:-)", ">:)", NULL);
empathy_smiley_manager_add (manager, "face-embarrassed",":-[", ":[", ":-$", ":$", NULL);
+ empathy_smiley_manager_add (manager, "face-glasses", "8-)", NULL);
empathy_smiley_manager_add (manager, "face-kiss", ":-*", ":*", NULL);
empathy_smiley_manager_add (manager, "face-laugh", ":-))", ":))", NULL);
empathy_smiley_manager_add (manager, "face-monkey", ":-(|)", ":(|)", NULL);
empathy_smiley_manager_add (manager, "face-raspberry", ":-P", ":P", ":-p", ":p", NULL);
empathy_smiley_manager_add (manager, "face-sad", ":-(", ":(", NULL);
empathy_smiley_manager_add (manager, "face-sick", ":-&", ":&", NULL);
- empathy_smiley_manager_add (manager, "face-smile", ":-)", ":)", NULL);
+ empathy_smiley_manager_add (manager, "face-smile", ":-)", ":)", ":]", "=)", NULL);
empathy_smiley_manager_add (manager, "face-smile-big", ":-D", ":D", ":-d", ":d", NULL);
empathy_smiley_manager_add (manager, "face-smirk", ":-!", ":!", NULL);
empathy_smiley_manager_add (manager, "face-surprise", ":-O", ":O", ":-o", ":o", NULL);
empathy_smiley_manager_add (manager, "face-tired", "|-)", "|)", NULL);
- empathy_smiley_manager_add (manager, "face-uncertain", ":-/", ":/", NULL);
+ empathy_smiley_manager_add (manager, "face-uncertain", ":-/", ":/", ":-\\", ":\\", NULL);
empathy_smiley_manager_add (manager, "face-wink", ";-)", ";)", NULL);
empathy_smiley_manager_add (manager, "face-worried", ":-S", ":S", ":-s", ":s", NULL);
+
+ empathy_smiley_manager_add (manager, "emblem-favorite", "<3", NULL);
}
static EmpathySmileyHit *