[Spice-commits] 3 commits - src/spicy-connect.c

[Victor Toso de Carvalho]

 src/spicy-connect.c |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit ff68bb8078260b13067ada64f9ca085178b2c1fc
Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Wed Oct 19 18:07:00 2016 +0200

    spicy: GtkTable is deprecated so use GtkGrid instead
    
    Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
    Acked-by: Jonathon Jongsma <jjongsma at redhat.com>

diff --git a/src/spicy-connect.c b/src/spicy-connect.c
index 915eb06..39555a6 100644
--- a/src/spicy-connect.c
+++ b/src/spicy-connect.c
@@ -141,7 +141,7 @@ gboolean spicy_connect_dialog(SpiceSession *session)
     GtkWidget *connect_button, *cancel_button, *label;
     GtkBox *main_box, *recent_box, *button_box;
     GtkWindow *window;
-    GtkTable *table;
+    GtkGrid *grid;
     int i;
 
     ConnectionInfo info = {
@@ -159,19 +159,19 @@ gboolean spicy_connect_dialog(SpiceSession *session)
     main_box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
     gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(main_box));
 
-    table = GTK_TABLE(gtk_table_new(3, 2, 0));
-    gtk_box_pack_start(main_box, GTK_WIDGET(table), FALSE, TRUE, 0);
-    gtk_container_set_border_width(GTK_CONTAINER(table), 5);
-    gtk_table_set_row_spacings(table, 5);
-    gtk_table_set_col_spacings(table, 5);
+    grid = GTK_GRID(gtk_grid_new());
+    gtk_box_pack_start(main_box, GTK_WIDGET(grid), FALSE, TRUE, 0);
+    gtk_container_set_border_width(GTK_CONTAINER(grid), 5);
+    gtk_grid_set_row_spacing(grid, 5);
+    gtk_grid_set_column_spacing(grid, 5);
 
     for (i = 0; i < SPICE_N_ELEMENTS(connect_entries); i++) {
         gchar *txt;
         label = gtk_label_new(connect_entries[i].text);
         gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-        gtk_table_attach_defaults(table, label, 0, 1, i, i+1);
+        gtk_grid_attach(grid, label, 0, i, 1, 1);
         connect_entries[i].entry = GTK_WIDGET(gtk_entry_new());
-        gtk_table_attach_defaults(table, connect_entries[i].entry, 1, 2, i, i+1);
+        gtk_grid_attach(grid, connect_entries[i].entry, 1, i, 1, 1);
         g_object_get(session, connect_entries[i].prop, &txt, NULL);
         SPICE_DEBUG("%s: #%i [%s]: \"%s\"",
                 __FUNCTION__, i, connect_entries[i].prop, txt);
commit bbed2bb11091f4b86a5091fdf5211a2aec6850f5
Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Wed Oct 19 18:06:56 2016 +0200

    spicy: Avoid gtk_hbutton_box_new(); it is deprecated
    
    Spice-Gtk requires GTK+ > 3.12 which has gtk_button_box_new().
    
    Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
    Acked-by: Jonathon Jongsma <jjongsma at redhat.com>

diff --git a/src/spicy-connect.c b/src/spicy-connect.c
index a1d895a..915eb06 100644
--- a/src/spicy-connect.c
+++ b/src/spicy-connect.c
@@ -189,7 +189,7 @@ gboolean spicy_connect_dialog(SpiceSession *session)
     gtk_box_pack_start(recent_box, label, FALSE, TRUE, 0);
     gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
-    button_box = GTK_BOX(gtk_hbutton_box_new());
+    button_box = GTK_BOX(gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL));
     gtk_button_box_set_layout(GTK_BUTTON_BOX(button_box), GTK_BUTTONBOX_END);
     gtk_box_set_spacing(button_box, 5);
     gtk_container_set_border_width(GTK_CONTAINER(button_box), 5);
commit 2ae7f8b727d4de8c91df3535e6b9aeef7b9a8dcc
Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Wed Oct 19 18:06:48 2016 +0200

    spicy: Avoid gtk_vbox_new(); it is deprecated
    
    Spice-Gtk requires GTK+ > 3.12 which has gtk_box_new().
    
    Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
    Acked-by: Jonathon Jongsma <jjongsma at redhat.com>

diff --git a/src/spicy-connect.c b/src/spicy-connect.c
index c471df5..a1d895a 100644
--- a/src/spicy-connect.c
+++ b/src/spicy-connect.c
@@ -156,7 +156,7 @@ gboolean spicy_connect_dialog(SpiceSession *session)
     gtk_window_set_resizable(window, FALSE);
     gtk_container_set_border_width(GTK_CONTAINER(window), 5);
 
-    main_box = GTK_BOX(gtk_vbox_new(FALSE, 0));
+    main_box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
     gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(main_box));
 
     table = GTK_TABLE(gtk_table_new(3, 2, 0));
@@ -181,7 +181,7 @@ gboolean spicy_connect_dialog(SpiceSession *session)
         }
     }
 
-    recent_box = GTK_BOX(gtk_vbox_new(FALSE, 0));
+    recent_box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
     gtk_box_pack_start(main_box, GTK_WIDGET(recent_box), TRUE, TRUE, 0);
     gtk_container_set_border_width(GTK_CONTAINER(recent_box), 5);