[gedit] GeditDocument: remove untitled_number handling
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] GeditDocument: remove untitled_number handling
- Date: Fri, 20 Nov 2020 05:35:25 +0000 (UTC)
commit 49749c38a04cb103c4077a782dbbbd1eb77869e8
Author: Sébastien Wilmet <swilmet gnome org>
Date: Fri Nov 20 06:09:47 2020 +0100
GeditDocument: remove untitled_number handling
Now handled by TeplFile.
gedit/gedit-document.c | 60 +-------------------------------------------------
1 file changed, 1 insertion(+), 59 deletions(-)
---
diff --git a/gedit/gedit-document.c b/gedit/gedit-document.c
index bfb506fb0..36cfe09dd 100644
--- a/gedit/gedit-document.c
+++ b/gedit/gedit-document.c
@@ -45,8 +45,6 @@ typedef struct
TeplMetadata *metadata;
- gint untitled_number;
-
gchar *content_type;
GDateTime *time_of_last_save_or_load;
@@ -93,8 +91,6 @@ enum
static guint document_signals[LAST_SIGNAL];
-static GHashTable *allocated_untitled_numbers = NULL;
-
G_DEFINE_TYPE_WITH_PRIVATE (GeditDocument, gedit_document, TEPL_TYPE_BUFFER)
static void
@@ -131,39 +127,6 @@ save_metadata_into_metadata_manager (GeditDocument *doc)
}
}
-static gint
-get_untitled_number (void)
-{
- gint i = 1;
-
- if (allocated_untitled_numbers == NULL)
- allocated_untitled_numbers = g_hash_table_new (NULL, NULL);
-
- g_return_val_if_fail (allocated_untitled_numbers != NULL, -1);
-
- while (TRUE)
- {
- if (g_hash_table_lookup (allocated_untitled_numbers, GINT_TO_POINTER (i)) == NULL)
- {
- g_hash_table_insert (allocated_untitled_numbers,
- GINT_TO_POINTER (i),
- GINT_TO_POINTER (i));
-
- return i;
- }
-
- ++i;
- }
-}
-
-static void
-release_untitled_number (gint n)
-{
- g_return_if_fail (allocated_untitled_numbers != NULL);
-
- g_hash_table_remove (allocated_untitled_numbers, GINT_TO_POINTER (n));
-}
-
static void
update_time_of_last_save_or_load (GeditDocument *doc)
{
@@ -250,17 +213,10 @@ gedit_document_dispose (GObject *object)
static void
gedit_document_finalize (GObject *object)
{
- GeditDocumentPrivate *priv;
+ GeditDocumentPrivate *priv = gedit_document_get_instance_private (GEDIT_DOCUMENT (object));
gedit_debug (DEBUG_DOCUMENT);
- priv = gedit_document_get_instance_private (GEDIT_DOCUMENT (object));
-
- if (priv->untitled_number > 0)
- {
- release_untitled_number (priv->untitled_number);
- }
-
g_free (priv->content_type);
if (priv->time_of_last_save_or_load != NULL)
@@ -693,23 +649,10 @@ on_location_changed (GtkSourceFile *file,
GParamSpec *pspec,
GeditDocument *doc)
{
- GeditDocumentPrivate *priv;
- GFile *location;
-
gedit_debug (DEBUG_DOCUMENT);
- priv = gedit_document_get_instance_private (doc);
-
load_metadata_from_metadata_manager (doc);
- location = gtk_source_file_get_location (file);
-
- if (location != NULL && priv->untitled_number > 0)
- {
- release_untitled_number (priv->untitled_number);
- priv->untitled_number = 0;
- }
-
g_object_notify_by_pspec (G_OBJECT (doc), properties[PROP_SHORTNAME]);
}
@@ -723,7 +666,6 @@ gedit_document_init (GeditDocument *doc)
gedit_debug (DEBUG_DOCUMENT);
- priv->untitled_number = get_untitled_number ();
priv->content_type = get_default_content_type ();
priv->language_set_by_user = FALSE;
priv->empty_search = TRUE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]