[evolution/wip/webkit-composer: 515/966] Import GtkhtmlFace* classes as EEmoticon*
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/webkit-composer: 515/966] Import GtkhtmlFace* classes as EEmoticon*
- Date: Wed, 23 Apr 2014 10:36:43 +0000 (UTC)
commit f5eb90994562c711f74dd370d8faec6850bb3bd8
Author: Dan Vrátil <dvratil redhat com>
Date: Mon Jul 23 14:34:15 2012 +0200
Import GtkhtmlFace* classes as EEmoticon*
GtkhtmlFaceAction => EEmoticonAction
GtkhtmlFaceChooserMenu => EEmoticonChooserMenu
GtkhtmlFaceChooser => EEmoticonChooser
GtkhtmlToolButton => EEmoticonToolButton
GtkhtmlFace => EEmoticon
e-util/Makefile.am | 10 +++
e-util/e-emoticon-action.c | 142 ++++++++++++++++++++++++++++++++++
e-util/e-emoticon-action.h | 8 ++
e-util/e-emoticon-chooser-menu.c | 103 +++++++++++++++++++++++++
e-util/e-emoticon-chooser-menu.h | 9 ++
e-util/e-emoticon-chooser.c | 80 +++++++++++++++++++
e-util/e-emoticon-chooser.h | 25 ++++++
e-util/e-emoticon-tool-button.c | 157 ++++++++++++++++++++++++++++++++++++++
e-util/e-emoticon-tool-button.h | 12 +++
e-util/e-emoticon.c | 14 ++++
e-util/e-emoticon.h | 11 +++
e-util/e-util.h | 5 +
12 files changed, 576 insertions(+), 0 deletions(-)
---
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 1d8d6d7..3998082 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -181,6 +181,11 @@ evolution_util_include_HEADERS = \
e-dialog-widgets.h \
e-editor-selection.h \
e-editor-widget.h \
+ e-emoticon-action.h \
+ e-emoticon-chooser-menu.h \
+ e-emoticon-chooser.h \
+ e-emoticon-tool-button.h \
+ e-emoticon.h \
e-event.h \
e-file-request.h \
e-file-utils.h \
@@ -432,6 +437,11 @@ libevolution_util_la_SOURCES = \
e-dialog-widgets.c \
e-editor-selection.c \
e-editor-widget.c \
+ e-emoticon-action.c \
+ e-emoticon-chooser-menu.c \
+ e-emoticon-chooser.c \
+ e-emoticon-tool-button.c \
+ e-emoticon.c \
e-event.c \
e-file-request.c \
e-file-utils.c \
diff --git a/e-util/e-emoticon-action.c b/e-util/e-emoticon-action.c
index 0850d33..a84df89 100644
--- a/e-util/e-emoticon-action.c
+++ b/e-util/e-emoticon-action.c
@@ -1,8 +1,12 @@
+<<<<<<< HEAD
/*
* e-emoticon-action.c
*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
+=======
+/* e-emoticon-action.c
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU Lesser General Public
@@ -25,10 +29,13 @@
#include "e-emoticon-chooser-menu.h"
#include "e-emoticon-tool-button.h"
+<<<<<<< HEAD
#define E_EMOTICON_ACTION_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_EMOTICON_ACTION, EEmoticonActionPrivate))
+=======
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
struct _EEmoticonActionPrivate {
GList *choosers;
EEmoticonChooser *current_chooser;
@@ -39,6 +46,7 @@ enum {
PROP_CURRENT_FACE
};
+<<<<<<< HEAD
/* Forward Declarations */
static void e_emoticon_action_interface_init
(EEmoticonChooserInterface *interface);
@@ -54,6 +62,13 @@ G_DEFINE_TYPE_WITH_CODE (
static void
emoticon_action_proxy_item_activated_cb (EEmoticonAction *action,
EEmoticonChooser *chooser)
+=======
+static gpointer parent_class;
+
+static void
+emoticon_action_proxy_item_activated_cb (EEmoticonAction *action,
+ EEmoticonChooser *chooser)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
action->priv->current_chooser = chooser;
@@ -62,9 +77,15 @@ emoticon_action_proxy_item_activated_cb (EEmoticonAction *action,
static void
emoticon_action_set_property (GObject *object,
+<<<<<<< HEAD
guint property_id,
const GValue *value,
GParamSpec *pspec)
+=======
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
switch (property_id) {
case PROP_CURRENT_FACE:
@@ -79,9 +100,15 @@ emoticon_action_set_property (GObject *object,
static void
emoticon_action_get_property (GObject *object,
+<<<<<<< HEAD
guint property_id,
GValue *value,
GParamSpec *pspec)
+=======
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
switch (property_id) {
case PROP_CURRENT_FACE:
@@ -99,12 +126,20 @@ emoticon_action_finalize (GObject *object)
{
EEmoticonActionPrivate *priv;
+<<<<<<< HEAD
priv = E_EMOTICON_ACTION_GET_PRIVATE (object);
+=======
+ priv = E_EMOTICON_ACTION (object)->priv;
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
g_list_free (priv->choosers);
/* Chain up to parent's finalize() method. */
+<<<<<<< HEAD
G_OBJECT_CLASS (e_emoticon_action_parent_class)->finalize (object);
+=======
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
}
static void
@@ -112,7 +147,11 @@ emoticon_action_activate (GtkAction *action)
{
EEmoticonActionPrivate *priv;
+<<<<<<< HEAD
priv = E_EMOTICON_ACTION_GET_PRIVATE (action);
+=======
+ priv = E_EMOTICON_ACTION (action)->priv;
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
priv->current_chooser = NULL;
}
@@ -139,11 +178,19 @@ emoticon_action_create_tool_item (GtkAction *action)
static void
emoticon_action_connect_proxy (GtkAction *action,
+<<<<<<< HEAD
GtkWidget *proxy)
{
EEmoticonActionPrivate *priv;
priv = E_EMOTICON_ACTION_GET_PRIVATE (action);
+=======
+ GtkWidget *proxy)
+{
+ EEmoticonActionPrivate *priv;
+
+ priv = E_EMOTICON_ACTION (action)->priv;
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
if (!E_IS_EMOTICON_CHOOSER (proxy))
goto chainup;
@@ -157,23 +204,39 @@ emoticon_action_connect_proxy (GtkAction *action,
chainup:
/* Chain up to parent's connect_proxy() method. */
+<<<<<<< HEAD
GTK_ACTION_CLASS (e_emoticon_action_parent_class)->
connect_proxy (action, proxy);
+=======
+ GTK_ACTION_CLASS (parent_class)->connect_proxy (action, proxy);
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
}
static void
emoticon_action_disconnect_proxy (GtkAction *action,
+<<<<<<< HEAD
GtkWidget *proxy)
{
EEmoticonActionPrivate *priv;
priv = E_EMOTICON_ACTION_GET_PRIVATE (action);
+=======
+ GtkWidget *proxy)
+{
+ EEmoticonActionPrivate *priv;
+
+ priv = E_EMOTICON_ACTION (action)->priv;
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
priv->choosers = g_list_remove (priv->choosers, proxy);
/* Chain up to parent's disconnect_proxy() method. */
+<<<<<<< HEAD
GTK_ACTION_CLASS (e_emoticon_action_parent_class)->
disconnect_proxy (action, proxy);
+=======
+ GTK_ACTION_CLASS (parent_class)->disconnect_proxy (action, proxy);
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
}
static GtkWidget *
@@ -182,7 +245,11 @@ emoticon_action_create_menu (GtkAction *action)
EEmoticonActionPrivate *priv;
GtkWidget *widget;
+<<<<<<< HEAD
priv = E_EMOTICON_ACTION_GET_PRIVATE (action);
+=======
+ priv = E_EMOTICON_ACTION (action)->priv;
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
widget = e_emoticon_chooser_menu_new ();
@@ -201,7 +268,11 @@ emoticon_action_get_current_emoticon (EEmoticonChooser *chooser)
EEmoticonActionPrivate *priv;
EEmoticon *emoticon = NULL;
+<<<<<<< HEAD
priv = E_EMOTICON_ACTION_GET_PRIVATE (chooser);
+=======
+ priv = E_EMOTICON_ACTION (chooser)->priv;
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
if (priv->current_chooser != NULL)
emoticon = e_emoticon_chooser_get_current_emoticon (
@@ -212,12 +283,20 @@ emoticon_action_get_current_emoticon (EEmoticonChooser *chooser)
static void
emoticon_action_set_current_emoticon (EEmoticonChooser *chooser,
+<<<<<<< HEAD
EEmoticon *emoticon)
+=======
+ EEmoticon *emoticon)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
EEmoticonActionPrivate *priv;
GList *iter;
+<<<<<<< HEAD
priv = E_EMOTICON_ACTION_GET_PRIVATE (chooser);
+=======
+ priv = E_EMOTICON_ACTION (chooser)->priv;
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
for (iter = priv->choosers; iter != NULL; iter = iter->next) {
EEmoticonChooser *proxy_chooser = iter->data;
@@ -227,11 +306,19 @@ emoticon_action_set_current_emoticon (EEmoticonChooser *chooser,
}
static void
+<<<<<<< HEAD
e_emoticon_action_class_init (EEmoticonActionClass *class)
+=======
+emoticon_action_class_init (EEmoticonActionClass *class)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
GObjectClass *object_class;
GtkActionClass *action_class;
+<<<<<<< HEAD
+=======
+ parent_class = g_type_class_peek_parent (class);
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
g_type_class_add_private (class, sizeof (EEmoticonAction));
object_class = G_OBJECT_CLASS (class);
@@ -252,6 +339,7 @@ e_emoticon_action_class_init (EEmoticonActionClass *class)
}
static void
+<<<<<<< HEAD
e_emoticon_action_interface_init (EEmoticonChooserInterface *interface)
{
interface->get_current_emoticon = emoticon_action_get_current_emoticon;
@@ -262,13 +350,67 @@ static void
e_emoticon_action_init (EEmoticonAction *action)
{
action->priv = E_EMOTICON_ACTION_GET_PRIVATE (action);
+=======
+emoticon_action_iface_init (EEmoticonChooserIface *iface)
+{
+ iface->get_current_emoticon = emoticon_action_get_current_emoticon;
+ iface->set_current_emoticon = emoticon_action_set_current_emoticon;
+}
+
+static void
+emoticon_action_init (EEmoticonAction *action)
+{
+ action->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ action, E_TYPE_EMOTICON_ACTION, EEmoticonActionPrivate);
+}
+
+GType
+e_emoticon_action_get_type (void)
+{
+ static GType type = 0;
+
+ if (G_UNLIKELY (type == 0)) {
+ static const GTypeInfo type_info = {
+ sizeof (EEmoticonActionClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) emoticon_action_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL, /* class_data */
+ sizeof (EEmoticonAction),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) emoticon_action_init,
+ NULL /* value_table */
+ };
+
+ static const GInterfaceInfo iface_info = {
+ (GInterfaceInitFunc) emoticon_action_iface_init,
+ (GInterfaceFinalizeFunc) NULL,
+ NULL /* interemoticon_data */
+ };
+
+ type = g_type_register_static (
+ GTK_TYPE_ACTION, "EEmoticonAction", &type_info, 0);
+
+ g_type_add_interface_static (
+ type, E_TYPE_EMOTICON_CHOOSER, &iface_info);
+ }
+
+ return type;
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
}
GtkAction *
e_emoticon_action_new (const gchar *name,
+<<<<<<< HEAD
const gchar *label,
const gchar *tooltip,
const gchar *stock_id)
+=======
+ const gchar *label,
+ const gchar *tooltip,
+ const gchar *stock_id)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
g_return_val_if_fail (name != NULL, NULL);
diff --git a/e-util/e-emoticon-action.h b/e-util/e-emoticon-action.h
index 0e450e8..76ca75b 100644
--- a/e-util/e-emoticon-action.h
+++ b/e-util/e-emoticon-action.h
@@ -1,8 +1,12 @@
+<<<<<<< HEAD
/*
* e-emoticon-action.h
*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
+=======
+/* e-emoticon-action.h
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU Lesser General Public
@@ -62,7 +66,11 @@ struct _EEmoticonActionClass {
GtkActionClass parent_class;
};
+<<<<<<< HEAD
GType e_emoticon_action_get_type (void) G_GNUC_CONST;
+=======
+GType e_emoticon_action_get_type (void);
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
GtkAction * e_emoticon_action_new (const gchar *name,
const gchar *label,
const gchar *tooltip,
diff --git a/e-util/e-emoticon-chooser-menu.c b/e-util/e-emoticon-chooser-menu.c
index f2ed337..d51a774 100644
--- a/e-util/e-emoticon-chooser-menu.c
+++ b/e-util/e-emoticon-chooser-menu.c
@@ -1,8 +1,12 @@
+<<<<<<< HEAD
/*
* e-emoticon-chooser-menu.c
*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
+=======
+/* e-emoticon-chooser-menu.c
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU Lesser General Public
@@ -33,6 +37,7 @@ enum {
PROP_CURRENT_FACE
};
+<<<<<<< HEAD
/* Forward Declarations */
static void e_emoticon_chooser_menu_interface_init
(EEmoticonChooserInterface *interface);
@@ -50,6 +55,15 @@ emoticon_chooser_menu_set_property (GObject *object,
guint property_id,
const GValue *value,
GParamSpec *pspec)
+=======
+static gpointer parent_class;
+
+static void
+emoticon_chooser_menu_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
switch (property_id) {
case PROP_CURRENT_FACE:
@@ -64,9 +78,15 @@ emoticon_chooser_menu_set_property (GObject *object,
static void
emoticon_chooser_menu_get_property (GObject *object,
+<<<<<<< HEAD
guint property_id,
GValue *value,
GParamSpec *pspec)
+=======
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
switch (property_id) {
case PROP_CURRENT_FACE:
@@ -94,7 +114,11 @@ emoticon_chooser_menu_get_current_emoticon (EEmoticonChooser *chooser)
static void
emoticon_chooser_menu_set_current_emoticon (EEmoticonChooser *chooser,
+<<<<<<< HEAD
EEmoticon *emoticon)
+=======
+ EEmoticon *emoticon)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
GList *list, *iter;
@@ -119,10 +143,19 @@ emoticon_chooser_menu_set_current_emoticon (EEmoticonChooser *chooser,
}
static void
+<<<<<<< HEAD
e_emoticon_chooser_menu_class_init (EEmoticonChooserMenuClass *class)
{
GObjectClass *object_class;
+=======
+emoticon_chooser_menu_class_init (EEmoticonChooserMenuClass *class)
+{
+ GObjectClass *object_class;
+
+ parent_class = g_type_class_peek_parent (class);
+
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
object_class = G_OBJECT_CLASS (class);
object_class->set_property = emoticon_chooser_menu_set_property;
object_class->get_property = emoticon_chooser_menu_get_property;
@@ -132,6 +165,7 @@ e_emoticon_chooser_menu_class_init (EEmoticonChooserMenuClass *class)
}
static void
+<<<<<<< HEAD
e_emoticon_chooser_menu_interface_init (EEmoticonChooserInterface *interface)
{
interface->get_current_emoticon =
@@ -142,11 +176,22 @@ e_emoticon_chooser_menu_interface_init (EEmoticonChooserInterface *interface)
static void
e_emoticon_chooser_menu_init (EEmoticonChooserMenu *chooser_menu)
+=======
+emoticon_chooser_menu_iface_init (EEmoticonChooserIface *iface)
+{
+ iface->get_current_emoticon = emoticon_chooser_menu_get_current_emoticon;
+ iface->set_current_emoticon = emoticon_chooser_menu_set_current_emoticon;
+}
+
+static void
+emoticon_chooser_menu_init (EEmoticonChooserMenu *chooser_menu)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
EEmoticonChooser *chooser;
GList *list, *iter;
chooser = E_EMOTICON_CHOOSER (chooser_menu);
+<<<<<<< HEAD
list = e_emoticon_chooser_get_items ();
for (iter = list; iter != NULL; iter = iter->next) {
@@ -164,6 +209,25 @@ e_emoticon_chooser_menu_init (EEmoticonChooserMenu *chooser_menu)
g_object_set_data_full (
G_OBJECT (item), "emoticon",
e_emoticon_copy (emoticon),
+=======
+ list = e_emoticon_chooser_get_items (chooser);
+
+ for (iter = list; iter != NULL; iter = iter->next) {
+ EEmoticon *face = iter->data;
+ GtkWidget *item;
+
+ /* To keep translated strings in subclasses */
+ item = gtk_image_menu_item_new_with_mnemonic (_(face->label));
+ gtk_image_menu_item_set_image (
+ GTK_IMAGE_MENU_ITEM (item),
+ gtk_image_new_from_icon_name (
+ face->icon_name, GTK_ICON_SIZE_MENU));
+ gtk_widget_show (item);
+
+ g_object_set_data_full (
+ G_OBJECT (item), "face",
+ e_emoticon_copy (face),
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
(GDestroyNotify) e_emoticon_free);
g_signal_connect_swapped (
@@ -177,6 +241,45 @@ e_emoticon_chooser_menu_init (EEmoticonChooserMenu *chooser_menu)
g_list_free (list);
}
+<<<<<<< HEAD
+=======
+GType
+e_emoticon_chooser_menu_get_type (void)
+{
+ static GType type = 0;
+
+ if (G_UNLIKELY (type == 0)) {
+ static const GTypeInfo type_info = {
+ sizeof (EEmoticonChooserMenuClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) emoticon_chooser_menu_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL, /* class_data */
+ sizeof (EEmoticonChooserMenu),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) emoticon_chooser_menu_init,
+ NULL /* value_table */
+ };
+
+ static const GInterfaceInfo iface_info = {
+ (GInterfaceInitFunc) emoticon_chooser_menu_iface_init,
+ (GInterfaceFinalizeFunc) NULL,
+ NULL /* interface_data */
+ };
+
+ type = g_type_register_static (
+ GTK_TYPE_MENU, "EEmoticonChooserMenu",
+ &type_info, 0);
+
+ g_type_add_interface_static (
+ type, E_TYPE_EMOTICON_CHOOSER, &iface_info);
+ }
+
+ return type;
+}
+
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
GtkWidget *
e_emoticon_chooser_menu_new (void)
{
diff --git a/e-util/e-emoticon-chooser-menu.h b/e-util/e-emoticon-chooser-menu.h
index d4f9954..2f6a4a0 100644
--- a/e-util/e-emoticon-chooser-menu.h
+++ b/e-util/e-emoticon-chooser-menu.h
@@ -1,8 +1,12 @@
+<<<<<<< HEAD
/*
* e-emoticon-chooser-menu.h
*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
+=======
+/* e-emoticon-chooser-menu.h
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU Lesser General Public
@@ -61,9 +65,14 @@ struct _EEmoticonChooserMenuClass {
GtkMenuClass parent_class;
};
+<<<<<<< HEAD
GType e_emoticon_chooser_menu_get_type
(void) G_GNUC_CONST;
GtkWidget * e_emoticon_chooser_menu_new (void);
+=======
+GType e_emoticon_chooser_menu_get_type (void);
+GtkWidget * e_emoticon_chooser_menu_new (void);
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
G_END_DECLS
diff --git a/e-util/e-emoticon-chooser.c b/e-util/e-emoticon-chooser.c
index 44ce06b..7bcaf57 100644
--- a/e-util/e-emoticon-chooser.c
+++ b/e-util/e-emoticon-chooser.c
@@ -1,8 +1,12 @@
+<<<<<<< HEAD
/*
* e-emoticon-chooser.c
*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
+=======
+/* e-emoticon-chooser.c
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU Lesser General Public
@@ -86,6 +90,7 @@ enum {
static guint signals[LAST_SIGNAL];
+<<<<<<< HEAD
G_DEFINE_INTERFACE (
EEmoticonChooser,
e_emoticon_chooser,
@@ -96,6 +101,13 @@ e_emoticon_chooser_default_init (EEmoticonChooserInterface *interface)
{
g_object_interface_install_property (
interface,
+=======
+static void
+emoticon_chooser_class_init (EEmoticonChooserIface *iface)
+{
+ g_object_interface_install_property (
+ iface,
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
g_param_spec_boxed (
"current-emoticon",
"Current Emoticon",
@@ -105,14 +117,21 @@ e_emoticon_chooser_default_init (EEmoticonChooserInterface *interface)
signals[ITEM_ACTIVATED] = g_signal_new (
"item-activated",
+<<<<<<< HEAD
G_TYPE_FROM_INTERFACE (interface),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EEmoticonChooserInterface, item_activated),
+=======
+ G_TYPE_FROM_INTERFACE (iface),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (EEmoticonChooserIface, item_activated),
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
}
+<<<<<<< HEAD
EEmoticon *
e_emoticon_chooser_get_current_emoticon (EEmoticonChooser *chooser)
{
@@ -124,10 +143,52 @@ e_emoticon_chooser_get_current_emoticon (EEmoticonChooser *chooser)
g_return_val_if_fail (interface->get_current_emoticon != NULL, NULL);
return interface->get_current_emoticon (chooser);
+=======
+GType
+e_emoticon_chooser_get_type (void)
+{
+ static GType type = 0;
+
+ if (G_UNLIKELY (type == 0)) {
+ static const GTypeInfo type_info = {
+ sizeof (EEmoticonChooserIface),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) emoticon_chooser_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL, /* class_data */
+ 0, /* instance_size */
+ 0, /* n_preallocs */
+ NULL, /* instance_init */
+ NULL /* value_table */
+ };
+
+ type = g_type_register_static (
+ G_TYPE_INTERFACE, "EEmoticonChooser", &type_info, 0);
+
+ g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
+ }
+
+ return type;
+}
+
+EEmoticon *
+e_emoticon_chooser_get_current_emoticon (EEmoticonChooser *chooser)
+{
+ EEmoticonChooserIface *iface;
+
+ g_return_val_if_fail (E_IS_EMOTICON_CHOOSER (chooser), NULL);
+
+ iface = E_EMOTICON_CHOOSER_GET_IFACE (chooser);
+ g_return_val_if_fail (iface->get_current_emoticon != NULL, NULL);
+
+ return iface->get_current_emoticon (chooser);
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
}
void
e_emoticon_chooser_set_current_emoticon (EEmoticonChooser *chooser,
+<<<<<<< HEAD
EEmoticon *emoticon)
{
EEmoticonChooserInterface *interface;
@@ -138,6 +199,18 @@ e_emoticon_chooser_set_current_emoticon (EEmoticonChooser *chooser,
g_return_if_fail (interface->set_current_emoticon != NULL);
interface->set_current_emoticon (chooser, emoticon);
+=======
+ EEmoticon *emoticon)
+{
+ EEmoticonChooserIface *iface;
+
+ g_return_if_fail (E_IS_EMOTICON_CHOOSER (chooser));
+
+ iface = E_EMOTICON_CHOOSER_GET_IFACE (chooser);
+ g_return_if_fail (iface->set_current_emoticon != NULL);
+
+ iface->set_current_emoticon (chooser, emoticon);
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
}
void
@@ -149,7 +222,11 @@ e_emoticon_chooser_item_activated (EEmoticonChooser *chooser)
}
GList *
+<<<<<<< HEAD
e_emoticon_chooser_get_items (void)
+=======
+e_emoticon_chooser_get_items (EEmoticonChooser *chooser)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
GList *list = NULL;
gint ii;
@@ -159,6 +236,7 @@ e_emoticon_chooser_get_items (void)
return g_list_reverse (list);
}
+<<<<<<< HEAD
const EEmoticon *
e_emoticon_chooser_lookup_emoticon (const gchar *icon_name)
@@ -176,3 +254,5 @@ e_emoticon_chooser_lookup_emoticon (const gchar *icon_name)
return NULL;
}
+=======
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
diff --git a/e-util/e-emoticon-chooser.h b/e-util/e-emoticon-chooser.h
index 14e899f..a7b0e1d 100644
--- a/e-util/e-emoticon-chooser.h
+++ b/e-util/e-emoticon-chooser.h
@@ -1,8 +1,12 @@
+<<<<<<< HEAD
/*
* e-emoticon-chooser.h
*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
+=======
+/* e-emoticon-chooser.h
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU Lesser General Public
@@ -37,17 +41,30 @@
#define E_IS_EMOTICON_CHOOSER(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE \
((obj), E_TYPE_EMOTICON_CHOOSER))
+<<<<<<< HEAD
#define E_EMOTICON_CHOOSER_GET_INTERFACE(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE \
((obj), E_TYPE_EMOTICON_CHOOSER, EEmoticonChooserInterface))
+=======
+#define E_EMOTICON_CHOOSER_GET_IFACE(obj) \
+ (G_TYPE_INSTANCE_GET_INTERFACE \
+ ((obj), E_TYPE_EMOTICON_CHOOSER, EEmoticonChooserIface))
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
G_BEGIN_DECLS
typedef struct _EEmoticonChooser EEmoticonChooser;
+<<<<<<< HEAD
typedef struct _EEmoticonChooserInterface EEmoticonChooserInterface;
struct _EEmoticonChooserInterface {
GTypeInterface parent_interface;
+=======
+typedef struct _EEmoticonChooserIface EEmoticonChooserIface;
+
+struct _EEmoticonChooserIface {
+ GTypeInterface parent_iface;
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
/* Methods */
EEmoticon * (*get_current_emoticon) (EEmoticonChooser *chooser);
@@ -58,7 +75,11 @@ struct _EEmoticonChooserInterface {
void (*item_activated) (EEmoticonChooser *chooser);
};
+<<<<<<< HEAD
GType e_emoticon_chooser_get_type (void) G_GNUC_CONST;
+=======
+GType e_emoticon_chooser_get_type (void);
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
EEmoticon * e_emoticon_chooser_get_current_emoticon
(EEmoticonChooser *chooser);
void e_emoticon_chooser_set_current_emoticon
@@ -66,11 +87,15 @@ void e_emoticon_chooser_set_current_emoticon
EEmoticon *emoticon);
void e_emoticon_chooser_item_activated
(EEmoticonChooser *chooser);
+<<<<<<< HEAD
GList * e_emoticon_chooser_get_items (void);
const EEmoticon *
e_emoticon_chooser_lookup_emoticon
(const gchar *icon_name);
+=======
+GList * e_emoticon_chooser_get_items (EEmoticonChooser *chooser);
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
G_END_DECLS
diff --git a/e-util/e-emoticon-tool-button.c b/e-util/e-emoticon-tool-button.c
index 54f99c9..3c3dd49 100644
--- a/e-util/e-emoticon-tool-button.c
+++ b/e-util/e-emoticon-tool-button.c
@@ -1,8 +1,12 @@
+<<<<<<< HEAD
/*
* e-emoticon-tool-button.c
*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
+=======
+/* e-emoticon-tool-button.c
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU Lesser General Public
@@ -35,10 +39,13 @@
#include "e-emoticon-chooser.h"
+<<<<<<< HEAD
#define E_EMOTICON_TOOL_BUTTON_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_EMOTICON_TOOL_BUTTON, EEmoticonToolButtonPrivate))
+=======
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
/* XXX Should calculate this dynamically. */
#define NUM_ROWS 7
#define NUM_COLS 3
@@ -66,6 +73,7 @@ struct _EEmoticonToolButtonPrivate {
GdkDevice *grab_mouse;
};
+<<<<<<< HEAD
static guint signals[LAST_SIGNAL];
/* Forward Declarations */
@@ -80,6 +88,11 @@ G_DEFINE_TYPE_WITH_CODE (
E_TYPE_EMOTICON_CHOOSER,
e_emoticon_tool_button_interface_init))
+=======
+static gpointer parent_class;
+static guint signals[LAST_SIGNAL];
+
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
/* XXX Copied from _gtk_toolbar_elide_underscores() */
static gchar *
emoticon_tool_button_elide_underscores (const gchar *original)
@@ -156,7 +169,11 @@ emoticon_tool_button_reposition_window (EEmoticonToolButton *button)
static void
emoticon_tool_button_emoticon_clicked_cb (EEmoticonToolButton *button,
+<<<<<<< HEAD
GtkWidget *emoticon_button)
+=======
+ GtkWidget *emoticon_button)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
button->priv->active_button = emoticon_button;
e_emoticon_tool_button_popdown (button);
@@ -164,8 +181,13 @@ emoticon_tool_button_emoticon_clicked_cb (EEmoticonToolButton *button,
static gboolean
emoticon_tool_button_emoticon_release_event_cb (EEmoticonToolButton *button,
+<<<<<<< HEAD
GdkEventButton *event,
GtkButton *emoticon_button)
+=======
+ GdkEventButton *event,
+ GtkButton *emoticon_button)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
GtkStateType state;
@@ -179,7 +201,11 @@ emoticon_tool_button_emoticon_release_event_cb (EEmoticonToolButton *button,
static gboolean
emoticon_tool_button_button_release_event_cb (EEmoticonToolButton *button,
+<<<<<<< HEAD
GdkEventButton *event)
+=======
+ GdkEventButton *event)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
GtkToggleToolButton *tool_button;
GtkWidget *event_widget;
@@ -224,7 +250,11 @@ emoticon_tool_button_child_hide_cb (EEmoticonToolButton *button)
static gboolean
emoticon_tool_button_child_key_press_event_cb (EEmoticonToolButton *button,
+<<<<<<< HEAD
GdkEventKey *event)
+=======
+ GdkEventKey *event)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
GtkWidget *window = button->priv->window;
@@ -236,9 +266,15 @@ emoticon_tool_button_child_key_press_event_cb (EEmoticonToolButton *button,
static void
emoticon_tool_button_set_property (GObject *object,
+<<<<<<< HEAD
guint property_id,
const GValue *value,
GParamSpec *pspec)
+=======
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
switch (property_id) {
case PROP_CURRENT_EMOTICON:
@@ -262,6 +298,7 @@ emoticon_tool_button_set_property (GObject *object,
static void
emoticon_tool_button_get_property (GObject *object,
+<<<<<<< HEAD
guint property_id,
GValue *value,
GParamSpec *pspec)
@@ -269,6 +306,15 @@ emoticon_tool_button_get_property (GObject *object,
EEmoticonToolButtonPrivate *priv;
priv = E_EMOTICON_TOOL_BUTTON_GET_PRIVATE (object);
+=======
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ EEmoticonToolButtonPrivate *priv;
+
+ priv = E_EMOTICON_TOOL_BUTTON (object)->priv;
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
switch (property_id) {
case PROP_CURRENT_EMOTICON:
@@ -291,20 +337,35 @@ emoticon_tool_button_dispose (GObject *object)
{
EEmoticonToolButtonPrivate *priv;
+<<<<<<< HEAD
priv = E_EMOTICON_TOOL_BUTTON_GET_PRIVATE (object);
if (priv->window != NULL) {
gtk_widget_destroy (priv->window);
+=======
+ priv = E_EMOTICON_TOOL_BUTTON (object)->priv;
+
+ if (priv->window != NULL) {
+ g_object_unref (priv->window);
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
priv->window = NULL;
}
/* Chain up to parent's dispose() method. */
+<<<<<<< HEAD
G_OBJECT_CLASS (e_emoticon_tool_button_parent_class)->dispose (object);
+=======
+ G_OBJECT_CLASS (parent_class)->dispose (object);
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
}
static gboolean
emoticon_tool_button_press_event (GtkWidget *widget,
+<<<<<<< HEAD
GdkEventButton *event)
+=======
+ GdkEventButton *event)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
EEmoticonToolButton *button;
GtkToggleToolButton *toggle_button;
@@ -383,8 +444,12 @@ emoticon_tool_button_popup (EEmoticonToolButton *button)
/* Try to grab the pointer and keyboard. */
window = gtk_widget_get_window (button->priv->window);
grab_status = !keyboard ||
+<<<<<<< HEAD
gdk_device_grab (
keyboard, window,
+=======
+ gdk_device_grab (keyboard, window,
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
GDK_OWNERSHIP_WINDOW, TRUE,
GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
NULL, activate_time) == GDK_GRAB_SUCCESS;
@@ -440,7 +505,11 @@ emoticon_tool_button_get_current_emoticon (EEmoticonChooser *chooser)
{
EEmoticonToolButtonPrivate *priv;
+<<<<<<< HEAD
priv = E_EMOTICON_TOOL_BUTTON_GET_PRIVATE (chooser);
+=======
+ priv = E_EMOTICON_TOOL_BUTTON (chooser)->priv;
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
if (priv->active_button == NULL)
return NULL;
@@ -450,12 +519,20 @@ emoticon_tool_button_get_current_emoticon (EEmoticonChooser *chooser)
static void
emoticon_tool_button_set_current_emoticon (EEmoticonChooser *chooser,
+<<<<<<< HEAD
EEmoticon *emoticon)
+=======
+ EEmoticon *emoticon)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
EEmoticonToolButtonPrivate *priv;
GList *list, *iter;
+<<<<<<< HEAD
priv = E_EMOTICON_TOOL_BUTTON_GET_PRIVATE (chooser);
+=======
+ priv = E_EMOTICON_TOOL_BUTTON (chooser)->priv;
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
list = gtk_container_get_children (GTK_CONTAINER (priv->table));
@@ -477,12 +554,20 @@ emoticon_tool_button_set_current_emoticon (EEmoticonChooser *chooser,
}
static void
+<<<<<<< HEAD
e_emoticon_tool_button_class_init (EEmoticonToolButtonClass *class)
+=======
+emoticon_tool_button_class_init (EEmoticonToolButtonClass *class)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
GObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkToggleToolButtonClass *toggle_tool_button_class;
+<<<<<<< HEAD
+=======
+ parent_class = g_type_class_peek_parent (class);
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
g_type_class_add_private (class, sizeof (EEmoticonToolButtonPrivate));
object_class = G_OBJECT_CLASS (class);
@@ -549,6 +634,7 @@ e_emoticon_tool_button_class_init (EEmoticonToolButtonClass *class)
}
static void
+<<<<<<< HEAD
e_emoticon_tool_button_interface_init (EEmoticonChooserInterface *interface)
{
interface->get_current_emoticon =
@@ -559,6 +645,16 @@ e_emoticon_tool_button_interface_init (EEmoticonChooserInterface *interface)
static void
e_emoticon_tool_button_init (EEmoticonToolButton *button)
+=======
+emoticon_tool_button_iemoticon_init (EEmoticonChooserIface *iemoticon)
+{
+ iemoticon->get_current_emoticon = emoticon_tool_button_get_current_emoticon;
+ iemoticon->set_current_emoticon = emoticon_tool_button_set_current_emoticon;
+}
+
+static void
+emoticon_tool_button_init (EEmoticonToolButton *button)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
EEmoticonChooser *chooser;
GtkWidget *toplevel;
@@ -568,11 +664,18 @@ e_emoticon_tool_button_init (EEmoticonToolButton *button)
GList *list, *iter;
gint ii;
+<<<<<<< HEAD
button->priv = E_EMOTICON_TOOL_BUTTON_GET_PRIVATE (button);
+=======
+ button->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+ button, E_TYPE_EMOTICON_TOOL_BUTTON,
+ EEmoticonToolButtonPrivate);
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
/* Build the pop-up window. */
window = gtk_window_new (GTK_WINDOW_POPUP);
+<<<<<<< HEAD
gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
gtk_window_set_type_hint (
GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_COMBO);
@@ -580,12 +683,23 @@ e_emoticon_tool_button_init (EEmoticonToolButton *button)
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (button));
if (GTK_IS_WINDOW (toplevel)) {
+=======
+ toplevel = gtk_widget_get_toplevel (GTK_WIDGET (button));
+ gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
+ gtk_window_set_type_hint (
+ GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_COMBO);
+ if (gtk_widget_is_toplevel (toplevel)) {
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
gtk_window_group_add_window (
gtk_window_get_group (GTK_WINDOW (toplevel)),
GTK_WINDOW (window));
gtk_window_set_transient_for (
GTK_WINDOW (window), GTK_WINDOW (toplevel));
}
+<<<<<<< HEAD
+=======
+ button->priv->window = g_object_ref (window);
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
g_signal_connect_swapped (
window, "show",
@@ -621,7 +735,11 @@ e_emoticon_tool_button_init (EEmoticonToolButton *button)
container = widget;
chooser = E_EMOTICON_CHOOSER (button);
+<<<<<<< HEAD
list = e_emoticon_chooser_get_items ();
+=======
+ list = e_emoticon_chooser_get_items (chooser);
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
g_assert (g_list_length (list) <= NUM_ROWS * NUM_COLS);
for (iter = list, ii = 0; iter != NULL; iter = iter->next, ii++) {
@@ -672,6 +790,45 @@ e_emoticon_tool_button_init (EEmoticonToolButton *button)
g_list_free (list);
}
+<<<<<<< HEAD
+=======
+GType
+e_emoticon_tool_button_get_type (void)
+{
+ static GType type = 0;
+
+ if (G_UNLIKELY (type == 0)) {
+ static const GTypeInfo type_info = {
+ sizeof (EEmoticonToolButtonClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) emoticon_tool_button_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL, /* class_data */
+ sizeof (EEmoticonToolButton),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) emoticon_tool_button_init,
+ NULL /* value_table */
+ };
+
+ static const GInterfaceInfo iemoticon_info = {
+ (GInterfaceInitFunc) emoticon_tool_button_iemoticon_init,
+ (GInterfaceFinalizeFunc) NULL,
+ NULL /* interemoticon_data */
+ };
+
+ type = g_type_register_static (
+ GTK_TYPE_TOGGLE_TOOL_BUTTON,
+ "EEmoticonToolButton", &type_info, 0);
+
+ g_type_add_interface_static (
+ type, E_TYPE_EMOTICON_CHOOSER, &iemoticon_info);
+ }
+
+ return type;
+}
+
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
GtkToolItem *
e_emoticon_tool_button_new (void)
{
diff --git a/e-util/e-emoticon-tool-button.h b/e-util/e-emoticon-tool-button.h
index fc7dc8e..bf4339f 100644
--- a/e-util/e-emoticon-tool-button.h
+++ b/e-util/e-emoticon-tool-button.h
@@ -1,8 +1,12 @@
+<<<<<<< HEAD
/*
* e-emoticon-tool-button.h
*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
+=======
+/* e-emoticon-tool-button.h
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU Lesser General Public
@@ -61,11 +65,19 @@ struct _EEmoticonToolButton {
struct _EEmoticonToolButtonClass {
GtkToggleToolButtonClass parent_class;
+<<<<<<< HEAD
void (*popup) (EEmoticonToolButton *button);
void (*popdown) (EEmoticonToolButton *button);
};
GType e_emoticon_tool_button_get_type (void) G_GNUC_CONST;
+=======
+ void (*popup) (EEmoticonToolButton *button);
+ void (*popdown) (EEmoticonToolButton *button);
+};
+
+GType e_emoticon_tool_button_get_type (void);
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
GtkToolItem * e_emoticon_tool_button_new (void);
void e_emoticon_tool_button_popup (EEmoticonToolButton *button);
void e_emoticon_tool_button_popdown (EEmoticonToolButton *button);
diff --git a/e-util/e-emoticon.c b/e-util/e-emoticon.c
index c543e52..46f32c6 100644
--- a/e-util/e-emoticon.c
+++ b/e-util/e-emoticon.c
@@ -1,8 +1,12 @@
+<<<<<<< HEAD
/*
* e-emoticon.c
*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
+=======
+/* e-emoticon.c
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU Lesser General Public
@@ -21,8 +25,11 @@
#include "e-emoticon.h"
+<<<<<<< HEAD
#include <gtk/gtk.h>
+=======
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
static EEmoticon *
emoticon_copy (EEmoticon *emoticon)
{
@@ -61,7 +68,11 @@ e_emoticon_get_type (void)
gboolean
e_emoticon_equal (EEmoticon *emoticon_a,
+<<<<<<< HEAD
EEmoticon *emoticon_b)
+=======
+ EEmoticon *emoticon_b)
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
{
if (((emoticon_a == NULL) && (emoticon_b != NULL)) ||
((emoticon_a != NULL) && (emoticon_b == NULL)))
@@ -93,6 +104,7 @@ e_emoticon_free (EEmoticon *emoticon)
{
g_boxed_free (E_TYPE_EMOTICON, emoticon);
}
+<<<<<<< HEAD
gchar *
e_emoticon_get_uri (EEmoticon *emoticon)
@@ -116,3 +128,5 @@ e_emoticon_get_uri (EEmoticon *emoticon)
return uri;
}
+=======
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
diff --git a/e-util/e-emoticon.h b/e-util/e-emoticon.h
index 66327ab..cf1a2f7 100644
--- a/e-util/e-emoticon.h
+++ b/e-util/e-emoticon.h
@@ -1,8 +1,12 @@
+<<<<<<< HEAD
/*
* e-emoticon.h
*
* Copyright (C) 2008 Novell, Inc.
* Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
+=======
+/* e-emoticon.h
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU Lesser General Public
@@ -41,12 +45,19 @@ struct _EEmoticon {
gchar *text_face;
};
+<<<<<<< HEAD
GType e_emoticon_get_type (void) G_GNUC_CONST;
+=======
+GType e_emoticon_get_type (void);
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
gboolean e_emoticon_equal (EEmoticon *emoticon_a,
EEmoticon *emoticon_b);
EEmoticon * e_emoticon_copy (EEmoticon *emoticon);
void e_emoticon_free (EEmoticon *emoticon);
+<<<<<<< HEAD
gchar * e_emoticon_get_uri (EEmoticon *emoticon);
+=======
+>>>>>>> Import GtkhtmlFace* classes as EEmoticon*
G_END_DECLS
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 11f2a26..f39e75a 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -93,6 +93,11 @@
#include <e-util/e-dialog-widgets.h>
#include <e-util/e-editor-selection.h>
#include <e-util/e-editor-widget.h>
+#include <e-util/e-emoticon-action.h>
+#include <e-util/e-emoticon-chooser-menu.h>
+#include <e-util/e-emoticon-chooser.h>
+#include <e-util/e-emoticon-tool-button.h>
+#include <e-util/e-emoticon.h>
#include <e-util/e-event.h>
#include <e-util/e-file-request.h>
#include <e-util/e-file-utils.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
