[gedit] Adjust to GtkSourceView API break
- From: Garrett Regier <gregier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] Adjust to GtkSourceView API break
- Date: Sun, 20 Mar 2011 16:21:12 +0000 (UTC)
commit 14d0907210ae2b84f973f094844a7979b43d550e
Author: Garrett Regier <alias301 gmail com>
Date: Sun Mar 20 08:04:12 2011 -0700
Adjust to GtkSourceView API break
gedit/dialogs/gedit-style-scheme-generator.c | 4 ++--
gedit/gedit-document.c | 2 +-
gedit/gedit-file-chooser-dialog.c | 2 +-
gedit/gedit-language-manager.c | 2 +-
gedit/gedit-print-job.c | 2 +-
gedit/gedit-settings.c | 2 +-
gedit/gedit-style-scheme-manager.c | 6 +++---
gedit/gedit-view.c | 2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/gedit/dialogs/gedit-style-scheme-generator.c b/gedit/dialogs/gedit-style-scheme-generator.c
index 1657628..e407b91 100644
--- a/gedit/dialogs/gedit-style-scheme-generator.c
+++ b/gedit/dialogs/gedit-style-scheme-generator.c
@@ -138,7 +138,7 @@ gedit_style_scheme_generator_new (GtkSourceStyleScheme *scheme)
{
GeditStyleSchemeGenerator *generator;
- g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME (scheme), NULL);
generator = g_object_new (GEDIT_TYPE_STYLE_SCHEME_GENERATOR, NULL);
g_return_val_if_fail (generator != NULL, NULL);
@@ -287,7 +287,7 @@ ensure_style (GeditStyleSchemeGenerator *generator, const gchar *style_id)
if (style != NULL)
return style;
- return GTK_SOURCE_STYLE (g_object_new (GTK_TYPE_SOURCE_STYLE, NULL));
+ return GTK_SOURCE_STYLE (g_object_new (GTK_SOURCE_TYPE_STYLE, NULL));
}
gboolean
diff --git a/gedit/gedit-document.c b/gedit/gedit-document.c
index 2b8d788..6070b59 100644
--- a/gedit/gedit-document.c
+++ b/gedit/gedit-document.c
@@ -180,7 +180,7 @@ enum {
static guint document_signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE(GeditDocument, gedit_document, GTK_TYPE_SOURCE_BUFFER)
+G_DEFINE_TYPE(GeditDocument, gedit_document, GTK_SOURCE_TYPE_BUFFER)
GQuark
gedit_document_error_quark (void)
diff --git a/gedit/gedit-file-chooser-dialog.c b/gedit/gedit-file-chooser-dialog.c
index 320395e..727c982 100644
--- a/gedit/gedit-file-chooser-dialog.c
+++ b/gedit/gedit-file-chooser-dialog.c
@@ -304,7 +304,7 @@ all_text_files_filter (const GtkFileFilterInfo *filter_info,
GtkSourceLanguage *lang;
lang = gtk_source_language_manager_get_language (lm, *languages);
- g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE (lang), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (lang), FALSE);
++languages;
mime_types = gtk_source_language_get_mime_types (lang);
diff --git a/gedit/gedit-language-manager.c b/gedit/gedit-language-manager.c
index 654493b..d5b16fc 100644
--- a/gedit/gedit-language-manager.c
+++ b/gedit/gedit-language-manager.c
@@ -74,7 +74,7 @@ gedit_language_manager_list_languages_sorted (GtkSourceLanguageManager *lm,
GtkSourceLanguage *lang;
lang = gtk_source_language_manager_get_language (lm, *ids);
- g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE (lang), NULL);
+ g_return_val_if_fail (GTK_SOURCE_IS_LANGUAGE (lang), NULL);
++ids;
if (include_hidden || !gtk_source_language_get_hidden (lang))
diff --git a/gedit/gedit-print-job.c b/gedit/gedit-print-job.c
index f4fbe6f..c39f76f 100644
--- a/gedit/gedit-print-job.c
+++ b/gedit/gedit-print-job.c
@@ -556,7 +556,7 @@ create_compositor (GeditPrintJob *job)
GEDIT_SETTINGS_PRINT_WRAP_MODE);
job->priv->compositor = GTK_SOURCE_PRINT_COMPOSITOR (
- g_object_new (GTK_TYPE_SOURCE_PRINT_COMPOSITOR,
+ g_object_new (GTK_SOURCE_TYPE_PRINT_COMPOSITOR,
"buffer", GTK_SOURCE_BUFFER (job->priv->doc),
"tab-width", gtk_source_view_get_tab_width (GTK_SOURCE_VIEW (job->priv->view)),
"highlight-syntax", gtk_source_buffer_get_highlight_syntax (GTK_SOURCE_BUFFER (job->priv->doc)) &&
diff --git a/gedit/gedit-settings.c b/gedit/gedit-settings.c
index aa21c4b..b35102c 100644
--- a/gedit/gedit-settings.c
+++ b/gedit/gedit-settings.c
@@ -263,7 +263,7 @@ on_scheme_changed (GSettings *settings,
docs = gedit_app_get_documents (gedit_app_get_default ());
for (l = docs; l != NULL; l = g_list_next (l))
{
- g_return_if_fail (GTK_IS_SOURCE_BUFFER (l->data));
+ g_return_if_fail (GTK_SOURCE_IS_BUFFER (l->data));
gtk_source_buffer_set_style_scheme (GTK_SOURCE_BUFFER (l->data),
style);
diff --git a/gedit/gedit-style-scheme-manager.c b/gedit/gedit-style-scheme-manager.c
index 816f34a..3cb828e 100644
--- a/gedit/gedit-style-scheme-manager.c
+++ b/gedit/gedit-style-scheme-manager.c
@@ -102,7 +102,7 @@ gedit_style_scheme_manager_list_schemes_sorted (GtkSourceStyleSchemeManager *man
const gchar * const * scheme_ids;
GSList *schemes = NULL;
- 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);
scheme_ids = gtk_source_style_scheme_manager_get_scheme_ids (manager);
@@ -253,7 +253,7 @@ _gedit_style_scheme_manager_install_scheme (GtkSourceStyleSchemeManager *manager
const gchar* const *ids;
- 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 (fname != NULL, NULL);
dirname = g_path_get_dirname (fname);
@@ -342,7 +342,7 @@ _gedit_style_scheme_manager_uninstall_scheme (GtkSourceStyleSchemeManager *manag
GtkSourceStyleScheme *scheme;
const gchar *filename;
- g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), FALSE);
+ g_return_val_if_fail (GTK_SOURCE_IS_STYLE_SCHEME_MANAGER (manager), FALSE);
g_return_val_if_fail (id != NULL, FALSE);
scheme = gtk_source_style_scheme_manager_get_scheme (manager, id);
diff --git a/gedit/gedit-view.c b/gedit/gedit-view.c
index 24571f7..ade98b2 100644
--- a/gedit/gedit-view.c
+++ b/gedit/gedit-view.c
@@ -75,7 +75,7 @@ struct _GeditViewPrivate
PeasExtensionSet *extensions;
};
-G_DEFINE_TYPE(GeditView, gedit_view, GTK_TYPE_SOURCE_VIEW)
+G_DEFINE_TYPE(GeditView, gedit_view, GTK_SOURCE_TYPE_VIEW)
/* Signals */
enum
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]