[balsa/gtk3] Drop support for GtkSourceView-1
- From: Peter Bloomfield <PeterB src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/gtk3] Drop support for GtkSourceView-1
- Date: Tue, 18 Jan 2011 00:16:04 +0000 (UTC)
commit cec4c66a5404b2183b2116981d2ab87a7f9554eb
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Mon Jan 17 17:02:58 2011 -0500
Drop support for GtkSourceView-1
* libbalsa/libbalsa.c (libbalsa_source_view_new): drop support
for GtkSourceView-1.
* libbalsa/libbalsa.h: ditto.
ChangeLog | 6 ++++
libbalsa/libbalsa.c | 83 +--------------------------------------------------
libbalsa/libbalsa.h | 2 +-
3 files changed, 8 insertions(+), 83 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3b6b868..a6b0fb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-17 Peter Bloomfield
+
+ * libbalsa/libbalsa.c (libbalsa_source_view_new): drop support
+ for GtkSourceView-1.
+ * libbalsa/libbalsa.h: ditto.
+
2011-01-11 Peter Bloomfield
* src/balsa-mime-widget-message.c
diff --git a/libbalsa/libbalsa.c b/libbalsa/libbalsa.c
index 12ed8e1..9c5aec3 100644
--- a/libbalsa/libbalsa.c
+++ b/libbalsa/libbalsa.c
@@ -958,90 +958,11 @@ libbalsa_get_image_from_x_face_header(const gchar * content, GError ** err)
#if HAVE_GTKSOURCEVIEW
GtkWidget *
-libbalsa_source_view_new(gboolean highlight_phrases, GdkColor *q_colour)
+libbalsa_source_view_new(gboolean highlight_phrases)
{
GtkSourceBuffer *sbuffer;
GtkWidget *sview;
-#if (HAVE_GTKSOURCEVIEW == 1)
-
- GtkTextTag * text_tag;
- GtkSourceTagStyle *tag_style;
- GtkSourceTagTable *tag_table;
- GSList *tag_list;
-
- /* create the tag table */
- tag_list = NULL;
- tag_table = gtk_source_tag_table_new();
-
- /* add highlighting for quoted text if requested */
- if (q_colour) {
- int k;
-
- for (k = 1; k <= 9; k++) {
- gchar * tag_id;
- const gchar * pattern;
- gchar *tmp = NULL;
-
- tag_id = g_strdup_printf("Quote-%d", k);
- if (k == 1)
- pattern = "^> *($|[^ |>:}#\n])";
- else
- pattern = tmp =
- g_strdup_printf("^(> *){%d}($|[^ |>:}#\n])", k);
- text_tag = gtk_line_comment_tag_new(tag_id, tag_id, pattern);
- g_free(tmp);
- g_free(tag_id);
- tag_style = gtk_source_tag_style_new();
- tag_style->mask = GTK_SOURCE_TAG_STYLE_USE_FOREGROUND;
- tag_style->foreground = q_colour[(k - 1) & 1];
- gtk_source_tag_set_style(GTK_SOURCE_TAG(text_tag), tag_style);
- gtk_source_tag_style_free(tag_style);
- tag_list = g_slist_prepend(tag_list, text_tag);
- }
- }
-
- /* if requested create the patterns for bold, italic and underline */
- if (highlight_phrases) {
- text_tag = gtk_pattern_tag_new("Bold", "Bold",
- "(^|[[:space:]])\\*[[:alnum:]][^*\n]*[[:alnum:]]\\*");
- tag_style = gtk_source_tag_style_new();
- tag_style->bold = TRUE;
- gtk_source_tag_set_style(GTK_SOURCE_TAG(text_tag), tag_style);
- gtk_source_tag_style_free(tag_style);
- tag_list = g_slist_prepend(tag_list, text_tag);
-
- text_tag = gtk_pattern_tag_new("Italic", "Italic",
- "(^|[[:space:]])/[[:alnum:]][^/\n]*[[:alnum:]]/");
- tag_style = gtk_source_tag_style_new();
- tag_style->italic = TRUE;
- gtk_source_tag_set_style(GTK_SOURCE_TAG(text_tag), tag_style);
- gtk_source_tag_style_free(tag_style);
- tag_list = g_slist_prepend(tag_list, text_tag);
-
- text_tag = gtk_pattern_tag_new("Underline", "Underline",
- "(^|[[:space:]])_[[:alnum:]][^_\n]*[[:alnum:]]_");
- tag_style = gtk_source_tag_style_new();
- tag_style->underline = TRUE;
- gtk_source_tag_set_style(GTK_SOURCE_TAG(text_tag), tag_style);
- gtk_source_tag_style_free(tag_style);
- tag_list = g_slist_prepend(tag_list, text_tag);
- }
-
- /* add tags to the table if present */
- if (tag_list) {
- gtk_source_tag_table_add_tags(tag_table, tag_list);
- g_slist_foreach(tag_list, (GFunc)g_object_unref, NULL);
- g_slist_free(tag_list);
- }
-
- /* create the source buffer */
- sbuffer = gtk_source_buffer_new(tag_table);
- g_object_unref(tag_table);
- gtk_source_buffer_set_highlight(sbuffer, highlight_phrases || q_colour);
- gtk_source_buffer_set_check_brackets(sbuffer, FALSE);
-
-#else /* (HAVE_GTKSOURCEVIEW == 1) */
static GtkSourceLanguageManager * lm = NULL;
static GtkSourceStyleScheme * scheme = NULL;
@@ -1092,8 +1013,6 @@ libbalsa_source_view_new(gboolean highlight_phrases, GdkColor *q_colour)
gtk_source_buffer_set_highlight_syntax(sbuffer, TRUE);
gtk_source_buffer_set_highlight_matching_brackets(sbuffer, FALSE);
-#endif /* (HAVE_GTKSOURCEVIEW == 1) */
-
/* create & return the source view */
sview = gtk_source_view_new_with_buffer(sbuffer);
g_object_unref(sbuffer);
diff --git a/libbalsa/libbalsa.h b/libbalsa/libbalsa.h
index 16c5a2a..145c1bd 100644
--- a/libbalsa/libbalsa.h
+++ b/libbalsa/libbalsa.h
@@ -205,7 +205,7 @@ enum LibBalsaImageError {
};
#if HAVE_GTKSOURCEVIEW
-GtkWidget *libbalsa_source_view_new(gboolean highlight_phrases, GdkColor *q_colour);
+GtkWidget *libbalsa_source_view_new(gboolean highlight_phrases);
#endif /* HAVE_GTKSOURCEVIEW */
#endif /* __LIBBALSA_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]