[gedit/wip/gedit-next] Remove --geometry command line option (deprecated in GTK+)



commit 7ebbbec806df3a6cbb15150a637a98b4d546e1eb
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sun Mar 27 11:16:15 2016 +0200

    Remove --geometry command line option (deprecated in GTK+)
    
    Geometry handling in GTK+ is deprecated. See the deprecation warning of
    gtk_window_parse_geometry().

 data/gedit.1      |    3 ---
 gedit/gedit-app.c |   20 --------------------
 2 files changed, 0 insertions(+), 23 deletions(-)
---
diff --git a/data/gedit.1 b/data/gedit.1
index 73ac249..095ee6d 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 c3a0a47..466e3db 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,
@@ -880,7 +865,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,
@@ -896,13 +880,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;
@@ -950,7 +932,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"))
        {
@@ -1091,7 +1072,6 @@ gedit_app_open (GApplication  *application,
        open_files (application,
                    FALSE,
                    FALSE,
-                   NULL,
                    0,
                    0,
                    NULL,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]