[gnome-nibbles/gnome-3-12] Revert "Force a minumum size (800x600), also helps for background resizing"

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 762b040c957accbce00f65fa9533d33672fa8813
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sun May 11 10:48:30 2014 -0500

    Revert "Force a minumum size (800x600), also helps for background resizing"
    
    This reverts commit 55e4d7b91c06b1409cd59ac58c264ac96cd9ef77.
    
    Conflicts:
        src/main.c
    
    https://bugzilla.gnome.org/show_bug.cgi?id=709595
    
    Conflicts:
        src/main.c

 src/main.c       |   11 +----------
 src/properties.c |    4 ++--
 2 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/src/main.c b/src/main.c
index 6aad853..93aa39d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -584,10 +584,6 @@ activate (GtkApplication* app,
 {
   GtkWidget *headerbar;
   GtkWidget *label;
-  GdkGeometry size_hints = {
-    800, 600, 0, 0, 800, 600, 0, 0, 0.0, 0.0, GDK_GRAVITY_NORTH_WEST  
-  };
-
   GtkWidget *vbox;
   ClutterColor stage_color = {0x00,0x00,0x00,0xff};
 
@@ -601,13 +597,8 @@ activate (GtkApplication* app,
   gtk_widget_show (headerbar);
 
   window = gtk_application_window_new (app);
-
   gtk_window_set_titlebar (GTK_WINDOW (window), headerbar);
-
-  gtk_window_set_geometry_hints (GTK_WINDOW (window),
-                    window,
-                    &size_hints,
-                    GDK_HINT_MIN_SIZE);
+  gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
 
   g_action_map_add_action_entries (G_ACTION_MAP (app), app_entries, G_N_ELEMENTS (app_entries), app);
 
diff --git a/src/properties.c b/src/properties.c
index 33f853e..c76048a 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -118,8 +118,8 @@ gnibbles_properties_update (GnibblesProperties * tmp)
   sound_enable (tmp->sound);
 
   tmp->tilesize = g_settings_get_int (settings, "tile-size");
-  if (tmp->tilesize < 8)
-    tmp->tilesize = 8;
+  if (tmp->tilesize < 1)
+    tmp->tilesize = 5;
   if (tmp->tilesize > 30)
     tmp->tilesize = 30;