[gedit/wip/gedit-document-deprecations: 2/2] Deprecate gedit_document_set_content_type()
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit/wip/gedit-document-deprecations: 2/2] Deprecate gedit_document_set_content_type()
- Date: Thu, 11 Jun 2015 10:14:04 +0000 (UTC)
commit 4e11f17136418f7af0a096dbde42560f0296904e
Author: Sébastien Wilmet <swilmet gnome org>
Date: Thu Jun 11 12:09:27 2015 +0200
Deprecate gedit_document_set_content_type()
The function is used nowhere in gedit or gedit-plugins.
gedit/gedit-document.c | 43 ++++++++++++++++++++++++++++---------------
gedit/gedit-document.h | 1 +
2 files changed, 29 insertions(+), 15 deletions(-)
---
diff --git a/gedit/gedit-document.c b/gedit/gedit-document.c
index 7ebe173..25d3428 100644
--- a/gedit/gedit-document.c
+++ b/gedit/gedit-document.c
@@ -44,6 +44,9 @@ static void gedit_document_loaded_real (GeditDocument *doc);
static void gedit_document_saved_real (GeditDocument *doc);
+static void set_content_type (GeditDocument *doc,
+ const gchar *content_type);
+
typedef struct
{
GtkSourceFile *file;
@@ -299,7 +302,7 @@ gedit_document_set_property (GObject *object,
break;
case PROP_CONTENT_TYPE:
- gedit_document_set_content_type (doc, g_value_get_string (value));
+ set_content_type (doc, g_value_get_string (value));
break;
case PROP_USE_GVFS_METADATA:
@@ -944,19 +947,12 @@ set_content_type_no_guess (GeditDocument *doc,
g_object_notify (G_OBJECT (doc), "content-type");
}
-/**
- * gedit_document_set_content_type:
- * @doc:
- * @content_type: (allow-none):
- */
-void
-gedit_document_set_content_type (GeditDocument *doc,
- const gchar *content_type)
+static void
+set_content_type (GeditDocument *doc,
+ const gchar *content_type)
{
GeditDocumentPrivate *priv;
- g_return_if_fail (GEDIT_IS_DOCUMENT (doc));
-
gedit_debug (DEBUG_DOCUMENT);
priv = gedit_document_get_instance_private (doc);
@@ -988,6 +984,23 @@ gedit_document_set_content_type (GeditDocument *doc,
}
/**
+ * gedit_document_set_content_type:
+ * @doc:
+ * @content_type: (allow-none):
+ *
+ * Deprecated: 3.18: Unused function. The intent is to change the
+ * #GeditDocument:content-type property to be read-only.
+ */
+void
+gedit_document_set_content_type (GeditDocument *doc,
+ const gchar *content_type)
+{
+ g_return_if_fail (GEDIT_IS_DOCUMENT (doc));
+
+ set_content_type (doc, content_type);
+}
+
+/**
* gedit_document_get_location:
* @doc: a #GeditDocument
*
@@ -1031,7 +1044,7 @@ gedit_document_set_location (GeditDocument *doc,
priv = gedit_document_get_instance_private (doc);
gtk_source_file_set_location (priv->file, location);
- gedit_document_set_content_type (doc, NULL);
+ set_content_type (doc, NULL);
}
/**
@@ -1225,7 +1238,7 @@ loaded_query_info_cb (GFile *location,
content_type = g_file_info_get_attribute_string (info,
G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE);
- gedit_document_set_content_type (doc, content_type);
+ set_content_type (doc, content_type);
}
if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE))
@@ -1276,7 +1289,7 @@ gedit_document_loaded_real (GeditDocument *doc)
set_readonly (doc, FALSE);
- gedit_document_set_content_type (doc, NULL);
+ set_content_type (doc, NULL);
location = gtk_source_file_get_location (priv->file);
@@ -1334,7 +1347,7 @@ saved_query_info_cb (GFile *location,
}
}
- gedit_document_set_content_type (doc, content_type);
+ set_content_type (doc, content_type);
if (info != NULL)
{
diff --git a/gedit/gedit-document.h b/gedit/gedit-document.h
index fb0d9f9..d2e6d86 100644
--- a/gedit/gedit-document.h
+++ b/gedit/gedit-document.h
@@ -69,6 +69,7 @@ void gedit_document_set_short_name_for_display (GeditDocument *doc,
gchar *gedit_document_get_content_type (GeditDocument *doc);
+G_DEPRECATED
void gedit_document_set_content_type (GeditDocument *doc,
const gchar *content_type);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]