[gtksourceview] Fix #define namespace
- From: Garrett Regier <gregier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview] Fix #define namespace
- Date: Sun, 20 Mar 2011 16:20:54 +0000 (UTC)
commit c08f3c12456e7a61ae89b593a660fffd6c8fe267
Author: Garrett Regier <alias301 gmail com>
Date: Sun Mar 20 08:13:18 2011 -0700
Fix #define namespace
docs/reference/gtksourceview-3.0-sections.txt | 120 ++++++++++----------
gtksourceview/Makefile.am | 4 +
.../words/gtksourcecompletionwords.c | 10 +-
.../words/gtksourcecompletionwords.h | 14 +-
.../words/gtksourcecompletionwordsbuffer.c | 14 +-
.../words/gtksourcecompletionwordsbuffer.h | 14 +-
.../words/gtksourcecompletionwordslibrary.c | 22 ++--
.../words/gtksourcecompletionwordslibrary.h | 14 +-
.../words/gtksourcecompletionwordsproposal.c | 12 +-
.../words/gtksourcecompletionwordsproposal.h | 14 +-
gtksourceview/gtksourcebuffer.c | 114 +++++++++---------
gtksourceview/gtksourcebuffer.h | 12 +-
gtksourceview/gtksourcecompletion.c | 44 ++++----
gtksourceview/gtksourcecompletion.h | 12 +-
gtksourceview/gtksourcecompletioncontext.c | 20 ++--
gtksourceview/gtksourcecompletioncontext.h | 14 +-
gtksourceview/gtksourcecompletioninfo.c | 12 +-
gtksourceview/gtksourcecompletioninfo.h | 12 +-
gtksourceview/gtksourcecompletionitem.c | 12 +-
gtksourceview/gtksourcecompletionitem.h | 14 +-
gtksourceview/gtksourcecompletionmodel.c | 62 +++++-----
gtksourceview/gtksourcecompletionmodel.h | 14 +-
gtksourceview/gtksourcecompletionproposal.c | 18 ++--
gtksourceview/gtksourcecompletionproposal.h | 8 +-
gtksourceview/gtksourcecompletionprovider.c | 34 +++---
gtksourceview/gtksourcecompletionprovider.h | 8 +-
gtksourceview/gtksourcecompletionutils.c | 4 +-
gtksourceview/gtksourcecontextengine.c | 12 +-
gtksourceview/gtksourcecontextengine.h | 12 +-
gtksourceview/gtksourceengine.c | 14 +-
gtksourceview/gtksourceengine.h | 12 +-
gtksourceview/gtksourcegutter.c | 26 ++--
gtksourceview/gtksourcegutter.h | 12 +-
gtksourceview/gtksourcegutterrenderer.c | 52 ++++----
gtksourceview/gtksourcegutterrenderer.h | 14 +-
gtksourceview/gtksourcegutterrendererlines.c | 6 +-
gtksourceview/gtksourcegutterrendererlines.h | 14 +-
gtksourceview/gtksourcegutterrenderermarks.c | 6 +-
gtksourceview/gtksourcegutterrenderermarks.h | 14 +-
gtksourceview/gtksourcegutterrendererpixbuf.c | 22 ++--
gtksourceview/gtksourcegutterrendererpixbuf.h | 14 +-
gtksourceview/gtksourcegutterrenderertext.c | 14 +-
gtksourceview/gtksourcegutterrenderertext.h | 14 +-
gtksourceview/gtksourcelanguage.c | 26 ++--
gtksourceview/gtksourcelanguage.h | 12 +-
gtksourceview/gtksourcelanguagemanager.c | 16 ++--
gtksourceview/gtksourcelanguagemanager.h | 12 +-
gtksourceview/gtksourcemark.c | 14 +-
gtksourceview/gtksourcemark.h | 12 +-
gtksourceview/gtksourcemarkattributes.c | 38 +++---
gtksourceview/gtksourcemarkattributes.h | 14 +-
gtksourceview/gtksourceprintcompositor.c | 84 +++++++-------
gtksourceview/gtksourceprintcompositor.h | 12 +-
gtksourceview/gtksourcestyle-private.h | 6 +-
gtksourceview/gtksourcestyle.c | 2 +-
gtksourceview/gtksourcestyle.h | 6 +-
gtksourceview/gtksourcestylescheme.c | 40 ++++----
gtksourceview/gtksourcestylescheme.h | 12 +-
gtksourceview/gtksourcestyleschememanager.c | 18 ++--
gtksourceview/gtksourcestyleschememanager.h | 12 +-
gtksourceview/gtksourceundomanager.c | 16 ++--
gtksourceview/gtksourceundomanager.h | 8 +-
gtksourceview/gtksourceundomanagerdefault.c | 8 +-
gtksourceview/gtksourceundomanagerdefault.h | 12 +-
gtksourceview/gtksourceview.c | 88 +++++++-------
gtksourceview/gtksourceview.h | 12 +-
tests/test-buffer.c | 2 +-
tests/test-completion.c | 2 +-
tests/test-languagemanager.c | 2 +-
tests/test-printcompositor.c | 8 +-
tests/test-widget.c | 48 ++++----
71 files changed, 728 insertions(+), 724 deletions(-)
---
diff --git a/docs/reference/gtksourceview-3.0-sections.txt b/docs/reference/gtksourceview-3.0-sections.txt
index 6dcd7ff..c054cd2 100644
--- a/docs/reference/gtksourceview-3.0-sections.txt
+++ b/docs/reference/gtksourceview-3.0-sections.txt
@@ -36,12 +36,12 @@ gtk_source_buffer_get_undo_manager
gtk_source_buffer_set_undo_manager
<SUBSECTION Standard>
GtkSourceBufferClass
-GTK_IS_SOURCE_BUFFER
-GTK_IS_SOURCE_BUFFER_CLASS
+GTK_SOURCE_IS_BUFFER
+GTK_SOURCE_IS_BUFFER_CLASS
GTK_SOURCE_BUFFER
GTK_SOURCE_BUFFER_CLASS
GTK_SOURCE_BUFFER_GET_CLASS
-GTK_TYPE_SOURCE_BUFFER
+GTK_SOURCE_TYPE_BUFFER
GtkSourceBufferPrivate
gtk_source_buffer_get_type
</SECTION>
@@ -86,12 +86,12 @@ gtk_source_view_get_completion
gtk_source_view_get_gutter
<SUBSECTION Standard>
GtkSourceViewClass
-GTK_IS_SOURCE_VIEW
-GTK_IS_SOURCE_VIEW_CLASS
+GTK_SOURCE_IS_VIEW
+GTK_SOURCE_IS_VIEW_CLASS
GTK_SOURCE_VIEW
GTK_SOURCE_VIEW_CLASS
GTK_SOURCE_VIEW_GET_CLASS
-GTK_TYPE_SOURCE_VIEW
+GTK_SOURCE_TYPE_VIEW
GtkSourceViewPrivate
gtk_source_view_get_type
</SECTION>
@@ -108,12 +108,12 @@ gtk_source_gutter_remove
gtk_source_gutter_queue_draw
<SUBSECTION Standard>
GtkSourceGutterClass
-GTK_IS_SOURCE_GUTTER
-GTK_IS_SOURCE_GUTTER_CLASS
+GTK_SOURCE_IS_GUTTER
+GTK_SOURCE_IS_GUTTER_CLASS
GTK_SOURCE_GUTTER
GTK_SOURCE_GUTTER_CLASS
GTK_SOURCE_GUTTER_GET_CLASS
-GTK_TYPE_SOURCE_GUTTER
+GTK_SOURCE_TYPE_GUTTER
GtkSourceGutterPrivate
gtk_source_gutter_get_type
</SECTION>
@@ -149,13 +149,13 @@ gtk_source_gutter_renderer_query_tooltip
gtk_source_gutter_renderer_query_data
<SUBSECTION Standard>
GtkSourceGutterRendererClass
-GTK_IS_SOURCE_GUTTER_RENDERER
-GTK_IS_SOURCE_GUTTER_RENDERER_CLASS
+GTK_SOURCE_IS_GUTTER_RENDERER
+GTK_SOURCE_IS_GUTTER_RENDERER_CLASS
GTK_SOURCE_GUTTER_RENDERER
GTK_SOURCE_GUTTER_RENDERER_CONST
GTK_SOURCE_GUTTER_RENDERER_CLASS
GTK_SOURCE_GUTTER_RENDERER_GET_CLASS
-GTK_TYPE_SOURCE_GUTTER_RENDERER
+GTK_SOURCE_TYPE_GUTTER_RENDERER
GtkSourceGutterRendererPrivate
gtk_source_gutter_renderer_get_type
</SECTION>
@@ -172,13 +172,13 @@ gtk_source_gutter_renderer_text_measure
gtk_source_gutter_renderer_text_measure_markup
<SUBSECTION Standard>
GtkSourceGutterRendererTextClass
-GTK_IS_SOURCE_GUTTER_RENDERER_TEXT
-GTK_IS_SOURCE_GUTTER_RENDERER_TEXT_CLASS
+GTK_SOURCE_IS_GUTTER_RENDERER_TEXT
+GTK_SOURCE_IS_GUTTER_RENDERER_TEXT_CLASS
GTK_SOURCE_GUTTER_RENDERER_TEXT
GTK_SOURCE_GUTTER_RENDERER_TEXT_CONST
GTK_SOURCE_GUTTER_RENDERER_TEXT_CLASS
GTK_SOURCE_GUTTER_RENDERER_TEXT_GET_CLASS
-GTK_TYPE_SOURCE_GUTTER_RENDERER_TEXT
+GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT
GtkSourceGutterRendererTextPrivate
gtk_source_gutter_renderer_text_get_type
</SECTION>
@@ -199,13 +199,13 @@ gtk_source_gutter_renderer_pixbuf_set_icon_name
gtk_source_gutter_renderer_pixbuf_get_icon_name
<SUBSECTION Standard>
GtkSourceGutterRendererPixbufClass
-GTK_IS_SOURCE_GUTTER_RENDERER_PIXBUF
-GTK_IS_SOURCE_GUTTER_RENDERER_PIXBUF_CLASS
+GTK_SOURCE_IS_GUTTER_RENDERER_PIXBUF
+GTK_SOURCE_IS_GUTTER_RENDERER_PIXBUF_CLASS
GTK_SOURCE_GUTTER_RENDERER_PIXBUF
GTK_SOURCE_GUTTER_RENDERER_PIXBUF_CONST
GTK_SOURCE_GUTTER_RENDERER_PIXBUF_CLASS
GTK_SOURCE_GUTTER_RENDERER_PIXBUF_GET_CLASS
-GTK_TYPE_SOURCE_GUTTER_RENDERER_PIXBUF
+GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF
GtkSourceGutterRendererPixbufPrivate
gtk_source_gutter_renderer_pixbuf_get_type
</SECTION>
@@ -226,8 +226,8 @@ gtk_source_undo_manager_can_redo_changed
<SUBSECTION Standard>
GtkSourceUndoManagerIface
GTK_SOURCE_UNDO_MANAGER
-GTK_IS_SOURCE_UNDO_MANAGER
-GTK_TYPE_SOURCE_UNDO_MANAGER
+GTK_SOURCE_IS_UNDO_MANAGER
+GTK_SOURCE_TYPE_UNDO_MANAGER
GTK_SOURCE_UNDO_MANAGER_GET_INTERFACE
gtk_source_undo_manager_get_type
</SECTION>
@@ -248,12 +248,12 @@ gtk_source_language_get_style_name
gtk_source_language_get_style_ids
<SUBSECTION Standard>
GtkSourceLanguageClass
-GTK_IS_SOURCE_LANGUAGE
-GTK_IS_SOURCE_LANGUAGE_CLASS
+GTK_SOURCE_IS_LANGUAGE
+GTK_SOURCE_IS_LANGUAGE_CLASS
GTK_SOURCE_LANGUAGE
GTK_SOURCE_LANGUAGE_CLASS
GTK_SOURCE_LANGUAGE_GET_CLASS
-GTK_TYPE_SOURCE_LANGUAGE
+GTK_SOURCE_TYPE_LANGUAGE
GtkSourceLanguagePrivate
gtk_source_language_get_type
</SECTION>
@@ -272,12 +272,12 @@ gtk_source_language_manager_get_language
gtk_source_language_manager_guess_language
<SUBSECTION Standard>
GtkSourceLanguageManagerClass
-GTK_IS_SOURCE_LANGUAGE_MANAGER
-GTK_IS_SOURCE_LANGUAGE_MANAGER_CLASS
+GTK_SOURCE_IS_LANGUAGE_MANAGER
+GTK_SOURCE_IS_LANGUAGE_MANAGER_CLASS
GTK_SOURCE_LANGUAGE_MANAGER
GTK_SOURCE_LANGUAGE_MANAGER_CLASS
GTK_SOURCE_LANGUAGE_MANAGER_GET_CLASS
-GTK_TYPE_SOURCE_LANGUAGE_MANAGER
+GTK_SOURCE_TYPE_LANGUAGE_MANAGER
GtkSourceLanguageManagerPrivate
gtk_source_language_manager_get_type
</SECTION>
@@ -294,12 +294,12 @@ gtk_source_mark_prev
<SUBSECTION Standard>
GtkSourceMarkClass
GtkSourceMarkPrivate
-GTK_IS_SOURCE_MARK
-GTK_IS_SOURCE_MARK_CLASS
+GTK_SOURCE_IS_MARK
+GTK_SOURCE_IS_MARK_CLASS
GTK_SOURCE_MARK
GTK_SOURCE_MARK_CLASS
GTK_SOURCE_MARK_GET_CLASS
-GTK_TYPE_SOURCE_MARK
+GTK_SOURCE_TYPE_MARK
gtk_source_mark_get_type
</SECTION>
@@ -324,12 +324,12 @@ gtk_source_mark_attributes_get_tooltip_text
gtk_source_mark_attributes_get_tooltip_markup
<SUBSECTION Standard>
GtkSourceMarkAttributesClass
-GTK_IS_SOURCE_MARK_ATTRIBUTES
-GTK_IS_SOURCE_MARK_ATTRIBUTES_CLASS
+GTK_SOURCE_IS_MARK_ATTRIBUTES
+GTK_SOURCE_IS_MARK_ATTRIBUTES_CLASS
GTK_SOURCE_MARK_ATTRIBUTES
GTK_SOURCE_MARK_ATTRIBUTES_CLASS
GTK_SOURCE_MARK_ATTRIBUTES_GET_CLASS
-GTK_TYPE_SOURCE_MARK_ATTRIBUTES
+GTK_SOURCE_TYPE_MARK_ATTRIBUTES
GtkSourceMarkAttributesPrivate
gtk_source_mark_attributes_get_type
</SECTION>
@@ -341,9 +341,9 @@ gtk_source_mark_attributes_get_type
GtkSourceStyle
gtk_source_style_copy
<SUBSECTION Standard>
-GTK_TYPE_SOURCE_STYLE
-GTK_IS_SOURCE_STYLE
-GTK_IS_SOURCE_STYLE_CLASS
+GTK_SOURCE_TYPE_STYLE
+GTK_SOURCE_IS_STYLE
+GTK_SOURCE_IS_STYLE_CLASS
GTK_SOURCE_STYLE
GTK_SOURCE_STYLE_CLASS
GTK_SOURCE_STYLE_GET_CLASS
@@ -366,12 +366,12 @@ gtk_source_style_scheme_manager_get_scheme
gtk_source_style_scheme_manager_force_rescan
<SUBSECTION Standard>
GtkSourceStyleSchemeManagerClass
-GTK_IS_SOURCE_STYLE_SCHEME_MANAGER
-GTK_IS_SOURCE_STYLE_SCHEME_MANAGER_CLASS
+GTK_SOURCE_IS_STYLE_SCHEME_MANAGER
+GTK_SOURCE_IS_STYLE_SCHEME_MANAGER_CLASS
GTK_SOURCE_STYLE_SCHEME_MANAGER
GTK_SOURCE_STYLE_SCHEME_MANAGER_CLASS
GTK_SOURCE_STYLE_SCHEME_MANAGER_GET_CLASS
-GTK_TYPE_SOURCE_STYLE_SCHEME_MANAGER
+GTK_SOURCE_TYPE_STYLE_SCHEME_MANAGER
gtk_source_style_scheme_manager_get_type
GtkSourceStyleSchemeManagerPrivate
</SECTION>
@@ -389,12 +389,12 @@ gtk_source_style_scheme_get_filename
gtk_source_style_scheme_get_style
<SUBSECTION Standard>
GtkSourceStyleSchemeClass
-GTK_IS_SOURCE_STYLE_SCHEME
-GTK_IS_SOURCE_STYLE_SCHEME_CLASS
+GTK_SOURCE_IS_STYLE_SCHEME
+GTK_SOURCE_IS_STYLE_SCHEME_CLASS
GTK_SOURCE_STYLE_SCHEME
GTK_SOURCE_STYLE_SCHEME_CLASS
GTK_SOURCE_STYLE_SCHEME_GET_CLASS
-GTK_TYPE_SOURCE_STYLE_SCHEME
+GTK_SOURCE_TYPE_STYLE_SCHEME
GtkSourceStyleSchemePrivate
gtk_source_style_scheme_get_type
</SECTION>
@@ -443,11 +443,11 @@ gtk_source_print_compositor_get_pagination_progress
gtk_source_print_compositor_draw_page
<SUBSECTION Standard>
GTK_SOURCE_PRINT_COMPOSITOR
-GTK_IS_SOURCE_PRINT_COMPOSITOR
-GTK_TYPE_SOURCE_PRINT_COMPOSITOR
+GTK_SOURCE_IS_PRINT_COMPOSITOR
+GTK_SOURCE_TYPE_PRINT_COMPOSITOR
gtk_source_print_compositor_get_type
GTK_SOURCE_PRINT_COMPOSITOR_CLASS
-GTK_IS_SOURCE_PRINT_COMPOSITOR_CLASS
+GTK_SOURCE_IS_PRINT_COMPOSITOR_CLASS
GTK_SOURCE_PRINT_COMPOSITOR_GET_CLASS
GtkSourcePrintCompositorPrivate
GtkSourcePrintCompositorClass
@@ -470,12 +470,12 @@ gtk_source_completion_move_window
gtk_source_completion_block_interactive
gtk_source_completion_unblock_interactive
<SUBSECTION Standard>
-GTK_IS_SOURCE_COMPLETION
-GTK_IS_SOURCE_COMPLETION_CLASS
+GTK_SOURCE_IS_COMPLETION
+GTK_SOURCE_IS_COMPLETION_CLASS
GTK_SOURCE_COMPLETION
GTK_SOURCE_COMPLETION_CLASS
GTK_SOURCE_COMPLETION_GET_CLASS
-GTK_TYPE_SOURCE_COMPLETION
+GTK_SOURCE_TYPE_COMPLETION
GtkSourceCompletionPrivate
gtk_source_completion_get_type
GtkSourceCompletionClass
@@ -491,12 +491,12 @@ gtk_source_completion_info_move_to_iter
gtk_source_completion_info_set_widget
gtk_source_completion_info_get_widget
<SUBSECTION Standard>
-GTK_IS_SOURCE_COMPLETION_INFO
-GTK_IS_SOURCE_COMPLETION_INFO_CLASS
+GTK_SOURCE_IS_COMPLETION_INFO
+GTK_SOURCE_IS_COMPLETION_INFO_CLASS
GTK_SOURCE_COMPLETION_INFO
GTK_SOURCE_COMPLETION_INFO_CLASS
GTK_SOURCE_COMPLETION_INFO_GET_CLASS
-GTK_TYPE_SOURCE_COMPLETION_INFO
+GTK_SOURCE_TYPE_COMPLETION_INFO
GtkSourceCompletionInfoPrivate
gtk_source_completion_info_get_type
GtkSourceCompletionInfoClass
@@ -516,10 +516,10 @@ gtk_source_completion_proposal_changed
gtk_source_completion_proposal_hash
gtk_source_completion_proposal_equal
<SUBSECTION Standard>
-GTK_IS_SOURCE_COMPLETION_PROPOSAL
+GTK_SOURCE_IS_COMPLETION_PROPOSAL
GTK_SOURCE_COMPLETION_PROPOSAL
GTK_SOURCE_COMPLETION_PROPOSAL_GET_INTERFACE
-GTK_TYPE_SOURCE_COMPLETION_PROPOSAL
+GTK_SOURCE_TYPE_COMPLETION_PROPOSAL
gtk_source_completion_proposal_get_type
GtkSourceCompletionProposalIface
</SECTION>
@@ -533,12 +533,12 @@ gtk_source_completion_item_new
gtk_source_completion_item_new_with_markup
gtk_source_completion_item_new_from_stock
<SUBSECTION Standard>
-GTK_IS_SOURCE_COMPLETION_ITEM
-GTK_IS_SOURCE_COMPLETION_ITEM_CLASS
+GTK_SOURCE_IS_COMPLETION_ITEM
+GTK_SOURCE_IS_COMPLETION_ITEM_CLASS
GTK_SOURCE_COMPLETION_ITEM
GTK_SOURCE_COMPLETION_ITEM_CLASS
GTK_SOURCE_COMPLETION_ITEM_GET_CLASS
-GTK_TYPE_SOURCE_COMPLETION_ITEM
+GTK_SOURCE_TYPE_COMPLETION_ITEM
gtk_source_completion_item_get_type
GtkSourceCompletionItemClass
</SECTION>
@@ -560,10 +560,10 @@ gtk_source_completion_provider_activate_proposal
gtk_source_completion_provider_get_interactive_delay
gtk_source_completion_provider_get_priority
<SUBSECTION Standard>
-GTK_IS_SOURCE_COMPLETION_PROVIDER
+GTK_SOURCE_IS_COMPLETION_PROVIDER
GTK_SOURCE_COMPLETION_PROVIDER
GTK_SOURCE_COMPLETION_PROVIDER_GET_INTERFACE
-GTK_TYPE_SOURCE_COMPLETION_PROVIDER
+GTK_SOURCE_TYPE_COMPLETION_PROVIDER
gtk_source_completion_provider_get_type
GtkSourceCompletionProviderIface
</SECTION>
@@ -578,12 +578,12 @@ gtk_source_completion_context_add_proposals
gtk_source_completion_context_get_iter
gtk_source_completion_context_get_activation
<SUBSECTION Standard>
-GTK_IS_SOURCE_COMPLETION_CONTEXT
-GTK_IS_SOURCE_COMPLETION_CONTEXT_CLASS
+GTK_SOURCE_IS_COMPLETION_CONTEXT
+GTK_SOURCE_IS_COMPLETION_CONTEXT_CLASS
GTK_SOURCE_COMPLETION_CONTEXT
GTK_SOURCE_COMPLETION_CONTEXT_CLASS
GTK_SOURCE_COMPLETION_CONTEXT_GET_CLASS
-GTK_TYPE_SOURCE_COMPLETION_CONTEXT
+GTK_SOURCE_TYPE_COMPLETION_CONTEXT
GtkSourceCompletionContextPrivate
gtk_source_completion_context_get_type
GtkSourceCompletionContextClass
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index 1315714..07498ae 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -147,6 +147,9 @@ stamp-gtksourceview-typebuiltins.c: Makefile.am $(libgtksourceview_headers)
gtksourceview-typebuiltins.h: stamp-gtksourceview-typebuiltins.h
@true
+
+# FIXME: we have to sed the file because glib-mkenums does
+# not recognize GTK_SOURCE as the prefix but instead GTK
stamp-gtksourceview-typebuiltins.h: Makefile.am $(libgtksourceview_headers)
$(AM_V_GEN) (cd $(srcdir) \
&& $(GLIB_MKENUMS) \
@@ -159,6 +162,7 @@ stamp-gtksourceview-typebuiltins.h: Makefile.am $(libgtksourceview_headers)
--eprod "GType @enum_name _get_type (void);\n" \
--eprod "G_END_DECLS\n\n" \
$(libgtksourceview_headers) ) > xgen-gth \
+ && $(SED) -i 's/GTK_TYPE_SOURCE_/GTK_SOURCE_TYPE_/' xgen-gth \
&& (cmp -s xgen-gth gtksourceview-typebuiltins.h || cp xgen-gth gtksourceview-typebuiltins.h) \
&& rm -f xgen-gth && echo stamp > $(@F)
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwords.c b/gtksourceview/completion-providers/words/gtksourcecompletionwords.c
index 4d78dfb..1d580b9 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwords.c
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwords.c
@@ -28,7 +28,7 @@
#include <gtksourceview/gtksourceview-i18n.h>
#include <string.h>
-#define GTK_SOURCE_COMPLETION_WORDS_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_TYPE_SOURCE_COMPLETION_WORDS, GtkSourceCompletionWordsPrivate))
+#define GTK_SOURCE_COMPLETION_WORDS_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_SOURCE_TYPE_COMPLETION_WORDS, GtkSourceCompletionWordsPrivate))
#define BUFFER_KEY "GtkSourceCompletionWordsBufferKey"
@@ -90,7 +90,7 @@ GType gsc_proposal_words_get_type (void);
G_DEFINE_TYPE_WITH_CODE (GtkSourceCompletionWords,
gtk_source_completion_words,
G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (GTK_TYPE_SOURCE_COMPLETION_PROVIDER,
+ G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_COMPLETION_PROVIDER,
gtk_source_completion_words_iface_init))
static gchar *
@@ -593,7 +593,7 @@ GtkSourceCompletionWords *
gtk_source_completion_words_new (const gchar *name,
GdkPixbuf *icon)
{
- return g_object_new (GTK_TYPE_SOURCE_COMPLETION_WORDS,
+ return g_object_new (GTK_SOURCE_TYPE_COMPLETION_WORDS,
"name", name,
"icon", icon,
NULL);
@@ -622,7 +622,7 @@ gtk_source_completion_words_register (GtkSourceCompletionWords *words,
GtkSourceCompletionWordsBuffer *buf;
BufferBinding *binding;
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_WORDS (words));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_WORDS (words));
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
binding = g_object_get_data (G_OBJECT (buffer), BUFFER_KEY);
@@ -665,7 +665,7 @@ void
gtk_source_completion_words_unregister (GtkSourceCompletionWords *words,
GtkTextBuffer *buffer)
{
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_WORDS (words));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_WORDS (words));
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
g_object_set_data (G_OBJECT (buffer), BUFFER_KEY, NULL);
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwords.h b/gtksourceview/completion-providers/words/gtksourcecompletionwords.h
index ce206e8..ae24a6e 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwords.h
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwords.h
@@ -27,13 +27,13 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_COMPLETION_WORDS (gtk_source_completion_words_get_type ())
-#define GTK_SOURCE_COMPLETION_WORDS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_COMPLETION_WORDS, GtkSourceCompletionWords))
-#define GTK_SOURCE_COMPLETION_WORDS_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_COMPLETION_WORDS, GtkSourceCompletionWords const))
-#define GTK_SOURCE_COMPLETION_WORDS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_COMPLETION_WORDS, GtkSourceCompletionWordsClass))
-#define GTK_IS_SOURCE_COMPLETION_WORDS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_COMPLETION_WORDS))
-#define GTK_IS_SOURCE_COMPLETION_WORDS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_COMPLETION_WORDS))
-#define GTK_SOURCE_COMPLETION_WORDS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_COMPLETION_WORDS, GtkSourceCompletionWordsClass))
+#define GTK_SOURCE_TYPE_COMPLETION_WORDS (gtk_source_completion_words_get_type ())
+#define GTK_SOURCE_COMPLETION_WORDS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_WORDS, GtkSourceCompletionWords))
+#define GTK_SOURCE_COMPLETION_WORDS_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_WORDS, GtkSourceCompletionWords const))
+#define GTK_SOURCE_COMPLETION_WORDS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_COMPLETION_WORDS, GtkSourceCompletionWordsClass))
+#define GTK_SOURCE_IS_COMPLETION_WORDS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_COMPLETION_WORDS))
+#define GTK_SOURCE_IS_COMPLETION_WORDS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_COMPLETION_WORDS))
+#define GTK_SOURCE_COMPLETION_WORDS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_COMPLETION_WORDS, GtkSourceCompletionWordsClass))
typedef struct _GtkSourceCompletionWords GtkSourceCompletionWords;
typedef struct _GtkSourceCompletionWordsClass GtkSourceCompletionWordsClass;
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.c b/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.c
index cee6986..5029824 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.c
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.c
@@ -24,7 +24,7 @@
#include <glib.h>
-#define GTK_SOURCE_COMPLETION_WORDS_BUFFER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_TYPE_SOURCE_COMPLETION_WORDS_BUFFER, GtkSourceCompletionWordsBufferPrivate))
+#define GTK_SOURCE_COMPLETION_WORDS_BUFFER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_SOURCE_TYPE_COMPLETION_WORDS_BUFFER, GtkSourceCompletionWordsBufferPrivate))
/* Timeout in seconds */
#define INITIATE_SCAN_TIMEOUT 5
@@ -730,10 +730,10 @@ gtk_source_completion_words_buffer_new (GtkSourceCompletionWordsLibrary *library
GtkSourceCompletionWordsBuffer *ret;
GtkTextIter iter;
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_WORDS_LIBRARY (library), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_WORDS_LIBRARY (library), NULL);
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
- ret = g_object_new (GTK_TYPE_SOURCE_COMPLETION_WORDS_BUFFER, NULL);
+ ret = g_object_new (GTK_SOURCE_TYPE_COMPLETION_WORDS_BUFFER, NULL);
ret->priv->library = g_object_ref (library);
ret->priv->buffer = g_object_ref (buffer);
@@ -761,7 +761,7 @@ gtk_source_completion_words_buffer_new (GtkSourceCompletionWordsLibrary *library
GtkTextBuffer *
gtk_source_completion_words_buffer_get_buffer (GtkSourceCompletionWordsBuffer *buffer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_WORDS_BUFFER (buffer), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_WORDS_BUFFER (buffer), NULL);
return buffer->priv->buffer;
}
@@ -770,7 +770,7 @@ void
gtk_source_completion_words_buffer_set_scan_batch_size (GtkSourceCompletionWordsBuffer *buffer,
guint size)
{
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_WORDS_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_WORDS_BUFFER (buffer));
g_return_if_fail (size != 0);
buffer->priv->scan_batch_size = size;
@@ -780,7 +780,7 @@ void
gtk_source_completion_words_buffer_set_minimum_word_size (GtkSourceCompletionWordsBuffer *buffer,
guint size)
{
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_WORDS_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_WORDS_BUFFER (buffer));
g_return_if_fail (size != 0);
buffer->priv->minimum_word_size = size;
@@ -789,7 +789,7 @@ gtk_source_completion_words_buffer_set_minimum_word_size (GtkSourceCompletionWor
GtkTextMark *
gtk_source_completion_words_buffer_get_mark (GtkSourceCompletionWordsBuffer *buffer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_WORDS_BUFFER (buffer), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_WORDS_BUFFER (buffer), NULL);
return buffer->priv->mark;
}
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.h b/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.h
index afd2dfa..9e32846 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.h
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwordsbuffer.h
@@ -29,13 +29,13 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_COMPLETION_WORDS_BUFFER (gtk_source_completion_words_buffer_get_type ())
-#define GTK_SOURCE_COMPLETION_WORDS_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_COMPLETION_WORDS_BUFFER, GtkSourceCompletionWordsBuffer))
-#define GTK_SOURCE_COMPLETION_WORDS_BUFFER_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_COMPLETION_WORDS_BUFFER, GtkSourceCompletionWordsBuffer const))
-#define GTK_SOURCE_COMPLETION_WORDS_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_COMPLETION_WORDS_BUFFER, GtkSourceCompletionWordsBufferClass))
-#define GTK_IS_SOURCE_COMPLETION_WORDS_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_COMPLETION_WORDS_BUFFER))
-#define GTK_IS_SOURCE_COMPLETION_WORDS_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_COMPLETION_WORDS_BUFFER))
-#define GTK_SOURCE_COMPLETION_WORDS_BUFFER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_COMPLETION_WORDS_BUFFER, GtkSourceCompletionWordsBufferClass))
+#define GTK_SOURCE_TYPE_COMPLETION_WORDS_BUFFER (gtk_source_completion_words_buffer_get_type ())
+#define GTK_SOURCE_COMPLETION_WORDS_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_WORDS_BUFFER, GtkSourceCompletionWordsBuffer))
+#define GTK_SOURCE_COMPLETION_WORDS_BUFFER_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_WORDS_BUFFER, GtkSourceCompletionWordsBuffer const))
+#define GTK_SOURCE_COMPLETION_WORDS_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_COMPLETION_WORDS_BUFFER, GtkSourceCompletionWordsBufferClass))
+#define GTK_SOURCE_IS_COMPLETION_WORDS_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_COMPLETION_WORDS_BUFFER))
+#define GTK_SOURCE_IS_COMPLETION_WORDS_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_COMPLETION_WORDS_BUFFER))
+#define GTK_SOURCE_COMPLETION_WORDS_BUFFER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_COMPLETION_WORDS_BUFFER, GtkSourceCompletionWordsBufferClass))
typedef struct _GtkSourceCompletionWordsBuffer GtkSourceCompletionWordsBuffer;
typedef struct _GtkSourceCompletionWordsBufferClass GtkSourceCompletionWordsBufferClass;
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.c b/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.c
index 4ba5320..f1a0004 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.c
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.c
@@ -23,7 +23,7 @@
#include <string.h>
-#define GTK_SOURCE_COMPLETION_WORDS_LIBRARY_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_TYPE_SOURCE_COMPLETION_WORDS_LIBRARY, GtkSourceCompletionWordsLibraryPrivate))
+#define GTK_SOURCE_COMPLETION_WORDS_LIBRARY_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_SOURCE_TYPE_COMPLETION_WORDS_LIBRARY, GtkSourceCompletionWordsLibraryPrivate))
enum
{
@@ -91,7 +91,7 @@ gtk_source_completion_words_library_init (GtkSourceCompletionWordsLibrary *self)
GtkSourceCompletionWordsLibrary *
gtk_source_completion_words_library_new (void)
{
- return g_object_new (GTK_TYPE_SOURCE_COMPLETION_WORDS_LIBRARY, NULL);
+ return g_object_new (GTK_SOURCE_TYPE_COMPLETION_WORDS_LIBRARY, NULL);
}
static gint
@@ -147,7 +147,7 @@ gtk_source_completion_words_library_find_first (GtkSourceCompletionWordsLibrary
GSequenceIter *iter;
GSequenceIter *prev;
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_WORDS_LIBRARY (library), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_WORDS_LIBRARY (library), NULL);
g_return_val_if_fail (word != NULL, NULL);
iter = g_sequence_search (library->priv->store,
@@ -228,8 +228,8 @@ gtk_source_completion_words_library_find (GtkSourceCompletionWordsLibrary *libr
const gchar *word = gtk_source_completion_words_proposal_get_word (proposal);
gint len = strlen (word);
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_WORDS_LIBRARY (library), NULL);
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_WORDS_PROPOSAL (proposal), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_WORDS_LIBRARY (library), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_WORDS_PROPOSAL (proposal), NULL);
iter = gtk_source_completion_words_library_find_first (library, word, len);
@@ -275,7 +275,7 @@ gtk_source_completion_words_library_add_word (GtkSourceCompletionWordsLibrary *l
GtkSourceCompletionWordsProposal *proposal;
GSequenceIter *iter;
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_WORDS_LIBRARY (library), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_WORDS_LIBRARY (library), NULL);
g_return_val_if_fail (word != NULL, NULL);
/* Check if word already exists */
@@ -319,8 +319,8 @@ void
gtk_source_completion_words_library_remove_word (GtkSourceCompletionWordsLibrary *library,
GtkSourceCompletionWordsProposal *proposal)
{
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_WORDS_LIBRARY (library));
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_WORDS_PROPOSAL (proposal));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_WORDS_LIBRARY (library));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_WORDS_PROPOSAL (proposal));
gtk_source_completion_words_proposal_unuse (proposal);
}
@@ -328,7 +328,7 @@ gtk_source_completion_words_library_remove_word (GtkSourceCompletionWordsLibrary
void
gtk_source_completion_words_library_lock (GtkSourceCompletionWordsLibrary *library)
{
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_WORDS_LIBRARY (library));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_WORDS_LIBRARY (library));
library->priv->locked = TRUE;
g_signal_emit (library, signals[LOCK], 0);
@@ -337,7 +337,7 @@ gtk_source_completion_words_library_lock (GtkSourceCompletionWordsLibrary *libra
void
gtk_source_completion_words_library_unlock (GtkSourceCompletionWordsLibrary *library)
{
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_WORDS_LIBRARY (library));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_WORDS_LIBRARY (library));
library->priv->locked = FALSE;
g_signal_emit (library, signals[UNLOCK], 0);
@@ -346,7 +346,7 @@ gtk_source_completion_words_library_unlock (GtkSourceCompletionWordsLibrary *lib
gboolean
gtk_source_completion_words_library_is_locked (GtkSourceCompletionWordsLibrary *library)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_WORDS_LIBRARY (library), TRUE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_WORDS_LIBRARY (library), TRUE);
return library->priv->locked;
}
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.h b/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.h
index fb3da64..e118c70 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.h
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwordslibrary.h
@@ -27,13 +27,13 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_COMPLETION_WORDS_LIBRARY (gtk_source_completion_words_library_get_type ())
-#define GTK_SOURCE_COMPLETION_WORDS_LIBRARY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_COMPLETION_PROVIDER_WORDS_LIBRARY, GtkSourceCompletionWordsLibrary))
-#define GTK_SOURCE_COMPLETION_WORDS_LIBRARY_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_COMPLETION_WORDS_LIBRARY, GtkSourceCompletionWordsLibrary const))
-#define GTK_SOURCE_COMPLETION_WORDS_LIBRARY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_COMPLETION_WORDS_LIBRARY, GtkSourceCompletionWordsLibraryClass))
-#define GTK_IS_SOURCE_COMPLETION_WORDS_LIBRARY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_COMPLETION_WORDS_LIBRARY))
-#define GTK_IS_SOURCE_COMPLETION_WORDS_LIBRARY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_COMPLETION_WORDS_LIBRARY))
-#define GTK_SOURCE_COMPLETION_WORDS_LIBRARY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_COMPLETION_WORDS_LIBRARY, GtkSourceCompletionWordsLibraryClass))
+#define GTK_SOURCE_TYPE_COMPLETION_WORDS_LIBRARY (gtk_source_completion_words_library_get_type ())
+#define GTK_SOURCE_COMPLETION_WORDS_LIBRARY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_PROVIDER_WORDS_LIBRARY, GtkSourceCompletionWordsLibrary))
+#define GTK_SOURCE_COMPLETION_WORDS_LIBRARY_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_WORDS_LIBRARY, GtkSourceCompletionWordsLibrary const))
+#define GTK_SOURCE_COMPLETION_WORDS_LIBRARY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_COMPLETION_WORDS_LIBRARY, GtkSourceCompletionWordsLibraryClass))
+#define GTK_SOURCE_IS_COMPLETION_WORDS_LIBRARY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_COMPLETION_WORDS_LIBRARY))
+#define GTK_SOURCE_IS_COMPLETION_WORDS_LIBRARY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_COMPLETION_WORDS_LIBRARY))
+#define GTK_SOURCE_COMPLETION_WORDS_LIBRARY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_COMPLETION_WORDS_LIBRARY, GtkSourceCompletionWordsLibraryClass))
typedef struct _GtkSourceCompletionWordsLibrary GtkSourceCompletionWordsLibrary;
typedef struct _GtkSourceCompletionWordsLibraryClass GtkSourceCompletionWordsLibraryClass;
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.c b/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.c
index f5ef2fd..e0b3b33 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.c
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.c
@@ -21,7 +21,7 @@
#include "gtksourcecompletionwordsproposal.h"
-#define GTK_SOURCE_COMPLETION_WORDS_PROPOSAL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_TYPE_SOURCE_COMPLETION_WORDS_PROPOSAL, GtkSourceCompletionWordsProposalPrivate))
+#define GTK_SOURCE_COMPLETION_WORDS_PROPOSAL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_SOURCE_TYPE_COMPLETION_WORDS_PROPOSAL, GtkSourceCompletionWordsProposalPrivate))
struct _GtkSourceCompletionWordsProposalPrivate
{
@@ -42,7 +42,7 @@ static void gtk_source_completion_proposal_iface_init (gpointer g_iface, gpointe
G_DEFINE_TYPE_WITH_CODE (GtkSourceCompletionWordsProposal,
gtk_source_completion_words_proposal,
G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (GTK_TYPE_SOURCE_COMPLETION_PROPOSAL,
+ G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_COMPLETION_PROPOSAL,
gtk_source_completion_proposal_iface_init))
static gchar *
@@ -106,7 +106,7 @@ GtkSourceCompletionWordsProposal *
gtk_source_completion_words_proposal_new (const gchar *word)
{
GtkSourceCompletionWordsProposal *proposal =
- g_object_new (GTK_TYPE_SOURCE_COMPLETION_WORDS_PROPOSAL, NULL);
+ g_object_new (GTK_SOURCE_TYPE_COMPLETION_WORDS_PROPOSAL, NULL);
proposal->priv->word = g_strdup (word);
return proposal;
@@ -115,7 +115,7 @@ gtk_source_completion_words_proposal_new (const gchar *word)
void
gtk_source_completion_words_proposal_use (GtkSourceCompletionWordsProposal *proposal)
{
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_WORDS_PROPOSAL (proposal));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_WORDS_PROPOSAL (proposal));
g_atomic_int_inc (&proposal->priv->use_count);
}
@@ -123,7 +123,7 @@ gtk_source_completion_words_proposal_use (GtkSourceCompletionWordsProposal *prop
void
gtk_source_completion_words_proposal_unuse (GtkSourceCompletionWordsProposal *proposal)
{
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_WORDS_PROPOSAL (proposal));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_WORDS_PROPOSAL (proposal));
if (g_atomic_int_dec_and_test (&proposal->priv->use_count))
{
@@ -134,7 +134,7 @@ gtk_source_completion_words_proposal_unuse (GtkSourceCompletionWordsProposal *pr
const gchar *
gtk_source_completion_words_proposal_get_word (GtkSourceCompletionWordsProposal *proposal)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_WORDS_PROPOSAL (proposal), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_WORDS_PROPOSAL (proposal), NULL);
return proposal->priv->word;
}
diff --git a/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.h b/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.h
index ebdffef..12e6e3c 100644
--- a/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.h
+++ b/gtksourceview/completion-providers/words/gtksourcecompletionwordsproposal.h
@@ -27,13 +27,13 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_COMPLETION_WORDS_PROPOSAL (gtk_source_completion_words_proposal_get_type ())
-#define GTK_SOURCE_COMPLETION_WORDS_PROPOSAL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_COMPLETION_WORDS_PROPOSAL, GtkSourceCompletionWordsProposal))
-#define GTK_SOURCE_COMPLETION_WORDS_PROPOSAL_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_COMPLETION_WORDS_PROPOSAL, GtkSourceCompletionWordsProposal const))
-#define GTK_SOURCE_COMPLETION_WORDS_PROPOSAL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_COMPLETION_WORDS_PROPOSAL, GtkSourceCompletionWordsProposalClass))
-#define GTK_IS_SOURCE_COMPLETION_WORDS_PROPOSAL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_COMPLETION_WORDS_PROPOSAL))
-#define GTK_IS_SOURCE_COMPLETION_WORDS_PROPOSAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_COMPLETION_WORDS_PROPOSAL))
-#define GTK_SOURCE_COMPLETION_WORDS_PROPOSAL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_COMPLETION_WORDS_PROPOSAL, GtkSourceCompletionWordsProposalClass))
+#define GTK_SOURCE_TYPE_COMPLETION_WORDS_PROPOSAL (gtk_source_completion_words_proposal_get_type ())
+#define GTK_SOURCE_COMPLETION_WORDS_PROPOSAL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_WORDS_PROPOSAL, GtkSourceCompletionWordsProposal))
+#define GTK_SOURCE_COMPLETION_WORDS_PROPOSAL_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_WORDS_PROPOSAL, GtkSourceCompletionWordsProposal const))
+#define GTK_SOURCE_COMPLETION_WORDS_PROPOSAL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_COMPLETION_WORDS_PROPOSAL, GtkSourceCompletionWordsProposalClass))
+#define GTK_SOURCE_IS_COMPLETION_WORDS_PROPOSAL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_COMPLETION_WORDS_PROPOSAL))
+#define GTK_SOURCE_IS_COMPLETION_WORDS_PROPOSAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_COMPLETION_WORDS_PROPOSAL))
+#define GTK_SOURCE_COMPLETION_WORDS_PROPOSAL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_COMPLETION_WORDS_PROPOSAL, GtkSourceCompletionWordsProposalClass))
typedef struct _GtkSourceCompletionWordsProposal GtkSourceCompletionWordsProposal;
typedef struct _GtkSourceCompletionWordsProposalClass GtkSourceCompletionWordsProposalClass;
diff --git a/gtksourceview/gtksourcebuffer.c b/gtksourceview/gtksourcebuffer.c
index 169aa11..b5260a5 100644
--- a/gtksourceview/gtksourcebuffer.c
+++ b/gtksourceview/gtksourcebuffer.c
@@ -275,7 +275,7 @@ gtk_source_buffer_class_init (GtkSourceBufferClass *klass)
_("Language"),
_("Language object to get "
"highlighting patterns from"),
- GTK_TYPE_SOURCE_LANGUAGE,
+ GTK_SOURCE_TYPE_LANGUAGE,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
@@ -306,7 +306,7 @@ gtk_source_buffer_class_init (GtkSourceBufferClass *klass)
g_param_spec_object ("style_scheme",
_("Style scheme"),
_("Style scheme"),
- GTK_TYPE_SOURCE_STYLE_SCHEME,
+ GTK_SOURCE_TYPE_STYLE_SCHEME,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
@@ -314,7 +314,7 @@ gtk_source_buffer_class_init (GtkSourceBufferClass *klass)
g_param_spec_object ("undo-manager",
_("Undo manager"),
_("The buffer undo manager"),
- GTK_TYPE_SOURCE_UNDO_MANAGER,
+ GTK_SOURCE_TYPE_UNDO_MANAGER,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
param_types[0] = GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE;
@@ -387,7 +387,7 @@ gtk_source_buffer_class_init (GtkSourceBufferClass *klass)
_gtksourceview_marshal_VOID__BOXED_ENUM,
G_TYPE_NONE, 2,
GTK_TYPE_TEXT_ITER,
- GTK_TYPE_SOURCE_BRACKET_MATCH_TYPE);
+ GTK_SOURCE_TYPE_BRACKET_MATCH_TYPE);
g_type_class_add_private (object_class, sizeof (GtkSourceBufferPrivate));
}
@@ -440,7 +440,7 @@ gtk_source_buffer_init (GtkSourceBuffer *buffer)
{
GtkSourceBufferPrivate *priv;
- priv = G_TYPE_INSTANCE_GET_PRIVATE (buffer, GTK_TYPE_SOURCE_BUFFER,
+ priv = G_TYPE_INSTANCE_GET_PRIVATE (buffer, GTK_SOURCE_TYPE_BUFFER,
GtkSourceBufferPrivate);
buffer->priv = priv;
@@ -464,7 +464,7 @@ gtk_source_buffer_finalize (GObject *object)
GtkSourceBuffer *buffer;
g_return_if_fail (object != NULL);
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (object));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (object));
buffer = GTK_SOURCE_BUFFER (object);
g_return_if_fail (buffer->priv != NULL);
@@ -481,7 +481,7 @@ gtk_source_buffer_dispose (GObject *object)
GtkSourceBuffer *buffer;
g_return_if_fail (object != NULL);
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (object));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (object));
buffer = GTK_SOURCE_BUFFER (object);
g_return_if_fail (buffer->priv != NULL);
@@ -521,7 +521,7 @@ gtk_source_buffer_set_property (GObject *object,
{
GtkSourceBuffer *source_buffer;
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (object));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (object));
source_buffer = GTK_SOURCE_BUFFER (object);
@@ -571,7 +571,7 @@ gtk_source_buffer_get_property (GObject *object,
{
GtkSourceBuffer *source_buffer;
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (object));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (object));
source_buffer = GTK_SOURCE_BUFFER (object);
@@ -629,7 +629,7 @@ gtk_source_buffer_get_property (GObject *object,
GtkSourceBuffer *
gtk_source_buffer_new (GtkTextTagTable *table)
{
- return g_object_new (GTK_TYPE_SOURCE_BUFFER,
+ return g_object_new (GTK_SOURCE_TYPE_BUFFER,
"tag-table", table,
NULL);
}
@@ -648,9 +648,9 @@ gtk_source_buffer_new (GtkTextTagTable *table)
GtkSourceBuffer *
gtk_source_buffer_new_with_language (GtkSourceLanguage *language)
{
- g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE (language), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), NULL);
- return g_object_new (GTK_TYPE_SOURCE_BUFFER,
+ return g_object_new (GTK_SOURCE_TYPE_BUFFER,
"tag-table", NULL,
"language", language,
NULL);
@@ -660,7 +660,7 @@ static void
gtk_source_buffer_can_undo_handler (GtkSourceUndoManager *manager,
GtkSourceBuffer *buffer)
{
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
g_object_notify (G_OBJECT (buffer), "can-undo");
}
@@ -669,7 +669,7 @@ static void
gtk_source_buffer_can_redo_handler (GtkSourceUndoManager *manager,
GtkSourceBuffer *buffer)
{
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
g_object_notify (G_OBJECT (buffer), "can-redo");
}
@@ -777,7 +777,7 @@ gtk_source_buffer_move_cursor (GtkTextBuffer *buffer,
gunichar cursor_char;
GtkSourceBracketMatchType previous_state;
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
g_return_if_fail (iter != NULL);
g_return_if_fail (mark != NULL);
g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
@@ -922,7 +922,7 @@ gtk_source_buffer_real_insert_text (GtkTextBuffer *buffer,
{
gint start_offset;
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
g_return_if_fail (iter != NULL);
g_return_if_fail (text != NULL);
g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
@@ -952,7 +952,7 @@ gtk_source_buffer_real_insert_pixbuf (GtkTextBuffer *buffer,
{
gint start_offset;
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
g_return_if_fail (iter != NULL);
g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
@@ -978,7 +978,7 @@ gtk_source_buffer_real_insert_anchor (GtkTextBuffer *buffer,
{
gint start_offset;
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
g_return_if_fail (iter != NULL);
g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
@@ -1007,7 +1007,7 @@ gtk_source_buffer_real_delete_range (GtkTextBuffer *buffer,
GtkTextIter iter;
GtkSourceBuffer *source_buffer = GTK_SOURCE_BUFFER (buffer);
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
g_return_if_fail (start != NULL);
g_return_if_fail (end != NULL);
g_return_if_fail (gtk_text_iter_get_buffer (start) == buffer);
@@ -1187,7 +1187,7 @@ gtk_source_buffer_find_bracket_match_with_limit (GtkSourceBuffer *buff
gboolean
gtk_source_buffer_can_undo (GtkSourceBuffer *buffer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), FALSE);
return gtk_source_undo_manager_can_undo (buffer->priv->undo_manager);
}
@@ -1204,7 +1204,7 @@ gtk_source_buffer_can_undo (GtkSourceBuffer *buffer)
gboolean
gtk_source_buffer_can_redo (GtkSourceBuffer *buffer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), FALSE);
return gtk_source_undo_manager_can_redo (buffer->priv->undo_manager);
}
@@ -1225,7 +1225,7 @@ gtk_source_buffer_can_redo (GtkSourceBuffer *buffer)
void
gtk_source_buffer_undo (GtkSourceBuffer *buffer)
{
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
g_signal_emit (buffer, buffer_signals[UNDO], 0);
}
@@ -1240,7 +1240,7 @@ gtk_source_buffer_undo (GtkSourceBuffer *buffer)
void
gtk_source_buffer_redo (GtkSourceBuffer *buffer)
{
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
g_signal_emit (buffer, buffer_signals[REDO], 0);
}
@@ -1258,7 +1258,7 @@ gtk_source_buffer_redo (GtkSourceBuffer *buffer)
gint
gtk_source_buffer_get_max_undo_levels (GtkSourceBuffer *buffer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), 0);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), 0);
return buffer->priv->max_undo_levels;
}
@@ -1285,7 +1285,7 @@ void
gtk_source_buffer_set_max_undo_levels (GtkSourceBuffer *buffer,
gint max_undo_levels)
{
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
if (buffer->priv->max_undo_levels == max_undo_levels)
{
@@ -1294,7 +1294,7 @@ gtk_source_buffer_set_max_undo_levels (GtkSourceBuffer *buffer,
buffer->priv->max_undo_levels = max_undo_levels;
- if (GTK_IS_SOURCE_UNDO_MANAGER_DEFAULT (buffer->priv->undo_manager))
+ if (GTK_SOURCE_IS_UNDO_MANAGER_DEFAULT (buffer->priv->undo_manager))
{
gtk_source_undo_manager_default_set_max_undo_levels (GTK_SOURCE_UNDO_MANAGER_DEFAULT (buffer->priv->undo_manager),
max_undo_levels);
@@ -1318,7 +1318,7 @@ gtk_source_buffer_set_max_undo_levels (GtkSourceBuffer *buffer,
void
gtk_source_buffer_begin_not_undoable_action (GtkSourceBuffer *buffer)
{
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
gtk_source_undo_manager_begin_not_undoable_action (buffer->priv->undo_manager);
}
@@ -1335,7 +1335,7 @@ gtk_source_buffer_begin_not_undoable_action (GtkSourceBuffer *buffer)
void
gtk_source_buffer_end_not_undoable_action (GtkSourceBuffer *buffer)
{
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
gtk_source_undo_manager_end_not_undoable_action (buffer->priv->undo_manager);
}
@@ -1353,7 +1353,7 @@ gtk_source_buffer_end_not_undoable_action (GtkSourceBuffer *buffer)
gboolean
gtk_source_buffer_get_highlight_matching_brackets (GtkSourceBuffer *buffer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), FALSE);
return (buffer->priv->highlight_brackets != FALSE);
}
@@ -1374,7 +1374,7 @@ void
gtk_source_buffer_set_highlight_matching_brackets (GtkSourceBuffer *buffer,
gboolean highlight)
{
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
highlight = (highlight != FALSE);
@@ -1412,7 +1412,7 @@ gtk_source_buffer_set_highlight_matching_brackets (GtkSourceBuffer *buffer,
gboolean
gtk_source_buffer_get_highlight_syntax (GtkSourceBuffer *buffer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), FALSE);
return (buffer->priv->highlight_syntax != FALSE);
}
@@ -1433,7 +1433,7 @@ void
gtk_source_buffer_set_highlight_syntax (GtkSourceBuffer *buffer,
gboolean highlight)
{
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
highlight = (highlight != FALSE);
@@ -1461,8 +1461,8 @@ void
gtk_source_buffer_set_language (GtkSourceBuffer *buffer,
GtkSourceLanguage *language)
{
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
- g_return_if_fail (GTK_IS_SOURCE_LANGUAGE (language) || language == NULL);
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_LANGUAGE (language) || language == NULL);
if (buffer->priv->language == language)
return;
@@ -1514,7 +1514,7 @@ gtk_source_buffer_set_language (GtkSourceBuffer *buffer,
GtkSourceLanguage *
gtk_source_buffer_get_language (GtkSourceBuffer *buffer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), NULL);
return buffer->priv->language;
}
@@ -1534,7 +1534,7 @@ _gtk_source_buffer_update_highlight (GtkSourceBuffer *buffer,
const GtkTextIter *end,
gboolean synchronous)
{
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
if (buffer->priv->highlight_engine != NULL)
_gtk_source_engine_update_highlight (buffer->priv->highlight_engine,
@@ -1582,8 +1582,8 @@ void
gtk_source_buffer_set_style_scheme (GtkSourceBuffer *buffer,
GtkSourceStyleScheme *scheme)
{
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
- g_return_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme) || scheme == NULL);
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme) || scheme == NULL);
if (buffer->priv->style_scheme == scheme)
return;
@@ -1615,7 +1615,7 @@ gtk_source_buffer_set_style_scheme (GtkSourceBuffer *buffer,
GtkSourceStyleScheme *
gtk_source_buffer_get_style_scheme (GtkSourceBuffer *buffer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), NULL);
return buffer->priv->style_scheme;
}
@@ -1750,7 +1750,7 @@ gtk_source_buffer_real_mark_set (GtkTextBuffer *buffer,
const GtkTextIter *location,
GtkTextMark *mark)
{
- if (GTK_IS_SOURCE_MARK (mark))
+ if (GTK_SOURCE_IS_MARK (mark))
{
/* for now we simply remove and reinsert at
* the right place every time */
@@ -1775,7 +1775,7 @@ static void
gtk_source_buffer_real_mark_deleted (GtkTextBuffer *buffer,
GtkTextMark *mark)
{
- if (GTK_IS_SOURCE_MARK (mark))
+ if (GTK_SOURCE_IS_MARK (mark))
{
source_mark_remove (GTK_SOURCE_BUFFER (buffer),
GTK_SOURCE_MARK (mark));
@@ -1836,7 +1836,7 @@ gtk_source_buffer_create_source_mark (GtkSourceBuffer *buffer,
{
GtkSourceMark *mark;
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), NULL);
g_return_val_if_fail (category != NULL, NULL);
g_return_val_if_fail (where != NULL, NULL);
@@ -1856,7 +1856,7 @@ _gtk_source_buffer_source_mark_next (GtkSourceBuffer *buffer,
GtkTextIter iter;
gint idx, cmp;
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), NULL);
/* TODO: we could speed this up by caching the current
* position in the mark and invalidating the cache when
@@ -1900,7 +1900,7 @@ _gtk_source_buffer_source_mark_prev (GtkSourceBuffer *buffer,
GtkTextIter iter;
gint idx, cmp;
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), NULL);
/* TODO: we could speed this up by caching the current
* position in the mark and invalidating the cache when
@@ -1958,7 +1958,7 @@ gtk_source_buffer_forward_iter_to_source_mark (GtkSourceBuffer *buffer,
GtkTextIter i;
gint idx, cmp;
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
i = *iter;
@@ -2017,7 +2017,7 @@ gtk_source_buffer_backward_iter_to_source_mark (GtkSourceBuffer *buffer,
GtkTextIter i;
gint idx, cmp;
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
i = *iter;
@@ -2083,7 +2083,7 @@ gtk_source_buffer_get_source_marks_at_iter (GtkSourceBuffer *buffer,
{
GtkSourceMark *mark;
- if (!GTK_IS_SOURCE_MARK (l->data))
+ if (!GTK_SOURCE_IS_MARK (l->data))
continue;
mark = GTK_SOURCE_MARK (l->data);
@@ -2121,7 +2121,7 @@ gtk_source_buffer_get_source_marks_at_line (GtkSourceBuffer *buffer,
GtkTextIter iter;
GSList *res;
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), NULL);
gtk_text_buffer_get_iter_at_line (GTK_TEXT_BUFFER (buffer),
&iter, line);
@@ -2175,7 +2175,7 @@ gtk_source_buffer_remove_source_marks (GtkSourceBuffer *buffer,
GSList *list;
GSList *l;
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
g_return_if_fail (start != NULL);
g_return_if_fail (end != NULL);
@@ -2230,7 +2230,7 @@ gtk_source_buffer_iter_has_context_class (GtkSourceBuffer *buffer,
{
GtkTextTag *tag;
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (context_class != NULL, FALSE);
@@ -2273,7 +2273,7 @@ gtk_source_buffer_get_context_classes_at_iter (GtkSourceBuffer *buffer,
GSList *item;
GPtrArray *ret;
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), NULL);
g_return_val_if_fail (iter != NULL, NULL);
tags = gtk_text_iter_get_tags (iter);
@@ -2317,7 +2317,7 @@ gtk_source_buffer_iter_forward_to_context_class_toggle (GtkSourceBuffer *buffer,
{
GtkTextTag *tag;
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (context_class != NULL, FALSE);
@@ -2362,7 +2362,7 @@ gtk_source_buffer_iter_backward_to_context_class_toggle (GtkSourceBuffer *buffer
{
GtkTextTag *tag;
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (context_class != NULL, FALSE);
@@ -2396,12 +2396,12 @@ void
gtk_source_buffer_set_undo_manager (GtkSourceBuffer *buffer,
GtkSourceUndoManager *manager)
{
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (buffer));
- g_return_if_fail (manager == NULL || GTK_IS_SOURCE_UNDO_MANAGER (manager));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (buffer));
+ g_return_if_fail (manager == NULL || GTK_SOURCE_IS_UNDO_MANAGER (manager));
if (manager == NULL)
{
- manager = g_object_new (GTK_TYPE_SOURCE_UNDO_MANAGER_DEFAULT,
+ manager = g_object_new (GTK_SOURCE_TYPE_UNDO_MANAGER_DEFAULT,
"buffer", buffer,
"max-undo-levels", buffer->priv->max_undo_levels,
NULL);
@@ -2430,7 +2430,7 @@ gtk_source_buffer_set_undo_manager (GtkSourceBuffer *buffer,
GtkSourceUndoManager *
gtk_source_buffer_get_undo_manager (GtkSourceBuffer *buffer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), NULL);
return buffer->priv->undo_manager;
}
diff --git a/gtksourceview/gtksourcebuffer.h b/gtksourceview/gtksourcebuffer.h
index 95c5788..1b9dedd 100644
--- a/gtksourceview/gtksourcebuffer.h
+++ b/gtksourceview/gtksourcebuffer.h
@@ -33,12 +33,12 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_BUFFER (gtk_source_buffer_get_type ())
-#define GTK_SOURCE_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_BUFFER, GtkSourceBuffer))
-#define GTK_SOURCE_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_BUFFER, GtkSourceBufferClass))
-#define GTK_IS_SOURCE_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_BUFFER))
-#define GTK_IS_SOURCE_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_BUFFER))
-#define GTK_SOURCE_BUFFER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_BUFFER, GtkSourceBufferClass))
+#define GTK_SOURCE_TYPE_BUFFER (gtk_source_buffer_get_type ())
+#define GTK_SOURCE_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_BUFFER, GtkSourceBuffer))
+#define GTK_SOURCE_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_BUFFER, GtkSourceBufferClass))
+#define GTK_SOURCE_IS_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_BUFFER))
+#define GTK_SOURCE_IS_BUFFER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_BUFFER))
+#define GTK_SOURCE_BUFFER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_BUFFER, GtkSourceBufferClass))
typedef struct _GtkSourceBuffer GtkSourceBuffer;
typedef struct _GtkSourceBufferClass GtkSourceBufferClass;
diff --git a/gtksourceview/gtksourcecompletion.c b/gtksourceview/gtksourcecompletion.c
index 82d46af..1b3d8f3 100644
--- a/gtksourceview/gtksourcecompletion.c
+++ b/gtksourceview/gtksourcecompletion.c
@@ -44,7 +44,7 @@
#define WINDOW_HEIGHT 200
#define GTK_SOURCE_COMPLETION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object),\
- GTK_TYPE_SOURCE_COMPLETION, \
+ GTK_SOURCE_TYPE_COMPLETION, \
GtkSourceCompletionPrivate))
/*#define ENABLE_DEBUG*/
@@ -1965,7 +1965,7 @@ gtk_source_completion_get_property (GObject *object,
{
GtkSourceCompletion *completion;
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION (object));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION (object));
completion = GTK_SOURCE_COMPLETION (object);
@@ -2012,7 +2012,7 @@ gtk_source_completion_set_property (GObject *object,
{
GtkSourceCompletion *completion;
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION (object));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION (object));
completion = GTK_SOURCE_COMPLETION (object);
@@ -2219,7 +2219,7 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass)
g_param_spec_object ("view",
_("View"),
_("The GtkSourceView bound to the completion"),
- GTK_TYPE_SOURCE_VIEW,
+ GTK_SOURCE_TYPE_VIEW,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
/**
@@ -2405,7 +2405,7 @@ gtk_source_completion_class_init (GtkSourceCompletionClass *klass)
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE,
1,
- GTK_TYPE_SOURCE_COMPLETION_CONTEXT);
+ GTK_SOURCE_TYPE_COMPLETION_CONTEXT);
/* Actions */
@@ -3217,9 +3217,9 @@ _gtk_source_completion_add_proposals (GtkSourceCompletion *completion,
{
GList *item;
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION (completion));
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_CONTEXT (context));
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_PROVIDER (provider));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION (completion));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_CONTEXT (context));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider));
g_return_if_fail (completion->priv->context == context);
item = g_list_find (completion->priv->running_providers, provider);
@@ -3267,7 +3267,7 @@ gtk_source_completion_show (GtkSourceCompletion *completion,
{
GList *selected_providers;
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION (completion), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION (completion), FALSE);
/* Make sure to clear any active completion */
DEBUG({
@@ -3324,7 +3324,7 @@ gtk_source_completion_show (GtkSourceCompletion *completion,
GList *
gtk_source_completion_get_providers (GtkSourceCompletion *completion)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION (completion), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION (completion), NULL);
return completion->priv->providers;
}
@@ -3352,9 +3352,9 @@ gtk_source_completion_error_quark (void)
GtkSourceCompletion *
gtk_source_completion_new (GtkSourceView *view)
{
- g_return_val_if_fail (GTK_IS_SOURCE_VIEW (view), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), NULL);
- return g_object_new (GTK_TYPE_SOURCE_COMPLETION,
+ return g_object_new (GTK_SOURCE_TYPE_COMPLETION,
"view", view,
NULL);
}
@@ -3377,8 +3377,8 @@ gtk_source_completion_add_provider (GtkSourceCompletion *completion,
GtkSourceCompletionProvider *provider,
GError **error)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION (completion), FALSE);
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROVIDER (provider), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION (completion), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider), FALSE);
if (g_list_find (completion->priv->providers, provider) != NULL)
{
@@ -3442,8 +3442,8 @@ gtk_source_completion_remove_provider (GtkSourceCompletion *completion,
{
GList *item;
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION (completion), FALSE);
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROVIDER (provider), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION (completion), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider), FALSE);
item = g_list_find (completion->priv->providers, provider);
@@ -3500,7 +3500,7 @@ gtk_source_completion_remove_provider (GtkSourceCompletion *completion,
void
gtk_source_completion_hide (GtkSourceCompletion *completion)
{
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION (completion));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION (completion));
DEBUG({
g_print ("Emitting hide\n");
@@ -3537,7 +3537,7 @@ gtk_source_completion_get_info_window (GtkSourceCompletion *completion)
GtkSourceView *
gtk_source_completion_get_view (GtkSourceCompletion *completion)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION (completion), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION (completion), NULL);
return completion->priv->view;
}
@@ -3563,7 +3563,7 @@ gtk_source_completion_create_context (GtkSourceCompletion *completion,
{
GtkTextIter iter;
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION (completion), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION (completion), NULL);
if (position == NULL)
{
@@ -3588,7 +3588,7 @@ void
gtk_source_completion_move_window (GtkSourceCompletion *completion,
GtkTextIter *iter)
{
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION (completion));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION (completion));
g_return_if_fail (iter != NULL);
if (!gtk_widget_get_visible (completion->priv->window))
@@ -3615,7 +3615,7 @@ gtk_source_completion_block_interactive (GtkSourceCompletion *completion)
{
GtkSourceBuffer *buffer;
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION (completion));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION (completion));
buffer = GTK_SOURCE_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (completion->priv->view)));
completion_begin_block (completion, buffer);
@@ -3634,7 +3634,7 @@ gtk_source_completion_unblock_interactive (GtkSourceCompletion *completion)
{
GtkSourceBuffer *buffer;
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION (completion));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION (completion));
buffer = GTK_SOURCE_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (completion->priv->view)));
completion_end_block (completion, buffer);
diff --git a/gtksourceview/gtksourcecompletion.h b/gtksourceview/gtksourcecompletion.h
index 863d105..6bfac12 100644
--- a/gtksourceview/gtksourcecompletion.h
+++ b/gtksourceview/gtksourcecompletion.h
@@ -33,12 +33,12 @@ G_BEGIN_DECLS
/*
* Type checking and casting macros
*/
-#define GTK_TYPE_SOURCE_COMPLETION (gtk_source_completion_get_type())
-#define GTK_SOURCE_COMPLETION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_SOURCE_COMPLETION, GtkSourceCompletion))
-#define GTK_SOURCE_COMPLETION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_SOURCE_COMPLETION, GtkSourceCompletionClass))
-#define GTK_IS_SOURCE_COMPLETION(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_SOURCE_COMPLETION))
-#define GTK_IS_SOURCE_COMPLETION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_COMPLETION))
-#define GTK_SOURCE_COMPLETION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_SOURCE_COMPLETION, GtkSourceCompletionClass))
+#define GTK_SOURCE_TYPE_COMPLETION (gtk_source_completion_get_type())
+#define GTK_SOURCE_COMPLETION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_SOURCE_TYPE_COMPLETION, GtkSourceCompletion))
+#define GTK_SOURCE_COMPLETION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_SOURCE_TYPE_COMPLETION, GtkSourceCompletionClass))
+#define GTK_SOURCE_IS_COMPLETION(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_SOURCE_TYPE_COMPLETION))
+#define GTK_SOURCE_IS_COMPLETION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_COMPLETION))
+#define GTK_SOURCE_COMPLETION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_SOURCE_TYPE_COMPLETION, GtkSourceCompletionClass))
#define GTK_SOURCE_COMPLETION_ERROR (gtk_source_completion_error_quark ())
diff --git a/gtksourceview/gtksourcecompletioncontext.c b/gtksourceview/gtksourcecompletioncontext.c
index ef7bf02..38b96cc 100644
--- a/gtksourceview/gtksourcecompletioncontext.c
+++ b/gtksourceview/gtksourcecompletioncontext.c
@@ -25,7 +25,7 @@
#include "gtksourceview-i18n.h"
#include "gtksourcecompletion.h"
-#define GTK_SOURCE_COMPLETION_CONTEXT_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_TYPE_SOURCE_COMPLETION_CONTEXT, GtkSourceCompletionContextPrivate))
+#define GTK_SOURCE_COMPLETION_CONTEXT_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_SOURCE_TYPE_COMPLETION_CONTEXT, GtkSourceCompletionContextPrivate))
struct _GtkSourceCompletionContextPrivate
{
@@ -236,7 +236,7 @@ gtk_source_completion_context_class_init (GtkSourceCompletionContextClass *klass
g_param_spec_object ("completion",
_("Completion"),
_("The completion object to which the context belongs"),
- GTK_TYPE_SOURCE_COMPLETION,
+ GTK_SOURCE_TYPE_COMPLETION,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
/**
@@ -263,7 +263,7 @@ gtk_source_completion_context_class_init (GtkSourceCompletionContextClass *klass
g_param_spec_flags ("activation",
_("Activation"),
_("The type of activation"),
- GTK_TYPE_SOURCE_COMPLETION_ACTIVATION,
+ GTK_SOURCE_TYPE_COMPLETION_ACTIVATION,
GTK_SOURCE_COMPLETION_ACTIVATION_NONE,
G_PARAM_READWRITE));
@@ -294,8 +294,8 @@ gtk_source_completion_context_add_proposals (GtkSourceCompletionContext *contex
GList *proposals,
gboolean finished)
{
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_CONTEXT (context));
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_PROVIDER (provider));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_CONTEXT (context));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider));
_gtk_source_completion_add_proposals (context->priv->completion,
context,
@@ -318,7 +318,7 @@ gtk_source_completion_context_get_iter (GtkSourceCompletionContext *context,
{
GtkTextBuffer *buffer;
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_CONTEXT (context));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_CONTEXT (context));
buffer = get_buffer (context);
@@ -345,7 +345,7 @@ gtk_source_completion_context_get_iter (GtkSourceCompletionContext *context,
GtkSourceCompletionActivation
gtk_source_completion_context_get_activation (GtkSourceCompletionContext *context)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_CONTEXT (context), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_CONTEXT (context), FALSE);
return context->priv->activation;
}
@@ -353,7 +353,7 @@ gtk_source_completion_context_get_activation (GtkSourceCompletionContext *contex
void
_gtk_source_completion_context_cancel (GtkSourceCompletionContext *context)
{
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_CONTEXT (context));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_CONTEXT (context));
g_signal_emit (context, context_signals[CANCELLED], 0);
}
@@ -361,10 +361,10 @@ _gtk_source_completion_context_cancel (GtkSourceCompletionContext *context)
GtkSourceCompletionContext *
_gtk_source_completion_context_new (GtkSourceCompletion *completion, GtkTextIter *position)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION (completion), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION (completion), NULL);
g_return_val_if_fail (position != NULL, NULL);
- return g_object_new (GTK_TYPE_SOURCE_COMPLETION_CONTEXT,
+ return g_object_new (GTK_SOURCE_TYPE_COMPLETION_CONTEXT,
"completion", completion,
"iter", position,
NULL);
diff --git a/gtksourceview/gtksourcecompletioncontext.h b/gtksourceview/gtksourcecompletioncontext.h
index 8d96721..bec65f8 100644
--- a/gtksourceview/gtksourcecompletioncontext.h
+++ b/gtksourceview/gtksourcecompletioncontext.h
@@ -27,13 +27,13 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_COMPLETION_CONTEXT (gtk_source_completion_context_get_type ())
-#define GTK_SOURCE_COMPLETION_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_COMPLETION_CONTEXT, GtkSourceCompletionContext))
-#define GTK_SOURCE_COMPLETION_CONTEXT_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_COMPLETION_CONTEXT, GtkSourceCompletionContext const))
-#define GTK_SOURCE_COMPLETION_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_COMPLETION_CONTEXT, GtkSourceCompletionContextClass))
-#define GTK_IS_SOURCE_COMPLETION_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_COMPLETION_CONTEXT))
-#define GTK_IS_SOURCE_COMPLETION_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_COMPLETION_CONTEXT))
-#define GTK_SOURCE_COMPLETION_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_COMPLETION_CONTEXT, GtkSourceCompletionContextClass))
+#define GTK_SOURCE_TYPE_COMPLETION_CONTEXT (gtk_source_completion_context_get_type ())
+#define GTK_SOURCE_COMPLETION_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_CONTEXT, GtkSourceCompletionContext))
+#define GTK_SOURCE_COMPLETION_CONTEXT_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_CONTEXT, GtkSourceCompletionContext const))
+#define GTK_SOURCE_COMPLETION_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_COMPLETION_CONTEXT, GtkSourceCompletionContextClass))
+#define GTK_SOURCE_IS_COMPLETION_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_COMPLETION_CONTEXT))
+#define GTK_SOURCE_IS_COMPLETION_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_COMPLETION_CONTEXT))
+#define GTK_SOURCE_COMPLETION_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_COMPLETION_CONTEXT, GtkSourceCompletionContextClass))
typedef struct _GtkSourceCompletionContext GtkSourceCompletionContext;
typedef struct _GtkSourceCompletionContextClass GtkSourceCompletionContextClass;
diff --git a/gtksourceview/gtksourcecompletioninfo.c b/gtksourceview/gtksourcecompletioninfo.c
index 116c166..c81fa8b 100644
--- a/gtksourceview/gtksourcecompletioninfo.c
+++ b/gtksourceview/gtksourcecompletioninfo.c
@@ -50,7 +50,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE(GtkSourceCompletionInfo, gtk_source_completion_info, GTK_TYPE_WINDOW);
-#define GTK_SOURCE_COMPLETION_INFO_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), GTK_TYPE_SOURCE_COMPLETION_INFO, GtkSourceCompletionInfoPrivate))
+#define GTK_SOURCE_COMPLETION_INFO_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), GTK_SOURCE_TYPE_COMPLETION_INFO, GtkSourceCompletionInfoPrivate))
static void
gtk_source_completion_info_init (GtkSourceCompletionInfo *info)
@@ -142,7 +142,7 @@ gtk_source_completion_info_class_init (GtkSourceCompletionInfoClass *klass)
GtkSourceCompletionInfo *
gtk_source_completion_info_new (void)
{
- return g_object_new (GTK_TYPE_SOURCE_COMPLETION_INFO,
+ return g_object_new (GTK_SOURCE_TYPE_COMPLETION_INFO,
"type", GTK_WINDOW_POPUP,
NULL);
}
@@ -167,8 +167,8 @@ gtk_source_completion_info_move_to_iter (GtkSourceCompletionInfo *info,
GtkTextMark *insert_mark;
GtkTextIter start;
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_INFO (info));
- g_return_if_fail (GTK_IS_SOURCE_VIEW (view));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_INFO (info));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (view));
if (iter == NULL)
{
@@ -199,7 +199,7 @@ void
gtk_source_completion_info_set_widget (GtkSourceCompletionInfo *info,
GtkWidget *widget)
{
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_INFO (info));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_INFO (info));
g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
if (info->priv->widget == widget)
@@ -246,7 +246,7 @@ gtk_source_completion_info_set_widget (GtkSourceCompletionInfo *info,
GtkWidget *
gtk_source_completion_info_get_widget (GtkSourceCompletionInfo* info)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_INFO (info), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_INFO (info), NULL);
return info->priv->widget;
}
diff --git a/gtksourceview/gtksourcecompletioninfo.h b/gtksourceview/gtksourcecompletioninfo.h
index 8baa6a5..f5f8a25 100644
--- a/gtksourceview/gtksourcecompletioninfo.h
+++ b/gtksourceview/gtksourcecompletioninfo.h
@@ -28,12 +28,12 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_COMPLETION_INFO (gtk_source_completion_info_get_type ())
-#define GTK_SOURCE_COMPLETION_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_COMPLETION_INFO, GtkSourceCompletionInfo))
-#define GTK_SOURCE_COMPLETION_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_COMPLETION_INFO, GtkSourceCompletionInfoClass)
-#define GTK_IS_SOURCE_COMPLETION_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_COMPLETION_INFO))
-#define GTK_IS_SOURCE_COMPLETION_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_COMPLETION_INFO))
-#define GTK_SOURCE_COMPLETION_INFO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_COMPLETION_INFO, GtkSourceCompletionInfoClass))
+#define GTK_SOURCE_TYPE_COMPLETION_INFO (gtk_source_completion_info_get_type ())
+#define GTK_SOURCE_COMPLETION_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_INFO, GtkSourceCompletionInfo))
+#define GTK_SOURCE_COMPLETION_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_COMPLETION_INFO, GtkSourceCompletionInfoClass)
+#define GTK_SOURCE_IS_COMPLETION_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_COMPLETION_INFO))
+#define GTK_SOURCE_IS_COMPLETION_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_COMPLETION_INFO))
+#define GTK_SOURCE_COMPLETION_INFO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_COMPLETION_INFO, GtkSourceCompletionInfoClass))
typedef struct _GtkSourceCompletionInfoPrivate GtkSourceCompletionInfoPrivate;
diff --git a/gtksourceview/gtksourcecompletionitem.c b/gtksourceview/gtksourcecompletionitem.c
index b4f87e9..9e59ec1 100644
--- a/gtksourceview/gtksourcecompletionitem.c
+++ b/gtksourceview/gtksourcecompletionitem.c
@@ -24,7 +24,7 @@
#include "gtksourcecompletionutils.h"
#include "gtksourceview-i18n.h"
-#define GTK_SOURCE_COMPLETION_ITEM_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_TYPE_SOURCE_COMPLETION_ITEM, GtkSourceCompletionItemPrivate))
+#define GTK_SOURCE_COMPLETION_ITEM_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_SOURCE_TYPE_COMPLETION_ITEM, GtkSourceCompletionItemPrivate))
struct _GtkSourceCompletionItemPrivate
{
@@ -51,7 +51,7 @@ static void gtk_source_completion_proposal_iface_init (gpointer g_iface, gpointe
G_DEFINE_TYPE_WITH_CODE (GtkSourceCompletionItem,
gtk_source_completion_item,
G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (GTK_TYPE_SOURCE_COMPLETION_PROPOSAL,
+ G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_COMPLETION_PROPOSAL,
gtk_source_completion_proposal_iface_init))
static gchar *
@@ -125,7 +125,7 @@ gtk_source_completion_item_get_property (GObject *object,
{
GtkSourceCompletionItem *self;
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_ITEM (object));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_ITEM (object));
self = GTK_SOURCE_COMPLETION_ITEM (object);
@@ -166,7 +166,7 @@ gtk_source_completion_item_set_property (GObject *object,
{
GtkSourceCompletionItem *self;
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_ITEM (object));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_ITEM (object));
self = GTK_SOURCE_COMPLETION_ITEM (object);
@@ -311,7 +311,7 @@ gtk_source_completion_item_new (const gchar *label,
GdkPixbuf *icon,
const gchar *info)
{
- return g_object_new (GTK_TYPE_SOURCE_COMPLETION_ITEM,
+ return g_object_new (GTK_SOURCE_TYPE_COMPLETION_ITEM,
"label", label,
"text", text,
"icon", icon,
@@ -338,7 +338,7 @@ gtk_source_completion_item_new_with_markup (const gchar *markup,
GdkPixbuf *icon,
const gchar *info)
{
- return g_object_new (GTK_TYPE_SOURCE_COMPLETION_ITEM,
+ return g_object_new (GTK_SOURCE_TYPE_COMPLETION_ITEM,
"markup", markup,
"text", text,
"icon", icon,
diff --git a/gtksourceview/gtksourcecompletionitem.h b/gtksourceview/gtksourcecompletionitem.h
index 64e0322..83ed6c1 100644
--- a/gtksourceview/gtksourcecompletionitem.h
+++ b/gtksourceview/gtksourcecompletionitem.h
@@ -27,13 +27,13 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_COMPLETION_ITEM (gtk_source_completion_item_get_type ())
-#define GTK_SOURCE_COMPLETION_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_COMPLETION_ITEM, GtkSourceCompletionItem))
-#define GTK_SOURCE_COMPLETION_ITEM_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_COMPLETION_ITEM, GtkSourceCompletionItem const))
-#define GTK_SOURCE_COMPLETION_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_COMPLETION_ITEM, GtkSourceCompletionItemClass))
-#define GTK_IS_SOURCE_COMPLETION_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_COMPLETION_ITEM))
-#define GTK_IS_SOURCE_COMPLETION_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_COMPLETION_ITEM))
-#define GTK_SOURCE_COMPLETION_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_COMPLETION_ITEM, GtkSourceCompletionItemClass))
+#define GTK_SOURCE_TYPE_COMPLETION_ITEM (gtk_source_completion_item_get_type ())
+#define GTK_SOURCE_COMPLETION_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_ITEM, GtkSourceCompletionItem))
+#define GTK_SOURCE_COMPLETION_ITEM_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_ITEM, GtkSourceCompletionItem const))
+#define GTK_SOURCE_COMPLETION_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_COMPLETION_ITEM, GtkSourceCompletionItemClass))
+#define GTK_SOURCE_IS_COMPLETION_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_COMPLETION_ITEM))
+#define GTK_SOURCE_IS_COMPLETION_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_COMPLETION_ITEM))
+#define GTK_SOURCE_COMPLETION_ITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_COMPLETION_ITEM, GtkSourceCompletionItemClass))
typedef struct _GtkSourceCompletionItem GtkSourceCompletionItem;
typedef struct _GtkSourceCompletionItemClass GtkSourceCompletionItemClass;
diff --git a/gtksourceview/gtksourcecompletionmodel.c b/gtksourceview/gtksourcecompletionmodel.c
index 7d4e5f4..25ba5fb 100644
--- a/gtksourceview/gtksourcecompletionmodel.c
+++ b/gtksourceview/gtksourcecompletionmodel.c
@@ -23,7 +23,7 @@
#include "gtksourceview-i18n.h"
#include "gtksourcecompletionprovider.h"
-#define GTK_SOURCE_COMPLETION_MODEL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_TYPE_SOURCE_COMPLETION_MODEL, GtkSourceCompletionModelPrivate))
+#define GTK_SOURCE_COMPLETION_MODEL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_SOURCE_TYPE_COMPLETION_MODEL, GtkSourceCompletionModelPrivate))
typedef struct
{
@@ -146,7 +146,7 @@ path_from_list (GtkSourceCompletionModel *model,
static GtkTreeModelFlags
tree_model_get_flags (GtkTreeModel *tree_model)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (tree_model), 0);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (tree_model), 0);
return 0;
}
@@ -154,7 +154,7 @@ tree_model_get_flags (GtkTreeModel *tree_model)
static gint
tree_model_get_n_columns (GtkTreeModel *tree_model)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (tree_model), 0);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (tree_model), 0);
return GTK_SOURCE_COMPLETION_MODEL_N_COLUMNS;
}
@@ -163,7 +163,7 @@ static GType
tree_model_get_column_type (GtkTreeModel *tree_model,
gint index)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (tree_model), G_TYPE_INVALID);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (tree_model), G_TYPE_INVALID);
g_return_val_if_fail (index >= 0 && index < GTK_SOURCE_COMPLETION_MODEL_N_COLUMNS, G_TYPE_INVALID);
return GTK_SOURCE_COMPLETION_MODEL (tree_model)->priv->column_types[index];
@@ -218,7 +218,7 @@ tree_model_get_iter (GtkTreeModel *tree_model,
GtkSourceCompletionModel *model;
gint *indices;
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (tree_model), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (tree_model), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (path != NULL, FALSE);
@@ -234,7 +234,7 @@ tree_model_get_path (GtkTreeModel *tree_model,
{
GtkSourceCompletionModel *model;
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (tree_model), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (tree_model), NULL);
g_return_val_if_fail (iter != NULL, NULL);
g_return_val_if_fail (iter->user_data != NULL, NULL);
@@ -251,7 +251,7 @@ tree_model_get_value (GtkTreeModel *tree_model,
{
ProposalNode *node;
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (tree_model));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (tree_model));
g_return_if_fail (iter != NULL);
g_return_if_fail (iter->user_data != NULL);
g_return_if_fail (column >= 0 && column < GTK_SOURCE_COMPLETION_MODEL_N_COLUMNS);
@@ -327,7 +327,7 @@ tree_model_iter_next (GtkTreeModel *tree_model,
{
GList *item;
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (tree_model), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (tree_model), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
item = g_list_next ((GList *)iter->user_data);
@@ -342,7 +342,7 @@ tree_model_iter_children (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreeIter *parent)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (tree_model), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (tree_model), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (parent == NULL || parent->user_data != NULL, FALSE);
@@ -362,7 +362,7 @@ static gboolean
tree_model_iter_has_child (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (tree_model), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (tree_model), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
return FALSE;
@@ -372,7 +372,7 @@ static gint
tree_model_iter_n_children (GtkTreeModel *tree_model,
GtkTreeIter *iter)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (tree_model), 0);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (tree_model), 0);
g_return_val_if_fail (iter == NULL || iter->user_data != NULL, 0);
if (iter == NULL)
@@ -391,7 +391,7 @@ tree_model_iter_nth_child (GtkTreeModel *tree_model,
GtkTreeIter *parent,
gint n)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (tree_model), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (tree_model), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (parent == NULL || parent->user_data != NULL, FALSE);
@@ -412,7 +412,7 @@ tree_model_iter_parent (GtkTreeModel *tree_model,
GtkTreeIter *iter,
GtkTreeIter *child)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (tree_model), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (tree_model), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (child != NULL, FALSE);
@@ -612,7 +612,7 @@ num_dec (GtkSourceCompletionModel *model,
GtkSourceCompletionModel*
gtk_source_completion_model_new (void)
{
- return g_object_new (GTK_TYPE_SOURCE_COMPLETION_MODEL, NULL);
+ return g_object_new (GTK_SOURCE_TYPE_COMPLETION_MODEL, NULL);
}
static void
@@ -639,7 +639,7 @@ void
gtk_source_completion_model_begin (GtkSourceCompletionModel *model,
GList *providers)
{
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (model));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (model));
if (providers != NULL)
{
@@ -1134,10 +1134,10 @@ gtk_source_completion_model_append (GtkSourceCompletionModel *model,
GtkTreePath *path = NULL;
gboolean is_new_provider = FALSE;
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (model));
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_PROVIDER (provider));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (model));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider));
- if (proposals == NULL || !GTK_IS_SOURCE_COMPLETION_PROPOSAL (proposals->data))
+ if (proposals == NULL || !GTK_SOURCE_IS_COMPLETION_PROPOSAL (proposals->data))
{
return;
}
@@ -1168,7 +1168,7 @@ gtk_source_completion_model_append (GtkSourceCompletionModel *model,
GtkSourceCompletionProposal *proposal;
GList *nodeitem;
- if (!GTK_IS_SOURCE_COMPLETION_PROPOSAL (item->data))
+ if (!GTK_SOURCE_IS_COMPLETION_PROPOSAL (item->data))
{
continue;
}
@@ -1251,7 +1251,7 @@ gtk_source_completion_model_clear (GtkSourceCompletionModel *model)
GtkTreePath *path;
ProviderInfo *info = NULL;
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (model));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (model));
path = gtk_tree_path_new_first ();
@@ -1313,7 +1313,7 @@ gtk_source_completion_model_is_empty (GtkSourceCompletionModel *model,
{
gboolean isempty = TRUE;
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (model), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (model), FALSE);
if (!invisible)
{
@@ -1335,8 +1335,8 @@ gtk_source_completion_model_n_proposals (GtkSourceCompletionModel *model,
{
ProviderInfo *info;
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (model), 0);
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROVIDER (provider), 0);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (model), 0);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider), 0);
info = g_hash_table_lookup (model->priv->providers_info, provider);
@@ -1354,7 +1354,7 @@ void
gtk_source_completion_model_set_show_headers (GtkSourceCompletionModel *model,
gboolean show_headers)
{
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (model));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (model));
show_headers = (show_headers != FALSE);
@@ -1369,7 +1369,7 @@ gboolean
gtk_source_completion_model_iter_is_header (GtkSourceCompletionModel *model,
GtkTreeIter *iter)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (model), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (model), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (iter->user_data != NULL, FALSE);
@@ -1382,7 +1382,7 @@ gtk_source_completion_model_iter_previous (GtkSourceCompletionModel *model,
{
GList *item;
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (model), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (model), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (iter->user_data != NULL, FALSE);
@@ -1410,7 +1410,7 @@ gtk_source_completion_model_iter_last (GtkSourceCompletionModel *model,
{
GList *item;
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (model), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (model), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
item = model->priv->last;
@@ -1433,7 +1433,7 @@ gtk_source_completion_model_iter_last (GtkSourceCompletionModel *model,
GList *
gtk_source_completion_model_get_providers (GtkSourceCompletionModel *model)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (model), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (model), NULL);
return model->priv->providers;
}
@@ -1442,7 +1442,7 @@ void
gtk_source_completion_model_set_visible_providers (GtkSourceCompletionModel *model,
GList *providers)
{
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (model));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (model));
g_list_free (model->priv->visible_providers);
model->priv->visible_providers = g_list_copy (providers);
@@ -1453,7 +1453,7 @@ gtk_source_completion_model_set_visible_providers (GtkSourceCompletionModel *mod
GList *
gtk_source_completion_model_get_visible_providers (GtkSourceCompletionModel *model)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (model), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (model), NULL);
return model->priv->visible_providers;
}
@@ -1463,7 +1463,7 @@ gtk_source_completion_model_iter_equal (GtkSourceCompletionModel *model,
GtkTreeIter *iter1,
GtkTreeIter *iter2)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_MODEL (model), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_MODEL (model), FALSE);
return iter1->user_data == iter2->user_data;
}
diff --git a/gtksourceview/gtksourcecompletionmodel.h b/gtksourceview/gtksourcecompletionmodel.h
index 5805a64..99c50e9 100644
--- a/gtksourceview/gtksourcecompletionmodel.h
+++ b/gtksourceview/gtksourcecompletionmodel.h
@@ -28,13 +28,13 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_COMPLETION_MODEL (gtk_source_completion_model_get_type ())
-#define GTK_SOURCE_COMPLETION_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_COMPLETION_MODEL, GtkSourceCompletionModel))
-#define GTK_SOURCE_COMPLETION_MODEL_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_COMPLETION_MODEL, GtkSourceCompletionModel const))
-#define GTK_SOURCE_COMPLETION_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_COMPLETION_MODEL, GtkSourceCompletionModelClass))
-#define GTK_IS_SOURCE_COMPLETION_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_COMPLETION_MODEL))
-#define GTK_IS_SOURCE_COMPLETION_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_COMPLETION_MODEL))
-#define GTK_SOURCE_COMPLETION_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_COMPLETION_MODEL, GtkSourceCompletionModelClass))
+#define GTK_SOURCE_TYPE_COMPLETION_MODEL (gtk_source_completion_model_get_type ())
+#define GTK_SOURCE_COMPLETION_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_MODEL, GtkSourceCompletionModel))
+#define GTK_SOURCE_COMPLETION_MODEL_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_MODEL, GtkSourceCompletionModel const))
+#define GTK_SOURCE_COMPLETION_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_COMPLETION_MODEL, GtkSourceCompletionModelClass))
+#define GTK_SOURCE_IS_COMPLETION_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_COMPLETION_MODEL))
+#define GTK_SOURCE_IS_COMPLETION_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_COMPLETION_MODEL))
+#define GTK_SOURCE_COMPLETION_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_COMPLETION_MODEL, GtkSourceCompletionModelClass))
typedef struct _GtkSourceCompletionModel GtkSourceCompletionModel;
typedef struct _GtkSourceCompletionModelClass GtkSourceCompletionModelClass;
diff --git a/gtksourceview/gtksourcecompletionproposal.c b/gtksourceview/gtksourcecompletionproposal.c
index 3d5317e..c308c17 100644
--- a/gtksourceview/gtksourcecompletionproposal.c
+++ b/gtksourceview/gtksourcecompletionproposal.c
@@ -143,7 +143,7 @@ gtk_source_completion_proposal_default_init (GtkSourceCompletionProposalIface *i
gchar *
gtk_source_completion_proposal_get_label (GtkSourceCompletionProposal *proposal)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROPOSAL (proposal), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROPOSAL (proposal), NULL);
return GTK_SOURCE_COMPLETION_PROPOSAL_GET_INTERFACE (proposal)->get_label (proposal);
}
@@ -162,7 +162,7 @@ gtk_source_completion_proposal_get_label (GtkSourceCompletionProposal *proposal)
gchar *
gtk_source_completion_proposal_get_markup (GtkSourceCompletionProposal *proposal)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROPOSAL (proposal), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROPOSAL (proposal), NULL);
return GTK_SOURCE_COMPLETION_PROPOSAL_GET_INTERFACE (proposal)->get_markup (proposal);
}
@@ -181,7 +181,7 @@ gtk_source_completion_proposal_get_markup (GtkSourceCompletionProposal *proposal
gchar *
gtk_source_completion_proposal_get_text (GtkSourceCompletionProposal *proposal)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROPOSAL (proposal), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROPOSAL (proposal), NULL);
return GTK_SOURCE_COMPLETION_PROPOSAL_GET_INTERFACE (proposal)->get_text (proposal);
}
@@ -197,7 +197,7 @@ gtk_source_completion_proposal_get_text (GtkSourceCompletionProposal *proposal)
GdkPixbuf *
gtk_source_completion_proposal_get_icon (GtkSourceCompletionProposal *proposal)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROPOSAL (proposal), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROPOSAL (proposal), NULL);
return GTK_SOURCE_COMPLETION_PROPOSAL_GET_INTERFACE (proposal)->get_icon (proposal);
}
@@ -216,7 +216,7 @@ gtk_source_completion_proposal_get_icon (GtkSourceCompletionProposal *proposal)
gchar *
gtk_source_completion_proposal_get_info (GtkSourceCompletionProposal *proposal)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROPOSAL (proposal), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROPOSAL (proposal), NULL);
return GTK_SOURCE_COMPLETION_PROPOSAL_GET_INTERFACE (proposal)->get_info (proposal);
}
@@ -234,7 +234,7 @@ gtk_source_completion_proposal_get_info (GtkSourceCompletionProposal *proposal)
guint
gtk_source_completion_proposal_hash (GtkSourceCompletionProposal *proposal)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROPOSAL (proposal), 0);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROPOSAL (proposal), 0);
return GTK_SOURCE_COMPLETION_PROPOSAL_GET_INTERFACE (proposal)->hash (proposal);
}
@@ -254,8 +254,8 @@ gboolean
gtk_source_completion_proposal_equal (GtkSourceCompletionProposal *proposal,
GtkSourceCompletionProposal *other)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROPOSAL (proposal), FALSE);
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROPOSAL (other), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROPOSAL (proposal), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROPOSAL (other), FALSE);
return GTK_SOURCE_COMPLETION_PROPOSAL_GET_INTERFACE (proposal)->equal (proposal, other);
}
@@ -271,6 +271,6 @@ gtk_source_completion_proposal_equal (GtkSourceCompletionProposal *proposal,
void
gtk_source_completion_proposal_changed (GtkSourceCompletionProposal *proposal)
{
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_PROPOSAL (proposal));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_PROPOSAL (proposal));
g_signal_emit (proposal, signals[CHANGED], 0);
}
diff --git a/gtksourceview/gtksourcecompletionproposal.h b/gtksourceview/gtksourcecompletionproposal.h
index f93e4dd..bb1827c 100644
--- a/gtksourceview/gtksourcecompletionproposal.h
+++ b/gtksourceview/gtksourcecompletionproposal.h
@@ -28,10 +28,10 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_COMPLETION_PROPOSAL (gtk_source_completion_proposal_get_type ())
-#define GTK_SOURCE_COMPLETION_PROPOSAL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_COMPLETION_PROPOSAL, GtkSourceCompletionProposal))
-#define GTK_IS_SOURCE_COMPLETION_PROPOSAL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_COMPLETION_PROPOSAL))
-#define GTK_SOURCE_COMPLETION_PROPOSAL_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_SOURCE_COMPLETION_PROPOSAL, GtkSourceCompletionProposalIface))
+#define GTK_SOURCE_TYPE_COMPLETION_PROPOSAL (gtk_source_completion_proposal_get_type ())
+#define GTK_SOURCE_COMPLETION_PROPOSAL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_PROPOSAL, GtkSourceCompletionProposal))
+#define GTK_SOURCE_IS_COMPLETION_PROPOSAL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_COMPLETION_PROPOSAL))
+#define GTK_SOURCE_COMPLETION_PROPOSAL_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_SOURCE_TYPE_COMPLETION_PROPOSAL, GtkSourceCompletionProposalIface))
typedef struct _GtkSourceCompletionProposal GtkSourceCompletionProposal;
typedef struct _GtkSourceCompletionProposalIface GtkSourceCompletionProposalIface;
diff --git a/gtksourceview/gtksourcecompletionprovider.c b/gtksourceview/gtksourcecompletionprovider.c
index 947d93f..114290e 100644
--- a/gtksourceview/gtksourcecompletionprovider.c
+++ b/gtksourceview/gtksourcecompletionprovider.c
@@ -155,7 +155,7 @@ gtk_source_completion_provider_default_init (GtkSourceCompletionProviderIface *i
gchar *
gtk_source_completion_provider_get_name (GtkSourceCompletionProvider *provider)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROVIDER (provider), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider), NULL);
return GTK_SOURCE_COMPLETION_PROVIDER_GET_INTERFACE (provider)->get_name (provider);
}
@@ -172,7 +172,7 @@ gtk_source_completion_provider_get_name (GtkSourceCompletionProvider *provider)
GdkPixbuf *
gtk_source_completion_provider_get_icon (GtkSourceCompletionProvider *provider)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROVIDER (provider), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider), NULL);
return GTK_SOURCE_COMPLETION_PROVIDER_GET_INTERFACE (provider)->get_icon (provider);
}
@@ -188,7 +188,7 @@ void
gtk_source_completion_provider_populate (GtkSourceCompletionProvider *provider,
GtkSourceCompletionContext *context)
{
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_PROVIDER (provider));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider));
GTK_SOURCE_COMPLETION_PROVIDER_GET_INTERFACE (provider)->populate (provider, context);
}
@@ -204,7 +204,7 @@ gtk_source_completion_provider_populate (GtkSourceCompletionProvider *provider,
GtkSourceCompletionActivation
gtk_source_completion_provider_get_activation (GtkSourceCompletionProvider *provider)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROVIDER (provider), GTK_SOURCE_COMPLETION_ACTIVATION_NONE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider), GTK_SOURCE_COMPLETION_ACTIVATION_NONE);
return GTK_SOURCE_COMPLETION_PROVIDER_GET_INTERFACE (provider)->get_activation (provider);
}
@@ -223,7 +223,7 @@ gboolean
gtk_source_completion_provider_match (GtkSourceCompletionProvider *provider,
GtkSourceCompletionContext *context)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROVIDER (provider), TRUE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider), TRUE);
return GTK_SOURCE_COMPLETION_PROVIDER_GET_INTERFACE (provider)->match (provider,
context);
@@ -250,8 +250,8 @@ GtkWidget *
gtk_source_completion_provider_get_info_widget (GtkSourceCompletionProvider *provider,
GtkSourceCompletionProposal *proposal)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROVIDER (provider), NULL);
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROPOSAL (proposal), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROPOSAL (proposal), NULL);
return GTK_SOURCE_COMPLETION_PROVIDER_GET_INTERFACE (provider)->get_info_widget (provider, proposal);
}
@@ -272,9 +272,9 @@ gtk_source_completion_provider_update_info (GtkSourceCompletionProvider *provide
GtkSourceCompletionProposal *proposal,
GtkSourceCompletionInfo *info)
{
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_PROVIDER (provider));
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_PROPOSAL (proposal));
- g_return_if_fail (GTK_IS_SOURCE_COMPLETION_INFO (info));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_PROPOSAL (proposal));
+ g_return_if_fail (GTK_SOURCE_IS_COMPLETION_INFO (info));
GTK_SOURCE_COMPLETION_PROVIDER_GET_INTERFACE (provider)->update_info (provider, proposal, info);
}
@@ -299,9 +299,9 @@ gtk_source_completion_provider_get_start_iter (GtkSourceCompletionProvider *prov
GtkSourceCompletionProposal *proposal,
GtkTextIter *iter)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROVIDER (provider), FALSE);
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_CONTEXT (context), FALSE);
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROPOSAL (proposal), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_CONTEXT (context), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROPOSAL (proposal), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
return GTK_SOURCE_COMPLETION_PROVIDER_GET_INTERFACE (provider)->get_start_iter (provider,
@@ -328,8 +328,8 @@ gtk_source_completion_provider_activate_proposal (GtkSourceCompletionProvider *p
GtkSourceCompletionProposal *proposal,
GtkTextIter *iter)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROVIDER (provider), FALSE);
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROPOSAL (proposal), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROPOSAL (proposal), FALSE);
return GTK_SOURCE_COMPLETION_PROVIDER_GET_INTERFACE (provider)->activate_proposal (provider,
proposal,
@@ -349,7 +349,7 @@ gtk_source_completion_provider_activate_proposal (GtkSourceCompletionProvider *p
gint
gtk_source_completion_provider_get_interactive_delay (GtkSourceCompletionProvider *provider)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROVIDER (provider), -1);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider), -1);
return GTK_SOURCE_COMPLETION_PROVIDER_GET_INTERFACE (provider)->get_interactive_delay (provider);
}
@@ -367,7 +367,7 @@ gtk_source_completion_provider_get_interactive_delay (GtkSourceCompletionProvide
gint
gtk_source_completion_provider_get_priority (GtkSourceCompletionProvider *provider)
{
- g_return_val_if_fail (GTK_IS_SOURCE_COMPLETION_PROVIDER (provider), 0);
+ g_return_val_if_fail (GTK_SOURCE_IS_COMPLETION_PROVIDER (provider), 0);
return GTK_SOURCE_COMPLETION_PROVIDER_GET_INTERFACE (provider)->get_priority (provider);
}
diff --git a/gtksourceview/gtksourcecompletionprovider.h b/gtksourceview/gtksourcecompletionprovider.h
index 2683942..514e7b3 100644
--- a/gtksourceview/gtksourcecompletionprovider.h
+++ b/gtksourceview/gtksourcecompletionprovider.h
@@ -34,10 +34,10 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_COMPLETION_PROVIDER (gtk_source_completion_provider_get_type ())
-#define GTK_SOURCE_COMPLETION_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_COMPLETION_PROVIDER, GtkSourceCompletionProvider))
-#define GTK_IS_SOURCE_COMPLETION_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_COMPLETION_PROVIDER))
-#define GTK_SOURCE_COMPLETION_PROVIDER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_SOURCE_COMPLETION_PROVIDER, GtkSourceCompletionProviderIface))
+#define GTK_SOURCE_TYPE_COMPLETION_PROVIDER (gtk_source_completion_provider_get_type ())
+#define GTK_SOURCE_COMPLETION_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_COMPLETION_PROVIDER, GtkSourceCompletionProvider))
+#define GTK_SOURCE_IS_COMPLETION_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_COMPLETION_PROVIDER))
+#define GTK_SOURCE_COMPLETION_PROVIDER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_SOURCE_TYPE_COMPLETION_PROVIDER, GtkSourceCompletionProviderIface))
#define GTK_SOURCE_COMPLETION_CAPABILITY_INTERACTIVE "standard::interactive"
#define GTK_SOURCE_COMPLETION_CAPABILITY_AUTOMATIC "standard::automatic"
diff --git a/gtksourceview/gtksourcecompletionutils.c b/gtksourceview/gtksourcecompletionutils.c
index 1b46eee..8edcbb4 100644
--- a/gtksourceview/gtksourcecompletionutils.c
+++ b/gtksourceview/gtksourcecompletionutils.c
@@ -160,7 +160,7 @@ gtk_source_completion_utils_replace_word (GtkSourceBuffer *source_buffer,
GtkTextIter word_end;
GtkTextMark *mark;
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (source_buffer));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (source_buffer));
buffer = GTK_TEXT_BUFFER (source_buffer);
gtk_text_buffer_begin_user_action (buffer);
@@ -197,7 +197,7 @@ gtk_source_completion_utils_replace_current_word (GtkSourceBuffer *source_buffer
GtkTextIter iter;
GtkTextMark *mark;
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (source_buffer));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (source_buffer));
mark = gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (source_buffer));
gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (source_buffer),
diff --git a/gtksourceview/gtksourcecontextengine.c b/gtksourceview/gtksourcecontextengine.c
index 273bca2..dcff39f 100644
--- a/gtksourceview/gtksourcecontextengine.c
+++ b/gtksourceview/gtksourcecontextengine.c
@@ -2482,7 +2482,7 @@ install_first_update (GtkSourceContextEngine *ce)
/* GtkSourceContextEngine class ------------------------------------------- */
-G_DEFINE_TYPE (GtkSourceContextEngine, _gtk_source_context_engine, GTK_TYPE_SOURCE_ENGINE)
+G_DEFINE_TYPE (GtkSourceContextEngine, _gtk_source_context_engine, GTK_SOURCE_TYPE_ENGINE)
static GQuark
gtk_source_context_engine_error_quark (void)
@@ -2711,8 +2711,8 @@ gtk_source_context_engine_set_style_scheme (GtkSourceEngine *engine,
{
GtkSourceContextEngine *ce;
- g_return_if_fail (GTK_IS_SOURCE_CONTEXT_ENGINE (engine));
- g_return_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme) || scheme == NULL);
+ g_return_if_fail (GTK_SOURCE_IS_CONTEXT_ENGINE (engine));
+ g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme) || scheme == NULL);
ce = GTK_SOURCE_CONTEXT_ENGINE (engine);
@@ -2795,7 +2795,7 @@ _gtk_source_context_engine_class_init (GtkSourceContextEngineClass *klass)
static void
_gtk_source_context_engine_init (GtkSourceContextEngine *ce)
{
- ce->priv = G_TYPE_INSTANCE_GET_PRIVATE (ce, GTK_TYPE_SOURCE_CONTEXT_ENGINE,
+ ce->priv = G_TYPE_INSTANCE_GET_PRIVATE (ce, GTK_SOURCE_TYPE_CONTEXT_ENGINE,
GtkSourceContextEnginePrivate);
}
@@ -2807,7 +2807,7 @@ _gtk_source_context_engine_new (GtkSourceContextData *ctx_data)
g_return_val_if_fail (ctx_data != NULL, NULL);
g_return_val_if_fail (ctx_data->lang != NULL, NULL);
- ce = g_object_new (GTK_TYPE_SOURCE_CONTEXT_ENGINE, NULL);
+ ce = g_object_new (GTK_SOURCE_TYPE_CONTEXT_ENGINE, NULL);
ce->priv->ctx_data = _gtk_source_context_data_ref (ctx_data);
#ifdef ENABLE_MEMORY_DEBUG
@@ -2831,7 +2831,7 @@ _gtk_source_context_data_new (GtkSourceLanguage *lang)
{
GtkSourceContextData *ctx_data;
- g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE (lang), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (lang), NULL);
ctx_data = g_slice_new0 (GtkSourceContextData);
ctx_data->ref_count = 1;
diff --git a/gtksourceview/gtksourcecontextengine.h b/gtksourceview/gtksourcecontextengine.h
index 09d05aa..4755f59 100644
--- a/gtksourceview/gtksourcecontextengine.h
+++ b/gtksourceview/gtksourcecontextengine.h
@@ -28,12 +28,12 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_CONTEXT_ENGINE (_gtk_source_context_engine_get_type ())
-#define GTK_SOURCE_CONTEXT_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_CONTEXT_ENGINE, GtkSourceContextEngine))
-#define GTK_SOURCE_CONTEXT_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_CONTEXT_ENGINE, GtkSourceContextEngineClass))
-#define GTK_IS_SOURCE_CONTEXT_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_CONTEXT_ENGINE))
-#define GTK_IS_SOURCE_CONTEXT_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_CONTEXT_ENGINE))
-#define GTK_SOURCE_CONTEXT_ENGINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_CONTEXT_ENGINE, GtkSourceContextEngineClass))
+#define GTK_SOURCE_TYPE_CONTEXT_ENGINE (_gtk_source_context_engine_get_type ())
+#define GTK_SOURCE_CONTEXT_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_CONTEXT_ENGINE, GtkSourceContextEngine))
+#define GTK_SOURCE_CONTEXT_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_CONTEXT_ENGINE, GtkSourceContextEngineClass))
+#define GTK_SOURCE_IS_CONTEXT_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_CONTEXT_ENGINE))
+#define GTK_SOURCE_IS_CONTEXT_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_CONTEXT_ENGINE))
+#define GTK_SOURCE_CONTEXT_ENGINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_CONTEXT_ENGINE, GtkSourceContextEngineClass))
typedef struct _GtkSourceContextData GtkSourceContextData;
typedef struct _GtkSourceContextReplace GtkSourceContextReplace;
diff --git a/gtksourceview/gtksourceengine.c b/gtksourceview/gtksourceengine.c
index 7434ed8..faad39d 100644
--- a/gtksourceview/gtksourceengine.c
+++ b/gtksourceview/gtksourceengine.c
@@ -46,7 +46,7 @@ void
_gtk_source_engine_attach_buffer (GtkSourceEngine *engine,
GtkTextBuffer *buffer)
{
- g_return_if_fail (GTK_IS_SOURCE_ENGINE (engine));
+ g_return_if_fail (GTK_SOURCE_IS_ENGINE (engine));
g_return_if_fail (GTK_SOURCE_ENGINE_GET_CLASS (engine)->attach_buffer != NULL);
GTK_SOURCE_ENGINE_GET_CLASS (engine)->attach_buffer (engine, buffer);
@@ -57,7 +57,7 @@ _gtk_source_engine_text_inserted (GtkSourceEngine *engine,
gint start_offset,
gint end_offset)
{
- g_return_if_fail (GTK_IS_SOURCE_ENGINE (engine));
+ g_return_if_fail (GTK_SOURCE_IS_ENGINE (engine));
g_return_if_fail (GTK_SOURCE_ENGINE_GET_CLASS (engine)->text_inserted != NULL);
GTK_SOURCE_ENGINE_GET_CLASS (engine)->text_inserted (engine,
@@ -70,7 +70,7 @@ _gtk_source_engine_text_deleted (GtkSourceEngine *engine,
gint offset,
gint length)
{
- g_return_if_fail (GTK_IS_SOURCE_ENGINE (engine));
+ g_return_if_fail (GTK_SOURCE_IS_ENGINE (engine));
g_return_if_fail (GTK_SOURCE_ENGINE_GET_CLASS (engine)->text_deleted != NULL);
GTK_SOURCE_ENGINE_GET_CLASS (engine)->text_deleted (engine,
@@ -84,7 +84,7 @@ _gtk_source_engine_update_highlight (GtkSourceEngine *engine,
const GtkTextIter *end,
gboolean synchronous)
{
- g_return_if_fail (GTK_IS_SOURCE_ENGINE (engine));
+ g_return_if_fail (GTK_SOURCE_IS_ENGINE (engine));
g_return_if_fail (start != NULL && end != NULL);
g_return_if_fail (GTK_SOURCE_ENGINE_GET_CLASS (engine)->update_highlight != NULL);
@@ -98,8 +98,8 @@ void
_gtk_source_engine_set_style_scheme (GtkSourceEngine *engine,
GtkSourceStyleScheme *scheme)
{
- g_return_if_fail (GTK_IS_SOURCE_ENGINE (engine));
- g_return_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme) || scheme == NULL);
+ g_return_if_fail (GTK_SOURCE_IS_ENGINE (engine));
+ g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme) || scheme == NULL);
g_return_if_fail (GTK_SOURCE_ENGINE_GET_CLASS (engine)->set_style_scheme != NULL);
GTK_SOURCE_ENGINE_GET_CLASS (engine)->set_style_scheme (engine, scheme);
@@ -109,7 +109,7 @@ GtkTextTag *
_gtk_source_engine_get_context_class_tag (GtkSourceEngine *engine,
const gchar *context_class)
{
- g_return_val_if_fail (GTK_IS_SOURCE_ENGINE (engine), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_ENGINE (engine), NULL);
g_return_val_if_fail (context_class != NULL, NULL);
return GTK_SOURCE_ENGINE_GET_CLASS (engine)->get_context_class_tag (engine,
diff --git a/gtksourceview/gtksourceengine.h b/gtksourceview/gtksourceengine.h
index 1905354..8b4cb18 100644
--- a/gtksourceview/gtksourceengine.h
+++ b/gtksourceview/gtksourceengine.h
@@ -27,12 +27,12 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_ENGINE (_gtk_source_engine_get_type ())
-#define GTK_SOURCE_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_ENGINE, GtkSourceEngine))
-#define GTK_SOURCE_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_ENGINE, GtkSourceEngineClass))
-#define GTK_IS_SOURCE_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_ENGINE))
-#define GTK_IS_SOURCE_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_ENGINE))
-#define GTK_SOURCE_ENGINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_ENGINE, GtkSourceEngineClass))
+#define GTK_SOURCE_TYPE_ENGINE (_gtk_source_engine_get_type ())
+#define GTK_SOURCE_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_ENGINE, GtkSourceEngine))
+#define GTK_SOURCE_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_ENGINE, GtkSourceEngineClass))
+#define GTK_SOURCE_IS_ENGINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_ENGINE))
+#define GTK_SOURCE_IS_ENGINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_ENGINE))
+#define GTK_SOURCE_ENGINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_ENGINE, GtkSourceEngineClass))
typedef struct _GtkSourceEngine GtkSourceEngine;
typedef struct _GtkSourceEngineClass GtkSourceEngineClass;
diff --git a/gtksourceview/gtksourcegutter.c b/gtksourceview/gtksourcegutter.c
index 79d398b..edda6f4 100644
--- a/gtksourceview/gtksourcegutter.c
+++ b/gtksourceview/gtksourcegutter.c
@@ -49,7 +49,7 @@
*
*/
-#define GTK_SOURCE_GUTTER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_TYPE_SOURCE_GUTTER, GtkSourceGutterPrivate))
+#define GTK_SOURCE_GUTTER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_SOURCE_TYPE_GUTTER, GtkSourceGutterPrivate))
/* Properties */
enum
@@ -547,7 +547,7 @@ gtk_source_gutter_class_init (GtkSourceGutterClass *klass)
g_param_spec_object ("view",
_("View"),
_("The gutters' GtkSourceView"),
- GTK_TYPE_SOURCE_VIEW,
+ GTK_SOURCE_TYPE_VIEW,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
/**
@@ -631,7 +631,7 @@ GtkSourceGutter *
gtk_source_gutter_new (GtkSourceView *view,
GtkTextWindowType type)
{
- return g_object_new (GTK_TYPE_SOURCE_GUTTER,
+ return g_object_new (GTK_SOURCE_TYPE_GUTTER,
"view", view,
"window_type", type,
NULL);
@@ -654,7 +654,7 @@ gtk_source_gutter_new (GtkSourceView *view,
GdkWindow *
gtk_source_gutter_get_window (GtkSourceGutter *gutter)
{
- g_return_val_if_fail (GTK_IS_SOURCE_GUTTER (gutter), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_GUTTER (gutter), NULL);
g_return_val_if_fail (gutter->priv->view != NULL, NULL);
return gtk_text_view_get_window (GTK_TEXT_VIEW (gutter->priv->view),
@@ -684,8 +684,8 @@ gtk_source_gutter_insert (GtkSourceGutter *gutter,
{
Renderer* internal_renderer;
- g_return_val_if_fail (GTK_IS_SOURCE_GUTTER (gutter), FALSE);
- g_return_val_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_GUTTER (gutter), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer), FALSE);
g_return_val_if_fail (gtk_source_gutter_renderer_get_view (renderer) == NULL, FALSE);
g_return_val_if_fail (gtk_source_gutter_renderer_get_window_type (renderer) == GTK_TEXT_WINDOW_PRIVATE, FALSE);
@@ -739,8 +739,8 @@ gtk_source_gutter_reorder (GtkSourceGutter *gutter,
Renderer *ret;
GList *retlist;
- g_return_if_fail (GTK_IS_SOURCE_GUTTER (gutter));
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER (gutter));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer));
if (renderer_find (gutter, renderer, &ret, &retlist))
{
@@ -769,8 +769,8 @@ gtk_source_gutter_remove (GtkSourceGutter *gutter,
Renderer *ret;
GList *retlist;
- g_return_if_fail (GTK_IS_SOURCE_GUTTER (gutter));
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER (gutter));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer));
if (renderer_find (gutter, renderer, &ret, &retlist))
{
@@ -795,7 +795,7 @@ gtk_source_gutter_remove (GtkSourceGutter *gutter,
void
gtk_source_gutter_queue_draw (GtkSourceGutter *gutter)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER (gutter));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER (gutter));
do_redraw (gutter);
}
@@ -1585,7 +1585,7 @@ gtk_source_gutter_set_padding (GtkSourceGutter *gutter,
gint xpad,
gint ypad)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER (gutter));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER (gutter));
if (set_xpad (gutter, xpad, FALSE) || set_ypad (gutter, ypad, FALSE))
{
@@ -1598,7 +1598,7 @@ gtk_source_gutter_get_padding (GtkSourceGutter *gutter,
gint *xpad,
gint *ypad)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER (gutter));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER (gutter));
if (xpad)
{
diff --git a/gtksourceview/gtksourcegutter.h b/gtksourceview/gtksourcegutter.h
index 0b0a346..b8192aa 100644
--- a/gtksourceview/gtksourcegutter.h
+++ b/gtksourceview/gtksourcegutter.h
@@ -30,12 +30,12 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_GUTTER (gtk_source_gutter_get_type ())
-#define GTK_SOURCE_GUTTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_GUTTER, GtkSourceGutter))
-#define GTK_SOURCE_GUTTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_GUTTER, GtkSourceGutterClass))
-#define GTK_IS_SOURCE_GUTTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_GUTTER))
-#define GTK_IS_SOURCE_GUTTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_GUTTER))
-#define GTK_SOURCE_GUTTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_GUTTER, GtkSourceGutterClass))
+#define GTK_SOURCE_TYPE_GUTTER (gtk_source_gutter_get_type ())
+#define GTK_SOURCE_GUTTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER, GtkSourceGutter))
+#define GTK_SOURCE_GUTTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_GUTTER, GtkSourceGutterClass))
+#define GTK_SOURCE_IS_GUTTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_GUTTER))
+#define GTK_SOURCE_IS_GUTTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_GUTTER))
+#define GTK_SOURCE_GUTTER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_GUTTER, GtkSourceGutterClass))
typedef struct _GtkSourceGutter GtkSourceGutter;
typedef struct _GtkSourceGutterClass GtkSourceGutterClass;
diff --git a/gtksourceview/gtksourcegutterrenderer.c b/gtksourceview/gtksourcegutterrenderer.c
index 8635531..f7b5735 100644
--- a/gtksourceview/gtksourcegutterrenderer.c
+++ b/gtksourceview/gtksourcegutterrenderer.c
@@ -25,7 +25,7 @@
#include "gtksourceview-typebuiltins.h"
#include "gtksourceview-i18n.h"
-#define GTK_SOURCE_GUTTER_RENDERER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_TYPE_SOURCE_GUTTER_RENDERER, GtkSourceGutterRendererPrivate))
+#define GTK_SOURCE_GUTTER_RENDERER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_SOURCE_TYPE_GUTTER_RENDERER, GtkSourceGutterRendererPrivate))
enum
{
@@ -631,7 +631,7 @@ gtk_source_gutter_renderer_class_init (GtkSourceGutterRendererClass *klass)
3,
GTK_TYPE_TEXT_ITER,
GTK_TYPE_TEXT_ITER,
- GTK_TYPE_SOURCE_GUTTER_RENDERER_STATE);
+ GTK_SOURCE_TYPE_GUTTER_RENDERER_STATE);
/**
* GtkSourceGutterRenderer::query-activatable:
@@ -686,7 +686,7 @@ gtk_source_gutter_renderer_class_init (GtkSourceGutterRendererClass *klass)
g_param_spec_enum ("alignment-mode",
_("Alignment Mode"),
_("The alignment mode"),
- GTK_TYPE_SOURCE_GUTTER_RENDERER_ALIGNMENT_MODE,
+ GTK_SOURCE_TYPE_GUTTER_RENDERER_ALIGNMENT_MODE,
GTK_SOURCE_GUTTER_RENDERER_ALIGNMENT_MODE_CELL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
@@ -761,7 +761,7 @@ gtk_source_gutter_renderer_begin (GtkSourceGutterRenderer *renderer,
GtkTextIter *start,
GtkTextIter *end)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer));
g_return_if_fail (cr != NULL);
g_return_if_fail (background_area != NULL);
g_return_if_fail (cell_area != NULL);
@@ -809,7 +809,7 @@ gtk_source_gutter_renderer_draw (GtkSourceGutterRenderer *renderer,
GtkTextIter *end,
GtkSourceGutterRendererState state)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer));
g_return_if_fail (cr != NULL);
g_return_if_fail (background_area != NULL);
g_return_if_fail (cell_area != NULL);
@@ -839,7 +839,7 @@ gtk_source_gutter_renderer_draw (GtkSourceGutterRenderer *renderer,
void
gtk_source_gutter_renderer_end (GtkSourceGutterRenderer *renderer)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer));
if (GTK_SOURCE_GUTTER_RENDERER_CLASS (G_OBJECT_GET_CLASS (renderer))->end)
{
@@ -869,7 +869,7 @@ gtk_source_gutter_renderer_query_activatable (GtkSourceGutterRenderer *renderer,
{
gboolean ret;
- g_return_val_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (area != NULL, FALSE);
g_return_val_if_fail (event != NULL, FALSE);
@@ -904,7 +904,7 @@ gtk_source_gutter_renderer_activate (GtkSourceGutterRenderer *renderer,
GdkRectangle *area,
GdkEvent *event)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer));
g_return_if_fail (iter != NULL);
g_return_if_fail (area != NULL);
g_return_if_fail (event != NULL);
@@ -924,7 +924,7 @@ gtk_source_gutter_renderer_activate (GtkSourceGutterRenderer *renderer,
void
gtk_source_gutter_renderer_queue_draw (GtkSourceGutterRenderer *renderer)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer));
g_signal_emit (renderer, signals[QUEUE_DRAW], 0);
}
@@ -955,7 +955,7 @@ gtk_source_gutter_renderer_query_tooltip (GtkSourceGutterRenderer *renderer,
{
gboolean ret;
- g_return_val_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (area != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TOOLTIP (tooltip), FALSE);
@@ -994,7 +994,7 @@ gtk_source_gutter_renderer_query_data (GtkSourceGutterRenderer *renderer,
GtkTextIter *end,
GtkSourceGutterRendererState state)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer));
g_return_if_fail (start != NULL);
g_return_if_fail (end != NULL);
@@ -1013,7 +1013,7 @@ void
gtk_source_gutter_renderer_set_visible (GtkSourceGutterRenderer *renderer,
gboolean visible)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer));
if (visible != renderer->priv->visible)
{
@@ -1037,7 +1037,7 @@ gtk_source_gutter_renderer_set_visible (GtkSourceGutterRenderer *renderer,
gboolean
gtk_source_gutter_renderer_get_visible (GtkSourceGutterRenderer *renderer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer), FALSE);
return renderer->priv->visible;
}
@@ -1058,7 +1058,7 @@ gtk_source_gutter_renderer_set_padding (GtkSourceGutterRenderer *renderer,
gint xpad,
gint ypad)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer));
set_xpad (renderer, xpad);
set_ypad (renderer, ypad);
@@ -1078,7 +1078,7 @@ gtk_source_gutter_renderer_get_padding (GtkSourceGutterRenderer *renderer,
gint *xpad,
gint *ypad)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer));
if (xpad)
{
@@ -1110,7 +1110,7 @@ gtk_source_gutter_renderer_set_alignment (GtkSourceGutterRenderer *renderer,
gboolean changed_x;
gboolean changed_y;
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer));
changed_x = set_xalign (renderer, xalign, FALSE);
changed_y = set_yalign (renderer, yalign, FALSE);
@@ -1135,7 +1135,7 @@ gtk_source_gutter_renderer_get_alignment (GtkSourceGutterRenderer *renderer,
gfloat *xalign,
gfloat *yalign)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer));
if (xalign)
{
@@ -1161,7 +1161,7 @@ void
gtk_source_gutter_renderer_set_alignment_mode (GtkSourceGutterRenderer *renderer,
GtkSourceGutterRendererAlignmentMode mode)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer));
set_alignment_mode (renderer, mode);
}
@@ -1179,7 +1179,7 @@ gtk_source_gutter_renderer_set_alignment_mode (GtkSourceGutterRenderer
GtkSourceGutterRendererAlignmentMode
gtk_source_gutter_renderer_get_alignment_mode (GtkSourceGutterRenderer *renderer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer), 0);
+ g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer), 0);
return renderer->priv->alignment_mode;
}
@@ -1196,7 +1196,7 @@ gtk_source_gutter_renderer_get_alignment_mode (GtkSourceGutterRenderer *renderer
GtkTextWindowType
gtk_source_gutter_renderer_get_window_type (GtkSourceGutterRenderer *renderer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer), GTK_TEXT_WINDOW_PRIVATE);
+ g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer), GTK_TEXT_WINDOW_PRIVATE);
return renderer->priv->window_type;
}
@@ -1213,7 +1213,7 @@ gtk_source_gutter_renderer_get_window_type (GtkSourceGutterRenderer *renderer)
GtkTextView *
gtk_source_gutter_renderer_get_view (GtkSourceGutterRenderer *renderer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer), NULL);
return renderer->priv->view;
}
@@ -1230,7 +1230,7 @@ gtk_source_gutter_renderer_get_view (GtkSourceGutterRenderer *renderer)
gint
gtk_source_gutter_renderer_get_size (GtkSourceGutterRenderer *renderer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer), 0);
+ g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer), 0);
return renderer->priv->size;
}
@@ -1248,7 +1248,7 @@ void
gtk_source_gutter_renderer_set_size (GtkSourceGutterRenderer *renderer,
gint size)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer));
set_size (renderer, size);
}
@@ -1267,7 +1267,7 @@ gboolean
gtk_source_gutter_renderer_get_background (GtkSourceGutterRenderer *renderer,
GdkRGBA *color)
{
- g_return_val_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer), FALSE);
if (color)
{
@@ -1290,7 +1290,7 @@ void
gtk_source_gutter_renderer_set_background (GtkSourceGutterRenderer *renderer,
const GdkRGBA *color)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer));
set_background_color (renderer, color);
}
@@ -1302,7 +1302,7 @@ _gtk_source_gutter_renderer_set_view (GtkSourceGutterRenderer *renderer,
{
GtkTextView *old_view;
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER (renderer));
g_return_if_fail (view == NULL || GTK_IS_TEXT_VIEW (view));
old_view = renderer->priv->view;
diff --git a/gtksourceview/gtksourcegutterrenderer.h b/gtksourceview/gtksourcegutterrenderer.h
index 21a1056..74ed4a2 100644
--- a/gtksourceview/gtksourcegutterrenderer.h
+++ b/gtksourceview/gtksourcegutterrenderer.h
@@ -28,13 +28,13 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_GUTTER_RENDERER (gtk_source_gutter_renderer_get_type ())
-#define GTK_SOURCE_GUTTER_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER, GtkSourceGutterRenderer))
-#define GTK_SOURCE_GUTTER_RENDERER_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER, GtkSourceGutterRenderer const))
-#define GTK_SOURCE_GUTTER_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_GUTTER_RENDERER, GtkSourceGutterRendererClass))
-#define GTK_IS_SOURCE_GUTTER_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER))
-#define GTK_IS_SOURCE_GUTTER_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_GUTTER_RENDERER))
-#define GTK_SOURCE_GUTTER_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER, GtkSourceGutterRendererClass))
+#define GTK_SOURCE_TYPE_GUTTER_RENDERER (gtk_source_gutter_renderer_get_type ())
+#define GTK_SOURCE_GUTTER_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER, GtkSourceGutterRenderer))
+#define GTK_SOURCE_GUTTER_RENDERER_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER, GtkSourceGutterRenderer const))
+#define GTK_SOURCE_GUTTER_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER, GtkSourceGutterRendererClass))
+#define GTK_SOURCE_IS_GUTTER_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER))
+#define GTK_SOURCE_IS_GUTTER_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER))
+#define GTK_SOURCE_GUTTER_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER, GtkSourceGutterRendererClass))
typedef struct _GtkSourceGutterRenderer GtkSourceGutterRenderer;
typedef struct _GtkSourceGutterRendererClass GtkSourceGutterRendererClass;
diff --git a/gtksourceview/gtksourcegutterrendererlines.c b/gtksourceview/gtksourcegutterrendererlines.c
index 5a593a1..52df1b6 100644
--- a/gtksourceview/gtksourcegutterrendererlines.c
+++ b/gtksourceview/gtksourcegutterrendererlines.c
@@ -22,7 +22,7 @@
#include "gtksourcegutterrendererlines.h"
#include "gtksourceview.h"
-#define GTK_SOURCE_GUTTER_RENDERER_LINES_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_TYPE_SOURCE_GUTTER_RENDERER_LINES, GtkSourceGutterRendererLinesPrivate))
+#define GTK_SOURCE_GUTTER_RENDERER_LINES_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_SOURCE_TYPE_GUTTER_RENDERER_LINES, GtkSourceGutterRendererLinesPrivate))
struct _GtkSourceGutterRendererLinesPrivate
{
@@ -31,7 +31,7 @@ struct _GtkSourceGutterRendererLinesPrivate
guint changed_handler_id;
};
-G_DEFINE_TYPE (GtkSourceGutterRendererLines, gtk_source_gutter_renderer_lines, GTK_TYPE_SOURCE_GUTTER_RENDERER_TEXT)
+G_DEFINE_TYPE (GtkSourceGutterRendererLines, gtk_source_gutter_renderer_lines, GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT)
static void
gtk_source_gutter_renderer_lines_finalize (GObject *object)
@@ -302,5 +302,5 @@ gtk_source_gutter_renderer_lines_init (GtkSourceGutterRendererLines *self)
GtkSourceGutterRenderer *
gtk_source_gutter_renderer_lines_new ()
{
- return g_object_new (GTK_TYPE_SOURCE_GUTTER_RENDERER_LINES, NULL);
+ return g_object_new (GTK_SOURCE_TYPE_GUTTER_RENDERER_LINES, NULL);
}
diff --git a/gtksourceview/gtksourcegutterrendererlines.h b/gtksourceview/gtksourcegutterrendererlines.h
index eb7b265..bc4bf90 100644
--- a/gtksourceview/gtksourcegutterrendererlines.h
+++ b/gtksourceview/gtksourcegutterrendererlines.h
@@ -27,13 +27,13 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_GUTTER_RENDERER_LINES (gtk_source_gutter_renderer_lines_get_type ())
-#define GTK_SOURCE_GUTTER_RENDERER_LINES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER_LINES, GtkSourceGutterRendererLines))
-#define GTK_SOURCE_GUTTER_RENDERER_LINES_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER_LINES, GtkSourceGutterRendererLines const))
-#define GTK_SOURCE_GUTTER_RENDERER_LINES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_GUTTER_RENDERER_LINES, GtkSourceGutterRendererLinesClass))
-#define GTK_IS_SOURCE_GUTTER_RENDERER_LINES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER_LINES))
-#define GTK_IS_SOURCE_GUTTER_RENDERER_LINES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_GUTTER_RENDERER_LINES))
-#define GTK_SOURCE_GUTTER_RENDERER_LINES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER_LINES, GtkSourceGutterRendererLinesClass))
+#define GTK_SOURCE_TYPE_GUTTER_RENDERER_LINES (gtk_source_gutter_renderer_lines_get_type ())
+#define GTK_SOURCE_GUTTER_RENDERER_LINES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_LINES, GtkSourceGutterRendererLines))
+#define GTK_SOURCE_GUTTER_RENDERER_LINES_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_LINES, GtkSourceGutterRendererLines const))
+#define GTK_SOURCE_GUTTER_RENDERER_LINES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER_LINES, GtkSourceGutterRendererLinesClass))
+#define GTK_SOURCE_IS_GUTTER_RENDERER_LINES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_LINES))
+#define GTK_SOURCE_IS_GUTTER_RENDERER_LINES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER_LINES))
+#define GTK_SOURCE_GUTTER_RENDERER_LINES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_LINES, GtkSourceGutterRendererLinesClass))
typedef struct _GtkSourceGutterRendererLines GtkSourceGutterRendererLines;
typedef struct _GtkSourceGutterRendererLinesClass GtkSourceGutterRendererLinesClass;
diff --git a/gtksourceview/gtksourcegutterrenderermarks.c b/gtksourceview/gtksourcegutterrenderermarks.c
index 12ead32..a8c41ab 100644
--- a/gtksourceview/gtksourcegutterrenderermarks.c
+++ b/gtksourceview/gtksourcegutterrenderermarks.c
@@ -25,13 +25,13 @@
#define COMPOSITE_ALPHA 225
-#define GTK_SOURCE_GUTTER_RENDERER_MARKS_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_TYPE_SOURCE_GUTTER_RENDERER_MARKS, GtkSourceGutterRendererMarksPrivate))
+#define GTK_SOURCE_GUTTER_RENDERER_MARKS_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_SOURCE_TYPE_GUTTER_RENDERER_MARKS, GtkSourceGutterRendererMarksPrivate))
struct _GtkSourceGutterRendererMarksPrivate
{
};
-G_DEFINE_TYPE (GtkSourceGutterRendererMarks, gtk_source_gutter_renderer_marks, GTK_TYPE_SOURCE_GUTTER_RENDERER_PIXBUF)
+G_DEFINE_TYPE (GtkSourceGutterRendererMarks, gtk_source_gutter_renderer_marks, GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF)
static void
gtk_source_gutter_renderer_marks_finalize (GObject *object)
@@ -452,5 +452,5 @@ gtk_source_gutter_renderer_marks_init (GtkSourceGutterRendererMarks *self)
GtkSourceGutterRenderer *
gtk_source_gutter_renderer_marks_new ()
{
- return g_object_new (GTK_TYPE_SOURCE_GUTTER_RENDERER_MARKS, NULL);
+ return g_object_new (GTK_SOURCE_TYPE_GUTTER_RENDERER_MARKS, NULL);
}
diff --git a/gtksourceview/gtksourcegutterrenderermarks.h b/gtksourceview/gtksourcegutterrenderermarks.h
index 80d063e..71cc35d 100644
--- a/gtksourceview/gtksourcegutterrenderermarks.h
+++ b/gtksourceview/gtksourcegutterrenderermarks.h
@@ -27,13 +27,13 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_GUTTER_RENDERER_MARKS (gtk_source_gutter_renderer_marks_get_type ())
-#define GTK_SOURCE_GUTTER_RENDERER_MARKS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER_MARKS, GtkSourceGutterRendererMarks))
-#define GTK_SOURCE_GUTTER_RENDERER_MARKS_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER_MARKS, GtkSourceGutterRendererMarks const))
-#define GTK_SOURCE_GUTTER_RENDERER_MARKS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_GUTTER_RENDERER_MARKS, GtkSourceGutterRendererMarksClass))
-#define GTK_IS_SOURCE_GUTTER_RENDERER_MARKS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER_MARKS))
-#define GTK_IS_SOURCE_GUTTER_RENDERER_MARKS_CLASS(klass)(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_GUTTER_RENDERER_MARKS))
-#define GTK_SOURCE_GUTTER_RENDERER_MARKS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER_MARKS, GtkSourceGutterRendererMarksClass))
+#define GTK_SOURCE_TYPE_GUTTER_RENDERER_MARKS (gtk_source_gutter_renderer_marks_get_type ())
+#define GTK_SOURCE_GUTTER_RENDERER_MARKS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_MARKS, GtkSourceGutterRendererMarks))
+#define GTK_SOURCE_GUTTER_RENDERER_MARKS_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_MARKS, GtkSourceGutterRendererMarks const))
+#define GTK_SOURCE_GUTTER_RENDERER_MARKS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER_MARKS, GtkSourceGutterRendererMarksClass))
+#define GTK_SOURCE_IS_GUTTER_RENDERER_MARKS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_MARKS))
+#define GTK_SOURCE_IS_GUTTER_RENDERER_MARKS_CLASS(klass)(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER_MARKS))
+#define GTK_SOURCE_GUTTER_RENDERER_MARKS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_MARKS, GtkSourceGutterRendererMarksClass))
typedef struct _GtkSourceGutterRendererMarks GtkSourceGutterRendererMarks;
typedef struct _GtkSourceGutterRendererMarksClass GtkSourceGutterRendererMarksClass;
diff --git a/gtksourceview/gtksourcegutterrendererpixbuf.c b/gtksourceview/gtksourcegutterrendererpixbuf.c
index 18b6610..527507a 100644
--- a/gtksourceview/gtksourcegutterrendererpixbuf.c
+++ b/gtksourceview/gtksourcegutterrendererpixbuf.c
@@ -24,14 +24,14 @@
#include "gtksourceview-i18n.h"
#include "gtksourcepixbufhelper.h"
-#define GTK_SOURCE_GUTTER_RENDERER_PIXBUF_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_TYPE_SOURCE_GUTTER_RENDERER_PIXBUF, GtkSourceGutterRendererPixbufPrivate))
+#define GTK_SOURCE_GUTTER_RENDERER_PIXBUF_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF, GtkSourceGutterRendererPixbufPrivate))
struct _GtkSourceGutterRendererPixbufPrivate
{
GtkSourcePixbufHelper *helper;
};
-G_DEFINE_TYPE (GtkSourceGutterRendererPixbuf, gtk_source_gutter_renderer_pixbuf, GTK_TYPE_SOURCE_GUTTER_RENDERER)
+G_DEFINE_TYPE (GtkSourceGutterRendererPixbuf, gtk_source_gutter_renderer_pixbuf, GTK_SOURCE_TYPE_GUTTER_RENDERER)
enum
{
@@ -339,14 +339,14 @@ gtk_source_gutter_renderer_pixbuf_init (GtkSourceGutterRendererPixbuf *self)
GtkSourceGutterRenderer *
gtk_source_gutter_renderer_pixbuf_new ()
{
- return g_object_new (GTK_TYPE_SOURCE_GUTTER_RENDERER_PIXBUF, NULL);
+ return g_object_new (GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF, NULL);
}
void
gtk_source_gutter_renderer_pixbuf_set_pixbuf (GtkSourceGutterRendererPixbuf *renderer,
GdkPixbuf *pixbuf)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER_PIXBUF (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER_PIXBUF (renderer));
g_return_if_fail (renderer == NULL || GDK_IS_PIXBUF (pixbuf));
set_pixbuf (renderer, pixbuf);
@@ -365,7 +365,7 @@ gtk_source_gutter_renderer_pixbuf_set_pixbuf (GtkSourceGutterRendererPixbuf *ren
GdkPixbuf *
gtk_source_gutter_renderer_pixbuf_get_pixbuf (GtkSourceGutterRendererPixbuf *renderer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER_PIXBUF (renderer), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER_PIXBUF (renderer), NULL);
return gtk_source_pixbuf_helper_get_pixbuf (renderer->priv->helper);
}
@@ -374,7 +374,7 @@ void
gtk_source_gutter_renderer_pixbuf_set_stock_id (GtkSourceGutterRendererPixbuf *renderer,
const gchar *stock_id)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER_PIXBUF_CLASS (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER_PIXBUF_CLASS (renderer));
set_stock_id (renderer, stock_id);
}
@@ -382,7 +382,7 @@ gtk_source_gutter_renderer_pixbuf_set_stock_id (GtkSourceGutterRendererPixbuf *r
const gchar *
gtk_source_gutter_renderer_pixbuf_get_stock_id (GtkSourceGutterRendererPixbuf *renderer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER_PIXBUF (renderer), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER_PIXBUF (renderer), NULL);
return gtk_source_pixbuf_helper_get_stock_id (renderer->priv->helper);
}
@@ -391,7 +391,7 @@ void
gtk_source_gutter_renderer_pixbuf_set_gicon (GtkSourceGutterRendererPixbuf *renderer,
GIcon *icon)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER_PIXBUF (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER_PIXBUF (renderer));
g_return_if_fail (icon == NULL || G_IS_ICON (icon));
set_gicon (renderer, icon);
@@ -409,7 +409,7 @@ gtk_source_gutter_renderer_pixbuf_set_gicon (GtkSourceGutterRendererPixbuf *rend
GIcon *
gtk_source_gutter_renderer_pixbuf_get_gicon (GtkSourceGutterRendererPixbuf *renderer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER_PIXBUF (renderer), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER_PIXBUF (renderer), NULL);
return gtk_source_pixbuf_helper_get_gicon (renderer->priv->helper);
}
@@ -418,7 +418,7 @@ void
gtk_source_gutter_renderer_pixbuf_set_icon_name (GtkSourceGutterRendererPixbuf *renderer,
const gchar *icon_name)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER_PIXBUF (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER_PIXBUF (renderer));
set_icon_name (renderer, icon_name);
}
@@ -426,7 +426,7 @@ gtk_source_gutter_renderer_pixbuf_set_icon_name (GtkSourceGutterRendererPixbuf *
const gchar *
gtk_source_gutter_renderer_pixbuf_get_icon_name (GtkSourceGutterRendererPixbuf *renderer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER_PIXBUF (renderer), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER_PIXBUF (renderer), NULL);
return gtk_source_pixbuf_helper_get_icon_name (renderer->priv->helper);
}
diff --git a/gtksourceview/gtksourcegutterrendererpixbuf.h b/gtksourceview/gtksourcegutterrendererpixbuf.h
index 9715823..b407bc2 100644
--- a/gtksourceview/gtksourcegutterrendererpixbuf.h
+++ b/gtksourceview/gtksourcegutterrendererpixbuf.h
@@ -26,13 +26,13 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_GUTTER_RENDERER_PIXBUF (gtk_source_gutter_renderer_pixbuf_get_type ())
-#define GTK_SOURCE_GUTTER_RENDERER_PIXBUF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER_PIXBUF, GtkSourceGutterRendererPixbuf))
-#define GTK_SOURCE_GUTTER_RENDERER_PIXBUF_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER_PIXBUF, GtkSourceGutterRendererPixbuf const))
-#define GTK_SOURCE_GUTTER_RENDERER_PIXBUF_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_GUTTER_RENDERER_PIXBUF, GtkSourceGutterRendererPixbufClass))
-#define GTK_IS_SOURCE_GUTTER_RENDERER_PIXBUF(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER_PIXBUF))
-#define GTK_IS_SOURCE_GUTTER_RENDERER_PIXBUF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_GUTTER_RENDERER_PIXBUF))
-#define GTK_SOURCE_GUTTER_RENDERER_PIXBUF_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER_PIXBUF, GtkSourceGutterRendererPixbufClass))
+#define GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF (gtk_source_gutter_renderer_pixbuf_get_type ())
+#define GTK_SOURCE_GUTTER_RENDERER_PIXBUF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF, GtkSourceGutterRendererPixbuf))
+#define GTK_SOURCE_GUTTER_RENDERER_PIXBUF_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF, GtkSourceGutterRendererPixbuf const))
+#define GTK_SOURCE_GUTTER_RENDERER_PIXBUF_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF, GtkSourceGutterRendererPixbufClass))
+#define GTK_SOURCE_IS_GUTTER_RENDERER_PIXBUF(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF))
+#define GTK_SOURCE_IS_GUTTER_RENDERER_PIXBUF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF))
+#define GTK_SOURCE_GUTTER_RENDERER_PIXBUF_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_PIXBUF, GtkSourceGutterRendererPixbufClass))
typedef struct _GtkSourceGutterRendererPixbuf GtkSourceGutterRendererPixbuf;
typedef struct _GtkSourceGutterRendererPixbufClass GtkSourceGutterRendererPixbufClass;
diff --git a/gtksourceview/gtksourcegutterrenderertext.c b/gtksourceview/gtksourcegutterrenderertext.c
index 942e605..ec9e91e 100644
--- a/gtksourceview/gtksourcegutterrenderertext.c
+++ b/gtksourceview/gtksourcegutterrenderertext.c
@@ -22,7 +22,7 @@
#include "gtksourcegutterrenderertext.h"
#include "gtksourceview-i18n.h"
-#define GTK_SOURCE_GUTTER_RENDERER_TEXT_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_TYPE_SOURCE_GUTTER_RENDERER_TEXT, GtkSourceGutterRendererTextPrivate))
+#define GTK_SOURCE_GUTTER_RENDERER_TEXT_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT, GtkSourceGutterRendererTextPrivate))
struct _GtkSourceGutterRendererTextPrivate
{
@@ -35,7 +35,7 @@ struct _GtkSourceGutterRendererTextPrivate
guint is_markup : 1;
};
-G_DEFINE_TYPE (GtkSourceGutterRendererText, gtk_source_gutter_renderer_text, GTK_TYPE_SOURCE_GUTTER_RENDERER)
+G_DEFINE_TYPE (GtkSourceGutterRendererText, gtk_source_gutter_renderer_text, GTK_SOURCE_TYPE_GUTTER_RENDERER)
enum
{
@@ -284,7 +284,7 @@ gtk_source_gutter_renderer_text_measure (GtkSourceGutterRendererText *renderer,
gint *width,
gint *height)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER_TEXT (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER_TEXT (renderer));
g_return_if_fail (text != NULL);
measure_text (renderer, NULL, text, width, height);
@@ -296,7 +296,7 @@ gtk_source_gutter_renderer_text_measure_markup (GtkSourceGutterRendererText *ren
gint *width,
gint *height)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER_TEXT (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER_TEXT (renderer));
g_return_if_fail (markup != NULL);
measure_text (renderer, markup, NULL, width, height);
@@ -425,7 +425,7 @@ gtk_source_gutter_renderer_text_init (GtkSourceGutterRendererText *self)
GtkSourceGutterRenderer *
gtk_source_gutter_renderer_text_new ()
{
- return g_object_new (GTK_TYPE_SOURCE_GUTTER_RENDERER_TEXT, NULL);
+ return g_object_new (GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT, NULL);
}
void
@@ -433,7 +433,7 @@ gtk_source_gutter_renderer_text_set_markup (GtkSourceGutterRendererText *rendere
const gchar *markup,
gint length)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER_TEXT (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER_TEXT (renderer));
set_text (renderer, markup, length, TRUE);
}
@@ -443,7 +443,7 @@ gtk_source_gutter_renderer_text_set_text (GtkSourceGutterRendererText *renderer,
const gchar *text,
gint length)
{
- g_return_if_fail (GTK_IS_SOURCE_GUTTER_RENDERER_TEXT (renderer));
+ g_return_if_fail (GTK_SOURCE_IS_GUTTER_RENDERER_TEXT (renderer));
set_text (renderer, text, length, FALSE);
}
diff --git a/gtksourceview/gtksourcegutterrenderertext.h b/gtksourceview/gtksourcegutterrenderertext.h
index 0bb5791..5fb1813 100644
--- a/gtksourceview/gtksourcegutterrenderertext.h
+++ b/gtksourceview/gtksourcegutterrenderertext.h
@@ -26,13 +26,13 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_GUTTER_RENDERER_TEXT (gtk_source_gutter_renderer_text_get_type ())
-#define GTK_SOURCE_GUTTER_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER_TEXT, GtkSourceGutterRendererText))
-#define GTK_SOURCE_GUTTER_RENDERER_TEXT_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER_TEXT, GtkSourceGutterRendererText const))
-#define GTK_SOURCE_GUTTER_RENDERER_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_GUTTER_RENDERER_TEXT, GtkSourceGutterRendererTextClass))
-#define GTK_IS_SOURCE_GUTTER_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER_TEXT))
-#define GTK_IS_SOURCE_GUTTER_RENDERER_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_GUTTER_RENDERER_TEXT))
-#define GTK_SOURCE_GUTTER_RENDERER_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_GUTTER_RENDERER_TEXT, GtkSourceGutterRendererTextClass))
+#define GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT (gtk_source_gutter_renderer_text_get_type ())
+#define GTK_SOURCE_GUTTER_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT, GtkSourceGutterRendererText))
+#define GTK_SOURCE_GUTTER_RENDERER_TEXT_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT, GtkSourceGutterRendererText const))
+#define GTK_SOURCE_GUTTER_RENDERER_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT, GtkSourceGutterRendererTextClass))
+#define GTK_SOURCE_IS_GUTTER_RENDERER_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT))
+#define GTK_SOURCE_IS_GUTTER_RENDERER_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT))
+#define GTK_SOURCE_GUTTER_RENDERER_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_GUTTER_RENDERER_TEXT, GtkSourceGutterRendererTextClass))
typedef struct _GtkSourceGutterRendererText GtkSourceGutterRendererText;
typedef struct _GtkSourceGutterRendererTextClass GtkSourceGutterRendererTextClass;
diff --git a/gtksourceview/gtksourcelanguage.c b/gtksourceview/gtksourcelanguage.c
index 4210ffd..27dfd61 100644
--- a/gtksourceview/gtksourcelanguage.c
+++ b/gtksourceview/gtksourcelanguage.c
@@ -146,7 +146,7 @@ gtk_source_language_get_property (GObject *object,
{
GtkSourceLanguage *language;
- g_return_if_fail (GTK_IS_SOURCE_LANGUAGE (object));
+ g_return_if_fail (GTK_SOURCE_IS_LANGUAGE (object));
language = GTK_SOURCE_LANGUAGE (object);
@@ -260,7 +260,7 @@ gtk_source_language_class_init (GtkSourceLanguageClass *klass)
static void
gtk_source_language_init (GtkSourceLanguage *lang)
{
- lang->priv = G_TYPE_INSTANCE_GET_PRIVATE (lang, GTK_TYPE_SOURCE_LANGUAGE,
+ lang->priv = G_TYPE_INSTANCE_GET_PRIVATE (lang, GTK_SOURCE_TYPE_LANGUAGE,
GtkSourceLanguagePrivate);
lang->priv->styles = g_hash_table_new_full (g_str_hash,
g_str_equal,
@@ -347,7 +347,7 @@ process_language_node (xmlTextReaderPtr reader, const gchar *filename)
xmlChar *untranslated_name;
GtkSourceLanguage *lang;
- lang = g_object_new (GTK_TYPE_SOURCE_LANGUAGE, NULL);
+ lang = g_object_new (GTK_SOURCE_TYPE_LANGUAGE, NULL);
lang->priv->lang_file_name = g_strdup (filename);
@@ -484,7 +484,7 @@ _gtk_source_language_translate_string (GtkSourceLanguage *language,
const gchar *
gtk_source_language_get_id (GtkSourceLanguage *language)
{
- g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE (language), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), NULL);
g_return_val_if_fail (language->priv->id != NULL, NULL);
return language->priv->id;
@@ -503,7 +503,7 @@ gtk_source_language_get_id (GtkSourceLanguage *language)
const gchar *
gtk_source_language_get_name (GtkSourceLanguage *language)
{
- g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE (language), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), NULL);
g_return_val_if_fail (language->priv->name != NULL, NULL);
return language->priv->name;
@@ -524,7 +524,7 @@ gtk_source_language_get_name (GtkSourceLanguage *language)
const gchar *
gtk_source_language_get_section (GtkSourceLanguage *language)
{
- g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE (language), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), NULL);
g_return_val_if_fail (language->priv->section != NULL, NULL);
return language->priv->section;
@@ -541,7 +541,7 @@ gtk_source_language_get_section (GtkSourceLanguage *language)
gboolean
gtk_source_language_get_hidden (GtkSourceLanguage *language)
{
- g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE (language), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), FALSE);
return language->priv->hidden;
}
@@ -560,7 +560,7 @@ const gchar *
gtk_source_language_get_metadata (GtkSourceLanguage *language,
const gchar *name)
{
- g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE (language), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), NULL);
g_return_val_if_fail (name != NULL, NULL);
return g_hash_table_lookup (language->priv->properties, name);
@@ -585,7 +585,7 @@ gtk_source_language_get_mime_types (GtkSourceLanguage *language)
{
const gchar *mimetypes;
- g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE (language), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), NULL);
mimetypes = gtk_source_language_get_metadata (language, "mimetypes");
if (mimetypes == NULL)
@@ -611,7 +611,7 @@ gtk_source_language_get_globs (GtkSourceLanguage *language)
{
const gchar *globs;
- g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE (language), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), NULL);
globs = gtk_source_language_get_metadata (language, "globs");
if (globs == NULL)
@@ -629,7 +629,7 @@ gtk_source_language_get_globs (GtkSourceLanguage *language)
GtkSourceLanguageManager *
_gtk_source_language_get_language_manager (GtkSourceLanguage *language)
{
- g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE (language), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), NULL);
g_return_val_if_fail (language->priv->id != NULL, NULL);
return language->priv->language_manager;
@@ -844,7 +844,7 @@ force_styles (GtkSourceLanguage *language)
gchar **
gtk_source_language_get_style_ids (GtkSourceLanguage *language)
{
- g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE (language), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), NULL);
g_return_val_if_fail (language->priv->id != NULL, NULL);
if (!force_styles (language))
@@ -886,7 +886,7 @@ gtk_source_language_get_style_name (GtkSourceLanguage *language,
{
GtkSourceStyleInfo *info;
- g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE (language), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (language), NULL);
g_return_val_if_fail (language->priv->id != NULL, NULL);
g_return_val_if_fail (style_id != NULL, NULL);
diff --git a/gtksourceview/gtksourcelanguage.h b/gtksourceview/gtksourcelanguage.h
index bb12594..3c78641 100644
--- a/gtksourceview/gtksourcelanguage.h
+++ b/gtksourceview/gtksourcelanguage.h
@@ -28,12 +28,12 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_LANGUAGE (gtk_source_language_get_type ())
-#define GTK_SOURCE_LANGUAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguage))
-#define GTK_SOURCE_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguageClass))
-#define GTK_IS_SOURCE_LANGUAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_SOURCE_LANGUAGE))
-#define GTK_IS_SOURCE_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_LANGUAGE))
-#define GTK_SOURCE_LANGUAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguageClass))
+#define GTK_SOURCE_TYPE_LANGUAGE (gtk_source_language_get_type ())
+#define GTK_SOURCE_LANGUAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_SOURCE_TYPE_LANGUAGE, GtkSourceLanguage))
+#define GTK_SOURCE_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_SOURCE_TYPE_LANGUAGE, GtkSourceLanguageClass))
+#define GTK_SOURCE_IS_LANGUAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_SOURCE_TYPE_LANGUAGE))
+#define GTK_SOURCE_IS_LANGUAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_LANGUAGE))
+#define GTK_SOURCE_LANGUAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_LANGUAGE, GtkSourceLanguageClass))
typedef struct _GtkSourceLanguage GtkSourceLanguage;
diff --git a/gtksourceview/gtksourcelanguagemanager.c b/gtksourceview/gtksourcelanguagemanager.c
index 31deba7..2fa350c 100644
--- a/gtksourceview/gtksourcelanguagemanager.c
+++ b/gtksourceview/gtksourcelanguagemanager.c
@@ -169,7 +169,7 @@ gtk_source_language_manager_class_init (GtkSourceLanguageManagerClass *klass)
static void
gtk_source_language_manager_init (GtkSourceLanguageManager *lm)
{
- lm->priv = G_TYPE_INSTANCE_GET_PRIVATE (lm, GTK_TYPE_SOURCE_LANGUAGE_MANAGER,
+ lm->priv = G_TYPE_INSTANCE_GET_PRIVATE (lm, GTK_SOURCE_TYPE_LANGUAGE_MANAGER,
GtkSourceLanguageManagerPrivate);
lm->priv->language_ids = NULL;
lm->priv->ids = NULL;
@@ -189,7 +189,7 @@ gtk_source_language_manager_init (GtkSourceLanguageManager *lm)
GtkSourceLanguageManager *
gtk_source_language_manager_new (void)
{
- return g_object_new (GTK_TYPE_SOURCE_LANGUAGE_MANAGER, NULL);
+ return g_object_new (GTK_SOURCE_TYPE_LANGUAGE_MANAGER, NULL);
}
/**
@@ -247,7 +247,7 @@ gtk_source_language_manager_set_search_path (GtkSourceLanguageManager *lm,
{
gchar **tmp;
- g_return_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm));
+ g_return_if_fail (GTK_SOURCE_IS_LANGUAGE_MANAGER (lm));
/* Search path cannot be changed in the list of available languages
* as been already computed */
@@ -278,7 +278,7 @@ gtk_source_language_manager_set_search_path (GtkSourceLanguageManager *lm,
const gchar * const *
gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm)
{
- g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE_MANAGER (lm), NULL);
if (lm->priv->lang_dirs == NULL)
lm->priv->lang_dirs = _gtk_source_view_get_default_dirs (LANGUAGE_DIR, TRUE);
@@ -297,7 +297,7 @@ gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm)
const char *
_gtk_source_language_manager_get_rng_file (GtkSourceLanguageManager *lm)
{
- g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE_MANAGER (lm), NULL);
if (lm->priv->rng_file == NULL)
{
@@ -397,7 +397,7 @@ ensure_languages (GtkSourceLanguageManager *lm)
const gchar * const *
gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm)
{
- g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE_MANAGER (lm), NULL);
ensure_languages (lm);
@@ -420,7 +420,7 @@ GtkSourceLanguage *
gtk_source_language_manager_get_language (GtkSourceLanguageManager *lm,
const gchar *id)
{
- g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE_MANAGER (lm), NULL);
g_return_val_if_fail (id != NULL, NULL);
ensure_languages (lm);
@@ -625,7 +625,7 @@ gtk_source_language_manager_guess_language (GtkSourceLanguageManager *lm,
GtkSourceLanguage *lang = NULL;
GSList *langs = NULL;
- g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE_MANAGER (lm), NULL);
g_return_val_if_fail ((filename != NULL && *filename != '\0') ||
(content_type != NULL && *content_type != '\0'), NULL);
diff --git a/gtksourceview/gtksourcelanguagemanager.h b/gtksourceview/gtksourcelanguagemanager.h
index de7a3aa..85acc6e 100644
--- a/gtksourceview/gtksourcelanguagemanager.h
+++ b/gtksourceview/gtksourcelanguagemanager.h
@@ -26,12 +26,12 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_LANGUAGE_MANAGER (gtk_source_language_manager_get_type ())
-#define GTK_SOURCE_LANGUAGE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_SOURCE_LANGUAGE_MANAGER, GtkSourceLanguageManager))
-#define GTK_SOURCE_LANGUAGE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_SOURCE_LANGUAGE_MANAGER, GtkSourceLanguageManagerClass))
-#define GTK_IS_SOURCE_LANGUAGE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_SOURCE_LANGUAGE_MANAGER))
-#define GTK_IS_SOURCE_LANGUAGE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_LANGUAGE_MANAGER))
-#define GTK_SOURCE_LANGUAGE_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_SOURCE_LANGUAGE_MANAGER, GtkSourceLanguageManagerClass))
+#define GTK_SOURCE_TYPE_LANGUAGE_MANAGER (gtk_source_language_manager_get_type ())
+#define GTK_SOURCE_LANGUAGE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_SOURCE_TYPE_LANGUAGE_MANAGER, GtkSourceLanguageManager))
+#define GTK_SOURCE_LANGUAGE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_SOURCE_TYPE_LANGUAGE_MANAGER, GtkSourceLanguageManagerClass))
+#define GTK_SOURCE_IS_LANGUAGE_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_SOURCE_TYPE_LANGUAGE_MANAGER))
+#define GTK_SOURCE_IS_LANGUAGE_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_LANGUAGE_MANAGER))
+#define GTK_SOURCE_LANGUAGE_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_SOURCE_TYPE_LANGUAGE_MANAGER, GtkSourceLanguageManagerClass))
typedef struct _GtkSourceLanguageManager GtkSourceLanguageManager;
diff --git a/gtksourceview/gtksourcemark.c b/gtksourceview/gtksourcemark.c
index 7ed86b7..b036cb9 100644
--- a/gtksourceview/gtksourcemark.c
+++ b/gtksourceview/gtksourcemark.c
@@ -64,7 +64,7 @@ gtk_source_mark_set_property (GObject *object,
{
GtkSourceMarkPrivate *priv;
- g_return_if_fail (GTK_IS_SOURCE_MARK (object));
+ g_return_if_fail (GTK_SOURCE_IS_MARK (object));
priv = GTK_SOURCE_MARK (object)->priv;
@@ -90,7 +90,7 @@ gtk_source_mark_get_property (GObject *object,
{
GtkSourceMark *mark;
- g_return_if_fail (GTK_IS_SOURCE_MARK (object));
+ g_return_if_fail (GTK_SOURCE_IS_MARK (object));
mark = GTK_SOURCE_MARK (object);
@@ -148,7 +148,7 @@ gtk_source_mark_class_init (GtkSourceMarkClass *klass)
static void
gtk_source_mark_init (GtkSourceMark *mark)
{
- mark->priv = G_TYPE_INSTANCE_GET_PRIVATE (mark, GTK_TYPE_SOURCE_MARK,
+ mark->priv = G_TYPE_INSTANCE_GET_PRIVATE (mark, GTK_SOURCE_TYPE_MARK,
GtkSourceMarkPrivate);
}
@@ -176,7 +176,7 @@ gtk_source_mark_new (const gchar *name,
{
g_return_val_if_fail (category != NULL, NULL);
- return GTK_SOURCE_MARK (g_object_new (GTK_TYPE_SOURCE_MARK,
+ return GTK_SOURCE_MARK (g_object_new (GTK_SOURCE_TYPE_MARK,
"category", category,
"name", name,
"left-gravity", TRUE,
@@ -196,7 +196,7 @@ gtk_source_mark_new (const gchar *name,
const gchar *
gtk_source_mark_get_category (GtkSourceMark *mark)
{
- g_return_val_if_fail (GTK_IS_SOURCE_MARK (mark), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_MARK (mark), NULL);
return mark->priv->category;
}
@@ -221,7 +221,7 @@ gtk_source_mark_next (GtkSourceMark *mark,
{
GtkTextBuffer *buffer;
- g_return_val_if_fail (GTK_IS_SOURCE_MARK (mark), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_MARK (mark), NULL);
buffer = gtk_text_mark_get_buffer (GTK_TEXT_MARK (mark));
if (buffer != NULL)
@@ -251,7 +251,7 @@ gtk_source_mark_prev (GtkSourceMark *mark,
{
GtkTextBuffer *buffer;
- g_return_val_if_fail (GTK_IS_SOURCE_MARK (mark), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_MARK (mark), NULL);
buffer = gtk_text_mark_get_buffer (GTK_TEXT_MARK (mark));
if (buffer != NULL)
diff --git a/gtksourceview/gtksourcemark.h b/gtksourceview/gtksourcemark.h
index 1ceef2f..59b9e19 100644
--- a/gtksourceview/gtksourcemark.h
+++ b/gtksourceview/gtksourcemark.h
@@ -26,12 +26,12 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_MARK (gtk_source_mark_get_type ())
-#define GTK_SOURCE_MARK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_MARK, GtkSourceMark))
-#define GTK_SOURCE_MARK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_MARK, GtkSourceMarkClass))
-#define GTK_IS_SOURCE_MARK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_MARK))
-#define GTK_IS_SOURCE_MARK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_MARK))
-#define GTK_SOURCE_MARK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_MARK, GtkSourceMarkClass))
+#define GTK_SOURCE_TYPE_MARK (gtk_source_mark_get_type ())
+#define GTK_SOURCE_MARK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_MARK, GtkSourceMark))
+#define GTK_SOURCE_MARK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_MARK, GtkSourceMarkClass))
+#define GTK_SOURCE_IS_MARK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_MARK))
+#define GTK_SOURCE_IS_MARK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_MARK))
+#define GTK_SOURCE_MARK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_MARK, GtkSourceMarkClass))
typedef struct _GtkSourceMark GtkSourceMark;
typedef struct _GtkSourceMarkClass GtkSourceMarkClass;
diff --git a/gtksourceview/gtksourcemarkattributes.c b/gtksourceview/gtksourcemarkattributes.c
index 9bd53a4..a9087ed 100644
--- a/gtksourceview/gtksourcemarkattributes.c
+++ b/gtksourceview/gtksourcemarkattributes.c
@@ -78,7 +78,7 @@
* takes precedence.
*/
-#define GTK_SOURCE_MARK_ATTRIBUTES_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_TYPE_SOURCE_MARK_ATTRIBUTES, GtkSourceMarkAttributesPrivate))
+#define GTK_SOURCE_MARK_ATTRIBUTES_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GTK_SOURCE_TYPE_MARK_ATTRIBUTES, GtkSourceMarkAttributesPrivate))
struct _GtkSourceMarkAttributesPrivate
{
@@ -365,7 +365,7 @@ gtk_source_mark_attributes_class_init (GtkSourceMarkAttributesClass *klass)
_gtksourceview_marshal_STRING__OBJECT,
G_TYPE_STRING,
1,
- GTK_TYPE_SOURCE_MARK);
+ GTK_SOURCE_TYPE_MARK);
/**
* GtkSourceMarkAttributes::query-tooltip-markup:
@@ -388,7 +388,7 @@ gtk_source_mark_attributes_class_init (GtkSourceMarkAttributesClass *klass)
_gtksourceview_marshal_STRING__OBJECT,
G_TYPE_STRING,
1,
- GTK_TYPE_SOURCE_MARK);
+ GTK_SOURCE_TYPE_MARK);
}
static void
@@ -409,7 +409,7 @@ gtk_source_mark_attributes_init (GtkSourceMarkAttributes *self)
GtkSourceMarkAttributes *
gtk_source_mark_attributes_new ()
{
- return g_object_new (GTK_TYPE_SOURCE_MARK_ATTRIBUTES, NULL);
+ return g_object_new (GTK_SOURCE_TYPE_MARK_ATTRIBUTES, NULL);
}
/**
@@ -423,7 +423,7 @@ void
gtk_source_mark_attributes_set_background (GtkSourceMarkAttributes *attributes,
const GdkRGBA *background)
{
- g_return_if_fail (GTK_IS_SOURCE_MARK_ATTRIBUTES (attributes));
+ g_return_if_fail (GTK_SOURCE_IS_MARK_ATTRIBUTES (attributes));
set_background (attributes, background);
}
@@ -441,7 +441,7 @@ gboolean
gtk_source_mark_attributes_get_background (GtkSourceMarkAttributes *attributes,
GdkRGBA *background)
{
- g_return_val_if_fail (GTK_IS_SOURCE_MARK_ATTRIBUTES (attributes), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_MARK_ATTRIBUTES (attributes), FALSE);
if (background)
{
@@ -461,7 +461,7 @@ void
gtk_source_mark_attributes_set_stock_id (GtkSourceMarkAttributes *attributes,
const gchar *stock_id)
{
- g_return_if_fail (GTK_IS_SOURCE_MARK_ATTRIBUTES (attributes));
+ g_return_if_fail (GTK_SOURCE_IS_MARK_ATTRIBUTES (attributes));
set_stock_id (attributes, stock_id);
}
@@ -479,7 +479,7 @@ gtk_source_mark_attributes_set_stock_id (GtkSourceMarkAttributes *attributes,
const gchar *
gtk_source_mark_attributes_get_stock_id (GtkSourceMarkAttributes *attributes)
{
- g_return_val_if_fail (GTK_IS_SOURCE_MARK_ATTRIBUTES (attributes), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_MARK_ATTRIBUTES (attributes), NULL);
return gtk_source_pixbuf_helper_get_stock_id (attributes->priv->helper);
}
@@ -495,7 +495,7 @@ void
gtk_source_mark_attributes_set_icon_name (GtkSourceMarkAttributes *attributes,
const gchar *icon_name)
{
- g_return_if_fail (GTK_IS_SOURCE_MARK_ATTRIBUTES (attributes));
+ g_return_if_fail (GTK_SOURCE_IS_MARK_ATTRIBUTES (attributes));
set_icon_name (attributes, icon_name);
}
@@ -513,7 +513,7 @@ gtk_source_mark_attributes_set_icon_name (GtkSourceMarkAttributes *attributes,
const gchar *
gtk_source_mark_attributes_get_icon_name (GtkSourceMarkAttributes *attributes)
{
- g_return_val_if_fail (GTK_IS_SOURCE_MARK_ATTRIBUTES (attributes), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_MARK_ATTRIBUTES (attributes), NULL);
return gtk_source_pixbuf_helper_get_icon_name (attributes->priv->helper);
}
@@ -529,7 +529,7 @@ void
gtk_source_mark_attributes_set_gicon (GtkSourceMarkAttributes *attributes,
GIcon *gicon)
{
- g_return_if_fail (GTK_IS_SOURCE_MARK_ATTRIBUTES (attributes));
+ g_return_if_fail (GTK_SOURCE_IS_MARK_ATTRIBUTES (attributes));
set_gicon (attributes, gicon);
}
@@ -547,7 +547,7 @@ gtk_source_mark_attributes_set_gicon (GtkSourceMarkAttributes *attributes,
GIcon *
gtk_source_mark_attributes_get_gicon (GtkSourceMarkAttributes *attributes)
{
- g_return_val_if_fail (GTK_IS_SOURCE_MARK_ATTRIBUTES (attributes), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_MARK_ATTRIBUTES (attributes), NULL);
return gtk_source_pixbuf_helper_get_gicon (attributes->priv->helper);
}
@@ -563,7 +563,7 @@ void
gtk_source_mark_attributes_set_pixbuf (GtkSourceMarkAttributes *attributes,
const GdkPixbuf *pixbuf)
{
- g_return_if_fail (GTK_IS_SOURCE_MARK_ATTRIBUTES (attributes));
+ g_return_if_fail (GTK_SOURCE_IS_MARK_ATTRIBUTES (attributes));
set_pixbuf (attributes, pixbuf);
}
@@ -581,7 +581,7 @@ gtk_source_mark_attributes_set_pixbuf (GtkSourceMarkAttributes *attributes,
const GdkPixbuf *
gtk_source_mark_attributes_get_pixbuf (GtkSourceMarkAttributes *attributes)
{
- g_return_val_if_fail (GTK_IS_SOURCE_MARK_ATTRIBUTES (attributes), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_MARK_ATTRIBUTES (attributes), NULL);
return gtk_source_pixbuf_helper_get_pixbuf (attributes->priv->helper);
}
@@ -606,7 +606,7 @@ gtk_source_mark_attributes_render_icon (GtkSourceMarkAttributes *attributes,
GtkWidget *widget,
gint size)
{
- g_return_val_if_fail (GTK_IS_SOURCE_MARK_ATTRIBUTES (attributes), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_MARK_ATTRIBUTES (attributes), NULL);
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
g_return_val_if_fail (size > 0, NULL);
@@ -633,8 +633,8 @@ gtk_source_mark_attributes_get_tooltip_text (GtkSourceMarkAttributes *attributes
{
gchar *ret;
- g_return_val_if_fail (GTK_IS_SOURCE_MARK_ATTRIBUTES (attributes), NULL);
- g_return_val_if_fail (GTK_IS_SOURCE_MARK (mark), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_MARK_ATTRIBUTES (attributes), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_MARK (mark), NULL);
ret = NULL;
g_signal_emit (attributes, signals[QUERY_TOOLTIP_TEXT], 0, mark, &ret);
@@ -660,8 +660,8 @@ gtk_source_mark_attributes_get_tooltip_markup (GtkSourceMarkAttributes *attribut
{
gchar *ret;
- g_return_val_if_fail (GTK_IS_SOURCE_MARK_ATTRIBUTES (attributes), NULL);
- g_return_val_if_fail (GTK_IS_SOURCE_MARK (mark), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_MARK_ATTRIBUTES (attributes), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_MARK (mark), NULL);
ret = NULL;
g_signal_emit (attributes, signals[QUERY_TOOLTIP_MARKUP], 0, mark, &ret);
diff --git a/gtksourceview/gtksourcemarkattributes.h b/gtksourceview/gtksourcemarkattributes.h
index 932fae6..ac9cfac 100644
--- a/gtksourceview/gtksourcemarkattributes.h
+++ b/gtksourceview/gtksourcemarkattributes.h
@@ -28,13 +28,13 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_MARK_ATTRIBUTES (gtk_source_mark_attributes_get_type ())
-#define GTK_SOURCE_MARK_ATTRIBUTES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_MARK_ATTRIBUTES, GtkSourceMarkAttributes))
-#define GTK_SOURCE_MARK_ATTRIBUTES_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_MARK_ATTRIBUTES, GtkSourceMarkAttributes const))
-#define GTK_SOURCE_MARK_ATTRIBUTES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_MARK_ATTRIBUTES, GtkSourceMarkAttributesClass))
-#define GTK_IS_SOURCE_MARK_ATTRIBUTES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_MARK_ATTRIBUTES))
-#define GTK_IS_SOURCE_MARK_ATTRIBUTES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_MARK_ATTRIBUTES))
-#define GTK_SOURCE_MARK_ATTRIBUTES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_MARK_ATTRIBUTES, GtkSourceMarkAttributesClass))
+#define GTK_SOURCE_TYPE_MARK_ATTRIBUTES (gtk_source_mark_attributes_get_type ())
+#define GTK_SOURCE_MARK_ATTRIBUTES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_MARK_ATTRIBUTES, GtkSourceMarkAttributes))
+#define GTK_SOURCE_MARK_ATTRIBUTES_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_MARK_ATTRIBUTES, GtkSourceMarkAttributes const))
+#define GTK_SOURCE_MARK_ATTRIBUTES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_MARK_ATTRIBUTES, GtkSourceMarkAttributesClass))
+#define GTK_SOURCE_IS_MARK_ATTRIBUTES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_MARK_ATTRIBUTES))
+#define GTK_SOURCE_IS_MARK_ATTRIBUTES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_MARK_ATTRIBUTES))
+#define GTK_SOURCE_MARK_ATTRIBUTES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_MARK_ATTRIBUTES, GtkSourceMarkAttributesClass))
typedef struct _GtkSourceMarkAttributes GtkSourceMarkAttributes;
typedef struct _GtkSourceMarkAttributesClass GtkSourceMarkAttributesClass;
diff --git a/gtksourceview/gtksourceprintcompositor.c b/gtksourceview/gtksourceprintcompositor.c
index c8e3e3f..3c65601 100644
--- a/gtksourceview/gtksourceprintcompositor.c
+++ b/gtksourceview/gtksourceprintcompositor.c
@@ -444,7 +444,7 @@ gtk_source_print_compositor_class_init (GtkSourcePrintCompositorClass *klass)
g_param_spec_object ("buffer",
_("Source Buffer"),
_("The GtkSourceBuffer object to print"),
- GTK_TYPE_SOURCE_BUFFER,
+ GTK_SOURCE_TYPE_BUFFER,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
/**
@@ -698,7 +698,7 @@ gtk_source_print_compositor_init (GtkSourcePrintCompositor *compositor)
GtkSourcePrintCompositorPrivate *priv;
priv = G_TYPE_INSTANCE_GET_PRIVATE (compositor,
- GTK_TYPE_SOURCE_PRINT_COMPOSITOR,
+ GTK_SOURCE_TYPE_PRINT_COMPOSITOR,
GtkSourcePrintCompositorPrivate);
compositor->priv = priv;
@@ -769,9 +769,9 @@ gtk_source_print_compositor_init (GtkSourcePrintCompositor *compositor)
GtkSourcePrintCompositor *
gtk_source_print_compositor_new (GtkSourceBuffer *buffer)
{
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), NULL);
- return g_object_new (GTK_TYPE_SOURCE_PRINT_COMPOSITOR,
+ return g_object_new (GTK_SOURCE_TYPE_PRINT_COMPOSITOR,
"buffer", buffer,
NULL);
}
@@ -800,13 +800,13 @@ gtk_source_print_compositor_new_from_view (GtkSourceView *view)
PangoFontDescription* font_desc;
GtkSourcePrintCompositor *compositor;
- g_return_val_if_fail (GTK_IS_SOURCE_VIEW (view), NULL);
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view))), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view))), NULL);
buffer = GTK_SOURCE_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)));
compositor = GTK_SOURCE_PRINT_COMPOSITOR (
- g_object_new (GTK_TYPE_SOURCE_PRINT_COMPOSITOR,
+ g_object_new (GTK_SOURCE_TYPE_PRINT_COMPOSITOR,
"buffer", buffer,
"tab-width", gtk_source_view_get_tab_width (view),
"highlight-syntax", gtk_source_buffer_get_highlight_syntax (buffer) != FALSE,
@@ -840,7 +840,7 @@ gtk_source_print_compositor_new_from_view (GtkSourceView *view)
GtkSourceBuffer *
gtk_source_print_compositor_get_buffer (GtkSourcePrintCompositor *compositor)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), NULL);
return compositor->priv->buffer;
}
@@ -861,7 +861,7 @@ void
gtk_source_print_compositor_set_tab_width (GtkSourcePrintCompositor *compositor,
guint width)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor));
+ g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor));
g_return_if_fail (width > 0 && width <= MAX_TAB_WIDTH);
g_return_if_fail (compositor->priv->state == INIT);
@@ -886,7 +886,7 @@ gtk_source_print_compositor_set_tab_width (GtkSourcePrintCompositor *compositor,
guint
gtk_source_print_compositor_get_tab_width (GtkSourcePrintCompositor *compositor)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor), DEFAULT_TAB_WIDTH);
+ g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), DEFAULT_TAB_WIDTH);
return compositor->priv->tab_width;
}
@@ -907,7 +907,7 @@ void
gtk_source_print_compositor_set_wrap_mode (GtkSourcePrintCompositor *compositor,
GtkWrapMode wrap_mode)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor));
+ g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor));
g_return_if_fail (compositor->priv->state == INIT);
if (wrap_mode == compositor->priv->wrap_mode)
@@ -931,7 +931,7 @@ gtk_source_print_compositor_set_wrap_mode (GtkSourcePrintCompositor *compositor,
GtkWrapMode
gtk_source_print_compositor_get_wrap_mode (GtkSourcePrintCompositor *compositor)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor), GTK_WRAP_NONE);
+ g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), GTK_WRAP_NONE);
return compositor->priv->wrap_mode;
}
@@ -953,7 +953,7 @@ void
gtk_source_print_compositor_set_highlight_syntax (GtkSourcePrintCompositor *compositor,
gboolean highlight)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor));
+ g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor));
g_return_if_fail (compositor->priv->state == INIT);
highlight = (highlight != FALSE);
@@ -981,7 +981,7 @@ gtk_source_print_compositor_set_highlight_syntax (GtkSourcePrintCompositor *comp
gboolean
gtk_source_print_compositor_get_highlight_syntax (GtkSourcePrintCompositor *compositor)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), FALSE);
return compositor->priv->highlight_syntax;
}
@@ -1006,7 +1006,7 @@ void
gtk_source_print_compositor_set_print_line_numbers (GtkSourcePrintCompositor *compositor,
guint interval)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor));
+ g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor));
g_return_if_fail (compositor->priv->state == INIT);
g_return_if_fail (interval <= 100);
@@ -1040,7 +1040,7 @@ void
gtk_source_print_compositor_set_print_header (GtkSourcePrintCompositor *compositor,
gboolean print)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor));
+ g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor));
g_return_if_fail (compositor->priv->state == INIT);
print = (print != FALSE);
@@ -1069,7 +1069,7 @@ gtk_source_print_compositor_set_print_header (GtkSourcePrintCompositor *composit
gboolean
gtk_source_print_compositor_get_print_header (GtkSourcePrintCompositor *compositor)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), FALSE);
return compositor->priv->print_header;
}
@@ -1096,7 +1096,7 @@ void
gtk_source_print_compositor_set_print_footer (GtkSourcePrintCompositor *compositor,
gboolean print)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor));
+ g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor));
g_return_if_fail (compositor->priv->state == INIT);
print = (print != FALSE);
@@ -1125,7 +1125,7 @@ gtk_source_print_compositor_set_print_footer (GtkSourcePrintCompositor *composit
gboolean
gtk_source_print_compositor_get_print_footer (GtkSourcePrintCompositor *compositor)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), FALSE);
return compositor->priv->print_footer;
}
@@ -1166,7 +1166,7 @@ gtk_source_print_compositor_set_header_format (GtkSourcePrintCompositor *composi
const gchar *center,
const gchar *right)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor));
+ g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor));
g_return_if_fail (compositor->priv->state == INIT);
/* FIXME: validate given strings? */
@@ -1217,7 +1217,7 @@ gtk_source_print_compositor_set_footer_format (GtkSourcePrintCompositor *composi
const gchar *center,
const gchar *right)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor));
+ g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor));
g_return_if_fail (compositor->priv->state == INIT);
/* FIXME: validate given strings? */
@@ -1247,7 +1247,7 @@ gtk_source_print_compositor_set_footer_format (GtkSourcePrintCompositor *composi
guint
gtk_source_print_compositor_get_print_line_numbers (GtkSourcePrintCompositor *compositor)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor), 0);
+ g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), 0);
return compositor->priv->print_line_numbers;
}
@@ -1304,7 +1304,7 @@ void
gtk_source_print_compositor_set_body_font_name (GtkSourcePrintCompositor *compositor,
const gchar *font_name)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor));
+ g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor));
g_return_if_fail (font_name != NULL);
g_return_if_fail (compositor->priv->state == INIT);
@@ -1331,7 +1331,7 @@ gtk_source_print_compositor_set_body_font_name (GtkSourcePrintCompositor *compos
gchar *
gtk_source_print_compositor_get_body_font_name (GtkSourcePrintCompositor *compositor)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), NULL);
return pango_font_description_to_string (compositor->priv->body_font);
}
@@ -1359,7 +1359,7 @@ void
gtk_source_print_compositor_set_line_numbers_font_name (GtkSourcePrintCompositor *compositor,
const gchar *font_name)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor));
+ g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor));
g_return_if_fail (font_name != NULL);
g_return_if_fail (compositor->priv->state == INIT);
@@ -1386,7 +1386,7 @@ gtk_source_print_compositor_set_line_numbers_font_name (GtkSourcePrintCompositor
gchar *
gtk_source_print_compositor_get_line_numbers_font_name (GtkSourcePrintCompositor *compositor)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), NULL);
if (compositor->priv->line_numbers_font == NULL)
{
@@ -1420,7 +1420,7 @@ void
gtk_source_print_compositor_set_header_font_name (GtkSourcePrintCompositor *compositor,
const gchar *font_name)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor));
+ g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor));
g_return_if_fail (font_name != NULL);
g_return_if_fail (compositor->priv->state == INIT);
@@ -1448,7 +1448,7 @@ gtk_source_print_compositor_set_header_font_name (GtkSourcePrintCompositor *comp
gchar *
gtk_source_print_compositor_get_header_font_name (GtkSourcePrintCompositor *compositor)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), NULL);
if (compositor->priv->header_font == NULL)
{
@@ -1482,7 +1482,7 @@ void
gtk_source_print_compositor_set_footer_font_name (GtkSourcePrintCompositor *compositor,
const gchar *font_name)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor));
+ g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor));
g_return_if_fail (font_name != NULL);
g_return_if_fail (compositor->priv->state == INIT);
@@ -1510,7 +1510,7 @@ gtk_source_print_compositor_set_footer_font_name (GtkSourcePrintCompositor *comp
gchar *
gtk_source_print_compositor_get_footer_font_name (GtkSourcePrintCompositor *compositor)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), NULL);
if (compositor->priv->footer_font == NULL)
{
@@ -1536,7 +1536,7 @@ gtk_source_print_compositor_set_top_margin (GtkSourcePrintCompositor *compositor
gdouble margin,
GtkUnit unit)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor));
+ g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor));
compositor->priv->margin_top = convert_to_mm (margin, unit);
}
@@ -1556,7 +1556,7 @@ gdouble
gtk_source_print_compositor_get_top_margin (GtkSourcePrintCompositor *compositor,
GtkUnit unit)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor), 0);
+ g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), 0);
return convert_from_mm (compositor->priv->margin_top, unit);
}
@@ -1576,7 +1576,7 @@ gtk_source_print_compositor_set_bottom_margin (GtkSourcePrintCompositor *composi
gdouble margin,
GtkUnit unit)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor));
+ g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor));
compositor->priv->margin_bottom = convert_to_mm (margin, unit);
}
@@ -1596,7 +1596,7 @@ gdouble
gtk_source_print_compositor_get_bottom_margin (GtkSourcePrintCompositor *compositor,
GtkUnit unit)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor), 0);
+ g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), 0);
return convert_from_mm (compositor->priv->margin_bottom, unit);
}
@@ -1616,7 +1616,7 @@ gtk_source_print_compositor_set_left_margin (GtkSourcePrintCompositor *composito
gdouble margin,
GtkUnit unit)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor));
+ g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor));
compositor->priv->margin_left = convert_to_mm (margin, unit);
}
@@ -1636,7 +1636,7 @@ gdouble
gtk_source_print_compositor_get_left_margin (GtkSourcePrintCompositor *compositor,
GtkUnit unit)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor), 0);
+ g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), 0);
return convert_from_mm (compositor->priv->margin_left, unit);
}
@@ -1656,7 +1656,7 @@ gtk_source_print_compositor_set_right_margin (GtkSourcePrintCompositor *composit
gdouble margin,
GtkUnit unit)
{
- g_return_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor));
+ g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor));
compositor->priv->margin_right = convert_to_mm (margin, unit);
}
@@ -1676,7 +1676,7 @@ gdouble
gtk_source_print_compositor_get_right_margin (GtkSourcePrintCompositor *compositor,
GtkUnit unit)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor), 0);
+ g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), 0);
return convert_from_mm (compositor->priv->margin_right, unit);
}
@@ -1696,7 +1696,7 @@ gtk_source_print_compositor_get_right_margin (GtkSourcePrintCompositor *composit
gint
gtk_source_print_compositor_get_n_pages (GtkSourcePrintCompositor *compositor)
{
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor), -1);
+ g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), -1);
if (compositor->priv->state != DONE)
return -1;
@@ -2586,7 +2586,7 @@ gtk_source_print_compositor_paginate (GtkSourcePrintCompositor *compositor,
gboolean done;
gint pages_count;
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor), TRUE);
+ g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), TRUE);
g_return_val_if_fail (GTK_IS_PRINT_CONTEXT (context), TRUE);
if (compositor->priv->state == DONE)
@@ -2830,7 +2830,7 @@ gtk_source_print_compositor_get_pagination_progress (GtkSourcePrintCompositor *c
GtkTextIter current;
gint char_count;
- g_return_val_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor), 0.0);
+ g_return_val_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor), 0.0);
if (compositor->priv->state == INIT)
return 0.0;
@@ -3130,7 +3130,7 @@ gtk_source_print_compositor_draw_page (GtkSourcePrintCompositor *compositor,
gint offset;
double x, y, ln_x;
- g_return_if_fail (GTK_IS_SOURCE_PRINT_COMPOSITOR (compositor));
+ g_return_if_fail (GTK_SOURCE_IS_PRINT_COMPOSITOR (compositor));
g_return_if_fail (GTK_IS_PRINT_CONTEXT (context));
g_return_if_fail (page_nr >= 0);
diff --git a/gtksourceview/gtksourceprintcompositor.h b/gtksourceview/gtksourceprintcompositor.h
index b8f2bcf..0f1cd83 100644
--- a/gtksourceview/gtksourceprintcompositor.h
+++ b/gtksourceview/gtksourceprintcompositor.h
@@ -28,12 +28,12 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_PRINT_COMPOSITOR (gtk_source_print_compositor_get_type ())
-#define GTK_SOURCE_PRINT_COMPOSITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_PRINT_COMPOSITOR, GtkSourcePrintCompositor))
-#define GTK_SOURCE_PRINT_COMPOSITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_PRINT_COMPOSITOR, GtkSourcePrintCompositorClass))
-#define GTK_IS_SOURCE_PRINT_COMPOSITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_PRINT_COMPOSITOR))
-#define GTK_IS_SOURCE_PRINT_COMPOSITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_PRINT_COMPOSITOR))
-#define GTK_SOURCE_PRINT_COMPOSITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_PRINT_COMPOSITOR, GtkSourcePrintCompositorClass))
+#define GTK_SOURCE_TYPE_PRINT_COMPOSITOR (gtk_source_print_compositor_get_type ())
+#define GTK_SOURCE_PRINT_COMPOSITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_PRINT_COMPOSITOR, GtkSourcePrintCompositor))
+#define GTK_SOURCE_PRINT_COMPOSITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_PRINT_COMPOSITOR, GtkSourcePrintCompositorClass))
+#define GTK_SOURCE_IS_PRINT_COMPOSITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_PRINT_COMPOSITOR))
+#define GTK_SOURCE_IS_PRINT_COMPOSITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_PRINT_COMPOSITOR))
+#define GTK_SOURCE_PRINT_COMPOSITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_PRINT_COMPOSITOR, GtkSourcePrintCompositorClass))
typedef struct _GtkSourcePrintCompositor GtkSourcePrintCompositor;
typedef struct _GtkSourcePrintCompositorClass GtkSourcePrintCompositorClass;
diff --git a/gtksourceview/gtksourcestyle-private.h b/gtksourceview/gtksourcestyle-private.h
index 3f655ca..027aaea 100644
--- a/gtksourceview/gtksourcestyle-private.h
+++ b/gtksourceview/gtksourcestyle-private.h
@@ -27,9 +27,9 @@
G_BEGIN_DECLS
-#define GTK_SOURCE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_STYLE, GtkSourceStyleClass))
-#define GTK_IS_SOURCE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_STYLE))
-#define GTK_SOURCE_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_STYLE, GtkSourceStyleClass))
+#define GTK_SOURCE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_STYLE, GtkSourceStyleClass))
+#define GTK_SOURCE_IS_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_STYLE))
+#define GTK_SOURCE_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_STYLE, GtkSourceStyleClass))
enum {
GTK_SOURCE_STYLE_USE_LINE_BACKGROUND = 1 << 0, /*< nick=use_line_background >*/
diff --git a/gtksourceview/gtksourcestyle.c b/gtksourceview/gtksourcestyle.c
index c516e4d..f76e02b 100644
--- a/gtksourceview/gtksourcestyle.c
+++ b/gtksourceview/gtksourcestyle.c
@@ -387,7 +387,7 @@ gtk_source_style_copy (const GtkSourceStyle *style)
g_return_val_if_fail (style != NULL, NULL);
- copy = g_object_new (GTK_TYPE_SOURCE_STYLE, NULL);
+ copy = g_object_new (GTK_SOURCE_TYPE_STYLE, NULL);
copy->foreground = style->foreground;
copy->background = style->background;
diff --git a/gtksourceview/gtksourcestyle.h b/gtksourceview/gtksourcestyle.h
index 94eefe8..826ea25 100644
--- a/gtksourceview/gtksourcestyle.h
+++ b/gtksourceview/gtksourcestyle.h
@@ -26,9 +26,9 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_STYLE (gtk_source_style_get_type ())
-#define GTK_SOURCE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_STYLE, GtkSourceStyle))
-#define GTK_IS_SOURCE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_STYLE))
+#define GTK_SOURCE_TYPE_STYLE (gtk_source_style_get_type ())
+#define GTK_SOURCE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_STYLE, GtkSourceStyle))
+#define GTK_SOURCE_IS_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_STYLE))
typedef struct _GtkSourceStyle GtkSourceStyle;
diff --git a/gtksourceview/gtksourcestylescheme.c b/gtksourceview/gtksourcestylescheme.c
index d9d41a3..c4ad99b 100644
--- a/gtksourceview/gtksourcestylescheme.c
+++ b/gtksourceview/gtksourcestylescheme.c
@@ -248,7 +248,7 @@ unref_if_not_null (gpointer object)
static void
gtk_source_style_scheme_init (GtkSourceStyleScheme *scheme)
{
- scheme->priv = G_TYPE_INSTANCE_GET_PRIVATE (scheme, GTK_TYPE_SOURCE_STYLE_SCHEME,
+ scheme->priv = G_TYPE_INSTANCE_GET_PRIVATE (scheme, GTK_SOURCE_TYPE_STYLE_SCHEME,
GtkSourceStyleSchemePrivate);
scheme->priv->defined_styles = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, g_object_unref);
@@ -269,7 +269,7 @@ gtk_source_style_scheme_init (GtkSourceStyleScheme *scheme)
const gchar *
gtk_source_style_scheme_get_id (GtkSourceStyleScheme *scheme)
{
- g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme), NULL);
g_return_val_if_fail (scheme->priv->id != NULL, "");
return scheme->priv->id;
@@ -286,7 +286,7 @@ gtk_source_style_scheme_get_id (GtkSourceStyleScheme *scheme)
const gchar *
gtk_source_style_scheme_get_name (GtkSourceStyleScheme *scheme)
{
- g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme), NULL);
g_return_val_if_fail (scheme->priv->name != NULL, "");
return scheme->priv->name;
@@ -303,7 +303,7 @@ gtk_source_style_scheme_get_name (GtkSourceStyleScheme *scheme)
const gchar *
gtk_source_style_scheme_get_description (GtkSourceStyleScheme *scheme)
{
- g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme), NULL);
return scheme->priv->description;
}
@@ -321,7 +321,7 @@ gtk_source_style_scheme_get_description (GtkSourceStyleScheme *scheme)
const gchar * const *
gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme)
{
- g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme), NULL);
if (scheme->priv->authors == NULL)
return NULL;
@@ -341,7 +341,7 @@ gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme)
const gchar *
gtk_source_style_scheme_get_filename (GtkSourceStyleScheme *scheme)
{
- g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme), NULL);
return scheme->priv->filename;
}
@@ -364,7 +364,7 @@ _gtk_source_style_scheme_new (const gchar *id,
g_return_val_if_fail (id != NULL, NULL);
g_return_val_if_fail (name != NULL, NULL);
- scheme = g_object_new (GTK_TYPE_SOURCE_STYLE_SCHEME,
+ scheme = g_object_new (GTK_SOURCE_TYPE_STYLE_SCHEME,
"id", id, "name", name, NULL);
return scheme;
@@ -486,7 +486,7 @@ gtk_source_style_scheme_get_style (GtkSourceStyleScheme *scheme,
GtkSourceStyle *style = NULL;
GtkSourceStyle *real_style;
- g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme), NULL);
g_return_val_if_fail (style_id != NULL, NULL);
if (g_hash_table_lookup_extended (scheme->priv->style_cache, style_id,
@@ -529,7 +529,7 @@ gtk_source_style_scheme_set_style (GtkSourceStyleScheme *scheme,
const gchar *name,
const GtkSourceStyle *style)
{
- g_return_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme));
+ g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme));
g_return_if_fail (name != NULL);
if (style != NULL)
@@ -543,7 +543,7 @@ gtk_source_style_scheme_set_style (GtkSourceStyleScheme *scheme,
GtkSourceStyle *
_gtk_source_style_scheme_get_matching_brackets_style (GtkSourceStyleScheme *scheme)
{
- g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme), NULL);
return gtk_source_style_scheme_get_style (scheme, STYLE_BRACKET_MATCH);
}
@@ -551,7 +551,7 @@ _gtk_source_style_scheme_get_matching_brackets_style (GtkSourceStyleScheme *sche
GtkSourceStyle *
_gtk_source_style_scheme_get_right_margin_style (GtkSourceStyleScheme *scheme)
{
- g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme), NULL);
return gtk_source_style_scheme_get_style (scheme, STYLE_RIGHT_MARGIN);
}
@@ -559,7 +559,7 @@ _gtk_source_style_scheme_get_right_margin_style (GtkSourceStyleScheme *scheme)
GtkSourceStyle *
_gtk_source_style_scheme_get_draw_spaces_style (GtkSourceStyleScheme *scheme)
{
- g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme), NULL);
return gtk_source_style_scheme_get_style (scheme, STYLE_DRAW_SPACES);
}
@@ -610,7 +610,7 @@ _gtk_source_style_scheme_get_current_line_color (GtkSourceStyleScheme *scheme,
{
GtkSourceStyle *style;
- g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme), FALSE);
g_return_val_if_fail (color != NULL, FALSE);
style = gtk_source_style_scheme_get_style (scheme, STYLE_CURRENT_LINE);
@@ -816,7 +816,7 @@ _gtk_source_style_scheme_apply (GtkSourceStyleScheme *scheme,
{
GtkSourceStyle *style, *style2;
- g_return_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme));
+ g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme));
g_return_if_fail (GTK_IS_WIDGET (widget));
/* we need to translate some of the style scheme properties in a CSS override */
@@ -843,7 +843,7 @@ void
_gtk_source_style_scheme_unapply (GtkSourceStyleScheme *scheme,
GtkWidget *widget)
{
- g_return_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme));
+ g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme));
g_return_if_fail (GTK_IS_WIDGET (widget));
remove_generated_css (scheme, widget);
@@ -960,7 +960,7 @@ parse_style (GtkSourceStyleScheme *scheme,
}
else
{
- result = g_object_new (GTK_TYPE_SOURCE_STYLE, NULL);
+ result = g_object_new (GTK_SOURCE_TYPE_STYLE, NULL);
result->mask = mask;
result->bold = bold;
@@ -1201,7 +1201,7 @@ _gtk_source_style_scheme_new_from_file (const gchar *filename)
return NULL;
}
- scheme = g_object_new (GTK_TYPE_SOURCE_STYLE_SCHEME, NULL);
+ scheme = g_object_new (GTK_SOURCE_TYPE_STYLE_SCHEME, NULL);
scheme->priv->filename = g_strdup (filename);
parse_style_scheme_element (scheme, node, &error);
@@ -1234,7 +1234,7 @@ _gtk_source_style_scheme_new_from_file (const gchar *filename)
const gchar *
_gtk_source_style_scheme_get_parent_id (GtkSourceStyleScheme *scheme)
{
- g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme), NULL);
return scheme->priv->parent_id;
}
@@ -1254,8 +1254,8 @@ void
_gtk_source_style_scheme_set_parent (GtkSourceStyleScheme *scheme,
GtkSourceStyleScheme *parent_scheme)
{
- g_return_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme));
- g_return_if_fail (parent_scheme == NULL || GTK_IS_SOURCE_STYLE_SCHEME (parent_scheme));
+ g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme));
+ g_return_if_fail (parent_scheme == NULL || GTK_SOURCE_IS_STYLE_SCHEME (parent_scheme));
if (scheme->priv->parent != NULL)
g_object_unref (scheme->priv->parent);
diff --git a/gtksourceview/gtksourcestylescheme.h b/gtksourceview/gtksourcestylescheme.h
index fe74bd2..48123af 100644
--- a/gtksourceview/gtksourcestylescheme.h
+++ b/gtksourceview/gtksourcestylescheme.h
@@ -27,12 +27,12 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_STYLE_SCHEME (gtk_source_style_scheme_get_type ())
-#define GTK_SOURCE_STYLE_SCHEME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_STYLE_SCHEME, GtkSourceStyleScheme))
-#define GTK_SOURCE_STYLE_SCHEME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_STYLE_SCHEME, GtkSourceStyleSchemeClass))
-#define GTK_IS_SOURCE_STYLE_SCHEME(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_STYLE_SCHEME))
-#define GTK_IS_SOURCE_STYLE_SCHEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_STYLE_SCHEME))
-#define GTK_SOURCE_STYLE_SCHEME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_STYLE_SCHEME, GtkSourceStyleSchemeClass))
+#define GTK_SOURCE_TYPE_STYLE_SCHEME (gtk_source_style_scheme_get_type ())
+#define GTK_SOURCE_STYLE_SCHEME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_STYLE_SCHEME, GtkSourceStyleScheme))
+#define GTK_SOURCE_STYLE_SCHEME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_STYLE_SCHEME, GtkSourceStyleSchemeClass))
+#define GTK_SOURCE_IS_STYLE_SCHEME(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_STYLE_SCHEME))
+#define GTK_SOURCE_IS_STYLE_SCHEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_STYLE_SCHEME))
+#define GTK_SOURCE_STYLE_SCHEME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_STYLE_SCHEME, GtkSourceStyleSchemeClass))
typedef struct _GtkSourceStyleScheme GtkSourceStyleScheme;
typedef struct _GtkSourceStyleSchemePrivate GtkSourceStyleSchemePrivate;
diff --git a/gtksourceview/gtksourcestyleschememanager.c b/gtksourceview/gtksourcestyleschememanager.c
index eec5d45..6db9274 100644
--- a/gtksourceview/gtksourcestyleschememanager.c
+++ b/gtksourceview/gtksourcestyleschememanager.c
@@ -171,7 +171,7 @@ static void
gtk_source_style_scheme_manager_init (GtkSourceStyleSchemeManager *mgr)
{
mgr->priv = G_TYPE_INSTANCE_GET_PRIVATE (mgr,
- GTK_TYPE_SOURCE_STYLE_SCHEME_MANAGER,
+ GTK_SOURCE_TYPE_STYLE_SCHEME_MANAGER,
GtkSourceStyleSchemeManagerPrivate);
mgr->priv->schemes_hash = NULL;
mgr->priv->ids = NULL;
@@ -190,7 +190,7 @@ gtk_source_style_scheme_manager_init (GtkSourceStyleSchemeManager *mgr)
GtkSourceStyleSchemeManager *
gtk_source_style_scheme_manager_new (void)
{
- return g_object_new (GTK_TYPE_SOURCE_STYLE_SCHEME_MANAGER, NULL);
+ return g_object_new (GTK_SOURCE_TYPE_STYLE_SCHEME_MANAGER, NULL);
}
/**
@@ -420,7 +420,7 @@ gtk_source_style_scheme_manager_set_search_path (GtkSourceStyleSchemeManager *m
{
gchar **tmp;
- g_return_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager));
+ g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME_MANAGER (manager));
tmp = manager->priv->search_path;
@@ -449,7 +449,7 @@ gtk_source_style_scheme_manager_append_search_path (GtkSourceStyleSchemeManager
{
guint len = 0;
- g_return_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager));
+ g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME_MANAGER (manager));
g_return_if_fail (path != NULL);
if (manager->priv->search_path == NULL)
@@ -485,7 +485,7 @@ gtk_source_style_scheme_manager_prepend_search_path (GtkSourceStyleSchemeManager
guint len = 0;
gchar **new_search_path;
- g_return_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager));
+ g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME_MANAGER (manager));
g_return_if_fail (path != NULL);
if (manager->priv->search_path == NULL)
@@ -519,7 +519,7 @@ gtk_source_style_scheme_manager_prepend_search_path (GtkSourceStyleSchemeManager
const gchar * const *
gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager)
{
- g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME_MANAGER (manager), NULL);
if (manager->priv->search_path == NULL)
manager->priv->search_path = _gtk_source_view_get_default_dirs (STYLES_DIR, FALSE);
@@ -538,7 +538,7 @@ gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *ma
void
gtk_source_style_scheme_manager_force_rescan (GtkSourceStyleSchemeManager *manager)
{
- g_return_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager));
+ g_return_if_fail (GTK_SOURCE_IS_STYLE_SCHEME_MANAGER (manager));
manager->priv->need_reload = TRUE;
@@ -558,7 +558,7 @@ gtk_source_style_scheme_manager_force_rescan (GtkSourceStyleSchemeManager *manag
const gchar * const *
gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager)
{
- g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME_MANAGER (manager), NULL);
reload_if_needed (manager);
@@ -579,7 +579,7 @@ GtkSourceStyleScheme *
gtk_source_style_scheme_manager_get_scheme (GtkSourceStyleSchemeManager *manager,
const gchar *scheme_id)
{
- g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME_MANAGER (manager), NULL);
g_return_val_if_fail (scheme_id != NULL, NULL);
reload_if_needed (manager);
diff --git a/gtksourceview/gtksourcestyleschememanager.h b/gtksourceview/gtksourcestyleschememanager.h
index 456e8bf..eda7ea2 100644
--- a/gtksourceview/gtksourcestyleschememanager.h
+++ b/gtksourceview/gtksourcestyleschememanager.h
@@ -26,12 +26,12 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_STYLE_SCHEME_MANAGER (gtk_source_style_scheme_manager_get_type ())
-#define GTK_SOURCE_STYLE_SCHEME_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_SOURCE_STYLE_SCHEME_MANAGER, GtkSourceStyleSchemeManager))
-#define GTK_SOURCE_STYLE_SCHEME_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_SOURCE_STYLE_SCHEME_MANAGER, GtkSourceStyleSchemeManagerClass))
-#define GTK_IS_SOURCE_STYLE_SCHEME_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_SOURCE_STYLE_SCHEME_MANAGER))
-#define GTK_IS_SOURCE_STYLE_SCHEME_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_STYLE_SCHEME_MANAGER))
-#define GTK_SOURCE_STYLE_SCHEME_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_SOURCE_STYLE_SCHEME_MANAGER, GtkSourceStyleSchemeManagerClass))
+#define GTK_SOURCE_TYPE_STYLE_SCHEME_MANAGER (gtk_source_style_scheme_manager_get_type ())
+#define GTK_SOURCE_STYLE_SCHEME_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_SOURCE_TYPE_STYLE_SCHEME_MANAGER, GtkSourceStyleSchemeManager))
+#define GTK_SOURCE_STYLE_SCHEME_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_SOURCE_TYPE_STYLE_SCHEME_MANAGER, GtkSourceStyleSchemeManagerClass))
+#define GTK_SOURCE_IS_STYLE_SCHEME_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_SOURCE_TYPE_STYLE_SCHEME_MANAGER))
+#define GTK_SOURCE_IS_STYLE_SCHEME_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_STYLE_SCHEME_MANAGER))
+#define GTK_SOURCE_STYLE_SCHEME_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_SOURCE_TYPE_STYLE_SCHEME_MANAGER, GtkSourceStyleSchemeManagerClass))
typedef struct _GtkSourceStyleSchemeManager GtkSourceStyleSchemeManager;
diff --git a/gtksourceview/gtksourceundomanager.c b/gtksourceview/gtksourceundomanager.c
index a0ced59..53c3e4b 100644
--- a/gtksourceview/gtksourceundomanager.c
+++ b/gtksourceview/gtksourceundomanager.c
@@ -170,7 +170,7 @@ gtk_source_undo_manager_default_init (GtkSourceUndoManagerIface *iface)
gboolean
gtk_source_undo_manager_can_undo (GtkSourceUndoManager *manager)
{
- g_return_val_if_fail (GTK_IS_SOURCE_UNDO_MANAGER (manager), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_UNDO_MANAGER (manager), FALSE);
return GTK_SOURCE_UNDO_MANAGER_GET_INTERFACE (manager)->can_undo (manager);
}
@@ -188,7 +188,7 @@ gtk_source_undo_manager_can_undo (GtkSourceUndoManager *manager)
gboolean
gtk_source_undo_manager_can_redo (GtkSourceUndoManager *manager)
{
- g_return_val_if_fail (GTK_IS_SOURCE_UNDO_MANAGER (manager), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_UNDO_MANAGER (manager), FALSE);
return GTK_SOURCE_UNDO_MANAGER_GET_INTERFACE (manager)->can_redo (manager);
}
@@ -206,7 +206,7 @@ gtk_source_undo_manager_can_redo (GtkSourceUndoManager *manager)
void
gtk_source_undo_manager_undo (GtkSourceUndoManager *manager)
{
- g_return_if_fail (GTK_IS_SOURCE_UNDO_MANAGER (manager));
+ g_return_if_fail (GTK_SOURCE_IS_UNDO_MANAGER (manager));
GTK_SOURCE_UNDO_MANAGER_GET_INTERFACE (manager)->undo (manager);
}
@@ -224,7 +224,7 @@ gtk_source_undo_manager_undo (GtkSourceUndoManager *manager)
void
gtk_source_undo_manager_redo (GtkSourceUndoManager *manager)
{
- g_return_if_fail (GTK_IS_SOURCE_UNDO_MANAGER (manager));
+ g_return_if_fail (GTK_SOURCE_IS_UNDO_MANAGER (manager));
GTK_SOURCE_UNDO_MANAGER_GET_INTERFACE (manager)->redo (manager);
}
@@ -242,7 +242,7 @@ gtk_source_undo_manager_redo (GtkSourceUndoManager *manager)
void
gtk_source_undo_manager_begin_not_undoable_action (GtkSourceUndoManager *manager)
{
- g_return_if_fail (GTK_IS_SOURCE_UNDO_MANAGER (manager));
+ g_return_if_fail (GTK_SOURCE_IS_UNDO_MANAGER (manager));
GTK_SOURCE_UNDO_MANAGER_GET_INTERFACE (manager)->begin_not_undoable_action (manager);
}
@@ -258,7 +258,7 @@ gtk_source_undo_manager_begin_not_undoable_action (GtkSourceUndoManager *manager
void
gtk_source_undo_manager_end_not_undoable_action (GtkSourceUndoManager *manager)
{
- g_return_if_fail (GTK_IS_SOURCE_UNDO_MANAGER (manager));
+ g_return_if_fail (GTK_SOURCE_IS_UNDO_MANAGER (manager));
GTK_SOURCE_UNDO_MANAGER_GET_INTERFACE (manager)->end_not_undoable_action (manager);
}
@@ -274,7 +274,7 @@ gtk_source_undo_manager_end_not_undoable_action (GtkSourceUndoManager *manager)
void
gtk_source_undo_manager_can_undo_changed (GtkSourceUndoManager *manager)
{
- g_return_if_fail (GTK_IS_SOURCE_UNDO_MANAGER (manager));
+ g_return_if_fail (GTK_SOURCE_IS_UNDO_MANAGER (manager));
g_signal_emit (manager, signals[CAN_UNDO_CHANGED], 0);
}
@@ -290,7 +290,7 @@ gtk_source_undo_manager_can_undo_changed (GtkSourceUndoManager *manager)
void
gtk_source_undo_manager_can_redo_changed (GtkSourceUndoManager *manager)
{
- g_return_if_fail (GTK_IS_SOURCE_UNDO_MANAGER (manager));
+ g_return_if_fail (GTK_SOURCE_IS_UNDO_MANAGER (manager));
g_signal_emit (manager, signals[CAN_REDO_CHANGED], 0);
}
diff --git a/gtksourceview/gtksourceundomanager.h b/gtksourceview/gtksourceundomanager.h
index e85eb9b..459e934 100644
--- a/gtksourceview/gtksourceundomanager.h
+++ b/gtksourceview/gtksourceundomanager.h
@@ -29,10 +29,10 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_UNDO_MANAGER (gtk_source_undo_manager_get_type ())
-#define GTK_SOURCE_UNDO_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_UNDO_MANAGER, GtkSourceUndoManager))
-#define GTK_IS_SOURCE_UNDO_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_UNDO_MANAGER))
-#define GTK_SOURCE_UNDO_MANAGER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_SOURCE_UNDO_MANAGER, GtkSourceUndoManagerIface))
+#define GTK_SOURCE_TYPE_UNDO_MANAGER (gtk_source_undo_manager_get_type ())
+#define GTK_SOURCE_UNDO_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManager))
+#define GTK_SOURCE_IS_UNDO_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER))
+#define GTK_SOURCE_UNDO_MANAGER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerIface))
typedef struct _GtkSourceUndoManager GtkSourceUndoManager;
typedef struct _GtkSourceUndoManagerIface GtkSourceUndoManagerIface;
diff --git a/gtksourceview/gtksourceundomanagerdefault.c b/gtksourceview/gtksourceundomanagerdefault.c
index 97bf632..694444c 100644
--- a/gtksourceview/gtksourceundomanagerdefault.c
+++ b/gtksourceview/gtksourceundomanagerdefault.c
@@ -188,7 +188,7 @@ static gboolean merge_action (GtkSourceUndoManagerDefault *um,
static void gtk_source_undo_manager_iface_init (GtkSourceUndoManagerIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkSourceUndoManagerDefault, gtk_source_undo_manager_default, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (GTK_TYPE_SOURCE_UNDO_MANAGER,
+ G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_UNDO_MANAGER,
gtk_source_undo_manager_iface_init))
static void
@@ -429,7 +429,7 @@ gtk_source_undo_manager_default_class_init (GtkSourceUndoManagerDefaultClass *kl
static void
gtk_source_undo_manager_default_init (GtkSourceUndoManagerDefault *um)
{
- um->priv = G_TYPE_INSTANCE_GET_PRIVATE (um, GTK_TYPE_SOURCE_UNDO_MANAGER_DEFAULT,
+ um->priv = G_TYPE_INSTANCE_GET_PRIVATE (um, GTK_SOURCE_TYPE_UNDO_MANAGER_DEFAULT,
GtkSourceUndoManagerDefaultPrivate);
um->priv->actions = g_ptr_array_new ();
@@ -1060,7 +1060,7 @@ merge_action (GtkSourceUndoManagerDefault *um,
{
GtkSourceUndoAction *last_action;
- g_return_val_if_fail (GTK_IS_SOURCE_UNDO_MANAGER_DEFAULT (um), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_UNDO_MANAGER_DEFAULT (um), FALSE);
g_return_val_if_fail (um->priv != NULL, FALSE);
if (um->priv->actions->len == 0)
@@ -1241,7 +1241,7 @@ void
gtk_source_undo_manager_default_set_max_undo_levels (GtkSourceUndoManagerDefault *manager,
gint max_undo_levels)
{
- g_return_if_fail (GTK_IS_SOURCE_UNDO_MANAGER_DEFAULT (manager));
+ g_return_if_fail (GTK_SOURCE_IS_UNDO_MANAGER_DEFAULT (manager));
set_max_undo_levels (manager, max_undo_levels);
g_object_notify (G_OBJECT (manager), "max-undo-levels");
diff --git a/gtksourceview/gtksourceundomanagerdefault.h b/gtksourceview/gtksourceundomanagerdefault.h
index b714e66..b396b90 100644
--- a/gtksourceview/gtksourceundomanagerdefault.h
+++ b/gtksourceview/gtksourceundomanagerdefault.h
@@ -29,12 +29,12 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_UNDO_MANAGER_DEFAULT (gtk_source_undo_manager_default_get_type ())
-#define GTK_SOURCE_UNDO_MANAGER_DEFAULT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_SOURCE_UNDO_MANAGER_DEFAULT, GtkSourceUndoManagerDefault))
-#define GTK_SOURCE_UNDO_MANAGER_DEFAULT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_SOURCE_UNDO_MANAGER_DEFAULT, GtkSourceUndoManagerDefaultClass))
-#define GTK_IS_SOURCE_UNDO_MANAGER_DEFAULT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_UNDO_MANAGER_DEFAULT))
-#define GTK_IS_SOURCE_UNDO_MANAGER_DEFAULT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_UNDO_MANAGER_DEFAULT))
-#define GTK_SOURCE_UNDO_MANAGER_DEFAULT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_UNDO_MANAGER_DEFAULT, GtkSourceUndoManagerDefaultClass))
+#define GTK_SOURCE_TYPE_UNDO_MANAGER_DEFAULT (gtk_source_undo_manager_default_get_type ())
+#define GTK_SOURCE_UNDO_MANAGER_DEFAULT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_SOURCE_TYPE_UNDO_MANAGER_DEFAULT, GtkSourceUndoManagerDefault))
+#define GTK_SOURCE_UNDO_MANAGER_DEFAULT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_SOURCE_TYPE_UNDO_MANAGER_DEFAULT, GtkSourceUndoManagerDefaultClass))
+#define GTK_SOURCE_IS_UNDO_MANAGER_DEFAULT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER_DEFAULT))
+#define GTK_SOURCE_IS_UNDO_MANAGER_DEFAULT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER_DEFAULT))
+#define GTK_SOURCE_UNDO_MANAGER_DEFAULT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER_DEFAULT, GtkSourceUndoManagerDefaultClass))
typedef struct _GtkSourceUndoManagerDefault GtkSourceUndoManagerDefault;
typedef struct _GtkSourceUndoManagerDefaultClass GtkSourceUndoManagerDefaultClass;
diff --git a/gtksourceview/gtksourceview.c b/gtksourceview/gtksourceview.c
index f1547d9..bb77dfe 100644
--- a/gtksourceview/gtksourceview.c
+++ b/gtksourceview/gtksourceview.c
@@ -305,7 +305,7 @@ gtk_source_view_class_init (GtkSourceViewClass *klass)
g_param_spec_object ("completion",
_("Completion"),
_("The completion object associated with the view"),
- GTK_TYPE_SOURCE_COMPLETION,
+ GTK_SOURCE_TYPE_COMPLETION,
G_PARAM_READABLE));
/**
@@ -421,7 +421,7 @@ gtk_source_view_class_init (GtkSourceViewClass *klass)
_("HOME and END keys move to first/last "
"non whitespace characters on line before going "
"to the start/end of the line"),
- GTK_TYPE_SOURCE_SMART_HOME_END_TYPE,
+ GTK_SOURCE_TYPE_SMART_HOME_END_TYPE,
GTK_SOURCE_SMART_HOME_END_DISABLED,
G_PARAM_READWRITE));
@@ -453,7 +453,7 @@ gtk_source_view_class_init (GtkSourceViewClass *klass)
g_param_spec_flags ("draw-spaces",
_("Draw Spaces"),
_("Set if and how the spaces should be visualized"),
- GTK_TYPE_SOURCE_DRAW_SPACES_FLAGS,
+ GTK_SOURCE_TYPE_DRAW_SPACES_FLAGS,
0,
G_PARAM_READWRITE));
@@ -763,7 +763,7 @@ gtk_source_view_set_property (GObject *object,
{
GtkSourceView *view;
- g_return_if_fail (GTK_IS_SOURCE_VIEW (object));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (object));
view = GTK_SOURCE_VIEW (object);
@@ -844,7 +844,7 @@ gtk_source_view_get_property (GObject *object,
{
GtkSourceView *view;
- g_return_if_fail (GTK_IS_SOURCE_VIEW (object));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (object));
view = GTK_SOURCE_VIEW (object);
@@ -984,7 +984,7 @@ gtk_source_view_init (GtkSourceView *view)
{
GtkTargetList *tl;
- view->priv = G_TYPE_INSTANCE_GET_PRIVATE (view, GTK_TYPE_SOURCE_VIEW,
+ view->priv = G_TYPE_INSTANCE_GET_PRIVATE (view, GTK_SOURCE_TYPE_VIEW,
GtkSourceViewPrivate);
view->priv->tab_width = DEFAULT_TAB_WIDTH;
@@ -1070,7 +1070,7 @@ gtk_source_view_finalize (GObject *object)
GtkSourceView *view;
g_return_if_fail (object != NULL);
- g_return_if_fail (GTK_IS_SOURCE_VIEW (object));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (object));
view = GTK_SOURCE_VIEW (object);
@@ -1208,7 +1208,7 @@ set_source_buffer (GtkSourceView *view,
g_object_unref (view->priv->source_buffer);
}
- if (buffer && GTK_IS_SOURCE_BUFFER (buffer))
+ if (buffer && GTK_SOURCE_IS_BUFFER (buffer))
{
view->priv->source_buffer = g_object_ref (buffer);
@@ -1291,12 +1291,12 @@ gtk_source_view_undo (GtkSourceView *view)
{
GtkTextBuffer *buffer;
- g_return_if_fail (GTK_IS_SOURCE_VIEW (view));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (view));
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
if (gtk_text_view_get_editable (GTK_TEXT_VIEW (view)) &&
- GTK_IS_SOURCE_BUFFER (buffer) &&
+ GTK_SOURCE_IS_BUFFER (buffer) &&
gtk_source_buffer_can_undo (GTK_SOURCE_BUFFER (buffer)))
{
gtk_source_buffer_undo (GTK_SOURCE_BUFFER (buffer));
@@ -1309,12 +1309,12 @@ gtk_source_view_redo (GtkSourceView *view)
{
GtkTextBuffer *buffer;
- g_return_if_fail (GTK_IS_SOURCE_VIEW (view));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (view));
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
if (gtk_text_view_get_editable (GTK_TEXT_VIEW (view)) &&
- GTK_IS_SOURCE_BUFFER (buffer) &&
+ GTK_SOURCE_IS_BUFFER (buffer) &&
gtk_source_buffer_can_redo (GTK_SOURCE_BUFFER (buffer)))
{
gtk_source_buffer_redo (GTK_SOURCE_BUFFER (buffer));
@@ -1380,7 +1380,7 @@ gtk_source_view_populate_popup (GtkTextView *text_view,
GtkWidget *menu_item;
buffer = gtk_text_view_get_buffer (text_view);
- if (!GTK_IS_SOURCE_BUFFER (buffer))
+ if (!GTK_SOURCE_IS_BUFFER (buffer))
return;
/* separator */
@@ -2575,9 +2575,9 @@ gtk_source_view_new_with_buffer (GtkSourceBuffer *buffer)
{
GtkWidget *view;
- g_return_val_if_fail (buffer != NULL && GTK_IS_SOURCE_BUFFER (buffer), NULL);
+ g_return_val_if_fail (buffer != NULL && GTK_SOURCE_IS_BUFFER (buffer), NULL);
- view = g_object_new (GTK_TYPE_SOURCE_VIEW, NULL);
+ view = g_object_new (GTK_SOURCE_TYPE_VIEW, NULL);
gtk_text_view_set_buffer (GTK_TEXT_VIEW (view), GTK_TEXT_BUFFER (buffer));
return view;
@@ -2595,7 +2595,7 @@ gboolean
gtk_source_view_get_show_line_numbers (GtkSourceView *view)
{
g_return_val_if_fail (view != NULL, FALSE);
- g_return_val_if_fail (GTK_IS_SOURCE_VIEW (view), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), FALSE);
return (view->priv->show_line_numbers != FALSE);
}
@@ -2612,7 +2612,7 @@ gtk_source_view_set_show_line_numbers (GtkSourceView *view,
gboolean show)
{
g_return_if_fail (view != NULL);
- g_return_if_fail (GTK_IS_SOURCE_VIEW (view));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (view));
show = (show != FALSE);
@@ -2642,7 +2642,7 @@ gtk_source_view_set_show_line_numbers (GtkSourceView *view,
gboolean
gtk_source_view_get_show_line_marks (GtkSourceView *view)
{
- g_return_val_if_fail (GTK_IS_SOURCE_VIEW (view), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), FALSE);
return (view->priv->show_line_marks != FALSE);
}
@@ -2660,7 +2660,7 @@ void
gtk_source_view_set_show_line_marks (GtkSourceView *view,
gboolean show)
{
- g_return_if_fail (GTK_IS_SOURCE_VIEW (view));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (view));
show = (show != FALSE);
@@ -2743,7 +2743,7 @@ gtk_source_view_set_tab_width (GtkSourceView *view,
guint
gtk_source_view_get_tab_width (GtkSourceView *view)
{
- g_return_val_if_fail (GTK_IS_SOURCE_VIEW (view), DEFAULT_TAB_WIDTH);
+ g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), DEFAULT_TAB_WIDTH);
return view->priv->tab_width;
}
@@ -2783,7 +2783,7 @@ gtk_source_view_set_indent_width (GtkSourceView *view,
gint
gtk_source_view_get_indent_width (GtkSourceView *view)
{
- g_return_val_if_fail (view != NULL && GTK_IS_SOURCE_VIEW (view), 0);
+ g_return_val_if_fail (view != NULL && GTK_SOURCE_IS_VIEW (view), 0);
return view->priv->indent_width;
}
@@ -3513,7 +3513,7 @@ gtk_source_view_key_press_event (GtkWidget *widget,
gboolean
gtk_source_view_get_auto_indent (GtkSourceView *view)
{
- g_return_val_if_fail (GTK_IS_SOURCE_VIEW (view), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), FALSE);
return (view->priv->auto_indent != FALSE);
}
@@ -3528,7 +3528,7 @@ gtk_source_view_get_auto_indent (GtkSourceView *view)
void
gtk_source_view_set_auto_indent (GtkSourceView *view, gboolean enable)
{
- g_return_if_fail (GTK_IS_SOURCE_VIEW (view));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (view));
enable = (enable != FALSE);
@@ -3552,7 +3552,7 @@ gtk_source_view_set_auto_indent (GtkSourceView *view, gboolean enable)
gboolean
gtk_source_view_get_insert_spaces_instead_of_tabs (GtkSourceView *view)
{
- g_return_val_if_fail (GTK_IS_SOURCE_VIEW (view), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), FALSE);
return (view->priv->insert_spaces != FALSE);
}
@@ -3568,7 +3568,7 @@ gtk_source_view_get_insert_spaces_instead_of_tabs (GtkSourceView *view)
void
gtk_source_view_set_insert_spaces_instead_of_tabs (GtkSourceView *view, gboolean enable)
{
- g_return_if_fail (GTK_IS_SOURCE_VIEW (view));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (view));
enable = (enable != FALSE);
@@ -3594,7 +3594,7 @@ gtk_source_view_set_insert_spaces_instead_of_tabs (GtkSourceView *view, gboolean
gboolean
gtk_source_view_get_indent_on_tab (GtkSourceView *view)
{
- g_return_val_if_fail (GTK_IS_SOURCE_VIEW (view), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), FALSE);
return (view->priv->indent_on_tab != FALSE);
}
@@ -3613,7 +3613,7 @@ gtk_source_view_get_indent_on_tab (GtkSourceView *view)
void
gtk_source_view_set_indent_on_tab (GtkSourceView *view, gboolean enable)
{
- g_return_if_fail (GTK_IS_SOURCE_VIEW (view));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (view));
enable = (enable != FALSE);
@@ -3702,7 +3702,7 @@ view_dnd_drop (GtkTextView *view,
gboolean
gtk_source_view_get_highlight_current_line (GtkSourceView *view)
{
- g_return_val_if_fail (GTK_IS_SOURCE_VIEW (view), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), FALSE);
return (view->priv->highlight_current_line != FALSE);
}
@@ -3717,7 +3717,7 @@ gtk_source_view_get_highlight_current_line (GtkSourceView *view)
void
gtk_source_view_set_highlight_current_line (GtkSourceView *view, gboolean hl)
{
- g_return_if_fail (GTK_IS_SOURCE_VIEW (view));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (view));
hl = (hl != FALSE);
@@ -3742,7 +3742,7 @@ gtk_source_view_set_highlight_current_line (GtkSourceView *view, gboolean hl)
gboolean
gtk_source_view_get_show_right_margin (GtkSourceView *view)
{
- g_return_val_if_fail (GTK_IS_SOURCE_VIEW (view), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), FALSE);
return (view->priv->show_right_margin != FALSE);
}
@@ -3757,7 +3757,7 @@ gtk_source_view_get_show_right_margin (GtkSourceView *view)
void
gtk_source_view_set_show_right_margin (GtkSourceView *view, gboolean show)
{
- g_return_if_fail (GTK_IS_SOURCE_VIEW (view));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (view));
show = (show != FALSE);
@@ -3782,7 +3782,7 @@ gtk_source_view_set_show_right_margin (GtkSourceView *view, gboolean show)
guint
gtk_source_view_get_right_margin_position (GtkSourceView *view)
{
- g_return_val_if_fail (GTK_IS_SOURCE_VIEW (view),
+ g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view),
DEFAULT_RIGHT_MARGIN_POSITION);
return view->priv->right_margin_pos;
@@ -3798,7 +3798,7 @@ gtk_source_view_get_right_margin_position (GtkSourceView *view)
void
gtk_source_view_set_right_margin_position (GtkSourceView *view, guint pos)
{
- g_return_if_fail (GTK_IS_SOURCE_VIEW (view));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (view));
g_return_if_fail (pos >= 1);
g_return_if_fail (pos <= MAX_RIGHT_MARGIN_POSITION);
@@ -3825,7 +3825,7 @@ void
gtk_source_view_set_smart_home_end (GtkSourceView *view,
GtkSourceSmartHomeEndType smart_he)
{
- g_return_if_fail (GTK_IS_SOURCE_VIEW (view));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (view));
if (view->priv->smart_home_end == smart_he)
return;
@@ -3847,7 +3847,7 @@ gtk_source_view_set_smart_home_end (GtkSourceView *view,
GtkSourceSmartHomeEndType
gtk_source_view_get_smart_home_end (GtkSourceView *view)
{
- g_return_val_if_fail (GTK_IS_SOURCE_VIEW (view), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), FALSE);
return view->priv->smart_home_end;
}
@@ -3865,7 +3865,7 @@ void
gtk_source_view_set_draw_spaces (GtkSourceView *view,
GtkSourceDrawSpacesFlags flags)
{
- g_return_if_fail (GTK_IS_SOURCE_VIEW (view));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (view));
if (view->priv->draw_spaces == flags)
return;
@@ -3889,7 +3889,7 @@ gtk_source_view_set_draw_spaces (GtkSourceView *view,
GtkSourceDrawSpacesFlags
gtk_source_view_get_draw_spaces (GtkSourceView *view)
{
- g_return_val_if_fail (GTK_IS_SOURCE_VIEW (view), 0);
+ g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), 0);
return view->priv->draw_spaces;
}
@@ -3912,7 +3912,7 @@ gtk_source_view_get_visual_column (GtkSourceView *view,
GtkTextIter position;
guint column, indent_width;
- g_return_val_if_fail (GTK_IS_SOURCE_VIEW (view), 0);
+ g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), 0);
g_return_val_if_fail (iter != NULL, 0);
tab_char = g_utf8_get_char ("\t");
@@ -4129,7 +4129,7 @@ gtk_source_view_update_style_scheme (GtkSourceView *view)
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
- if (GTK_IS_SOURCE_BUFFER (buffer))
+ if (GTK_SOURCE_IS_BUFFER (buffer))
new_scheme = gtk_source_buffer_get_style_scheme (GTK_SOURCE_BUFFER (buffer));
else
new_scheme = NULL;
@@ -4195,7 +4195,7 @@ mark_category_free (MarkCategory *category)
GtkSourceCompletion *
gtk_source_view_get_completion (GtkSourceView *view)
{
- g_return_val_if_fail (GTK_IS_SOURCE_VIEW (view), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), NULL);
if (view->priv->completion == NULL && !view->priv->dispose_has_run)
{
@@ -4224,7 +4224,7 @@ GtkSourceGutter *
gtk_source_view_get_gutter (GtkSourceView *view,
GtkTextWindowType window_type)
{
- g_return_val_if_fail (GTK_IS_SOURCE_VIEW (view), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), NULL);
g_return_val_if_fail (window_type == GTK_TEXT_WINDOW_LEFT ||
window_type == GTK_TEXT_WINDOW_RIGHT, NULL);
@@ -4267,9 +4267,9 @@ gtk_source_view_set_mark_attributes (GtkSourceView *view,
{
MarkCategory *mark_category;
- g_return_if_fail (GTK_IS_SOURCE_VIEW (view));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (view));
g_return_if_fail (category != NULL);
- g_return_if_fail (GTK_IS_SOURCE_MARK_ATTRIBUTES (attributes));
+ g_return_if_fail (GTK_SOURCE_IS_MARK_ATTRIBUTES (attributes));
g_return_if_fail (priority >= 0);
mark_category = mark_category_new (attributes, priority);
@@ -4296,7 +4296,7 @@ gtk_source_view_get_mark_attributes (GtkSourceView *view,
{
MarkCategory *mark_category;
- g_return_val_if_fail (GTK_IS_SOURCE_VIEW (view), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_VIEW (view), NULL);
g_return_val_if_fail (category != NULL, NULL);
mark_category = g_hash_table_lookup (view->priv->mark_categories,
diff --git a/gtksourceview/gtksourceview.h b/gtksourceview/gtksourceview.h
index c31bdb7..beb0752 100644
--- a/gtksourceview/gtksourceview.h
+++ b/gtksourceview/gtksourceview.h
@@ -33,12 +33,12 @@
G_BEGIN_DECLS
-#define GTK_TYPE_SOURCE_VIEW (gtk_source_view_get_type ())
-#define GTK_SOURCE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_VIEW, GtkSourceView))
-#define GTK_SOURCE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_VIEW, GtkSourceViewClass))
-#define GTK_IS_SOURCE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_VIEW))
-#define GTK_IS_SOURCE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_VIEW))
-#define GTK_SOURCE_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_VIEW, GtkSourceViewClass))
+#define GTK_SOURCE_TYPE_VIEW (gtk_source_view_get_type ())
+#define GTK_SOURCE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_VIEW, GtkSourceView))
+#define GTK_SOURCE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_VIEW, GtkSourceViewClass))
+#define GTK_SOURCE_IS_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_VIEW))
+#define GTK_SOURCE_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_VIEW))
+#define GTK_SOURCE_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_SOURCE_TYPE_VIEW, GtkSourceViewClass))
/**
* GtkSourceViewGutterPosition:
diff --git a/tests/test-buffer.c b/tests/test-buffer.c
index a45c665..71bfa0d 100644
--- a/tests/test-buffer.c
+++ b/tests/test-buffer.c
@@ -17,7 +17,7 @@ test_get_buffer (void)
buffer = GTK_SOURCE_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)));
g_assert (buffer != NULL);
- g_assert (GTK_IS_SOURCE_BUFFER (buffer));
+ g_assert (GTK_SOURCE_IS_BUFFER (buffer));
if (g_object_is_floating (view))
{
diff --git a/tests/test-completion.c b/tests/test-completion.c
index 9106f91..21642ea 100644
--- a/tests/test-completion.c
+++ b/tests/test-completion.c
@@ -60,7 +60,7 @@ GType test_provider_get_type (void);
G_DEFINE_TYPE_WITH_CODE (TestProvider,
test_provider,
G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (GTK_TYPE_SOURCE_COMPLETION_PROVIDER,
+ G_IMPLEMENT_INTERFACE (GTK_SOURCE_TYPE_COMPLETION_PROVIDER,
test_provider_iface_init))
static gchar *
diff --git a/tests/test-languagemanager.c b/tests/test-languagemanager.c
index 3c92a1f..07fdc13 100644
--- a/tests/test-languagemanager.c
+++ b/tests/test-languagemanager.c
@@ -30,7 +30,7 @@ test_get_language (void)
lang1 = gtk_source_language_manager_get_language (lm, *ids);
g_assert (lang1 != NULL);
- g_assert (GTK_IS_SOURCE_LANGUAGE (lang1));
+ g_assert (GTK_SOURCE_IS_LANGUAGE (lang1));
g_assert_cmpstr (*ids, == , gtk_source_language_get_id (lang1));
/* langs are owned by the manager */
diff --git a/tests/test-printcompositor.c b/tests/test-printcompositor.c
index 3e17694..cb8f930 100644
--- a/tests/test-printcompositor.c
+++ b/tests/test-printcompositor.c
@@ -15,11 +15,11 @@ test_buffer_ref (void)
compositor = gtk_source_print_compositor_new (buffer_original);
buffer = gtk_source_print_compositor_get_buffer (compositor);
- g_assert (GTK_IS_SOURCE_BUFFER (buffer));
+ g_assert (GTK_SOURCE_IS_BUFFER (buffer));
g_object_unref (G_OBJECT (buffer_original));
buffer = gtk_source_print_compositor_get_buffer (compositor);
- g_assert (GTK_IS_SOURCE_BUFFER (buffer));
+ g_assert (GTK_SOURCE_IS_BUFFER (buffer));
}
static void
@@ -32,11 +32,11 @@ test_buffer_view_ref (void)
view = gtk_source_view_new ();
compositor = gtk_source_print_compositor_new_from_view (GTK_SOURCE_VIEW (view));
buffer = gtk_source_print_compositor_get_buffer (compositor);
- g_assert (GTK_IS_SOURCE_BUFFER (buffer));
+ g_assert (GTK_SOURCE_IS_BUFFER (buffer));
gtk_widget_destroy (view);
buffer = gtk_source_print_compositor_get_buffer (compositor);
- g_assert (GTK_IS_SOURCE_BUFFER (buffer));
+ g_assert (GTK_SOURCE_IS_BUFFER (buffer));
g_object_unref (G_OBJECT (compositor));
}
diff --git a/tests/test-widget.c b/tests/test-widget.c
index 1d2d87a..b620057 100644
--- a/tests/test-widget.c
+++ b/tests/test-widget.c
@@ -296,7 +296,7 @@ gtk_source_buffer_load_file (GtkSourceBuffer *source_buffer,
gchar *buffer;
GError *error_here = NULL;
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (source_buffer), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (source_buffer), FALSE);
g_return_val_if_fail (filename != NULL, FALSE);
if (!g_file_get_contents (filename, &buffer, NULL, &error_here))
@@ -499,7 +499,7 @@ out:
static void
numbers_toggled_cb (GtkAction *action, gpointer user_data)
{
- g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_IS_SOURCE_VIEW (user_data));
+ g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_SOURCE_IS_VIEW (user_data));
gtk_source_view_set_show_line_numbers (
GTK_SOURCE_VIEW (user_data),
gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
@@ -508,7 +508,7 @@ numbers_toggled_cb (GtkAction *action, gpointer user_data)
static void
marks_toggled_cb (GtkAction *action, gpointer user_data)
{
- g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_IS_SOURCE_VIEW (user_data));
+ g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_SOURCE_IS_VIEW (user_data));
gtk_source_view_set_show_line_marks (
GTK_SOURCE_VIEW (user_data),
gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
@@ -517,7 +517,7 @@ marks_toggled_cb (GtkAction *action, gpointer user_data)
static void
margin_toggled_cb (GtkAction *action, gpointer user_data)
{
- g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_IS_SOURCE_VIEW (user_data));
+ g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_SOURCE_IS_VIEW (user_data));
gtk_source_view_set_show_right_margin (
GTK_SOURCE_VIEW (user_data),
gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
@@ -527,7 +527,7 @@ static void
hl_syntax_toggled_cb (GtkAction *action, gpointer user_data)
{
GtkTextBuffer *buffer;
- g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_IS_SOURCE_VIEW (user_data));
+ g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_SOURCE_IS_VIEW (user_data));
buffer = gtk_text_view_get_buffer (user_data);
gtk_source_buffer_set_highlight_syntax (
GTK_SOURCE_BUFFER (buffer),
@@ -538,7 +538,7 @@ static void
hl_bracket_toggled_cb (GtkAction *action, gpointer user_data)
{
GtkTextBuffer *buffer;
- g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_IS_SOURCE_VIEW (user_data));
+ g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_SOURCE_IS_VIEW (user_data));
buffer = gtk_text_view_get_buffer (user_data);
gtk_source_buffer_set_highlight_matching_brackets (
GTK_SOURCE_BUFFER (buffer),
@@ -548,7 +548,7 @@ hl_bracket_toggled_cb (GtkAction *action, gpointer user_data)
static void
hl_line_toggled_cb (GtkAction *action, gpointer user_data)
{
- g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_IS_SOURCE_VIEW (user_data));
+ g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_SOURCE_IS_VIEW (user_data));
gtk_source_view_set_highlight_current_line (
GTK_SOURCE_VIEW (user_data),
gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
@@ -559,7 +559,7 @@ draw_spaces_toggled_cb (GtkAction *action, gpointer user_data)
{
gboolean draw_spaces;
- g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_IS_SOURCE_VIEW (user_data));
+ g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_SOURCE_IS_VIEW (user_data));
draw_spaces = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
if (draw_spaces)
@@ -573,7 +573,7 @@ draw_spaces_toggled_cb (GtkAction *action, gpointer user_data)
static void
wrap_lines_toggled_cb (GtkAction *action, gpointer user_data)
{
- g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_IS_SOURCE_VIEW (user_data));
+ g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_SOURCE_IS_VIEW (user_data));
gtk_text_view_set_wrap_mode (user_data,
gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)) ?
GTK_WRAP_WORD : GTK_WRAP_NONE);
@@ -583,7 +583,7 @@ static void
auto_indent_toggled_cb (GtkAction *action,
gpointer user_data)
{
- g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_IS_SOURCE_VIEW (user_data));
+ g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_SOURCE_IS_VIEW (user_data));
gtk_source_view_set_auto_indent (
GTK_SOURCE_VIEW (user_data),
gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
@@ -593,7 +593,7 @@ static void
insert_spaces_toggled_cb (GtkAction *action,
gpointer user_data)
{
- g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_IS_SOURCE_VIEW (user_data));
+ g_return_if_fail (GTK_IS_TOGGLE_ACTION (action) && GTK_SOURCE_IS_VIEW (user_data));
gtk_source_view_set_insert_spaces_instead_of_tabs (
GTK_SOURCE_VIEW (user_data),
gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
@@ -604,7 +604,7 @@ tabs_toggled_cb (GtkAction *action,
GtkAction *current,
gpointer user_data)
{
- g_return_if_fail (GTK_IS_RADIO_ACTION (action) && GTK_IS_SOURCE_VIEW (user_data));
+ g_return_if_fail (GTK_IS_RADIO_ACTION (action) && GTK_SOURCE_IS_VIEW (user_data));
gtk_source_view_set_tab_width (
GTK_SOURCE_VIEW (user_data),
gtk_radio_action_get_current_value (GTK_RADIO_ACTION (action)));
@@ -615,7 +615,7 @@ indent_toggled_cb (GtkAction *action,
GtkAction *current,
gpointer user_data)
{
- g_return_if_fail (GTK_IS_RADIO_ACTION (action) && GTK_IS_SOURCE_VIEW (user_data));
+ g_return_if_fail (GTK_IS_RADIO_ACTION (action) && GTK_SOURCE_IS_VIEW (user_data));
gtk_source_view_set_indent_width (
GTK_SOURCE_VIEW (user_data),
gtk_radio_action_get_current_value (GTK_RADIO_ACTION (action)));
@@ -626,7 +626,7 @@ smart_home_end_toggled_cb (GtkAction *action,
GtkAction *current,
gpointer user_data)
{
- g_return_if_fail (GTK_IS_RADIO_ACTION (action) && GTK_IS_SOURCE_VIEW (user_data));
+ g_return_if_fail (GTK_IS_RADIO_ACTION (action) && GTK_SOURCE_IS_VIEW (user_data));
gtk_source_view_set_smart_home_end (
GTK_SOURCE_VIEW (user_data),
gtk_radio_action_get_current_value (GTK_RADIO_ACTION (action)));
@@ -639,7 +639,7 @@ new_view_cb (GtkAction *action, gpointer user_data)
GtkSourceView *view;
GtkWidget *window;
- g_return_if_fail (GTK_IS_SOURCE_VIEW (user_data));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (user_data));
view = GTK_SOURCE_VIEW (user_data);
buffer = GTK_SOURCE_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)));
@@ -658,7 +658,7 @@ forward_string_cb (GtkAction *action,
GtkTextIter iter;
GtkTextMark *insert;
- g_return_if_fail (GTK_IS_SOURCE_VIEW (user_data));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (user_data));
view = GTK_SOURCE_VIEW (user_data);
buffer = GTK_SOURCE_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)));
@@ -686,7 +686,7 @@ backward_string_cb (GtkAction *action,
GtkTextIter iter;
GtkTextMark *insert;
- g_return_if_fail (GTK_IS_SOURCE_VIEW (user_data));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (user_data));
view = GTK_SOURCE_VIEW (user_data);
buffer = GTK_SOURCE_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)));
@@ -858,7 +858,7 @@ open_file_cb (GtkAction *action, gpointer user_data)
gint response;
static gchar *last_dir;
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (user_data));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (user_data));
chooser = gtk_file_chooser_dialog_new ("Open file...",
NULL,
@@ -1028,7 +1028,7 @@ print_file_cb (GtkAction *action, gpointer user_data)
const gchar *filename;
gchar *basename;
- g_return_if_fail (GTK_IS_SOURCE_VIEW (user_data));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (user_data));
view = GTK_SOURCE_VIEW (user_data);
@@ -1120,7 +1120,7 @@ update_cursor_position (GtkTextBuffer *buffer, gpointer user_data)
gchar **classes_ptr;
GString *str;
- g_return_if_fail (GTK_IS_SOURCE_VIEW (user_data));
+ g_return_if_fail (GTK_SOURCE_IS_VIEW (user_data));
view = GTK_SOURCE_VIEW (user_data);
pos_label = GTK_LABEL (g_object_get_data (G_OBJECT (view), "pos_label"));
@@ -1174,7 +1174,7 @@ move_cursor_cb (GtkTextBuffer *buffer,
static gboolean
window_deleted_cb (GtkWidget *widget, GdkEvent *ev, gpointer user_data)
{
- g_return_val_if_fail (GTK_IS_SOURCE_VIEW (user_data), TRUE);
+ g_return_val_if_fail (GTK_SOURCE_IS_VIEW (user_data), TRUE);
if (g_list_nth_data (windows, 0) == widget)
{
@@ -1261,7 +1261,7 @@ bracket_matched (GtkSourceBuffer *buffer G_GNUC_UNUSED,
g_return_if_fail (iter != NULL);
- eclass = G_ENUM_CLASS (g_type_class_ref (GTK_TYPE_SOURCE_BRACKET_MATCH_TYPE));
+ eclass = G_ENUM_CLASS (g_type_class_ref (GTK_SOURCE_TYPE_BRACKET_MATCH_TYPE));
evalue = g_enum_get_value (eclass, state);
g_print ("Bracket match state: '%s'\n", evalue->value_nick);
@@ -1347,8 +1347,8 @@ create_view_window (GtkSourceBuffer *buffer, GtkSourceView *from)
GtkUIManager *ui_manager;
GError *error;
- g_return_val_if_fail (GTK_IS_SOURCE_BUFFER (buffer), NULL);
- g_return_val_if_fail (from == NULL || GTK_IS_SOURCE_VIEW (from), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_BUFFER (buffer), NULL);
+ g_return_val_if_fail (from == NULL || GTK_SOURCE_IS_VIEW (from), NULL);
/* window */
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
