[evolution/wip/webkit-composer: 583/966] Drop GtkHTML dependency.
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/webkit-composer: 583/966] Drop GtkHTML dependency.
- Date: Wed, 23 Apr 2014 10:42:26 +0000 (UTC)
commit 685f57c551707396d8a15eab484da7766f1289f6
Author: Matthew Barnes <mbarnes redhat com>
Date: Sun Jul 7 17:40:46 2013 -0400
Drop GtkHTML dependency.
calendar/gui/dialogs/Makefile.am | 2 +-
configure.ac | 8 -
e-util/Makefile.am | 3 +-
e-util/e-color-chooser-widget.c | 74 ----
e-util/e-color-chooser-widget.h | 19 -
e-util/e-color-combo.h | 29 --
e-util/e-editor-dialog.h | 15 -
e-util/e-editor-hrule-dialog.h | 13 -
e-util/e-editor-image-dialog.h | 13 -
e-util/e-editor-link-dialog.h | 13 -
e-util/e-editor-page-dialog.h | 13 -
e-util/e-editor-paragraph-dialog.h | 14 -
e-util/e-editor-spell-check-dialog.h | 19 -
e-util/e-editor-table-dialog.h | 13 -
e-util/e-editor-text-dialog.h | 13 -
e-util/e-emoticon-action.c | 125 ------
e-util/e-emoticon-action.h | 12 -
e-util/e-emoticon-chooser-menu.h | 14 -
e-util/e-emoticon-tool-button.h | 16 -
e-util/e-emoticon.h | 16 -
e-util/e-image-chooser-dialog.c | 38 --
e-util/e-image-chooser-dialog.h | 5 -
e-util/e-spell-checker.c | 693 ----------------------------------
e-util/e-spell-checker.h | 49 ---
modules/web-inspector/Makefile.am | 2 +-
25 files changed, 3 insertions(+), 1228 deletions(-)
---
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index e73a531..ec5afaa 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -14,7 +14,7 @@ libcal_dialogs_la_CPPFLAGS = \
-DPREFIX=\""$(prefix)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CODE_COVERAGE_CFLAGS)
+ $(CODE_COVERAGE_CFLAGS) \
$(NULL)
ecalendarincludedir = $(privincludedir)/calendar/gui/dialogs
diff --git a/configure.ac b/configure.ac
index 7141d38..170b0ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,9 +46,6 @@ m4_define([soup_encoded_version], [SOUP_VERSION_2_42])
m4_define([eds_minimum_version], [evo_version])
m4_define([enchant_minimum_version], [1.1.7])
-m4_define([gtkhtml_minimum_version], [4.5.2])
-m4_define([gdk_pixbuf_minimum_version], [2.24.0])
-m4_define([gcr_minimum_version], [3.4])
m4_define([gnome_desktop_minimum_version], [2.91.3])
m4_define([gnome_icon_theme_minimum_version], [2.30.2.1])
m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92])
@@ -619,11 +616,6 @@ AM_CONDITIONAL(SUNLDAP, [test x$with_sunldap != xno])
AC_DEFINE(HANDLE_LIBICAL_MEMORY, 1, [Define it once memory returned by libical is free'ed properly])
-dnl ************
-dnl Kerberos 5
-dnl ************
-EVO_KRB5_SUPPORT(no)
-
dnl ********************************************************************************
dnl security extension support (SSL and S/MIME)
dnl
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index a64e548..5f694f4 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -101,10 +101,9 @@ libevolution_util_la_CPPFLAGS = \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
$(GEO_CFLAGS) \
- $(GTKSPELL_CFLAGS) \
- $(CODE_COVERAGE_CFLAGS) \
$(ENCHANT_CFLAGS) \
$(GTKSPELL_CFLAGS) \
+ $(CODE_COVERAGE_CFLAGS) \
$(NULL)
evolution_util_include_HEADERS = \
diff --git a/e-util/e-color-chooser-widget.c b/e-util/e-color-chooser-widget.c
index b5c863e..18339f5 100644
--- a/e-util/e-color-chooser-widget.c
+++ b/e-util/e-color-chooser-widget.c
@@ -1,14 +1,6 @@
-<<<<<<< HEAD
-
-/* e-color-chooser-widget.c
- *
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
- *
-=======
/* e-color-chooser-widget.c
*
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
* 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
* License as published by the Free Software Foundation.
@@ -32,23 +24,10 @@
#include <glib/gi18n-lib.h>
-<<<<<<< HEAD
-#define E_COLOR_CHOOSER_WIDGET_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE \
- ((obj), E_TYPE_COLOR_CHOOSER_WIDGET, EColorChooserWidgetPrivate))
-
-/**
- * EColorChooserWidget:
- *
- * This widget wrapps around #GtkColorChooserWidget and allows the widget to be
- * used as a delegate for #GtkComboBox for instance.
- */
-=======
G_DEFINE_TYPE (
EColorChooserWidget,
e_color_chooser_widget,
GTK_TYPE_COLOR_CHOOSER_WIDGET);
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
struct _EColorChooserWidgetPrivate {
gboolean showing_editor;
@@ -61,14 +40,6 @@ enum {
static guint signals[LAST_SIGNAL];
-<<<<<<< HEAD
-G_DEFINE_TYPE (
- EColorChooserWidget,
- e_color_chooser_widget,
- GTK_TYPE_COLOR_CHOOSER_WIDGET);
-
-=======
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
/* UGLY UGLY UGLY!
* GtkColorChooserWidget sends "color-activated" signal
* only when user double-clicks the color. This is totally stupid
@@ -85,11 +56,7 @@ G_DEFINE_TYPE (
*/
static gboolean
color_chooser_widget_button_press_event (GtkWidget *widget,
-<<<<<<< HEAD
- GdkEventButton *event)
-=======
GdkEventButton *event)
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
{
if ((event->type == GDK_BUTTON_PRESS) &&
(event->button == GDK_BUTTON_PRIMARY)) {
@@ -104,13 +71,8 @@ color_chooser_widget_button_press_event (GtkWidget *widget,
static void
color_chooser_widget_color_activated (GtkColorChooser *chooser,
-<<<<<<< HEAD
- GdkRGBA *color,
- gpointer user_data)
-=======
GdkRGBA *color,
gpointer user_data)
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
{
/* Because we are simulating the double-click by accepting only
* single click, the color in the swatch is actually not selected,
@@ -121,10 +83,6 @@ color_chooser_widget_color_activated (GtkColorChooser *chooser,
static gboolean
run_color_chooser_dialog (gpointer user_data)
{
-<<<<<<< HEAD
- EColorChooserWidgetPrivate *priv;
-=======
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
GtkWidget *parent_window;
GtkWidget *parent_chooser;
GtkWidget *dialog;
@@ -132,10 +90,7 @@ run_color_chooser_dialog (gpointer user_data)
parent_chooser = user_data;
-<<<<<<< HEAD
-=======
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
g_object_set (
G_OBJECT (parent_chooser), "show-editor", FALSE, NULL);
@@ -143,19 +98,11 @@ run_color_chooser_dialog (gpointer user_data)
if (!parent_window)
parent_window = gtk_widget_get_toplevel (parent_chooser);
dialog = gtk_dialog_new_with_buttons (
-<<<<<<< HEAD
- N_("Choose custom color"),
- GTK_WINDOW (parent_window),
- GTK_DIALOG_MODAL,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL);
-=======
N_("Choose custom color"),
GTK_WINDOW (parent_window),
GTK_DIALOG_MODAL,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL);
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
chooser = gtk_color_chooser_widget_new ();
g_object_set (G_OBJECT (chooser), "show-editor", TRUE, NULL);
@@ -176,25 +123,14 @@ run_color_chooser_dialog (gpointer user_data)
gtk_widget_destroy (dialog);
-<<<<<<< HEAD
- priv = E_COLOR_CHOOSER_WIDGET_GET_PRIVATE (parent_chooser);
- priv->showing_editor = FALSE;
-
-=======
E_COLOR_CHOOSER_WIDGET (parent_chooser)->priv->showing_editor = FALSE;
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
return FALSE;
}
static void
color_chooser_show_editor_notify_cb (EColorChooserWidget *chooser,
-<<<<<<< HEAD
- GParamSpec *pspec,
- gpointer user_data)
-=======
GParamSpec *pspec,
gpointer user_data)
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
{
gboolean show_editor;
@@ -215,15 +151,9 @@ color_chooser_show_editor_notify_cb (EColorChooserWidget *chooser,
}
void
-<<<<<<< HEAD
-e_color_chooser_widget_class_init (EColorChooserWidgetClass *class)
-{
- g_type_class_add_private (class, sizeof (EColorChooserWidgetPrivate));
-=======
e_color_chooser_widget_class_init (EColorChooserWidgetClass *klass)
{
g_type_class_add_private (klass, sizeof (EColorChooserWidgetPrivate));
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
signals[SIGNAL_EDITOR_ACTIVATED] = g_signal_new (
"editor-activated",
@@ -273,13 +203,9 @@ e_color_chooser_widget_init (EColorChooserWidget *widget)
{
GtkWidget *swatch;
-<<<<<<< HEAD
- widget->priv = E_COLOR_CHOOSER_WIDGET_GET_PRIVATE (widget);
-=======
widget->priv = G_TYPE_INSTANCE_GET_PRIVATE (
widget, E_TYPE_COLOR_CHOOSER_WIDGET,
EColorChooserWidgetPrivate);
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
widget->priv->showing_editor = FALSE;
swatch = find_swatch (GTK_CONTAINER (widget));
diff --git a/e-util/e-color-chooser-widget.h b/e-util/e-color-chooser-widget.h
index c14fcf5..b68062c 100644
--- a/e-util/e-color-chooser-widget.h
+++ b/e-util/e-color-chooser-widget.h
@@ -1,10 +1,5 @@
/* e-color-chooser-widget.h
*
-<<<<<<< HEAD
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
- *
-=======
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
* 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
* License as published by the Free Software Foundation.
@@ -56,35 +51,21 @@ typedef struct _EColorChooserWidgetPrivate EColorChooserWidgetPrivate;
struct _EColorChooserWidget {
GtkColorChooserWidget parent;
-<<<<<<< HEAD
-=======
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
EColorChooserWidgetPrivate *priv;
};
struct _EColorChooserWidgetClass {
GtkColorChooserWidgetClass parent_class;
-<<<<<<< HEAD
- void (*editor_activated) (GtkColorChooserWidget *chooser);
-};
-
-GType e_color_chooser_widget_get_type (void) G_GNUC_CONST;
-=======
void (*editor_activated) (GtkColorChooserWidget *chooser);
};
GType e_color_chooser_widget_get_type (void);
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
GtkWidget * e_color_chooser_widget_new (void);
G_END_DECLS
#endif /* E_COLOR_CHOOSER_WIDGET_H */
-<<<<<<< HEAD
-
-=======
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
diff --git a/e-util/e-color-combo.h b/e-util/e-color-combo.h
index 9e27201..1b90a35 100644
--- a/e-util/e-color-combo.h
+++ b/e-util/e-color-combo.h
@@ -1,10 +1,5 @@
/* e-color-combo.h
*
-<<<<<<< HEAD
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
- *
-=======
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
* 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
* License as published by the Free Software Foundation.
@@ -68,22 +63,12 @@ struct _EColorComboClass {
GdkRGBA *color);
};
-<<<<<<< HEAD
-GType e_color_combo_get_type (void) G_GNUC_CONST;
-=======
GType e_color_combo_get_type (void);
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
GtkWidget * e_color_combo_new (void);
GtkWidget * e_color_combo_new_defaults (GdkRGBA *default_color,
const gchar *default_label);
void e_color_combo_popup (EColorCombo *combo);
void e_color_combo_popdown (EColorCombo *combo);
-<<<<<<< HEAD
-void e_color_combo_get_current_color (EColorCombo *combo,
- GdkRGBA *rgba);
-void e_color_combo_set_current_color (EColorCombo *combo,
- const GdkRGBA *color);
-=======
void e_color_combo_get_current_color (EColorCombo *combo,
GdkRGBA *rgba);
@@ -91,40 +76,26 @@ void e_color_combo_get_current_color (EColorCombo *combo,
void e_color_combo_set_current_color (EColorCombo *combo,
const GdkRGBA *color);
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
void e_color_combo_get_default_color (EColorCombo *combo,
GdkRGBA *color);
void e_color_combo_set_default_color (EColorCombo *combo,
const GdkRGBA *default_color);
-<<<<<<< HEAD
-const gchar * e_color_combo_get_default_label (EColorCombo *combo);
-void e_color_combo_set_default_label (EColorCombo *combo,
- const gchar *text);
-=======
const gchar * e_color_combo_get_default_label (EColorCombo *combo);
void e_color_combo_set_default_label (EColorCombo *combo,
const gchar *text);
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
gboolean e_color_combo_get_default_transparent
(EColorCombo *combo);
void e_color_combo_set_default_transparent
(EColorCombo *combo,
gboolean transparent);
-<<<<<<< HEAD
-GList * e_color_combo_get_palette (EColorCombo *combo);
-void e_color_combo_set_palette (EColorCombo *combo,
- GList *palette);
-
-=======
GList * e_color_combo_get_palette (EColorCombo *combo);
void e_color_combo_set_palette (EColorCombo *combo,
GList *palette);
->>>>>>> Import GtkhtmlColorCombo as EColorCombo
G_END_DECLS
#endif /* E_COLOR_COMBO_H */
diff --git a/e-util/e-editor-dialog.h b/e-util/e-editor-dialog.h
index 0828337..6f305fd 100644
--- a/e-util/e-editor-dialog.h
+++ b/e-util/e-editor-dialog.h
@@ -1,11 +1,6 @@
/*
* e-editor-dialog.h
*
-<<<<<<< HEAD
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
- *
-=======
->>>>>>> Refactor EEditorDialog... classes
* This program 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
@@ -58,10 +53,7 @@ typedef struct _EEditorDialogPrivate EEditorDialogPrivate;
struct _EEditorDialog {
GtkWindow parent;
-<<<<<<< HEAD
-=======
->>>>>>> Refactor EEditorDialog... classes
EEditorDialogPrivate *priv;
};
@@ -69,16 +61,9 @@ struct _EEditorDialogClass {
GtkWindowClass parent_class;
};
-<<<<<<< HEAD
-GType e_editor_dialog_get_type (void) G_GNUC_CONST;
-EEditor * e_editor_dialog_get_editor (EEditorDialog *dialog);
-GtkBox * e_editor_dialog_get_button_box (EEditorDialog *dialog);
-GtkGrid * e_editor_dialog_get_container (EEditorDialog *dialog);
-=======
GType e_editor_dialog_get_type (void);
EEditor * e_editor_dialog_get_editor (EEditorDialog *dialog);
->>>>>>> Refactor EEditorDialog... classes
GtkBox * e_editor_dialog_get_button_box (EEditorDialog *dialog);
diff --git a/e-util/e-editor-hrule-dialog.h b/e-util/e-editor-hrule-dialog.h
index 76803e9..d36b589 100644
--- a/e-util/e-editor-hrule-dialog.h
+++ b/e-util/e-editor-hrule-dialog.h
@@ -1,11 +1,6 @@
/*
* e-editor-hrule-dialog.h
*
-<<<<<<< HEAD
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
- *
-=======
->>>>>>> Make horizontal rule dialog work
* This program 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
@@ -57,10 +52,7 @@ typedef struct _EEditorHRuleDialogPrivate EEditorHRuleDialogPrivate;
struct _EEditorHRuleDialog {
EEditorDialog parent;
-<<<<<<< HEAD
-=======
->>>>>>> Make horizontal rule dialog work
EEditorHRuleDialogPrivate *priv;
};
@@ -68,14 +60,9 @@ struct _EEditorHRuleDialogClass {
EEditorDialogClass parent_class;
};
-<<<<<<< HEAD
-GType e_editor_hrule_dialog_get_type (void) G_GNUC_CONST;
-GtkWidget * e_editor_hrule_dialog_new (EEditor *editor);
-=======
GType e_editor_hrule_dialog_get_type (void);
GtkWidget* e_editor_hrule_dialog_new (EEditor *editor);
->>>>>>> Make horizontal rule dialog work
G_END_DECLS
diff --git a/e-util/e-editor-image-dialog.h b/e-util/e-editor-image-dialog.h
index 4161afa..c6fdaa5 100644
--- a/e-util/e-editor-image-dialog.h
+++ b/e-util/e-editor-image-dialog.h
@@ -1,11 +1,6 @@
/*
* e-editor-image-dialog.h
*
-<<<<<<< HEAD
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
- *
-=======
->>>>>>> Make 'Image Properties' dialog work
* This program 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
@@ -57,10 +52,7 @@ typedef struct _EEditorImageDialogPrivate EEditorImageDialogPrivate;
struct _EEditorImageDialog {
EEditorDialog parent;
-<<<<<<< HEAD
-=======
->>>>>>> Make 'Image Properties' dialog work
EEditorImageDialogPrivate *priv;
};
@@ -68,15 +60,10 @@ struct _EEditorImageDialogClass {
EEditorDialogClass parent_class;
};
-<<<<<<< HEAD
-GType e_editor_image_dialog_get_type (void) G_GNUC_CONST;
-GtkWidget * e_editor_image_dialog_new (EEditor *editor);
-=======
GType e_editor_image_dialog_get_type (void);
GtkWidget* e_editor_image_dialog_new (EEditor *editor);
->>>>>>> Make 'Image Properties' dialog work
void e_editor_image_dialog_show (EEditorImageDialog *dialog,
WebKitDOMNode *image);
diff --git a/e-util/e-editor-link-dialog.h b/e-util/e-editor-link-dialog.h
index 5c1d0c7..8f0ea49 100644
--- a/e-util/e-editor-link-dialog.h
+++ b/e-util/e-editor-link-dialog.h
@@ -1,11 +1,6 @@
/*
* e-editor-link-dialog.h
*
-<<<<<<< HEAD
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
- *
-=======
->>>>>>> Refactor EEditorDialog... classes
* This program 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
@@ -57,10 +52,7 @@ typedef struct _EEditorLinkDialogPrivate EEditorLinkDialogPrivate;
struct _EEditorLinkDialog {
EEditorDialog parent;
-<<<<<<< HEAD
-=======
->>>>>>> Refactor EEditorDialog... classes
EEditorLinkDialogPrivate *priv;
};
@@ -68,14 +60,9 @@ struct _EEditorLinkDialogClass {
EEditorDialogClass parent_class;
};
-<<<<<<< HEAD
-GType e_editor_link_dialog_get_type (void) G_GNUC_CONST;
-GtkWidget * e_editor_link_dialog_new (EEditor *editor);
-=======
GType e_editor_link_dialog_get_type (void);
GtkWidget* e_editor_link_dialog_new (EEditor *editor);
->>>>>>> Refactor EEditorDialog... classes
G_END_DECLS
diff --git a/e-util/e-editor-page-dialog.h b/e-util/e-editor-page-dialog.h
index 7516ab6..21a6399 100644
--- a/e-util/e-editor-page-dialog.h
+++ b/e-util/e-editor-page-dialog.h
@@ -1,11 +1,6 @@
/*
* e-editor-page-dialog.h
*
-<<<<<<< HEAD
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
- *
-=======
->>>>>>> Make 'Page Properties' dialog work
* This program 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
@@ -57,10 +52,7 @@ typedef struct _EEditorPageDialogPrivate EEditorPageDialogPrivate;
struct _EEditorPageDialog {
EEditorDialog parent;
-<<<<<<< HEAD
-=======
->>>>>>> Make 'Page Properties' dialog work
EEditorPageDialogPrivate *priv;
};
@@ -68,14 +60,9 @@ struct _EEditorPageDialogClass {
EEditorDialogClass parent_class;
};
-<<<<<<< HEAD
-GType e_editor_page_dialog_get_type (void) G_GNUC_CONST;
-GtkWidget * e_editor_page_dialog_new (EEditor *editor);
-=======
GType e_editor_page_dialog_get_type (void);
GtkWidget* e_editor_page_dialog_new (EEditor *editor);
->>>>>>> Make 'Page Properties' dialog work
G_END_DECLS
diff --git a/e-util/e-editor-paragraph-dialog.h b/e-util/e-editor-paragraph-dialog.h
index 3f3dc8a..cadd32d 100644
--- a/e-util/e-editor-paragraph-dialog.h
+++ b/e-util/e-editor-paragraph-dialog.h
@@ -1,11 +1,6 @@
/*
* e-editor-paragraph-dialog.h
*
-<<<<<<< HEAD
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
- *
-=======
->>>>>>> Make 'Paragraph Properties' dialog work
* This program 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
@@ -57,10 +52,7 @@ typedef struct _EEditorParagraphDialogPrivate EEditorParagraphDialogPrivate;
struct _EEditorParagraphDialog {
EEditorDialog parent;
-<<<<<<< HEAD
-=======
->>>>>>> Make 'Paragraph Properties' dialog work
EEditorParagraphDialogPrivate *priv;
};
@@ -68,15 +60,9 @@ struct _EEditorParagraphDialogClass {
EEditorDialogClass parent_class;
};
-<<<<<<< HEAD
-GType e_editor_paragraph_dialog_get_type
- (void) G_GNUC_CONST;
-GtkWidget * e_editor_paragraph_dialog_new (EEditor *editor);
-=======
GType e_editor_paragraph_dialog_get_type (void);
GtkWidget* e_editor_paragraph_dialog_new (EEditor *editor);
->>>>>>> Make 'Paragraph Properties' dialog work
G_END_DECLS
diff --git a/e-util/e-editor-spell-check-dialog.h b/e-util/e-editor-spell-check-dialog.h
index a1a52cf..624ff72 100644
--- a/e-util/e-editor-spell-check-dialog.h
+++ b/e-util/e-editor-spell-check-dialog.h
@@ -1,11 +1,4 @@
-<<<<<<< HEAD
-/*
- * e-editor-spell-check-dialog.h
- *
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
-=======
/* e-editor-spell-check-dialog.h
->>>>>>> Port spell-checking
*
* 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
@@ -58,10 +51,7 @@ typedef struct _EEditorSpellCheckDialogPrivate EEditorSpellCheckDialogPrivate;
struct _EEditorSpellCheckDialog {
EEditorDialog parent;
-<<<<<<< HEAD
-=======
->>>>>>> Port spell-checking
EEditorSpellCheckDialogPrivate *priv;
};
@@ -69,14 +59,6 @@ struct _EEditorSpellCheckDialogClass {
EEditorDialogClass parent_class;
};
-<<<<<<< HEAD
-GType e_editor_spell_check_dialog_get_type
- (void) G_GNUC_CONST;
-GtkWidget * e_editor_spell_check_dialog_new
- (EEditor *editor);
-void e_editor_spell_check_dialog_update_dictionaries
- (EEditorSpellCheckDialog *dialog);
-=======
GType e_editor_spell_check_dialog_get_type (void);
GtkWidget * e_editor_spell_check_dialog_new (EEditor *editor);
@@ -85,7 +67,6 @@ GList * e_editor_spell_check_dialog_get_dictionaries
void e_editor_spell_check_dialog_set_dictionaries
(EEditorSpellCheckDialog *dialog,
GList *dictionaries);
->>>>>>> Port spell-checking
G_END_DECLS
diff --git a/e-util/e-editor-table-dialog.h b/e-util/e-editor-table-dialog.h
index d164cb6..8bcca33 100644
--- a/e-util/e-editor-table-dialog.h
+++ b/e-util/e-editor-table-dialog.h
@@ -1,11 +1,6 @@
/*
* e-editor-table-dialog.h
*
-<<<<<<< HEAD
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
- *
-=======
->>>>>>> Make the 'Table properties' dialog work
* This program 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
@@ -57,10 +52,7 @@ typedef struct _EEditorTableDialogPrivate EEditorTableDialogPrivate;
struct _EEditorTableDialog {
EEditorDialog parent;
-<<<<<<< HEAD
-=======
->>>>>>> Make the 'Table properties' dialog work
EEditorTableDialogPrivate *priv;
};
@@ -68,14 +60,9 @@ struct _EEditorTableDialogClass {
EEditorDialogClass parent_class;
};
-<<<<<<< HEAD
-GType e_editor_table_dialog_get_type (void) G_GNUC_CONST;
-GtkWidget * e_editor_table_dialog_new (EEditor *editor);
-=======
GType e_editor_table_dialog_get_type (void);
GtkWidget* e_editor_table_dialog_new (EEditor *editor);
->>>>>>> Make the 'Table properties' dialog work
G_END_DECLS
diff --git a/e-util/e-editor-text-dialog.h b/e-util/e-editor-text-dialog.h
index 3526894..f660f4e 100644
--- a/e-util/e-editor-text-dialog.h
+++ b/e-util/e-editor-text-dialog.h
@@ -1,11 +1,6 @@
/*
* e-editor-text-dialog.h
*
-<<<<<<< HEAD
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
- *
-=======
->>>>>>> Make 'Text Properties' dialog work
* This program 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
@@ -57,10 +52,7 @@ typedef struct _EEditorTextDialogPrivate EEditorTextDialogPrivate;
struct _EEditorTextDialog {
EEditorDialog parent;
-<<<<<<< HEAD
-=======
->>>>>>> Make 'Text Properties' dialog work
EEditorTextDialogPrivate *priv;
};
@@ -68,14 +60,9 @@ struct _EEditorTextDialogClass {
EEditorDialogClass parent_class;
};
-<<<<<<< HEAD
-GType e_editor_text_dialog_get_type (void) G_GNUC_CONST;
-GtkWidget * e_editor_text_dialog_new (EEditor *editor);
-=======
GType e_editor_text_dialog_get_type (void);
GtkWidget* e_editor_text_dialog_new (EEditor *editor);
->>>>>>> Make 'Text Properties' dialog work
G_END_DECLS
diff --git a/e-util/e-emoticon-action.c b/e-util/e-emoticon-action.c
index a84df89..7ff674c 100644
--- a/e-util/e-emoticon-action.c
+++ b/e-util/e-emoticon-action.c
@@ -1,12 +1,4 @@
-<<<<<<< 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
@@ -29,13 +21,6 @@
#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;
@@ -46,29 +31,11 @@ enum {
PROP_CURRENT_FACE
};
-<<<<<<< HEAD
-/* Forward Declarations */
-static void e_emoticon_action_interface_init
- (EEmoticonChooserInterface *interface);
-
-G_DEFINE_TYPE_WITH_CODE (
- EEmoticonAction,
- e_emoticon_action,
- GTK_TYPE_ACTION,
- G_IMPLEMENT_INTERFACE (
- E_TYPE_EMOTICON_CHOOSER,
- e_emoticon_action_interface_init))
-
-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;
@@ -77,15 +44,9 @@ 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:
@@ -100,15 +61,9 @@ 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:
@@ -126,20 +81,12 @@ 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
@@ -147,11 +94,7 @@ 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;
}
@@ -178,19 +121,11 @@ 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;
@@ -204,39 +139,21 @@ 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 *
@@ -245,11 +162,7 @@ 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 ();
@@ -268,11 +181,7 @@ 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 (
@@ -283,20 +192,12 @@ 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;
@@ -306,19 +207,12 @@ 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);
@@ -339,18 +233,6 @@ 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;
- interface->set_current_emoticon = emoticon_action_set_current_emoticon;
-}
-
-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;
@@ -397,20 +279,13 @@ e_emoticon_action_get_type (void)
}
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 76ca75b..388b851 100644
--- a/e-util/e-emoticon-action.h
+++ b/e-util/e-emoticon-action.h
@@ -1,12 +1,4 @@
-<<<<<<< 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
@@ -66,11 +58,7 @@ 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.h b/e-util/e-emoticon-chooser-menu.h
index 2f6a4a0..bbed9aa 100644
--- a/e-util/e-emoticon-chooser-menu.h
+++ b/e-util/e-emoticon-chooser-menu.h
@@ -1,12 +1,4 @@
-<<<<<<< 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
@@ -65,14 +57,8 @@ 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-tool-button.h b/e-util/e-emoticon-tool-button.h
index bf4339f..6c1273e 100644
--- a/e-util/e-emoticon-tool-button.h
+++ b/e-util/e-emoticon-tool-button.h
@@ -1,12 +1,4 @@
-<<<<<<< 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
@@ -65,19 +57,11 @@ 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.h b/e-util/e-emoticon.h
index 53a5ec3..17995d5 100644
--- a/e-util/e-emoticon.h
+++ b/e-util/e-emoticon.h
@@ -1,12 +1,4 @@
-<<<<<<< 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
@@ -45,19 +37,11 @@ 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*
gchar * e_emoticon_get_uri (EEmoticon *emoticon);
diff --git a/e-util/e-image-chooser-dialog.c b/e-util/e-image-chooser-dialog.c
index a8c227c..17daca3 100644
--- a/e-util/e-image-chooser-dialog.c
+++ b/e-util/e-image-chooser-dialog.c
@@ -1,11 +1,6 @@
/*
* e-image-chooser-dialog.c
*
-<<<<<<< HEAD
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
- *
-=======
->>>>>>> Import GtkHTMLImageChooserDialog to EImageChooserDialog
* 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
* License as published by the Free Software Foundation.
@@ -23,13 +18,6 @@
#include "e-image-chooser-dialog.h"
-<<<<<<< HEAD
-#define E_IMAGE_CHOOSER_DIALOG_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE \
- ((obj), E_TYPE_IMAGE_CHOOSER_DIALOG, EImageChooserDialogPrivate))
-
-=======
->>>>>>> Import GtkHTMLImageChooserDialog to EImageChooserDialog
#define PREVIEW_WIDTH 256
#define PREVIEW_HEIGHT 256
@@ -107,11 +95,7 @@ image_chooser_dialog_update_preview (GtkFileChooser *file_chooser)
GFile *preview_file;
Context *context;
-<<<<<<< HEAD
- priv = E_IMAGE_CHOOSER_DIALOG_GET_PRIVATE (file_chooser);
-=======
priv = E_IMAGE_CHOOSER_DIALOG (file_chooser)->priv;
->>>>>>> Import GtkHTMLImageChooserDialog to EImageChooserDialog
preview_file = gtk_file_chooser_get_preview_file (file_chooser);
preview_widget = gtk_file_chooser_get_preview_widget (file_chooser);
@@ -146,11 +130,7 @@ image_chooser_dialog_dispose (GObject *object)
{
EImageChooserDialogPrivate *priv;
-<<<<<<< HEAD
- priv = E_IMAGE_CHOOSER_DIALOG_GET_PRIVATE (object);
-=======
priv = E_IMAGE_CHOOSER_DIALOG (object)->priv;
->>>>>>> Import GtkHTMLImageChooserDialog to EImageChooserDialog
if (priv->cancellable != NULL) {
g_cancellable_cancel (priv->cancellable);
@@ -188,24 +168,14 @@ image_chooser_dialog_constructed (GObject *object)
}
static void
-<<<<<<< HEAD
-e_image_chooser_dialog_class_init (EImageChooserDialogClass *class)
-=======
e_image_chooser_dialog_class_init (EImageChooserDialogClass *klass)
->>>>>>> Import GtkHTMLImageChooserDialog to EImageChooserDialog
{
GObjectClass *object_class;
g_type_class_add_private (
-<<<<<<< HEAD
- class, sizeof (EImageChooserDialogPrivate));
-
- object_class = G_OBJECT_CLASS (class);
-=======
klass, sizeof (EImageChooserDialogPrivate));
object_class = G_OBJECT_CLASS (klass);
->>>>>>> Import GtkHTMLImageChooserDialog to EImageChooserDialog
object_class->dispose = image_chooser_dialog_dispose;
object_class->constructed = image_chooser_dialog_constructed;
}
@@ -213,13 +183,9 @@ e_image_chooser_dialog_class_init (EImageChooserDialogClass *klass)
static void
e_image_chooser_dialog_init (EImageChooserDialog *dialog)
{
-<<<<<<< HEAD
- dialog->priv = E_IMAGE_CHOOSER_DIALOG_GET_PRIVATE (dialog);
-=======
dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (
dialog, E_TYPE_IMAGE_CHOOSER_DIALOG,
EImageChooserDialogPrivate);
->>>>>>> Import GtkHTMLImageChooserDialog to EImageChooserDialog
g_signal_connect (
dialog, "update-preview",
@@ -228,11 +194,7 @@ e_image_chooser_dialog_init (EImageChooserDialog *dialog)
GtkWidget *
e_image_chooser_dialog_new (const gchar *title,
-<<<<<<< HEAD
- GtkWindow *parent)
-=======
GtkWindow *parent)
->>>>>>> Import GtkHTMLImageChooserDialog to EImageChooserDialog
{
return g_object_new (
E_TYPE_IMAGE_CHOOSER_DIALOG,
diff --git a/e-util/e-image-chooser-dialog.h b/e-util/e-image-chooser-dialog.h
index 9119fbf..82f8cec 100644
--- a/e-util/e-image-chooser-dialog.h
+++ b/e-util/e-image-chooser-dialog.h
@@ -1,11 +1,6 @@
/*
* e-image-chooser-dialog.h
*
-<<<<<<< HEAD
- * Copyright (C) 2012 Dan Vrátil <dvratil redhat com>
- *
-=======
->>>>>>> Import GtkHTMLImageChooserDialog to EImageChooserDialog
* 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
* License as published by the Free Software Foundation.
diff --git a/e-util/e-spell-checker.c b/e-util/e-spell-checker.c
index 2e10d1c..f10438b 100644
--- a/e-util/e-spell-checker.c
+++ b/e-util/e-spell-checker.c
@@ -23,44 +23,11 @@
#include "e-spell-checker.h"
#include "e-spell-dictionary.h"
-<<<<<<< HEAD
-#include <libebackend/libebackend.h>
-=======
->>>>>>> Move spell-checking parts to e-util
#include <webkit/webkitspellchecker.h>
#include <pango/pango.h>
#include <gtk/gtk.h>
-<<<<<<< HEAD
-#define E_SPELL_CHECKER_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE \
- ((obj), E_TYPE_SPELL_CHECKER, ESpellCheckerPrivate))
-
-#define MAX_SUGGESTIONS 10
-
-struct _ESpellCheckerPrivate {
- EnchantBroker *broker;
- GHashTable *active_dictionaries;
- GHashTable *dictionaries_cache;
- gboolean dictionaries_loaded;
-
- /* We retain ownership of the EnchantDict's since they
- * have to be freed through enchant_broker_free_dict()
- * and we also own the EnchantBroker. */
- GHashTable *enchant_dicts;
-};
-
-enum {
- PROP_0,
- PROP_ACTIVE_LANGUAGES
-};
-
-/* Forward Declarations */
-static void e_spell_checker_init_webkit_checker
- (WebKitSpellCheckerInterface *interface);
-=======
static void e_spell_checker_init_webkit_checker (WebKitSpellCheckerInterface *iface);
->>>>>>> Move spell-checking parts to e-util
G_DEFINE_TYPE_EXTENDED (
ESpellChecker,
@@ -68,13 +35,6 @@ G_DEFINE_TYPE_EXTENDED (
G_TYPE_OBJECT,
0,
G_IMPLEMENT_INTERFACE (
-<<<<<<< HEAD
- E_TYPE_EXTENSIBLE, NULL)
- G_IMPLEMENT_INTERFACE (
- WEBKIT_TYPE_SPELL_CHECKER,
- e_spell_checker_init_webkit_checker))
-
-=======
WEBKIT_TYPE_SPELL_CHECKER,
e_spell_checker_init_webkit_checker))
@@ -89,7 +49,6 @@ enum {
PROP_ACTIVE_DICTIONARIES
};
->>>>>>> Move spell-checking parts to e-util
/**
* ESpellChecker:
*
@@ -98,35 +57,6 @@ enum {
* so it can be set as a default spell-checker to WebKit editors
*/
-<<<<<<< HEAD
-static gboolean
-spell_checker_enchant_dicts_foreach_cb (gpointer key,
- gpointer value,
- gpointer user_data)
-{
- EnchantDict *enchant_dict = value;
- EnchantBroker *enchant_broker = user_data;
-
- enchant_broker_free_dict (enchant_broker, enchant_dict);
-
- return TRUE;
-}
-
-static void
-wksc_check_spelling (WebKitSpellChecker *webkit_checker,
- const gchar *word,
- gint *misspelling_location,
- gint *misspelling_length)
-{
- ESpellChecker *checker = E_SPELL_CHECKER (webkit_checker);
- GHashTable *active_dictionaries;
- PangoLanguage *language;
- PangoLogAttr *attrs;
- gint length, ii;
-
- active_dictionaries = checker->priv->active_dictionaries;
- if (g_hash_table_size (active_dictionaries) == 0)
-=======
static void
wksc_check_spelling (WebKitSpellChecker *webkit_checker,
const char *word,
@@ -141,7 +71,6 @@ wksc_check_spelling (WebKitSpellChecker *webkit_checker,
dicts = checker->priv->active;
if (!dicts)
->>>>>>> Move spell-checking parts to e-util
return;
length = g_utf8_strlen (word, -1);
@@ -156,22 +85,6 @@ wksc_check_spelling (WebKitSpellChecker *webkit_checker,
* then we get into an inner loop to find the is_word_end
* corresponding */
if (attrs[ii].is_word_start) {
-<<<<<<< HEAD
- gboolean word_recognized;
- gint start = ii;
- gint end = ii;
- gint word_length;
- gchar *cstart;
- gint bytes;
- gchar *new_word;
-
- while (attrs[end].is_word_end < 1)
- end++;
-
- word_length = end - start;
- /* Set the iterator to be at the current word
- * end, so we don't check characters twice. */
-=======
int start = ii;
int end = ii;
int word_length;
@@ -187,7 +100,6 @@ wksc_check_spelling (WebKitSpellChecker *webkit_checker,
word_length = end - start;
/* Set the iterator to be at the current word end, so we don't
* check characters twice. */
->>>>>>> Move spell-checking parts to e-util
ii = end;
cstart = g_utf8_offset_to_pointer (word, start);
@@ -196,21 +108,6 @@ wksc_check_spelling (WebKitSpellChecker *webkit_checker,
g_utf8_strncpy (new_word, cstart, word_length);
-<<<<<<< HEAD
- word_recognized = e_spell_checker_check_word (
- checker, new_word, word_length);
-
- if (word_recognized) {
- if (misspelling_location != NULL)
- *misspelling_location = -1;
- if (misspelling_length != NULL)
- *misspelling_length = 0;
- } else {
- if (misspelling_location != NULL)
- *misspelling_location = start;
- if (misspelling_length != NULL)
- *misspelling_length = word_length;
-=======
for (iter = dicts; iter; iter = iter->next) {
ESpellDictionary *dict = iter->data;
@@ -228,7 +125,6 @@ wksc_check_spelling (WebKitSpellChecker *webkit_checker,
*misspelling_length = 0;
break;
}
->>>>>>> Move spell-checking parts to e-util
}
g_free (new_word);
@@ -240,46 +136,6 @@ wksc_check_spelling (WebKitSpellChecker *webkit_checker,
static gchar **
wksc_get_guesses (WebKitSpellChecker *webkit_checker,
-<<<<<<< HEAD
- const gchar *word,
- const gchar *context)
-{
- ESpellChecker *checker = E_SPELL_CHECKER (webkit_checker);
- GHashTable *active_dictionaries;
- GList *list, *link;
- gchar ** guesses;
- gint ii = 0;
-
- guesses = g_new0 (gchar *, MAX_SUGGESTIONS + 1);
-
- active_dictionaries = checker->priv->active_dictionaries;
- list = g_hash_table_get_keys (active_dictionaries);
-
- for (link = list; link != NULL; link = g_list_next (link)) {
- ESpellDictionary *dictionary;
- GList *suggestions;
-
- dictionary = E_SPELL_DICTIONARY (link->data);
- suggestions = e_spell_dictionary_get_suggestions (
- dictionary, word, -1);
-
- while (suggestions != NULL && ii < MAX_SUGGESTIONS) {
- guesses[ii++] = suggestions->data;
- suggestions->data = NULL;
-
- suggestions = g_list_delete_link (
- suggestions, suggestions);
- }
-
- g_list_free_full (suggestions, (GDestroyNotify) g_free);
-
- if (ii >= MAX_SUGGESTIONS)
- break;
- }
-
- g_list_free (list);
-
-=======
const gchar *word,
const gchar *context)
{
@@ -314,17 +170,12 @@ wksc_get_guesses (WebKitSpellChecker *webkit_checker,
}
}
->>>>>>> Move spell-checking parts to e-util
return guesses;
}
static gchar *
wksc_get_autocorrect_suggestions (WebKitSpellChecker *webkit_checker,
-<<<<<<< HEAD
- const gchar *word)
-=======
const gchar *word)
->>>>>>> Move spell-checking parts to e-util
{
/* Not supported/needed */
return NULL;
@@ -332,32 +183,11 @@ wksc_get_autocorrect_suggestions (WebKitSpellChecker *webkit_checker,
static void
spell_checker_learn_word (WebKitSpellChecker *webkit_checker,
-<<<<<<< HEAD
- const gchar *word)
-=======
const gchar *word)
->>>>>>> Move spell-checking parts to e-util
{
/* Carefully, this will add the word to all active dictionaries! */
ESpellChecker *checker;
-<<<<<<< HEAD
- GHashTable *active_dictionaries;
- GList *list, *link;
-
- checker = E_SPELL_CHECKER (webkit_checker);
- active_dictionaries = checker->priv->active_dictionaries;
- list = g_hash_table_get_keys (active_dictionaries);
-
- for (link = list; link != NULL; link = g_list_next (link)) {
- ESpellDictionary *dictionary;
-
- dictionary = E_SPELL_DICTIONARY (link->data);
- e_spell_dictionary_learn_word (dictionary, word, -1);
- }
-
- g_list_free (list);
-=======
GList *iter;
checker = E_SPELL_CHECKER (webkit_checker);
@@ -366,37 +196,15 @@ spell_checker_learn_word (WebKitSpellChecker *webkit_checker,
e_spell_dictionary_learn_word (dict, word, -1);
}
->>>>>>> Move spell-checking parts to e-util
}
static void
spell_checker_ignore_word (WebKitSpellChecker *webkit_checker,
-<<<<<<< HEAD
- const gchar *word)
-=======
const gchar *word)
->>>>>>> Move spell-checking parts to e-util
{
/* Carefully, this will add the word to all active dictionaries */
ESpellChecker *checker;
-<<<<<<< HEAD
- GHashTable *active_dictionaries;
- GList *list, *link;
-
- checker = E_SPELL_CHECKER (webkit_checker);
- active_dictionaries = checker->priv->active_dictionaries;
- list = g_hash_table_get_keys (active_dictionaries);
-
- for (link = list; link != NULL; link = g_list_next (link)) {
- ESpellDictionary *dictionary;
-
- dictionary = E_SPELL_DICTIONARY (link->data);
- e_spell_dictionary_ignore_word (dictionary, word, -1);
- }
-
- g_list_free (list);
-=======
GList *iter;
checker = E_SPELL_CHECKER (webkit_checker);
@@ -405,69 +213,10 @@ spell_checker_ignore_word (WebKitSpellChecker *webkit_checker,
e_spell_dictionary_ignore_word (dict, word, -1);
}
->>>>>>> Move spell-checking parts to e-util
}
static void
wksc_update_languages (WebKitSpellChecker *webkit_checker,
-<<<<<<< HEAD
- const gchar *languages)
-{
- ESpellChecker *checker;
- GHashTable *active_dictionaries;
- GQueue queue = G_QUEUE_INIT;
-
- checker = E_SPELL_CHECKER (webkit_checker);
- active_dictionaries = checker->priv->active_dictionaries;
-
- if (languages != NULL) {
- gchar **langs;
- gint ii;
-
- langs = g_strsplit (languages, ",", -1);
- for (ii = 0; langs[ii] != NULL; ii++) {
- ESpellDictionary *dictionary;
-
- dictionary = e_spell_checker_ref_dictionary (
- checker, langs[ii]);
- if (dictionary != NULL)
- g_queue_push_tail (&queue, dictionary);
- }
- g_strfreev (langs);
- } else {
- ESpellDictionary *dictionary;
- PangoLanguage *pango_language;
- const gchar *language;
-
- pango_language = gtk_get_default_language ();
- language = pango_language_to_string (pango_language);
- dictionary = e_spell_checker_ref_dictionary (checker, language);
-
- if (dictionary == NULL) {
- GList *list;
-
- list = e_spell_checker_list_available_dicts (checker);
- if (list != NULL) {
- dictionary = g_object_ref (list->data);
- g_list_free (list);
- }
- }
-
- if (dictionary != NULL)
- g_queue_push_tail (&queue, dictionary);
- }
-
- g_hash_table_remove_all (active_dictionaries);
-
- while (!g_queue_is_empty (&queue)) {
- ESpellDictionary *dictionary;
-
- dictionary = g_queue_pop_head (&queue);
- g_hash_table_add (active_dictionaries, dictionary);
- }
-
- g_object_notify (G_OBJECT (checker), "active-languages");
-=======
const char *languages)
{
ESpellChecker *checker;
@@ -518,23 +267,10 @@ spell_checker_set_property (GObject *object,
}
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
->>>>>>> Move spell-checking parts to e-util
}
static void
spell_checker_get_property (GObject *object,
-<<<<<<< HEAD
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
-{
- switch (property_id) {
- case PROP_ACTIVE_LANGUAGES:
- g_value_take_boxed (
- value,
- e_spell_checker_list_active_languages (
- E_SPELL_CHECKER (object), NULL));
-=======
guint property_id,
GValue *value,
GParamSpec *pspec)
@@ -545,7 +281,6 @@ spell_checker_get_property (GObject *object,
value,
e_spell_checker_get_active_dictionaries (
E_SPELL_CHECKER (object)));
->>>>>>> Move spell-checking parts to e-util
return;
}
@@ -555,166 +290,6 @@ spell_checker_get_property (GObject *object,
static void
spell_checker_dispose (GObject *object)
{
-<<<<<<< HEAD
- ESpellCheckerPrivate *priv;
-
- priv = E_SPELL_CHECKER_GET_PRIVATE (object);
-
- g_hash_table_remove_all (priv->active_dictionaries);
- g_hash_table_remove_all (priv->dictionaries_cache);
-
- /* Chain up to parent's dispose() method. */
- G_OBJECT_CLASS (e_spell_checker_parent_class)->dispose (object);
-}
-
-static void
-spell_checker_finalize (GObject *object)
-{
- ESpellCheckerPrivate *priv;
-
- priv = E_SPELL_CHECKER_GET_PRIVATE (object);
-
- /* Freeing EnchantDicts requires help from EnchantBroker. */
- g_hash_table_foreach_remove (
- priv->enchant_dicts,
- spell_checker_enchant_dicts_foreach_cb,
- priv->broker);
- g_hash_table_destroy (priv->enchant_dicts);
-
- enchant_broker_free (priv->broker);
-
- g_hash_table_destroy (priv->active_dictionaries);
- g_hash_table_destroy (priv->dictionaries_cache);
-
- /* Chain up to parent's finalize() method. */
- G_OBJECT_CLASS (e_spell_checker_parent_class)->finalize (object);
-}
-
-static void
-spell_checker_constructed (GObject *object)
-{
- /* Chain up to parent's constructed() method. */
- G_OBJECT_CLASS (e_spell_checker_parent_class)->constructed (object);
-
- e_extensible_load_extensions (E_EXTENSIBLE (object));
-}
-
-static void
-e_spell_checker_class_init (ESpellCheckerClass *class)
-{
- GObjectClass *object_class;
-
- g_type_class_add_private (class, sizeof (ESpellCheckerPrivate));
-
- object_class = G_OBJECT_CLASS (class);
- object_class->get_property = spell_checker_get_property;
- object_class->dispose = spell_checker_dispose;
- object_class->finalize = spell_checker_finalize;
- object_class->constructed = spell_checker_constructed;
-
- g_object_class_install_property (
- object_class,
- PROP_ACTIVE_LANGUAGES,
- g_param_spec_boxed (
- "active-languages",
- "Active Languages",
- "Active spell check language codes",
- G_TYPE_STRV,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
-}
-
-static void
-e_spell_checker_init_webkit_checker (WebKitSpellCheckerInterface *interface)
-{
- interface->check_spelling_of_string = wksc_check_spelling;
- interface->get_autocorrect_suggestions_for_misspelled_word =
- wksc_get_autocorrect_suggestions;
- interface->get_guesses_for_word = wksc_get_guesses;
- interface->ignore_word = spell_checker_ignore_word;
- interface->learn_word = spell_checker_learn_word;
- interface->update_spell_checking_languages = wksc_update_languages;
-}
-
-static void
-e_spell_checker_init (ESpellChecker *checker)
-{
- GHashTable *active_dictionaries;
- GHashTable *dictionaries_cache;
- GHashTable *enchant_dicts;
-
- active_dictionaries = g_hash_table_new_full (
- (GHashFunc) e_spell_dictionary_hash,
- (GEqualFunc) e_spell_dictionary_equal,
- (GDestroyNotify) g_object_unref,
- (GDestroyNotify) NULL);
-
- dictionaries_cache = g_hash_table_new_full (
- (GHashFunc) g_str_hash,
- (GEqualFunc) g_str_equal,
- (GDestroyNotify) NULL,
- (GDestroyNotify) g_object_unref);
-
- enchant_dicts = g_hash_table_new_full (
- (GHashFunc) g_str_hash,
- (GEqualFunc) g_str_equal,
- (GDestroyNotify) g_free,
- (GDestroyNotify) NULL);
-
- checker->priv = E_SPELL_CHECKER_GET_PRIVATE (checker);
-
- checker->priv->broker = enchant_broker_init ();
- checker->priv->active_dictionaries = active_dictionaries;
- checker->priv->dictionaries_cache = dictionaries_cache;
- checker->priv->enchant_dicts = enchant_dicts;
-}
-
-/**
- * e_spell_checker_new:
- *
- * Creates a new #ESpellChecker instance.
- *
- * Returns: a new #ESpellChecker
- **/
-ESpellChecker *
-e_spell_checker_new (void)
-{
- return g_object_new (E_TYPE_SPELL_CHECKER, NULL);
-}
-
-static void
-list_enchant_dicts (const gchar * const lang_tag,
- const gchar * const provider_name,
- const gchar * const provider_desc,
- const gchar * const provider_file,
- gpointer user_data)
-{
- ESpellChecker *checker = user_data;
- EnchantDict *enchant_dict;
-
- enchant_dict = enchant_broker_request_dict (
- checker->priv->broker, lang_tag);
- if (enchant_dict != NULL) {
- ESpellDictionary *dictionary;
- const gchar *code;
-
- /* Note that we retain ownership of the EnchantDict.
- * Since EnchantDict is not reference counted, we're
- * merely loaning the pointer to ESpellDictionary. */
- dictionary = e_spell_dictionary_new (checker, enchant_dict);
- code = e_spell_dictionary_get_code (dictionary);
-
- g_hash_table_insert (
- checker->priv->dictionaries_cache,
- (gpointer) code, dictionary);
-
- g_hash_table_insert (
- checker->priv->enchant_dicts,
- g_strdup (code), enchant_dict);
- }
-}
-
-=======
ESpellCheckerPrivate *priv = E_SPELL_CHECKER (object)->priv;
g_list_free_full (priv->active, g_object_unref);
@@ -804,7 +379,6 @@ list_enchant_dicts (const char * const lang_tag,
}
->>>>>>> Move spell-checking parts to e-util
/**
* e_spell_checker_list_available_dicts:
* @checker: An #ESpellChecker
@@ -812,248 +386,12 @@ list_enchant_dicts (const char * const lang_tag,
* Returns list of all dictionaries available to the actual
* spell-checking backend.
*
-<<<<<<< HEAD
- * Returns: new copy of #GList of #ESpellDictionary. The dictionaries are
- * owned by the @checker and should not be free'd. The list should be freed
- * using g_list_free() when not neede anymore. [transfer-list]
-=======
* Return value: a #GList of #ESpellDictionary. Free the list using g_list_free()
* when not needed anymore.
->>>>>>> Move spell-checking parts to e-util
*/
GList *
e_spell_checker_list_available_dicts (ESpellChecker *checker)
{
-<<<<<<< HEAD
- GList *list;
-
- g_return_val_if_fail (E_IS_SPELL_CHECKER (checker), NULL);
-
- if (!checker->priv->dictionaries_loaded) {
- enchant_broker_list_dicts (
- checker->priv->broker,
- list_enchant_dicts, checker);
- checker->priv->dictionaries_loaded = TRUE;
- }
-
- list = g_hash_table_get_values (checker->priv->dictionaries_cache);
-
- return g_list_sort (list, (GCompareFunc) e_spell_dictionary_compare);
-}
-
-/**
- * e_spell_checker_ref_dictionary:
- * @checker: an #ESpellChecker
- * @language_code: (allow-none): language code of a dictionary, or %NULL
- *
- * Tries to find an #ESpellDictionary for given @language_code.
- * If @language_code is %NULL, the function will return a default
- * #ESpellDictionary.
- *
- * Returns: an #ESpellDictionary for @language_code
- */
-ESpellDictionary *
-e_spell_checker_ref_dictionary (ESpellChecker *checker,
- const gchar *language_code)
-{
- ESpellDictionary *dictionary;
- GList *list;
-
- g_return_val_if_fail (E_IS_SPELL_CHECKER (checker), NULL);
-
- /* If the cache has not yet been initialized, do so - we will need
- * it anyway, Otherwise is this call very cheap */
- list = e_spell_checker_list_available_dicts (checker);
-
- if (language_code == NULL) {
- dictionary = (list != NULL) ? list->data : NULL;
- } else {
- dictionary = g_hash_table_lookup (
- checker->priv->dictionaries_cache,
- language_code);
- }
-
- if (dictionary != NULL)
- g_object_ref (dictionary);
-
- g_list_free (list);
-
- return dictionary;
-}
-
-/**
- * e_spell_checker_get_enchant_dict:
- * @checker: an #ESpellChecker
- * @language_code: language code of a dictionary, or %NULL
- *
- * Returns the #EnchantDict for @language_code, or %NULL if there is none.
- *
- * Returns: the #EnchantDict for @language_code, or %NULL
- **/
-EnchantDict *
-e_spell_checker_get_enchant_dict (ESpellChecker *checker,
- const gchar *language_code)
-{
- g_return_val_if_fail (E_IS_SPELL_CHECKER (checker), NULL);
- g_return_val_if_fail (language_code != NULL, NULL);
-
- return g_hash_table_lookup (
- checker->priv->enchant_dicts, language_code);
-}
-
-gboolean
-e_spell_checker_get_language_active (ESpellChecker *checker,
- const gchar *language_code)
-{
- ESpellDictionary *dictionary;
- GHashTable *active_dictionaries;
- gboolean active;
-
- g_return_val_if_fail (E_IS_SPELL_CHECKER (checker), FALSE);
- g_return_val_if_fail (language_code != NULL, FALSE);
-
- dictionary = e_spell_checker_ref_dictionary (checker, language_code);
- g_return_val_if_fail (dictionary != NULL, FALSE);
-
- active_dictionaries = checker->priv->active_dictionaries;
- active = g_hash_table_contains (active_dictionaries, dictionary);
-
- g_object_unref (dictionary);
-
- return active;
-}
-
-void
-e_spell_checker_set_language_active (ESpellChecker *checker,
- const gchar *language_code,
- gboolean active)
-{
- ESpellDictionary *dictionary;
- GHashTable *active_dictionaries;
- gboolean is_active;
-
- g_return_if_fail (E_IS_SPELL_CHECKER (checker));
- g_return_if_fail (language_code != NULL);
-
- dictionary = e_spell_checker_ref_dictionary (checker, language_code);
- g_return_if_fail (dictionary != NULL);
-
- active_dictionaries = checker->priv->active_dictionaries;
- is_active = g_hash_table_contains (active_dictionaries, dictionary);
-
- if (active && !is_active) {
- g_object_ref (dictionary);
- g_hash_table_add (active_dictionaries, dictionary);
- g_object_notify (G_OBJECT (checker), "active-languages");
- } else if (!active && is_active) {
- g_hash_table_remove (active_dictionaries, dictionary);
- g_object_notify (G_OBJECT (checker), "active-languages");
- }
-
- g_object_unref (dictionary);
-}
-
-/**
- * e_spell_checker_list_active_languages:
- * @checker: an #ESpellChecker
- * @n_languages: return location for the number of active languages, or %NULL
- *
- * Returns a %NULL-terminated array of language codes actively being used
- * for spell checking. Free the returned array with g_strfreev().
- *
- * Returns: a %NULL-teriminated array of language codes
- **/
-gchar **
-e_spell_checker_list_active_languages (ESpellChecker *checker,
- guint *n_languages)
-{
- GHashTable *active_dictionaries;
- GList *list, *link;
- gchar **active_languages;
- guint size;
- gint ii = 0;
-
- g_return_val_if_fail (E_IS_SPELL_CHECKER (checker), NULL);
-
- active_dictionaries = checker->priv->active_dictionaries;
- list = g_hash_table_get_keys (active_dictionaries);
- size = g_hash_table_size (active_dictionaries);
-
- active_languages = g_new0 (gchar *, size + 1);
-
- list = g_list_sort (list, (GCompareFunc) e_spell_dictionary_compare);
-
- for (link = list; link != NULL; link = g_list_next (link)) {
- ESpellDictionary *dictionary;
- const gchar *language_code;
-
- dictionary = E_SPELL_DICTIONARY (link->data);
- language_code = e_spell_dictionary_get_code (dictionary);
- active_languages[ii++] = g_strdup (language_code);
- }
-
- if (n_languages != NULL)
- *n_languages = size;
-
- g_list_free (list);
-
- return active_languages;
-}
-
-/**
- * e_spell_checker_count_active_languages:
- * @checker: an #ESpellChecker
- *
- * Returns the number of languages actively being used for spell checking.
- *
- * Returns: number of active spell checking languages
- **/
-guint
-e_spell_checker_count_active_languages (ESpellChecker *checker)
-{
- g_return_val_if_fail (E_IS_SPELL_CHECKER (checker), 0);
-
- return g_hash_table_size (checker->priv->active_dictionaries);
-}
-
-/**
- * e_spell_checker_check_word:
- * @checker: an #SpellChecker
- * @word: a word to spell-check
- * @length: length of @word in bytes or -1 when %NULL-terminated
- *
- * Calls e_spell_dictionary_check_word() on all active dictionaries in
- * @checker, and returns %TRUE if @word is recognized by any of them.
- *
- * Returns: %TRUE if @word is recognized, %FALSE otherwise
- **/
-gboolean
-e_spell_checker_check_word (ESpellChecker *checker,
- const gchar *word,
- gsize length)
-{
- GList *list, *link;
- gboolean recognized = FALSE;
-
- g_return_val_if_fail (E_IS_SPELL_CHECKER (checker), TRUE);
- g_return_val_if_fail (word != NULL && *word != '\0', TRUE);
-
- list = g_hash_table_get_keys (checker->priv->active_dictionaries);
-
- for (link = list; link != NULL; link = g_list_next (link)) {
- ESpellDictionary *dictionary;
-
- dictionary = E_SPELL_DICTIONARY (link->data);
- if (e_spell_dictionary_check_word (dictionary, word, length)) {
- recognized = TRUE;
- break;
- }
- }
-
- g_list_free (list);
-
- return recognized;
-=======
ESpellChecker *e_checker;
ListAvailDictsData data = { 0 };
@@ -1154,7 +492,6 @@ e_spell_checker_free_dict (ESpellChecker *checker,
g_return_if_fail (dict != NULL);
enchant_broker_free_dict (checker->priv->broker, dict);
->>>>>>> Move spell-checking parts to e-util
}
/**
@@ -1162,25 +499,11 @@ e_spell_checker_free_dict (ESpellChecker *checker,
* @checker: an #ESpellChecker
* @word: word to ignore for the rest of session
*
-<<<<<<< HEAD
- * Calls e_spell_dictionary_ignore_word() on all active dictionaries in
-=======
* Calls #e_spell_dictionary_ignore_word() on all active dictionaries in
->>>>>>> Move spell-checking parts to e-util
* the @checker.
*/
void
e_spell_checker_ignore_word (ESpellChecker *checker,
-<<<<<<< HEAD
- const gchar *word)
-{
- WebKitSpellCheckerInterface *interface;
-
- g_return_if_fail (E_IS_SPELL_CHECKER (checker));
-
- interface = WEBKIT_SPELL_CHECKER_GET_IFACE (checker);
- interface->ignore_word (WEBKIT_SPELL_CHECKER (checker), word);
-=======
const gchar *word)
{
WebKitSpellCheckerInterface *webkit_checker_iface;
@@ -1189,7 +512,6 @@ e_spell_checker_ignore_word (ESpellChecker *checker,
webkit_checker_iface = WEBKIT_SPELL_CHECKER_GET_IFACE (checker);
webkit_checker_iface->ignore_word (WEBKIT_SPELL_CHECKER (checker), word);
->>>>>>> Move spell-checking parts to e-util
}
/**
@@ -1197,25 +519,11 @@ e_spell_checker_ignore_word (ESpellChecker *checker,
* @checker: an #ESpellChecker
* @word: word to learn
*
-<<<<<<< HEAD
- * Calls e_spell_dictionary_learn_word() on all active dictionaries in
-=======
* Calls #e_spell_dictionary_learn_word() on all active dictionaries in
->>>>>>> Move spell-checking parts to e-util
* the @checker.
*/
void
e_spell_checker_learn_word (ESpellChecker *checker,
-<<<<<<< HEAD
- const gchar *word)
-{
- WebKitSpellCheckerInterface *interface;
-
- g_return_if_fail (E_IS_SPELL_CHECKER (checker));
-
- interface = WEBKIT_SPELL_CHECKER_GET_IFACE (checker);
- interface->learn_word (WEBKIT_SPELL_CHECKER (checker), word);
-=======
const gchar *word)
{
WebKitSpellCheckerInterface *webkit_checker_iface;
@@ -1224,5 +532,4 @@ e_spell_checker_learn_word (ESpellChecker *checker,
webkit_checker_iface = WEBKIT_SPELL_CHECKER_GET_IFACE (checker);
webkit_checker_iface->learn_word (WEBKIT_SPELL_CHECKER (checker), word);
->>>>>>> Move spell-checking parts to e-util
}
diff --git a/e-util/e-spell-checker.h b/e-util/e-spell-checker.h
index c6b551b..14155f2 100644
--- a/e-util/e-spell-checker.h
+++ b/e-util/e-spell-checker.h
@@ -16,13 +16,6 @@
* Boston, MA 02111-1307, USA.
*/
-<<<<<<< HEAD
-#if !defined (__E_UTIL_H_INSIDE__) && !defined (LIBEUTIL_COMPILATION)
-#error "Only <e-util/e-util.h> should be included directly."
-#endif
-
-=======
->>>>>>> Move spell-checking parts to e-util
#ifndef E_SPELL_CHECKER_H
#define E_SPELL_CHECKER_H
@@ -48,10 +41,7 @@
(G_TYPE_INSTANCE_GET_CLASS \
((obj), E_TYPE_SPELL_CHECKER, ESpellCheckerClass))
-<<<<<<< HEAD
-=======
->>>>>>> Move spell-checking parts to e-util
G_BEGIN_DECLS
typedef struct _ESpellChecker ESpellChecker;
@@ -60,10 +50,7 @@ typedef struct _ESpellCheckerClass ESpellCheckerClass;
struct _ESpellChecker {
GObject parent;
-<<<<<<< HEAD
-=======
->>>>>>> Move spell-checking parts to e-util
ESpellCheckerPrivate *priv;
};
@@ -71,41 +58,6 @@ struct _ESpellCheckerClass {
GObjectClass parent_class;
};
-<<<<<<< HEAD
-GType e_spell_checker_get_type (void) G_GNUC_CONST;
-ESpellChecker * e_spell_checker_new (void);
-GList * e_spell_checker_list_available_dicts
- (ESpellChecker *checker);
-ESpellDictionary *
- e_spell_checker_ref_dictionary (ESpellChecker *checker,
- const gchar *language_code);
-EnchantDict * e_spell_checker_get_enchant_dict
- (ESpellChecker *checker,
- const gchar *language_code);
-gboolean e_spell_checker_get_language_active
- (ESpellChecker *checker,
- const gchar *language_code);
-void e_spell_checker_set_language_active
- (ESpellChecker *checker,
- const gchar *language_code,
- gboolean active);
-gchar ** e_spell_checker_list_active_languages
- (ESpellChecker *checker,
- guint *n_languages);
-guint e_spell_checker_count_active_languages
- (ESpellChecker *checker);
-gboolean e_spell_checker_check_word (ESpellChecker *checker,
- const gchar *word,
- gsize length);
-void e_spell_checker_learn_word (ESpellChecker *checker,
- const gchar *word);
-void e_spell_checker_ignore_word (ESpellChecker *checker,
- const gchar *word);
-
-G_END_DECLS
-
-#endif /* E_SPELL_CHECKER_H */
-=======
GType e_spell_checker_get_type (void);
ESpellChecker * e_spell_checker_new (void);
@@ -134,4 +86,3 @@ G_END_DECLS
#endif /* E_SPELL_CHECKER_H */
->>>>>>> Move spell-checking parts to e-util
diff --git a/modules/web-inspector/Makefile.am b/modules/web-inspector/Makefile.am
index d58e991..237121e 100644
--- a/modules/web-inspector/Makefile.am
+++ b/modules/web-inspector/Makefile.am
@@ -6,7 +6,7 @@ module_web_inspector_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"evolution-web-inspector\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
- $(CODE_COVERAGE_CFLAGS)
+ $(CODE_COVERAGE_CFLAGS) \
$(NULL)
module_web_inspector_la_SOURCES = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
