[gedit-plugins] Update to latest gsv mark api.
- From: Paolo Borelli <pborelli src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit-plugins] Update to latest gsv mark api.
- Date: Sat, 15 Jan 2011 13:52:48 +0000 (UTC)
commit b2b3f6dba881021bad72c9696f0156076cd21cb8
Author: Paolo Borelli <pborelli gnome org>
Date: Sat Jan 15 14:54:38 2011 +0100
Update to latest gsv mark api.
plugins/bookmarks/gedit-bookmarks-plugin.c | 36 +++++++++++++++------------
1 files changed, 20 insertions(+), 16 deletions(-)
---
diff --git a/plugins/bookmarks/gedit-bookmarks-plugin.c b/plugins/bookmarks/gedit-bookmarks-plugin.c
index 0d0ea69..7c30b01 100644
--- a/plugins/bookmarks/gedit-bookmarks-plugin.c
+++ b/plugins/bookmarks/gedit-bookmarks-plugin.c
@@ -37,6 +37,8 @@
GeditBookmarksPluginPrivate))
#define BOOKMARK_CATEGORY "GeditBookmarksPluginBookmark"
+#define BOOKMARK_PRIORITY 1
+
#define INSERT_DATA_KEY "GeditBookmarksInsertData"
#define METADATA_ATTR "metadata::gedit-bookmarks"
@@ -292,12 +294,6 @@ disable_bookmarks (GeditView *view)
g_object_set_data (G_OBJECT (buffer), INSERT_DATA_KEY, NULL);
}
-static GtkSourceMarkCategory *
-get_bookmark_category (GtkSourceView *view)
-{
- return gtk_source_view_get_mark_category (view, BOOKMARK_CATEGORY);
-}
-
static GdkPixbuf *
get_bookmark_pixbuf (GeditBookmarksPlugin *plugin)
{
@@ -316,7 +312,7 @@ get_bookmark_pixbuf (GeditBookmarksPlugin *plugin)
}
static void
-update_background_color (GtkSourceMarkCategory *category, GtkSourceBuffer *buffer)
+update_background_color (GtkSourceMarkAttributes *attrs, GtkSourceBuffer *buffer)
{
GtkSourceStyleScheme *scheme;
GtkSourceStyle *style;
@@ -336,14 +332,14 @@ update_background_color (GtkSourceMarkCategory *category, GtkSourceBuffer *buffe
GdkRGBA color;
gdk_rgba_parse (&color, bg);
- gtk_source_mark_category_set_background (category, &color);
+ gtk_source_mark_attributes_set_background (attrs, &color);
g_free (bg);
return;
}
}
- gtk_source_mark_category_set_background (category, NULL);
+ gtk_source_mark_attributes_set_background (attrs, NULL);
}
static void
@@ -357,17 +353,23 @@ enable_bookmarks (GeditView *view,
/* Make sure the category pixbuf is set */
if (pixbuf)
{
- GtkSourceMarkCategory *category;
GtkTextBuffer *buffer;
+ GtkSourceMarkAttributes *attrs;
InsertData *data;
- category = get_bookmark_category (GTK_SOURCE_VIEW (view));
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
- update_background_color (category, GTK_SOURCE_BUFFER (buffer));
- gtk_source_mark_category_set_pixbuf (category, pixbuf);
+ attrs = gtk_source_mark_attributes_new ();
+
+ update_background_color (attrs, GTK_SOURCE_BUFFER (buffer));
+ gtk_source_mark_attributes_set_pixbuf (attrs, pixbuf);
g_object_unref (pixbuf);
+ gtk_source_view_set_mark_attributes (GTK_SOURCE_VIEW (view),
+ BOOKMARK_CATEGORY,
+ attrs,
+ BOOKMARK_PRIORITY);
+
gtk_source_view_set_show_line_marks (GTK_SOURCE_VIEW (view), TRUE);
g_signal_connect (buffer,
@@ -877,11 +879,13 @@ on_style_scheme_notify (GObject *object,
GParamSpec *pspec,
GeditView *view)
{
- GtkSourceMarkCategory *category;
+ GtkSourceMarkAttributes *attrs;
- category = get_bookmark_category (GTK_SOURCE_VIEW (view));
+ attrs = gtk_source_view_get_mark_attributes (GTK_SOURCE_VIEW (view),
+ BOOKMARK_CATEGORY,
+ NULL);
- update_background_color (category, GTK_SOURCE_BUFFER (object));
+ update_background_color (attrs, GTK_SOURCE_BUFFER (object));
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]