[gedit/zbrown/deteplification-src: 633/633] deteplification: cleanup some fallout
- From: Zander Brown <zbrown src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit/zbrown/deteplification-src: 633/633] deteplification: cleanup some fallout
- Date: Sat, 10 Apr 2021 12:48:12 +0000 (UTC)
commit 29599996c64cb6087e757980993619317b080553
Author: Zander Brown <zbrown gnome org>
Date: Sat Apr 10 04:43:59 2021 +0100
deteplification: cleanup some fallout
build-aux/flatpak/org.gnome.gedit.yml | 5 ----
docs/reference/api-breaks.xml | 43 +++++++++++++++++++++++++++++++++++
gedit/gedit-document.c | 3 +++
gedit/gedit-preferences-dialog.c | 7 +++---
gedit/gedit-print-job.c | 2 +-
gedit/gedit-view.c | 2 +-
gedit/meson.build | 1 +
7 files changed, 52 insertions(+), 11 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.gedit.yml b/build-aux/flatpak/org.gnome.gedit.yml
index 07de885e2..d3b535176 100644
--- a/build-aux/flatpak/org.gnome.gedit.yml
+++ b/build-aux/flatpak/org.gnome.gedit.yml
@@ -66,11 +66,6 @@ modules:
url: https://www.freedesktop.org/software/uchardet/releases/uchardet-0.0.6.tar.xz
sha256: 8351328cdfbcb2432e63938721dd781eb8c11ebc56e3a89d0f84576b96002c61
- - name: tepl
- sources:
- - type: git
- url: https://gitlab.gnome.org/GNOME/tepl.git
-
- name: gedit
buildsystem: meson
sources:
diff --git a/docs/reference/api-breaks.xml b/docs/reference/api-breaks.xml
index c8a80c2c6..a239cc443 100644
--- a/docs/reference/api-breaks.xml
+++ b/docs/reference/api-breaks.xml
@@ -29,12 +29,55 @@
All previously deprecated APIs have been removed.
</para>
</listitem>
+ <listitem>
+ <para>
+ The <code>GeditProgressInfoBar</code> class has been removed, you can
+ use <link linkend="TeplProgressInfoBar">TeplProgressInfoBar</link>
+ instead.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <link linkend="GeditDocument">GeditDocument</link> is now a subclass
+ of <link linkend="TeplBuffer">TeplBuffer</link>.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The <code>GeditDocument::cursor-moved</code> signal has been removed.
+ You can use the <link linkend="TeplBuffer">TeplBuffer</link> API
+ instead.
+ </para>
+ </listitem>
<listitem>
<para>
The <code>gedit_document_get_uri_for_display()</code> function has
been removed from the public API.
</para>
</listitem>
+ <listitem>
+ <para>
+ The <code>GeditDocument:shortname</code> property has been removed.
+ You can use the <link linkend="TeplFile">TeplFile</link> API instead.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The <code>gedit_document_is_untouched()</code> function has been
+ removed. You can use the <link linkend="TeplBuffer">TeplBuffer</link>
+ API instead.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The <code>gedit_view_set_font()</code> function has been removed.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <code>DEBUG_METADATA</code> has been removed.
+ </para>
+ </listitem>
</itemizedlist>
</refsect1>
diff --git a/gedit/gedit-document.c b/gedit/gedit-document.c
index 49cc589ba..4cb08ee03 100644
--- a/gedit/gedit-document.c
+++ b/gedit/gedit-document.c
@@ -382,9 +382,12 @@ static void
gedit_document_constructed (GObject *object)
{
GeditDocument *doc = GEDIT_DOCUMENT (object);
+ GeditDocumentPrivate *priv;
GeditSettings *settings;
GSettings *editor_settings;
+ priv = gedit_document_get_instance_private (doc);
+
settings = _gedit_settings_get_singleton ();
editor_settings = _gedit_settings_peek_editor_settings (settings);
diff --git a/gedit/gedit-preferences-dialog.c b/gedit/gedit-preferences-dialog.c
index 95cc98e4d..ec3f53a3d 100644
--- a/gedit/gedit-preferences-dialog.c
+++ b/gedit/gedit-preferences-dialog.c
@@ -816,10 +816,9 @@ install_scheme_clicked (GtkButton *button,
chooser = gedit_file_chooser_dialog_create (_("Add Scheme"),
GTK_WINDOW (dlg),
- GEDIT_FILE_CHOOSER_OPEN,
- NULL,
- _("_Cancel"), GTK_RESPONSE_CANCEL,
- _("A_dd Scheme"), GTK_RESPONSE_ACCEPT);
+ GEDIT_FILE_CHOOSER_FLAG_OPEN,
+ _("_Cancel"),
+ _("A_dd Scheme"));
/* Filters */
gedit_file_chooser_dialog_add_pattern_filter (chooser,
diff --git a/gedit/gedit-print-job.c b/gedit/gedit-print-job.c
index 8ab4ab707..e6c1dcdcb 100644
--- a/gedit/gedit-print-job.c
+++ b/gedit/gedit-print-job.c
@@ -534,7 +534,7 @@ create_compositor (GeditPrintJob *job)
gchar *name_to_display;
gchar *left;
- doc_name = gedit_document_get_uri_for_display (GEDIT_DOCUMENT (buf));
+ doc_name = _gedit_document_get_uri_for_display (GEDIT_DOCUMENT (buf));
name_to_display = gedit_utils_str_middle_truncate (doc_name, 60);
left = g_strdup_printf (_("File: %s"), name_to_display);
diff --git a/gedit/gedit-view.c b/gedit/gedit-view.c
index d4729670d..035e599ab 100644
--- a/gedit/gedit-view.c
+++ b/gedit/gedit-view.c
@@ -99,8 +99,8 @@ current_document_removed (GeditView *view)
static void
buffer_changed (GeditView *view)
{
- GeditDocument *doc;
GtkSourceFile *file;
+ GtkTextBuffer *buffer;
current_document_removed (view);
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
diff --git a/gedit/meson.build b/gedit/meson.build
index 83514050e..844b6bac8 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -133,6 +133,7 @@ libgedit_link_args = []
libgedit_deps = [
deps_basic_list,
libgd_dep,
+ libxml_dep,
]
if host_machine.system() == 'darwin'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]