From f56cb60783ef1364c4b9c299c972bb379c865cc1 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 10 Nov 2009 20:47:38 +0100 Subject: [PATCH 3/5] Remove all _gedit.*line_column duplications, just add column parameter. * Modified gedit/gedit-commands-file.c * Modified gedit/gedit-commands.h * Modified gedit/gedit-tab.c * Modified gedit/gedit-tab.h * Modified gedit/gedit-window.c * Modified gedit/gedit.c _gedit.* functions are internal, not part of api, no need for duplication. --- gedit/gedit-commands-file.c | 41 ++++++++---------------------- gedit/gedit-commands.h | 11 +------- gedit/gedit-tab.c | 57 +++++++++++++------------------------------ gedit/gedit-tab.h | 15 +---------- gedit/gedit-window.c | 10 ++++---- gedit/gedit.c | 21 +++++++-------- 6 files changed, 47 insertions(+), 108 deletions(-) diff --git a/gedit/gedit-commands-file.c b/gedit/gedit-commands-file.c index a7b07f7..324e642 100644 --- a/gedit/gedit-commands-file.c +++ b/gedit/gedit-commands-file.c @@ -201,12 +201,12 @@ load_file_list (GeditWindow *window, // FIXME: pass the GFile to tab when api is there uri = g_file_get_uri (l->data); - _gedit_tab_load_line_column (tab, - uri, - encoding, - line_pos, - column_pos, - create); + _gedit_tab_load (tab, + uri, + encoding, + line_pos, + column_pos, + create); g_free (uri); l = g_slist_next (l); @@ -413,11 +413,11 @@ gedit_commands_load_files (GeditWindow *window, * titled document. */ gint -_gedit_cmd_load_files_from_prompt_line_column (GeditWindow *window, - GSList *files, - const GeditEncoding *encoding, - gint line_pos, - gint column_pos) +_gedit_cmd_load_files_from_prompt (GeditWindow *window, + GSList *files, + const GeditEncoding *encoding, + gint line_pos, + gint column_pos) { gedit_debug (DEBUG_COMMANDS); @@ -425,25 +425,6 @@ _gedit_cmd_load_files_from_prompt_line_column (GeditWindow *window, TRUE); } -/** - * _gedit_cmd_load_files_from_prompt - * - * Deprecated: 2.29.2. Use - * _gedit_cmd_load_files_from_prompt_line_column instead. - */ -gint -_gedit_cmd_load_files_from_prompt (GeditWindow *window, - GSList *files, - const GeditEncoding *encoding, - gint line_pos) -{ - return _gedit_cmd_load_files_from_prompt_line_column (window, - files, - encoding, - line_pos, - 0); -} - static void open_dialog_destroyed (GeditWindow *window, GeditFileChooserDialog *dialog) diff --git a/gedit/gedit-commands.h b/gedit/gedit-commands.h index 05b9ede..4944fc5 100644 --- a/gedit/gedit-commands.h +++ b/gedit/gedit-commands.h @@ -75,18 +75,11 @@ void gedit_commands_save_all_documents (GeditWindow *window); */ /* Create titled documens for non-existing URIs */ -gint _gedit_cmd_load_files_from_prompt_line_column (GeditWindow *window, - GSList *files, - const GeditEncoding *encoding, - gint line_pos, - gint column_pos); - -/* Deprecated: 2.29.2. Use - _gedit_cmd_load_files_from_prompt_line_column instead. */ gint _gedit_cmd_load_files_from_prompt (GeditWindow *window, GSList *files, const GeditEncoding *encoding, - gint line_pos); + gint line_pos, + gint column_pos); void _gedit_cmd_file_new (GtkAction *action, GeditWindow *window); diff --git a/gedit/gedit-tab.c b/gedit/gedit-tab.c index 60fd3ef..d9cb507 100644 --- a/gedit/gedit-tab.c +++ b/gedit/gedit-tab.c @@ -1630,11 +1630,11 @@ _gedit_tab_new (void) /* Whether create is TRUE, creates a new empty document if location does not refer to an existing file */ GtkWidget * -_gedit_tab_new_from_uri_line_column (const gchar *uri, - const GeditEncoding *encoding, - gint line_pos, - gint column_pos, - gboolean create) +_gedit_tab_new_from_uri (const gchar *uri, + const GeditEncoding *encoding, + gint line_pos, + gint column_pos, + gboolean create) { GeditTab *tab; @@ -1642,27 +1642,16 @@ _gedit_tab_new_from_uri_line_column (const gchar *uri, tab = GEDIT_TAB (_gedit_tab_new ()); - _gedit_tab_load_line_column (tab, - uri, - encoding, - line_pos, - column_pos, - create); + _gedit_tab_load (tab, + uri, + encoding, + line_pos, + column_pos, + create); return GTK_WIDGET (tab); } -/* Deprecated: 2.29.2. Use _gedit_tab_new_from_uri_line_column instead. */ -GtkWidget * -_gedit_tab_new_from_uri (const gchar *uri, - const GeditEncoding *encoding, - gint line_pos, - gboolean create) -{ - return _gedit_tab_new_from_uri_line_column (uri, encoding, - line_pos, 0, create); -} - /** * gedit_tab_get_view: * @tab: a #GeditTab @@ -2026,12 +2015,12 @@ gedit_tab_get_from_document (GeditDocument *doc) } void -_gedit_tab_load_line_column (GeditTab *tab, - const gchar *uri, - const GeditEncoding *encoding, - gint line_pos, - gint column_pos, - gboolean create) +_gedit_tab_load (GeditTab *tab, + const gchar *uri, + const GeditEncoding *encoding, + gint line_pos, + gint column_pos, + gboolean create) { GeditDocument *doc; @@ -2058,18 +2047,6 @@ _gedit_tab_load_line_column (GeditTab *tab, create); } -/* Deprecated: 2.29.2. Use _gedit_tab_load_line_column instead. */ -void -_gedit_tab_load (GeditTab *tab, - const gchar *uri, - const GeditEncoding *encoding, - gint line_pos, - gboolean create) -{ - return _gedit_tab_load_line_column (tab, uri, encoding, line_pos, 0, - create); -} - void _gedit_tab_revert (GeditTab *tab) { diff --git a/gedit/gedit-tab.h b/gedit/gedit-tab.h index c12fbc0..850266b 100644 --- a/gedit/gedit-tab.h +++ b/gedit/gedit-tab.h @@ -128,30 +128,19 @@ GtkWidget *_gedit_tab_new (void); /* Whether create is TRUE, creates a new empty document if location does not refer to an existing file */ -GtkWidget *_gedit_tab_new_from_uri_line_column (const gchar *uri, - const GeditEncoding *encoding, - gint line_pos, - gint column_pos, - gboolean create); -/* Deprecated: 2.29.2. Use _gedit_tab_new_from_uri_line_column instead. */ GtkWidget *_gedit_tab_new_from_uri (const gchar *uri, const GeditEncoding *encoding, gint line_pos, + gint column_pos, gboolean create); gchar *_gedit_tab_get_name (GeditTab *tab); gchar *_gedit_tab_get_tooltips (GeditTab *tab); GdkPixbuf *_gedit_tab_get_icon (GeditTab *tab); -void _gedit_tab_load_line_column (GeditTab *tab, - const gchar *uri, - const GeditEncoding *encoding, - gint line_pos, - gint column_pos, - gboolean create); -/* Deprecated: 2.29.2. Use _gedit_tab_load_line_column instead. */ void _gedit_tab_load (GeditTab *tab, const gchar *uri, const GeditEncoding *encoding, gint line_pos, + gint column_pos, gboolean create); void _gedit_tab_revert (GeditTab *tab); void _gedit_tab_save (GeditTab *tab); diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c index ed48285..e65bef9 100644 --- a/gedit/gedit-window.c +++ b/gedit/gedit-window.c @@ -4032,11 +4032,11 @@ gedit_window_create_tab_from_uri_line_column (GeditWindow *window, g_return_val_if_fail (GEDIT_IS_WINDOW (window), NULL); g_return_val_if_fail (uri != NULL, NULL); - tab = _gedit_tab_new_from_uri_line_column (uri, - encoding, - line_pos, - column_pos, - create); + tab = _gedit_tab_new_from_uri (uri, + encoding, + line_pos, + column_pos, + create); if (tab == NULL) return NULL; diff --git a/gedit/gedit.c b/gedit/gedit.c index 9c02724..22e6ac3 100644 --- a/gedit/gedit.c +++ b/gedit/gedit.c @@ -386,11 +386,11 @@ on_message_received (const char *message, if (file_list != NULL) { - _gedit_cmd_load_files_from_prompt_line_column (window, - file_list, - encoding, - line_position, - column_position); + _gedit_cmd_load_files_from_prompt (window, + file_list, + encoding, + line_position, + column_position); if (new_document_option) gedit_window_create_tab (window, TRUE); @@ -732,12 +732,11 @@ main (int argc, char *argv[]) encoding = gedit_encoding_get_from_charset (encoding_charset); gedit_debug_message (DEBUG_APP, "Load files"); - _gedit_cmd_load_files_from_prompt_line_column - (window, - file_list, - encoding, - line_position, - column_position); + _gedit_cmd_load_files_from_prompt (window, + file_list, + encoding, + line_position, + column_position); } else { -- 1.6.3.3