diff options
| author | Sébastien Wilmet <swilmet@gnome.org> | 2016-03-27 11:16:15 +0200 |
|---|---|---|
| committer | Sébastien Wilmet <swilmet@gnome.org> | 2016-04-17 13:29:42 +0200 |
| commit | ae9fdfb63759c935b04ea70b974dabe8839a6ada (patch) | |
| tree | ecd49eca482d5f018ecd7c8fa816a5f58fc5558d | |
| parent | b51c409c492b48867512c7c05728a1c0439dd145 (diff) | |
| download | gedit-wip/gedit-next.tar.gz | |
Remove --geometry command line option (deprecated in GTK+)wip/gedit-next
Geometry handling in GTK+ is deprecated. See the deprecation warning of
gtk_window_parse_geometry().
| -rw-r--r-- | data/gedit.1 | 3 | ||||
| -rw-r--r-- | gedit/gedit-app.c | 20 |
2 files changed, 0 insertions, 23 deletions
diff --git a/data/gedit.1 b/data/gedit.1 index 73ac249bc..095ee6dd3 100644 --- a/data/gedit.1 +++ b/data/gedit.1 @@ -31,9 +31,6 @@ itself. \fB\-\-encoding\fR Set the character encoding to be used for opening the files listed on the command line. .TP -\fB\-g, \-\-geometry=GEOMETRY\fR -Set the X geometry window size (WIDTHxHEIGHT+X+Y). -.TP \fB\-\-list-encodings\fR Display list of possible values for the encoding option and exit. .TP diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c index 9e175526b..8dfc5e7ae 100644 --- a/gedit/gedit-app.c +++ b/gedit/gedit-app.c @@ -85,7 +85,6 @@ typedef struct /* command line parsing */ gboolean new_window; gboolean new_document; - gchar *geometry; const GtkSourceEncoding *encoding; GInputStream *stdin_stream; GSList *file_list; @@ -139,13 +138,6 @@ static const GOptionEntry options[] = NULL }, - /* Window geometry */ - { - "geometry", 'g', 0, G_OPTION_ARG_STRING, NULL, - N_("Set the size and position of the window (WIDTHxHEIGHT+X+Y)"), - N_("GEOMETRY") - }, - /* Wait for closing documents */ { "wait", 'w', 0, G_OPTION_ARG_NONE, NULL, @@ -420,7 +412,6 @@ static void open_files (GApplication *application, gboolean new_window, gboolean new_document, - gchar *geometry, gint line_position, gint column_position, const GtkSourceEncoding *encoding, @@ -446,11 +437,6 @@ open_files (GApplication *application, gtk_widget_show (GTK_WIDGET (window)); } - if (geometry) - { - gtk_window_parse_geometry (GTK_WINDOW (window), geometry); - } - if (stdin_stream) { gedit_debug_message (DEBUG_APP, "Load stdin"); @@ -536,7 +522,6 @@ new_document_activated (GSimpleAction *action, open_files (application, FALSE, TRUE, - NULL, 0, 0, NULL, @@ -899,7 +884,6 @@ gedit_app_activate (GApplication *application) open_files (application, priv->new_window, priv->new_document, - priv->geometry, priv->line_position, priv->column_position, priv->encoding, @@ -915,13 +899,11 @@ clear_options (GeditApp *app) priv = gedit_app_get_instance_private (app); - g_free (priv->geometry); g_clear_object (&priv->stdin_stream); g_slist_free_full (priv->file_list, g_object_unref); priv->new_window = FALSE; priv->new_document = FALSE; - priv->geometry = NULL; priv->encoding = NULL; priv->file_list = NULL; priv->line_position = 0; @@ -969,7 +951,6 @@ gedit_app_command_line (GApplication *application, g_variant_dict_lookup (options, "new-window", "b", &priv->new_window); g_variant_dict_lookup (options, "new-document", "b", &priv->new_document); - g_variant_dict_lookup (options, "geometry", "s", &priv->geometry); if (g_variant_dict_contains (options, "wait")) { @@ -1110,7 +1091,6 @@ gedit_app_open (GApplication *application, open_files (application, FALSE, FALSE, - NULL, 0, 0, NULL, |