/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2007 Collabora Ltd.
+ * Copyright (C) 2007-2008 Collabora Ltd.
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * Lesser General Public License for more details.
*
- * 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., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
- * Authors: Xavier Claessens <xclaesse@gmail.com>
+ * Authors: Dafydd Harrie <dafydd.harries@collabora.co.uk>
+ * Xavier Claessens <xclaesse@gmail.com>
*/
#include <config.h>
#include <string.h>
-#include <libempathy/empathy-debug.h>
-
+#include <libempathy/empathy-utils.h>
#include "empathy-smiley-manager.h"
#include "empathy-ui-utils.h"
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
- EMPATHY_TYPE_SMILEY_MANAGER, EmpathySmileyManagerPriv))
-
-#define DEBUG_DOMAIN "SmileyManager"
+typedef struct _SmileyManagerTree SmileyManagerTree;
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathySmileyManager)
typedef struct {
+ SmileyManagerTree *tree;
+ GSList *smileys;
+} EmpathySmileyManagerPriv;
+
+struct _SmileyManagerTree {
gunichar c;
GdkPixbuf *pixbuf;
GSList *childrens;
-} SmileyManagerTree;
-
-struct _EmpathySmileyManagerPriv {
- SmileyManagerTree *tree;
- GSList *smileys;
};
-static void empathy_smiley_manager_class_init (EmpathySmileyManagerClass *klass);
-static void empathy_smiley_manager_init (EmpathySmileyManager *manager);
-
G_DEFINE_TYPE (EmpathySmileyManager, empathy_smiley_manager, G_TYPE_OBJECT);
+static EmpathySmileyManager *manager_singleton = NULL;
+
static SmileyManagerTree *
smiley_manager_tree_new (gunichar c)
{
g_object_unref (smiley->pixbuf);
}
g_free (smiley->str);
+ g_slice_free (EmpathySmiley, smiley);
}
static void
g_slist_free (priv->smileys);
}
+static GObject *
+smiley_manager_constructor (GType type,
+ guint n_props,
+ GObjectConstructParam *props)
+{
+ GObject *retval;
+
+ if (manager_singleton) {
+ retval = g_object_ref (manager_singleton);
+ } else {
+ retval = G_OBJECT_CLASS (empathy_smiley_manager_parent_class)->constructor
+ (type, n_props, props);
+
+ manager_singleton = EMPATHY_SMILEY_MANAGER (retval);
+ g_object_add_weak_pointer (retval, (gpointer) &manager_singleton);
+ }
+
+ return retval;
+}
+
static void
empathy_smiley_manager_class_init (EmpathySmileyManagerClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = smiley_manager_finalize;
+ object_class->constructor = smiley_manager_constructor;
g_type_class_add_private (object_class, sizeof (EmpathySmileyManagerPriv));
}
static void
empathy_smiley_manager_init (EmpathySmileyManager *manager)
{
- EmpathySmileyManagerPriv *priv = GET_PRIV (manager);
+ EmpathySmileyManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
+ EMPATHY_TYPE_SMILEY_MANAGER, EmpathySmileyManagerPriv);
+ manager->priv = priv;
priv->tree = smiley_manager_tree_new ('\0');
priv->smileys = NULL;
+
+ empathy_smiley_manager_load (manager);
}
EmpathySmileyManager *
-empathy_smiley_manager_new (void)
+empathy_smiley_manager_dup_singleton (void)
{
- static EmpathySmileyManager *manager = NULL;
-
- if (!manager) {
- manager = g_object_new (EMPATHY_TYPE_SMILEY_MANAGER, NULL);
- g_object_add_weak_pointer (G_OBJECT (manager), (gpointer) &manager);
- empathy_smiley_manager_load (manager);
- } else {
- g_object_ref (manager);
- }
-
- return manager;
+ return g_object_new (EMPATHY_TYPE_SMILEY_MANAGER, NULL);
}
static SmileyManagerTree *
va_list var_args)
{
EmpathySmileyManagerPriv *priv = GET_PRIV (manager);
- const gchar *str;
+ const gchar *str;
for (str = first_str; str; str = va_arg (var_args, gchar*)) {
smiley_manager_tree_insert (priv->tree, smiley, str);
va_list var_args;
g_return_if_fail (EMPATHY_IS_SMILEY_MANAGER (manager));
- g_return_if_fail (!G_STR_EMPTY (icon_name));
- g_return_if_fail (!G_STR_EMPTY (first_str));
+ g_return_if_fail (!EMP_STR_EMPTY (icon_name));
+ g_return_if_fail (!EMP_STR_EMPTY (first_str));
smiley = empathy_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
if (smiley) {
g_return_if_fail (EMPATHY_IS_SMILEY_MANAGER (manager));
g_return_if_fail (GDK_IS_PIXBUF (smiley));
- g_return_if_fail (!G_STR_EMPTY (first_str));
+ g_return_if_fail (!EMP_STR_EMPTY (first_str));
va_start (var_args, first_str);
smiley_manager_add_valist (manager, smiley, first_str, var_args);
g_return_if_fail (EMPATHY_IS_SMILEY_MANAGER (manager));
/* From fd.o icon-naming spec */
- empathy_smiley_manager_add (manager, "face-angel", "0:-)", "0:)", NULL);
+ empathy_smiley_manager_add (manager, "face-angel", "O:-)", "O:)", 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-devil-grin", ">:-)", ">:)", NULL);
- empathy_smiley_manager_add (manager, "face-devil-sad", ">:-(", ">:(", NULL);
- empathy_smiley_manager_add (manager, "face-glasses", "B-)", "B)", NULL);
+ empathy_smiley_manager_add (manager, "face-devilish", ">:-)", ">:)", NULL);
+ empathy_smiley_manager_add (manager, "face-embarrassed",":-[", ":[", ":-$", ":$", NULL);
empathy_smiley_manager_add (manager, "face-kiss", ":-*", ":*", NULL);
empathy_smiley_manager_add (manager, "face-monkey", ":-(|)", ":(|)", NULL);
empathy_smiley_manager_add (manager, "face-plain", ":-|", ":|", 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-smile", ":-)", ":)", NULL);
- empathy_smiley_manager_add (manager, "face-smile-big", ":-D", ":D", 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", ":-0", ":0", NULL);
+ empathy_smiley_manager_add (manager, "face-surprise", ":-O", ":O", NULL);
empathy_smiley_manager_add (manager, "face-wink", ";-)", ";)", NULL);
}
return priv->smileys;
}
+typedef struct {
+ EmpathySmileyManager *manager;
+ EmpathySmiley *smiley;
+ EmpathySmileyMenuFunc func;
+ gpointer user_data;
+} ActivateData;
+
+static void
+smiley_menu_data_free (gpointer user_data,
+ GClosure *closure)
+{
+ ActivateData *data = (ActivateData*) user_data;
+
+ g_object_unref (data->manager);
+ g_slice_free (ActivateData, data);
+}
+
+static void
+smiley_menu_activate_cb (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ ActivateData *data = (ActivateData*) user_data;
+
+ data->func (data->manager, data->smiley, data->user_data);
+}
+
+GtkWidget *
+empathy_smiley_menu_new (EmpathySmileyManager *manager,
+ EmpathySmileyMenuFunc func,
+ gpointer user_data)
+{
+ EmpathySmileyManagerPriv *priv = GET_PRIV (manager);
+ GSList *l;
+ GtkWidget *menu;
+ gint x = 0;
+ gint y = 0;
+
+ g_return_val_if_fail (EMPATHY_IS_SMILEY_MANAGER (manager), NULL);
+ g_return_val_if_fail (func != NULL, NULL);
+
+ menu = gtk_menu_new ();
+
+ for (l = priv->smileys; l; l = l->next) {
+ EmpathySmiley *smiley;
+ GtkWidget *item;
+ GtkWidget *image;
+ ActivateData *data;
+
+ smiley = l->data;
+ image = gtk_image_new_from_pixbuf (smiley->pixbuf);
+
+ item = gtk_image_menu_item_new_with_label ("");
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+
+ gtk_menu_attach (GTK_MENU (menu), item,
+ x, x + 1, y, y + 1);
+
+ gtk_widget_set_tooltip_text (item, smiley->str);
+
+ data = g_slice_new (ActivateData);
+ data->manager = g_object_ref (manager);
+ data->smiley = smiley;
+ data->func = func;
+ data->user_data = user_data;
+
+ g_signal_connect_data (item, "activate",
+ G_CALLBACK (smiley_menu_activate_cb),
+ data,
+ smiley_menu_data_free,
+ 0);
+
+ if (x > 3) {
+ y++;
+ x = 0;
+ } else {
+ x++;
+ }
+ }
+
+ gtk_widget_show_all (menu);
+
+ return menu;
+}
+
projects / empathy.git / blobdiff