From 7c82efa24cabe2934a735c13fb59c84d1219c360 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 10 Nov 2009 20:49:31 +0100 Subject: [PATCH 4/5] Remove load-line-column signal and implementation. * Modified gedit/gedit-document-loader.c * Modified gedit/gedit-document-loader.h * Modified gedit/gedit-document.c * Modified gedit/gedit-document.h * Modified gedit/gedit-gio-document-loader.c * Modified gedit/gedit-tab.c Apparently, noone uses this, so it's safe to add the column parameter in place. --- gedit/gedit-document-loader.c | 18 ------- gedit/gedit-document-loader.h | 4 -- gedit/gedit-document.c | 96 +++++++----------------------------- gedit/gedit-document.h | 20 +------- gedit/gedit-gio-document-loader.c | 1 - gedit/gedit-tab.c | 48 +++++++++--------- 6 files changed, 46 insertions(+), 141 deletions(-) diff --git a/gedit/gedit-document-loader.c b/gedit/gedit-document-loader.c index ee4f427..a20653d 100644 --- a/gedit/gedit-document-loader.c +++ b/gedit/gedit-document-loader.c @@ -383,24 +383,6 @@ gedit_document_loader_new (GeditDocument *doc, /* If enconding == NULL, the encoding will be autodetected */ void -gedit_document_loader_load_line_column (GeditDocumentLoader *loader) -{ - gedit_debug (DEBUG_LOADER); - - g_return_if_fail (GEDIT_IS_DOCUMENT_LOADER (loader)); - - /* the loader can be used just once, then it must be thrown away */ - g_return_if_fail (loader->used == FALSE); - loader->used = TRUE; - - if (loader->encoding == NULL) - loader->metadata_encoding = get_metadata_encoding (loader->uri); - - GEDIT_DOCUMENT_LOADER_GET_CLASS (loader)->load_line_column (loader); -} - -/* Deprecated: 2.29.2. Use gedit_document_loader_load_line_column instead. */ -void gedit_document_loader_load (GeditDocumentLoader *loader) { gedit_debug (DEBUG_LOADER); diff --git a/gedit/gedit-document-loader.h b/gedit/gedit-document-loader.h index 8eb219b..65f6eeb 100644 --- a/gedit/gedit-document-loader.h +++ b/gedit/gedit-document-loader.h @@ -84,8 +84,6 @@ struct _GeditDocumentLoaderClass const GError *error); /* VTable */ - void (* load_line_column) (GeditDocumentLoader *loader); - /* Deprecated: 2.29.2. Use gedit_document_loader_load_line_column instead. */ void (* load) (GeditDocumentLoader *loader); gboolean (* cancel) (GeditDocumentLoader *loader); const gchar * (* get_content_type) (GeditDocumentLoader *loader); @@ -114,8 +112,6 @@ void gedit_document_loader_loading (GeditDocumentLoader *loader, gboolean completed, GError *error); -void gedit_document_loader_load_line_column (GeditDocumentLoader *loader); -/* Deprecated: 2.29.2. Use gedit_document_loader_load_line_column instead. */ void gedit_document_loader_load (GeditDocumentLoader *loader); #if 0 gboolean gedit_document_loader_load_from_stdin (GeditDocumentLoader *loader); diff --git a/gedit/gedit-document.c b/gedit/gedit-document.c index a473396..8291409 100644 --- a/gedit/gedit-document.c +++ b/gedit/gedit-document.c @@ -74,16 +74,11 @@ PROFILE (static GTimer *timer = NULL) #define GEDIT_DOCUMENT_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), GEDIT_TYPE_DOCUMENT, GeditDocumentPrivate)) -static void gedit_document_load_line_column_real (GeditDocument *doc, - const gchar *uri, - const GeditEncoding *encoding, - gint line_pos, - gint column_pos, - gboolean create); static void gedit_document_load_real (GeditDocument *doc, const gchar *uri, const GeditEncoding *encoding, gint line_pos, + gint column_pos, gboolean create); static void gedit_document_save_real (GeditDocument *doc, const gchar *uri, @@ -162,7 +157,6 @@ enum { enum { CURSOR_MOVED, LOAD, - LOAD_LINE_COLUMN, LOADING, LOADED, SAVE, @@ -410,7 +404,6 @@ gedit_document_class_init (GeditDocumentClass *klass) buf_class->mark_set = gedit_document_mark_set; buf_class->changed = gedit_document_changed; - klass->load_line_column = gedit_document_load_line_column_real; klass->load = gedit_document_load_real; klass->save = gedit_document_save_real; @@ -495,7 +488,7 @@ gedit_document_class_init (GeditDocumentClass *klass) 0); /** - * GeditDocument::load_line_column: + * GeditDocument::load: * @document: the #GeditDocument. * @uri: the uri where to load the document from. * @encoding: the #GeditEncoding to encode the document. @@ -506,30 +499,6 @@ gedit_document_class_init (GeditDocumentClass *klass) * The "load-line-column" signal is emitted when a document is loaded. * */ - document_signals[LOAD_LINE_COLUMN] = - g_signal_new ("load-line-column", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GeditDocumentClass, load_line_column), - NULL, NULL, - gedit_marshal_VOID__STRING_BOXED_INT_BOOLEAN, - G_TYPE_NONE, - 4, - G_TYPE_STRING, - /* we rely on the fact that the GeditEncoding pointer stays - * the same forever */ - GEDIT_TYPE_ENCODING | G_SIGNAL_TYPE_STATIC_SCOPE, - G_TYPE_INT, - G_TYPE_INT, - G_TYPE_BOOLEAN); - - /** - * GeditDocument::load: - * - * Deprecated: 2.29.2. Use load_line_column instead. - * - * Since: 2.22 - */ document_signals[LOAD] = g_signal_new ("load", G_OBJECT_CLASS_TYPE (object_class), @@ -544,9 +513,9 @@ gedit_document_class_init (GeditDocumentClass *klass) * the same forever */ GEDIT_TYPE_ENCODING | G_SIGNAL_TYPE_STATIC_SCOPE, G_TYPE_INT, + G_TYPE_INT, G_TYPE_BOOLEAN); - document_signals[LOADING] = g_signal_new ("loading", G_OBJECT_CLASS_TYPE (object_class), @@ -1195,12 +1164,12 @@ document_loader_loading (GeditDocumentLoader *loader, } static void -gedit_document_load_line_column_real (GeditDocument *doc, - const gchar *uri, - const GeditEncoding *encoding, - gint line_pos, - gint column_pos, - gboolean create) +gedit_document_load_real (GeditDocument *doc, + const gchar *uri, + const GeditEncoding *encoding, + gint line_pos, + gint column_pos, + gboolean create) { g_return_if_fail (doc->priv->loader == NULL); @@ -1221,22 +1190,11 @@ gedit_document_load_line_column_real (GeditDocument *doc, set_uri (doc, uri, NULL); - gedit_document_loader_load_line_column (doc->priv->loader); -} - -static void -gedit_document_load_real (GeditDocument *doc, - const gchar *uri, - const GeditEncoding *encoding, - gint line_pos, - gboolean create) -{ - return gedit_document_load_line_column_real (doc, uri, encoding, - line_pos, 0, create); + gedit_document_loader_load (doc->priv->loader); } /** - * gedit_document_load_line_column: + * gedit_document_load: * @doc: the #GeditDocument. * @uri: the uri where to load the document from. * @encoding: the #GeditEncoding to encode the document. @@ -1244,38 +1202,22 @@ gedit_document_load_real (GeditDocument *doc, * @column_pos: the column to show. * @create: whether the document should be created if it doesn't exist. * - * Load a document. This results in the "load-line-column" signal to be emitted. - */ -void -gedit_document_load_line_column (GeditDocument *doc, - const gchar *uri, - const GeditEncoding *encoding, - gint line_pos, - gint column_pos, - gboolean create) -{ - g_return_if_fail (GEDIT_IS_DOCUMENT (doc)); - g_return_if_fail (uri != NULL); - g_return_if_fail (gedit_utils_is_valid_uri (uri)); - - g_signal_emit (doc, document_signals[LOAD_LINE_COLUMN], 0, uri, - encoding, line_pos, column_pos, create); -} - -/** - * gedit_document_load: - * - * Deprecated: 2.29.2. Use gedit_document_load_line_column instead. + * Load a document. This results in the "load" signal to be emitted. */ void gedit_document_load (GeditDocument *doc, const gchar *uri, const GeditEncoding *encoding, gint line_pos, + gint column_pos, gboolean create) { - return gedit_document_load_line_column (doc, uri, encoding, - line_pos, 0, create); + g_return_if_fail (GEDIT_IS_DOCUMENT (doc)); + g_return_if_fail (uri != NULL); + g_return_if_fail (gedit_utils_is_valid_uri (uri)); + + g_signal_emit (doc, document_signals[LOAD], 0, uri, + encoding, line_pos, column_pos, create); } /** diff --git a/gedit/gedit-document.h b/gedit/gedit-document.h index 4acdbe1..89444ca 100644 --- a/gedit/gedit-document.h +++ b/gedit/gedit-document.h @@ -103,18 +103,11 @@ struct _GeditDocumentClass void (* cursor_moved) (GeditDocument *document); /* Document load */ - void (* load_line_column) (GeditDocument *document, - const gchar *uri, - const GeditEncoding *encoding, - gint line_pos, - gint column_pos, - gboolean create); - - /* Deprecated: 2.29.2. Use load_line_column instead. */ void (* load) (GeditDocument *document, const gchar *uri, const GeditEncoding *encoding, gint line_pos, + gint column_pos, gboolean create); void (* loading) (GeditDocument *document, @@ -178,18 +171,11 @@ gchar *gedit_document_get_mime_type (GeditDocument *doc); gboolean gedit_document_get_readonly (GeditDocument *doc); -void gedit_document_load_line_column (GeditDocument *doc, - const gchar *uri, - const GeditEncoding *encoding, - gint line_pos, - gint column_pos, - gboolean create); - -/* Deprecated: 2.29.2. Use gedit_document_load_line_column instead. */ -void gedit_document_load (GeditDocument *doc, +void gedit_document_load (GeditDocument *doc, const gchar *uri, const GeditEncoding *encoding, gint line_pos, + gint column_pos, gboolean create); gboolean gedit_document_insert_file (GeditDocument *doc, diff --git a/gedit/gedit-gio-document-loader.c b/gedit/gedit-gio-document-loader.c index ba3a474..1bc65bb 100644 --- a/gedit/gedit-gio-document-loader.c +++ b/gedit/gedit-gio-document-loader.c @@ -129,7 +129,6 @@ gedit_gio_document_loader_class_init (GeditGioDocumentLoaderClass *klass) object_class->finalize = gedit_gio_document_loader_finalize; - loader_class->load_line_column = gedit_gio_document_loader_load; loader_class->load = gedit_gio_document_loader_load; loader_class->cancel = gedit_gio_document_loader_cancel; loader_class->get_content_type = gedit_gio_document_loader_get_content_type; diff --git a/gedit/gedit-tab.c b/gedit/gedit-tab.c index d9cb507..d26e5f1 100644 --- a/gedit/gedit-tab.c +++ b/gedit/gedit-tab.c @@ -487,12 +487,12 @@ io_loading_error_message_area_response (GtkWidget *message_area, g_return_if_fail (tab->priv->auto_save_timeout <= 0); - gedit_document_load_line_column (doc, - uri, - tab->priv->tmp_encoding, - tab->priv->tmp_line_pos, - tab->priv->tmp_column_pos, - FALSE); + gedit_document_load (doc, + uri, + tab->priv->tmp_encoding, + tab->priv->tmp_line_pos, + tab->priv->tmp_column_pos, + FALSE); } else { @@ -530,12 +530,12 @@ conversion_loading_error_message_area_response (GtkWidget *message_area, g_return_if_fail (tab->priv->auto_save_timeout <= 0); - gedit_document_load_line_column (doc, - uri, - encoding, - tab->priv->tmp_line_pos, - tab->priv->tmp_column_pos, - FALSE); + gedit_document_load (doc, + uri, + encoding, + tab->priv->tmp_line_pos, + tab->priv->tmp_column_pos, + FALSE); } else { @@ -2039,12 +2039,12 @@ _gedit_tab_load (GeditTab *tab, if (tab->priv->auto_save_timeout > 0) remove_auto_save_timeout (tab); - gedit_document_load_line_column (doc, - uri, - encoding, - line_pos, - column_pos, - create); + gedit_document_load (doc, + uri, + encoding, + line_pos, + column_pos, + create); } void @@ -2077,12 +2077,12 @@ _gedit_tab_revert (GeditTab *tab) if (tab->priv->auto_save_timeout > 0) remove_auto_save_timeout (tab); - gedit_document_load_line_column (doc, - uri, - tab->priv->tmp_encoding, - 0, - 0, - FALSE); + gedit_document_load (doc, + uri, + tab->priv->tmp_encoding, + 0, + 0, + FALSE); g_free (uri); } -- 1.6.3.3